From 14d31f37e82f159896eeeb5700d4c874948e76bb Mon Sep 17 00:00:00 2001 From: David Jumani Date: Fri, 14 Feb 2025 11:03:46 -0500 Subject: [PATCH] bump k8s 1.32 --- go.mod | 130 +- go.sum | 1203 ++++++++-- .../v1/auth_config.pb.clone.go | 142 +- .../v1/auth_config.pb.go | 2004 ++++------------- .../v1/extauth-internal.pb.clone.go | 42 +- .../v1/extauth-internal.pb.go | 1066 ++------- .../v1/types/auth_config.pb.go | 72 +- .../v1/types/gateway.pb.go | 74 +- .../v1/types/matchable_http_gateway.pb.go | 74 +- .../v1/types/matchable_tcp_gateway.pb.go | 74 +- .../v1/types/route_table.pb.go | 74 +- .../v1/types/virtual_service.pb.go | 72 +- .../fed.gloo.solo.io/v1/types/settings.pb.go | 72 +- .../fed.gloo.solo.io/v1/types/upstream.pb.go | 72 +- .../v1/types/upstream_group.pb.go | 72 +- .../v1alpha1/types/rate_limit_config.pb.go | 72 +- pkg/api/fed.solo.io/core/v1/placement.pb.go | 96 +- pkg/api/fed.solo.io/v1/types/failover.pb.go | 136 +- pkg/api/fed.solo.io/v1/types/instance.pb.go | 226 +- .../v1/external_options.pb.clone.go | 20 +- .../gateway.solo.io/v1/external_options.pb.go | 292 +-- .../gateway.solo.io/v1/gateway.pb.clone.go | 16 +- pkg/api/gateway.solo.io/v1/gateway.pb.go | 228 +- pkg/api/gateway.solo.io/v1/http_gateway.pb.go | 72 +- .../v1/matchable_http_gateway.pb.clone.go | 8 +- .../v1/matchable_http_gateway.pb.go | 102 +- .../v1/matchable_tcp_gateway.pb.clone.go | 8 +- .../v1/matchable_tcp_gateway.pb.go | 102 +- .../v1/route_table.pb.clone.go | 12 +- pkg/api/gateway.solo.io/v1/route_table.pb.go | 88 +- .../v1/virtual_service.pb.clone.go | 20 +- .../gateway.solo.io/v1/virtual_service.pb.go | 230 +- .../tap/output_sink/v3/grpc_output_sink.pb.go | 28 +- .../tap/output_sink/v3/http_output_sink.pb.go | 28 +- .../envoy/annotations/deprecation.pb.go | 20 +- .../v2/cluster/outlier_detection.pb.clone.go | 60 +- .../api/v2/cluster/outlier_detection.pb.go | 94 +- .../envoy/api/v2/core/health_check.pb.go | 236 +- .../envoy/api/v2/route/route.pb.clone.go | 150 +- .../external/envoy/api/v2/route/route.pb.go | 938 ++------ .../v3/mutation_rules.pb.clone.go | 24 +- .../mutation_rules/v3/mutation_rules.pb.go | 76 +- .../envoy/config/core/v3/address.pb.clone.go | 22 +- .../envoy/config/core/v3/address.pb.go | 184 +- .../envoy/config/core/v3/backoff.pb.clone.go | 10 +- .../envoy/config/core/v3/backoff.pb.go | 42 +- .../envoy/config/core/v3/base.pb.clone.go | 38 +- .../external/envoy/config/core/v3/base.pb.go | 454 +--- .../config/core/v3/event_service_config.pb.go | 30 +- .../config/core/v3/extension.pb.clone.go | 6 +- .../envoy/config/core/v3/extension.pb.go | 36 +- .../config/core/v3/grpc_service.pb.clone.go | 34 +- .../envoy/config/core/v3/grpc_service.pb.go | 354 +-- .../config/core/v3/health_check.pb.clone.go | 70 +- .../envoy/config/core/v3/health_check.pb.go | 262 +-- .../envoy/config/core/v3/http_uri.pb.clone.go | 6 +- .../envoy/config/core/v3/http_uri.pb.go | 40 +- .../envoy/config/core/v3/proxy_protocol.pb.go | 50 +- .../envoy/config/core/v3/socket_option.pb.go | 30 +- .../filter/http/gzip/v2/gzip.pb.clone.go | 14 +- .../config/filter/http/gzip/v2/gzip.pb.go | 66 +- .../v3/tls_cipher_inspector.pb.go | 28 +- .../server_name/v3/server_name_matcher.pb.go | 50 +- .../v3/cipher_detection_input.pb.go | 28 +- .../route/v3/route_components.pb.clone.go | 158 +- .../config/route/v3/route_components.pb.go | 1154 +++------- .../envoy/config/trace/v3/datadog.pb.clone.go | 18 +- .../envoy/config/trace/v3/datadog.pb.go | 80 +- .../envoy/config/trace/v3/opencensus.pb.go | 142 +- .../envoy/config/trace/v3/opentelemetry.pb.go | 52 +- .../envoy/config/trace/v3/zipkin.pb.clone.go | 12 +- .../envoy/config/trace/v3/zipkin.pb.go | 42 +- .../advanced_http/advanced_http.pb.go | 150 +- .../envoy/extensions/aws/filter.pb.clone.go | 22 +- .../envoy/extensions/aws/filter.pb.go | 144 +- .../envoy/extensions/cache/grpc/config.pb.go | 40 +- .../envoy/extensions/extauth/sanitize.pb.go | 50 +- .../filters/http/buffer/v3/buffer.pb.clone.go | 6 +- .../filters/http/buffer/v3/buffer.pb.go | 64 +- .../filters/http/csrf/v3/csrf.pb.go | 28 +- .../http/ext_proc/v3/processing_mode.pb.go | 28 +- .../filters/http/graphql/v2/graphql.pb.go | 810 ++----- .../filters/http/graphql/v2/stitching.pb.go | 250 +- .../filters/http/jwt_authn/v3/config.pb.go | 298 +-- .../filters/http/wasm/v3/wasm.pb.go | 28 +- .../extensions/http_path/http_path.pb.go | 28 +- .../envoy/extensions/jwt/solo_jwt_authn.pb.go | 116 +- .../proxylatency/proxylatency.pb.clone.go | 14 +- .../proxylatency/proxylatency.pb.go | 44 +- .../transformation/transformation.pb.clone.go | 20 +- .../transformation/transformation.pb.go | 498 +--- .../transformation_ee/transformation.pb.go | 230 +- .../transformers/xslt/xslt_transformer.pb.go | 28 +- .../upstream_wait/upstream_wait_filter.pb.go | 28 +- .../external/envoy/extensions/waf/waf.pb.go | 94 +- .../envoy/extensions/wasm/v3/wasm.pb.clone.go | 12 +- .../envoy/extensions/wasm/v3/wasm.pb.go | 86 +- .../xff_offset/solo_xff_offset_filter.pb.go | 28 +- .../v3/external_processor.pb.clone.go | 28 +- .../ext_proc/v3/external_processor.pb.go | 322 +-- .../envoy/type/matcher/v3/regex.pb.clone.go | 6 +- .../envoy/type/matcher/v3/regex.pb.go | 82 +- .../envoy/type/matcher/v3/string.pb.go | 52 +- .../envoy/type/metadata/v3/metadata.pb.go | 164 +- .../external/envoy/type/range.pb.go | 50 +- .../envoy/type/tracing/v3/custom_tag.pb.go | 118 +- .../external/envoy/type/v3/http.pb.go | 4 +- .../external/envoy/type/v3/http_status.pb.go | 28 +- .../external/envoy/type/v3/percent.pb.go | 50 +- .../external/envoy/type/v3/range.pb.go | 72 +- .../envoy/type/v3/semantic_version.pb.go | 28 +- .../external/udpa/annotations/migrate.pb.go | 110 +- .../external/udpa/annotations/sensitive.pb.go | 12 +- .../external/udpa/annotations/status.pb.go | 40 +- .../udpa/annotations/versioning.pb.go | 38 +- pkg/api/gloo.solo.io/v1/artifact.pb.go | 28 +- .../v1/circuit_breaker.pb.clone.go | 18 +- pkg/api/gloo.solo.io/v1/circuit_breaker.pb.go | 50 +- .../gloo.solo.io/v1/connection.pb.clone.go | 22 +- pkg/api/gloo.solo.io/v1/connection.pb.go | 74 +- .../v1/core/matchers/matchers.pb.clone.go | 6 +- .../v1/core/matchers/matchers.pb.go | 104 +- .../v1/core/selectors/selectors.pb.go | 50 +- .../gloo.solo.io/v1/destination_spec.pb.go | 30 +- pkg/api/gloo.solo.io/v1/endpoint.pb.go | 50 +- .../v1/enterprise/options/ai/ai.pb.clone.go | 8 +- .../v1/enterprise/options/ai/ai.pb.go | 854 ++----- .../options/caching/caching.pb.clone.go | 16 +- .../enterprise/options/caching/caching.pb.go | 50 +- .../v1/enterprise/options/dlp/dlp.pb.go | 138 +- .../options/extproc/extproc.pb.clone.go | 60 +- .../enterprise/options/extproc/extproc.pb.go | 180 +- .../v1/enterprise/options/gcp/gcp.pb.go | 28 +- .../v1/enterprise/options/jwt/jwt.pb.clone.go | 16 +- .../v1/enterprise/options/jwt/jwt.pb.go | 288 +-- .../options/ratelimit/ratelimit.pb.clone.go | 8 +- .../options/ratelimit/ratelimit.pb.go | 198 +- .../v1/enterprise/options/rbac/rbac.pb.go | 138 +- .../stateful_session/stateful_session.pb.go | 104 +- .../v1/enterprise/options/waf/waf.pb.go | 74 +- .../v1/enterprise/ratelimit.pb.go | 28 +- .../gloo.solo.io/v1/extensions.pb.clone.go | 12 +- pkg/api/gloo.solo.io/v1/extensions.pb.go | 68 +- pkg/api/gloo.solo.io/v1/failover.pb.clone.go | 24 +- pkg/api/gloo.solo.io/v1/failover.pb.go | 184 +- pkg/api/gloo.solo.io/v1/filters/stages.pb.go | 28 +- .../gloo.solo.io/v1/gloosnapshot/snap.pb.go | 4 +- .../v1/http_listener_options.pb.clone.go | 16 +- .../v1/http_listener_options.pb.go | 46 +- .../v1/listener_options.pb.clone.go | 12 +- .../gloo.solo.io/v1/listener_options.pb.go | 86 +- .../gloo.solo.io/v1/load_balancer.pb.clone.go | 34 +- pkg/api/gloo.solo.io/v1/load_balancer.pb.go | 226 +- .../options/advanced_http/advanced_http.pb.go | 128 +- .../v1/options/als/als.pb.clone.go | 8 +- pkg/api/gloo.solo.io/v1/options/als/als.pb.go | 374 +-- pkg/api/gloo.solo.io/v1/options/aws/aws.pb.go | 72 +- .../v1/options/aws/ec2/aws_ec2.pb.go | 74 +- .../gloo.solo.io/v1/options/azure/azure.pb.go | 72 +- .../connection_limit.pb.clone.go | 12 +- .../connection_limit/connection_limit.pb.go | 46 +- .../v1/options/consul/consul.pb.go | 28 +- .../options/consul/query_options.pb.clone.go | 6 +- .../v1/options/consul/query_options.pb.go | 42 +- .../gloo.solo.io/v1/options/cors/cors.pb.go | 50 +- .../dynamic_forward_proxy.pb.clone.go | 36 +- .../dynamic_forward_proxy.pb.go | 222 +- .../options/faultinjection/fault.pb.clone.go | 6 +- .../v1/options/faultinjection/fault.pb.go | 86 +- .../v1/options/graphql/graphql.pb.go | 50 +- .../gloo.solo.io/v1/options/grpc/grpc.pb.go | 72 +- .../v1/options/grpc_json/grpc_json.pb.go | 74 +- .../v1/options/grpc_web/grpc_web.pb.go | 28 +- .../v1/options/hcm/hcm.pb.clone.go | 160 +- pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.go | 284 +-- .../header_validation/header_validation.pb.go | 38 +- .../v1/options/headers/headers.pb.clone.go | 8 +- .../v1/options/headers/headers.pb.go | 102 +- .../v1/options/healthcheck/healthcheck.pb.go | 30 +- .../v1/options/kubernetes/kubernetes.pb.go | 28 +- .../v1/options/lbhash/lbhash.pb.clone.go | 6 +- .../v1/options/lbhash/lbhash.pb.go | 82 +- .../local_ratelimit.pb.clone.go | 20 +- .../local_ratelimit/local_ratelimit.pb.go | 80 +- .../gloo.solo.io/v1/options/pipe/pipe.pb.go | 28 +- .../v1/options/protocol/protocol.pb.clone.go | 32 +- .../v1/options/protocol/protocol.pb.go | 112 +- .../protocol_upgrade.pb.clone.go | 6 +- .../protocol_upgrade/protocol_upgrade.pb.go | 60 +- .../proxy_protocol/proxy_protocol.pb.go | 72 +- .../gloo.solo.io/v1/options/rest/rest.pb.go | 74 +- .../v1/options/retries/retries.pb.clone.go | 20 +- .../v1/options/retries/retries.pb.go | 98 +- .../v1/options/router/router.pb.go | 42 +- .../v1/options/service_spec.pb.go | 30 +- .../v1/options/shadowing/shadowing.pb.go | 28 +- .../v1/options/static/static.pb.clone.go | 24 +- .../v1/options/static/static.pb.go | 98 +- .../gloo.solo.io/v1/options/stats/stats.pb.go | 50 +- .../gloo.solo.io/v1/options/subset_spec.pb.go | 72 +- pkg/api/gloo.solo.io/v1/options/tap/tap.pb.go | 136 +- .../v1/options/tcp/tcp.pb.clone.go | 20 +- pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.go | 120 +- .../v1/options/tracing/tracing.pb.clone.go | 50 +- .../v1/options/tracing/tracing.pb.go | 216 +- .../transformation/parameters.pb.clone.go | 6 +- .../options/transformation/parameters.pb.go | 40 +- .../transformation/transformation.pb.clone.go | 28 +- .../transformation/transformation.pb.go | 416 +--- .../v1/options/wasm/wasm.pb.clone.go | 6 +- .../gloo.solo.io/v1/options/wasm/wasm.pb.go | 82 +- pkg/api/gloo.solo.io/v1/proxy.pb.clone.go | 60 +- pkg/api/gloo.solo.io/v1/proxy.pb.go | 768 ++----- .../route_configuration_options.pb.clone.go | 10 +- .../v1/route_configuration_options.pb.go | 42 +- .../gloo.solo.io/v1/route_options.pb.clone.go | 54 +- pkg/api/gloo.solo.io/v1/route_options.pb.go | 106 +- pkg/api/gloo.solo.io/v1/secret.pb.go | 162 +- pkg/api/gloo.solo.io/v1/settings.pb.clone.go | 180 +- pkg/api/gloo.solo.io/v1/settings.pb.go | 1034 ++------- pkg/api/gloo.solo.io/v1/ssl/ssl.pb.clone.go | 26 +- pkg/api/gloo.solo.io/v1/ssl/ssl.pb.go | 194 +- pkg/api/gloo.solo.io/v1/subset.pb.go | 28 +- .../v1/tcp_listener_options.pb.go | 28 +- pkg/api/gloo.solo.io/v1/upstream.pb.clone.go | 68 +- pkg/api/gloo.solo.io/v1/upstream.pb.go | 214 +- .../v1/virtual_host_options.pb.clone.go | 12 +- .../v1/virtual_host_options.pb.go | 42 +- .../v1/weighted_destination_options.pb.go | 28 +- .../graphql.gloo.solo.io/v1beta1/clients.go | 26 +- .../v1beta1/controller/event_handlers.go | 6 +- .../v1beta1/controller/reconcilers.go | 6 +- .../v1beta1/graphql.pb.clone.go | 52 +- .../v1beta1/graphql.pb.go | 596 ++--- .../v1beta1/sets/mocks/sets.go | 32 +- .../graphql.gloo.solo.io/v1beta1/sets/sets.go | 94 +- pkg/api/graphql.gloo.solo.io/v1beta1/types.go | 2 +- .../v1alpha1/types/multicluster.pb.go | 146 +- .../v1alpha1/ratelimit.pb.go | 530 +---- 239 files changed, 7980 insertions(+), 20701 deletions(-) diff --git a/go.mod b/go.mod index 3cd9e6437..4ee0f2245 100644 --- a/go.mod +++ b/go.mod @@ -1,82 +1,84 @@ module github.com/solo-io/solo-apis -go 1.23.1 +go 1.23.3 replace ( github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // skv2 uses a newer version than the imported solo-kit version which causes issues. Replaces the version with the solo-kit version github.com/pseudomuto/protoc-gen-doc => github.com/pseudomuto/protoc-gen-doc v1.0.0 - k8s.io/api => k8s.io/api v0.29.2 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.2 - k8s.io/apimachinery => k8s.io/apimachinery v0.29.2 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.2 - k8s.io/client-go => k8s.io/client-go v0.29.2 - k8s.io/code-generator => k8s.io/code-generator v0.29.2 - k8s.io/component-base => k8s.io/component-base v0.29.2 + k8s.io/api => k8s.io/api v0.32.2 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2 + k8s.io/apimachinery => k8s.io/apimachinery v0.32.2 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2 + k8s.io/client-go => k8s.io/client-go v0.32.2 + k8s.io/code-generator => k8s.io/code-generator v0.32.2 + k8s.io/component-base => k8s.io/component-base v0.32.2 ) require ( - github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 - github.com/envoyproxy/protoc-gen-validate v1.0.2 + github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b + github.com/envoyproxy/protoc-gen-validate v1.0.4 github.com/gogo/protobuf v1.3.2 github.com/golang/mock v1.6.0 - github.com/golang/protobuf v1.5.3 + github.com/golang/protobuf v1.5.4 github.com/mitchellh/hashstructure v1.0.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.30.0 + github.com/onsi/gomega v1.35.1 github.com/pkg/errors v0.9.1 github.com/rotisserie/eris v0.4.0 - github.com/solo-io/go-utils v0.24.8 - github.com/solo-io/protoc-gen-ext v0.0.18 - github.com/solo-io/skv2 v0.39.1 - github.com/solo-io/solo-kit v0.35.0 - golang.org/x/tools v0.16.1 - google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d - google.golang.org/grpc v1.59.0 - google.golang.org/protobuf v1.31.0 + github.com/solo-io/go-utils v0.27.4 + github.com/solo-io/protoc-gen-ext v0.0.20 + github.com/solo-io/skv2 v0.42.0 + github.com/solo-io/solo-kit v0.37.0 + golang.org/x/tools v0.26.0 + google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 + google.golang.org/grpc v1.65.0 + google.golang.org/protobuf v1.35.1 istio.io/tools v0.0.0-20200918020118-6d0a0e49b5d3 - k8s.io/api v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/client-go v0.29.2 - k8s.io/code-generator v0.29.2 - sigs.k8s.io/controller-runtime v0.17.4 + k8s.io/api v0.32.2 + k8s.io/apimachinery v0.32.2 + k8s.io/client-go v0.32.2 + k8s.io/code-generator v0.32.2 + sigs.k8s.io/controller-runtime v0.20.1 ) require ( - github.com/BurntSushi/toml v1.2.1 // indirect + cel.dev/expr v0.18.0 // indirect + github.com/BurntSushi/toml v1.3.2 // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/Masterminds/sprig/v3 v3.2.3 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cockroachdb/apd/v2 v2.0.1 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/emicklei/proto v1.6.15 // indirect - github.com/evanphx/json-patch/v5 v5.8.0 // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/gertd/go-pluralize v0.1.1 // indirect github.com/getkin/kin-openapi v0.123.0 // indirect github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect - github.com/go-logr/logr v1.4.1 // indirect - github.com/go-openapi/jsonpointer v0.20.2 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.8 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/gobuffalo/envy v1.8.1 // indirect github.com/gobuffalo/packd v0.3.0 // indirect github.com/gobuffalo/packr v1.30.1 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/google/btree v1.1.3 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.1 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/huandu/xstrings v1.4.0 // indirect github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect - github.com/iancoleman/strcase v0.2.0 // indirect + github.com/iancoleman/strcase v0.3.0 // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/invopop/jsonschema v0.7.0 // indirect github.com/invopop/yaml v0.2.0 // indirect @@ -90,7 +92,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-zglob v0.0.3 // indirect - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect @@ -102,48 +103,47 @@ require ( github.com/nxadm/tail v1.4.8 // indirect github.com/pborman/uuid v1.2.0 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect - github.com/prometheus/client_golang v1.18.0 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.45.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect - github.com/shopspring/decimal v1.2.0 // indirect + github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/solo-io/anyvendor v0.0.4 // indirect github.com/solo-io/cue v0.4.7 // indirect - github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/afero v1.10.0 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/ugorji/go/codec v1.2.12 // indirect + github.com/x448/float16 v0.8.4 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.26.0 // indirect - golang.org/x/crypto v0.16.0 // indirect - golang.org/x/exp v0.0.0-20220921164117-439092de6870 // indirect - golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect - golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.15.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/time v0.3.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/crypto v0.28.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/term v0.25.0 // indirect + golang.org/x/text v0.19.0 // indirect + golang.org/x/time v0.7.0 // indirect + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect + gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.29.2 // indirect - k8s.io/component-base v0.29.2 // indirect - k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect - k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + k8s.io/apiextensions-apiserver v0.32.2 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect + k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect + k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect + sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 7f389756b..c584c058f 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,6 @@ +cel.dev/expr v0.15.0/go.mod h1:TRSuuV7DlVCE/uwv5QbAiW/v8l5O8C4eEPHeu7gf7Sg= +cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo= +cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -39,16 +42,31 @@ cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMz cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw= cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= +cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM= +cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= +cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU= +cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= +cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw= cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E= cloud.google.com/go/accessapproval v1.7.1/go.mod h1:JYczztsHRMK7NTXb6Xw+dwbs/WnOJxbo/2mTI+Kgg68= +cloud.google.com/go/accessapproval v1.7.2/go.mod h1:/gShiq9/kK/h8T/eEn1BTzalDvk0mZxJlhfw0p+Xuc0= +cloud.google.com/go/accessapproval v1.7.3/go.mod h1:4l8+pwIxGTNqSf4T3ds8nLO94NQf0W/KnMNuQ9PbnP8= +cloud.google.com/go/accessapproval v1.7.4/go.mod h1:/aTEh45LzplQgFYdQdwPMR9YdX0UlhBmvB84uAmQKUc= +cloud.google.com/go/accessapproval v1.7.5/go.mod h1:g88i1ok5dvQ9XJsxpUInWWvUBrIZhyPDPbk4T01OoJ0= cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o= cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE= cloud.google.com/go/accesscontextmanager v1.6.0/go.mod h1:8XCvZWfYw3K/ji0iVnp+6pu7huxoQTLmxAbVjbloTtM= cloud.google.com/go/accesscontextmanager v1.7.0/go.mod h1:CEGLewx8dwa33aDAZQujl7Dx+uYhS0eay198wB/VumQ= cloud.google.com/go/accesscontextmanager v1.8.0/go.mod h1:uI+AI/r1oyWK99NN8cQ3UK76AMelMzgZCvJfsi2c+ps= cloud.google.com/go/accesscontextmanager v1.8.1/go.mod h1:JFJHfvuaTC+++1iL1coPiG1eu5D24db2wXCDWDjIrxo= +cloud.google.com/go/accesscontextmanager v1.8.2/go.mod h1:E6/SCRM30elQJ2PKtFMs2YhfJpZSNcJyejhuzoId4Zk= +cloud.google.com/go/accesscontextmanager v1.8.3/go.mod h1:4i/JkF2JiFbhLnnpnfoTX5vRXfhf9ukhU1ANOTALTOQ= +cloud.google.com/go/accesscontextmanager v1.8.4/go.mod h1:ParU+WbMpD34s5JFEnGAnPBYAgUHozaTmDJU7aCU9+M= +cloud.google.com/go/accesscontextmanager v1.8.5/go.mod h1:TInEhcZ7V9jptGNqN3EzZ5XMhT6ijWxTGjzyETwmL0Q= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg= @@ -57,6 +75,16 @@ cloud.google.com/go/aiplatform v1.36.1/go.mod h1:WTm12vJRPARNvJ+v6P52RDHCNe4Ahvj cloud.google.com/go/aiplatform v1.37.0/go.mod h1:IU2Cv29Lv9oCn/9LkFiiuKfwrRTq+QQMbW+hPCxJGZw= cloud.google.com/go/aiplatform v1.45.0/go.mod h1:Iu2Q7sC7QGhXUeOhAj/oCK9a+ULz1O4AotZiqjQ8MYA= cloud.google.com/go/aiplatform v1.48.0/go.mod h1:Iu2Q7sC7QGhXUeOhAj/oCK9a+ULz1O4AotZiqjQ8MYA= +cloud.google.com/go/aiplatform v1.50.0/go.mod h1:IRc2b8XAMTa9ZmfJV1BCCQbieWWvDnP1A8znyz5N7y4= +cloud.google.com/go/aiplatform v1.51.0/go.mod h1:IRc2b8XAMTa9ZmfJV1BCCQbieWWvDnP1A8znyz5N7y4= +cloud.google.com/go/aiplatform v1.51.1/go.mod h1:kY3nIMAVQOK2XDqDPHaOuD9e+FdMA6OOpfBjsvaFSOo= +cloud.google.com/go/aiplatform v1.51.2/go.mod h1:hCqVYB3mY45w99TmetEoe8eCQEwZEp9WHxeZdcv9phw= +cloud.google.com/go/aiplatform v1.52.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU= +cloud.google.com/go/aiplatform v1.54.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU= +cloud.google.com/go/aiplatform v1.57.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU= +cloud.google.com/go/aiplatform v1.58.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU= +cloud.google.com/go/aiplatform v1.58.2/go.mod h1:c3kCiVmb6UC1dHAjZjcpDj6ZS0bHQ2slL88ZjC2LtlA= +cloud.google.com/go/aiplatform v1.60.0/go.mod h1:eTlGuHOahHprZw3Hio5VKmtThIOak5/qy6pzdsqcQnM= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4= cloud.google.com/go/analytics v0.17.0/go.mod h1:WXFa3WSym4IZ+JiKmavYdJwGG/CvpqiqczmL59bTD9M= @@ -64,18 +92,35 @@ cloud.google.com/go/analytics v0.18.0/go.mod h1:ZkeHGQlcIPkw0R/GW+boWHhCOR43xz9R cloud.google.com/go/analytics v0.19.0/go.mod h1:k8liqf5/HCnOUkbawNtrWWc+UAzyDlW89doe8TtoDsE= cloud.google.com/go/analytics v0.21.2/go.mod h1:U8dcUtmDmjrmUTnnnRnI4m6zKn/yaA5N9RlEkYFHpQo= cloud.google.com/go/analytics v0.21.3/go.mod h1:U8dcUtmDmjrmUTnnnRnI4m6zKn/yaA5N9RlEkYFHpQo= +cloud.google.com/go/analytics v0.21.4/go.mod h1:zZgNCxLCy8b2rKKVfC1YkC2vTrpfZmeRCySM3aUbskA= +cloud.google.com/go/analytics v0.21.5/go.mod h1:BQtOBHWTlJ96axpPPnw5CvGJ6i3Ve/qX2fTxR8qWyr8= +cloud.google.com/go/analytics v0.21.6/go.mod h1:eiROFQKosh4hMaNhF85Oc9WO97Cpa7RggD40e/RBy8w= +cloud.google.com/go/analytics v0.22.0/go.mod h1:eiROFQKosh4hMaNhF85Oc9WO97Cpa7RggD40e/RBy8w= +cloud.google.com/go/analytics v0.23.0/go.mod h1:YPd7Bvik3WS95KBok2gPXDqQPHy08TsCQG6CdUCb+u0= cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk= cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc= cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8= cloud.google.com/go/apigateway v1.6.1/go.mod h1:ufAS3wpbRjqfZrzpvLC2oh0MFlpRJm2E/ts25yyqmXA= +cloud.google.com/go/apigateway v1.6.2/go.mod h1:CwMC90nnZElorCW63P2pAYm25AtQrHfuOkbRSHj0bT8= +cloud.google.com/go/apigateway v1.6.3/go.mod h1:k68PXWpEs6BVDTtnLQAyG606Q3mz8pshItwPXjgv44Y= +cloud.google.com/go/apigateway v1.6.4/go.mod h1:0EpJlVGH5HwAN4VF4Iec8TAzGN1aQgbxAWGJsnPCGGY= +cloud.google.com/go/apigateway v1.6.5/go.mod h1:6wCwvYRckRQogyDDltpANi3zsCDl6kWi0b4Je+w2UiI= cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc= cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04= cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8= cloud.google.com/go/apigeeconnect v1.6.1/go.mod h1:C4awq7x0JpLtrlQCr8AzVIzAaYgngRqWf9S5Uhg+wWs= +cloud.google.com/go/apigeeconnect v1.6.2/go.mod h1:s6O0CgXT9RgAxlq3DLXvG8riw8PYYbU/v25jqP3Dy18= +cloud.google.com/go/apigeeconnect v1.6.3/go.mod h1:peG0HFQ0si2bN15M6QSjEW/W7Gy3NYkWGz7pFz13cbo= +cloud.google.com/go/apigeeconnect v1.6.4/go.mod h1:CapQCWZ8TCjnU0d7PobxhpOdVz/OVJ2Hr/Zcuu1xFx0= +cloud.google.com/go/apigeeconnect v1.6.5/go.mod h1:MEKm3AiT7s11PqTfKE3KZluZA9O91FNysvd3E6SJ6Ow= cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY= cloud.google.com/go/apigeeregistry v0.5.0/go.mod h1:YR5+s0BVNZfVOUkMa5pAR2xGd0A473vA5M7j247o1wM= cloud.google.com/go/apigeeregistry v0.6.0/go.mod h1:BFNzW7yQVLZ3yj0TKcwzb8n25CFBri51GVGOEUcgQsc= cloud.google.com/go/apigeeregistry v0.7.1/go.mod h1:1XgyjZye4Mqtw7T9TsY4NW10U7BojBvG4RMD+vRDrIw= +cloud.google.com/go/apigeeregistry v0.7.2/go.mod h1:9CA2B2+TGsPKtfi3F7/1ncCCsL62NXBRfM6iPoGSM+8= +cloud.google.com/go/apigeeregistry v0.8.1/go.mod h1:MW4ig1N4JZQsXmBSwH4rwpgDonocz7FPBSw6XPGHmYw= +cloud.google.com/go/apigeeregistry v0.8.2/go.mod h1:h4v11TDGdeXJDJvImtgK2AFVvMIgGWjSb0HRnBSjcX8= +cloud.google.com/go/apigeeregistry v0.8.3/go.mod h1:aInOWnqF4yMQx8kTjDqHNXjZGh/mxeNlAf52YqtASUs= cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU= cloud.google.com/go/apikeys v0.5.0/go.mod h1:5aQfwY4D+ewMMWScd3hm2en3hCj+BROlyrt3ytS7KLI= cloud.google.com/go/apikeys v0.6.0/go.mod h1:kbpXu5upyiAlGkKrJgQl8A0rKNNJ7dQ377pdroRSSi8= @@ -85,11 +130,19 @@ cloud.google.com/go/appengine v1.6.0/go.mod h1:hg6i0J/BD2cKmDJbaFSYHFyZkgBEfQrDg cloud.google.com/go/appengine v1.7.0/go.mod h1:eZqpbHFCqRGa2aCdope7eC0SWLV1j0neb/QnMJVWx6A= cloud.google.com/go/appengine v1.7.1/go.mod h1:IHLToyb/3fKutRysUlFO0BPt5j7RiQ45nrzEJmKTo6E= cloud.google.com/go/appengine v1.8.1/go.mod h1:6NJXGLVhZCN9aQ/AEDvmfzKEfoYBlfB80/BHiKVputY= +cloud.google.com/go/appengine v1.8.2/go.mod h1:WMeJV9oZ51pvclqFN2PqHoGnys7rK0rz6s3Mp6yMvDo= +cloud.google.com/go/appengine v1.8.3/go.mod h1:2oUPZ1LVZ5EXi+AF1ihNAF+S8JrzQ3till5m9VQkrsk= +cloud.google.com/go/appengine v1.8.4/go.mod h1:TZ24v+wXBujtkK77CXCpjZbnuTvsFNT41MUaZ28D6vg= +cloud.google.com/go/appengine v1.8.5/go.mod h1:uHBgNoGLTS5di7BvU25NFDuKa82v0qQLjyMJLuPQrVo= cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0= cloud.google.com/go/area120 v0.7.0/go.mod h1:a3+8EUD1SX5RUcCs3MY5YasiO1z6yLiNLRiFrykbynY= cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k= cloud.google.com/go/area120 v0.8.1/go.mod h1:BVfZpGpB7KFVNxPiQBuHkX6Ed0rS51xIgmGyjrAfzsg= +cloud.google.com/go/area120 v0.8.2/go.mod h1:a5qfo+x77SRLXnCynFWPUZhnZGeSgvQ+Y0v1kSItkh4= +cloud.google.com/go/area120 v0.8.3/go.mod h1:5zj6pMzVTH+SVHljdSKC35sriR/CVvQZzG/Icdyriw0= +cloud.google.com/go/area120 v0.8.4/go.mod h1:jfawXjxf29wyBXr48+W+GyX/f8fflxp642D/bb9v68M= +cloud.google.com/go/area120 v0.8.5/go.mod h1:BcoFCbDLZjsfe4EkCnEq1LKvHSK0Ew/zk5UFu6GMyA0= cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ= cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk= cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0= @@ -99,6 +152,11 @@ cloud.google.com/go/artifactregistry v1.11.2/go.mod h1:nLZns771ZGAwVLzTX/7Al6R9e cloud.google.com/go/artifactregistry v1.12.0/go.mod h1:o6P3MIvtzTOnmvGagO9v/rOjjA0HmhJ+/6KAXrmYDCI= cloud.google.com/go/artifactregistry v1.13.0/go.mod h1:uy/LNfoOIivepGhooAUpL1i30Hgee3Cu0l4VTWHUC08= cloud.google.com/go/artifactregistry v1.14.1/go.mod h1:nxVdG19jTaSTu7yA7+VbWL346r3rIdkZ142BSQqhn5E= +cloud.google.com/go/artifactregistry v1.14.2/go.mod h1:Xk+QbsKEb0ElmyeMfdHAey41B+qBq3q5R5f5xD4XT3U= +cloud.google.com/go/artifactregistry v1.14.3/go.mod h1:A2/E9GXnsyXl7GUvQ/2CjHA+mVRoWAXC0brg2os+kNI= +cloud.google.com/go/artifactregistry v1.14.4/go.mod h1:SJJcZTMv6ce0LDMUnihCN7WSrI+kBSFV0KIKo8S8aYU= +cloud.google.com/go/artifactregistry v1.14.6/go.mod h1:np9LSFotNWHcjnOgh8UVK0RFPCTUGbO0ve3384xyHfE= +cloud.google.com/go/artifactregistry v1.14.7/go.mod h1:0AUKhzWQzfmeTvT4SjfI4zjot72EMfrkvL9g9aRjnnM= cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o= cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s= cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0= @@ -108,6 +166,14 @@ cloud.google.com/go/asset v1.11.1/go.mod h1:fSwLhbRvC9p9CXQHJ3BgFeQNM4c9x10lqlrd cloud.google.com/go/asset v1.12.0/go.mod h1:h9/sFOa4eDIyKmH6QMpm4eUK3pDojWnUhTgJlk762Hg= cloud.google.com/go/asset v1.13.0/go.mod h1:WQAMyYek/b7NBpYq/K4KJWcRqzoalEsxz/t/dTk4THw= cloud.google.com/go/asset v1.14.1/go.mod h1:4bEJ3dnHCqWCDbWJ/6Vn7GVI9LerSi7Rfdi03hd+WTQ= +cloud.google.com/go/asset v1.15.0/go.mod h1:tpKafV6mEut3+vN9ScGvCHXHj7FALFVta+okxFECHcg= +cloud.google.com/go/asset v1.15.1/go.mod h1:yX/amTvFWRpp5rcFq6XbCxzKT8RJUam1UoboE179jU4= +cloud.google.com/go/asset v1.15.2/go.mod h1:B6H5tclkXvXz7PD22qCA2TDxSVQfasa3iDlM89O2NXs= +cloud.google.com/go/asset v1.15.3/go.mod h1:yYLfUD4wL4X589A9tYrv4rFrba0QlDeag0CMcM5ggXU= +cloud.google.com/go/asset v1.16.0/go.mod h1:yYLfUD4wL4X589A9tYrv4rFrba0QlDeag0CMcM5ggXU= +cloud.google.com/go/asset v1.17.0/go.mod h1:yYLfUD4wL4X589A9tYrv4rFrba0QlDeag0CMcM5ggXU= +cloud.google.com/go/asset v1.17.1/go.mod h1:byvDw36UME5AzGNK7o4JnOnINkwOZ1yRrGrKIahHrng= +cloud.google.com/go/asset v1.17.2/go.mod h1:SVbzde67ehddSoKf5uebOD1sYw8Ab/jD/9EIeWg99q4= cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= @@ -115,26 +181,50 @@ cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEar cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0= cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E= cloud.google.com/go/assuredworkloads v1.11.1/go.mod h1:+F04I52Pgn5nmPG36CWFtxmav6+7Q+c5QyJoL18Lry0= +cloud.google.com/go/assuredworkloads v1.11.2/go.mod h1:O1dfr+oZJMlE6mw0Bp0P1KZSlj5SghMBvTpZqIcUAW4= +cloud.google.com/go/assuredworkloads v1.11.3/go.mod h1:vEjfTKYyRUaIeA0bsGJceFV2JKpVRgyG2op3jfa59Zs= +cloud.google.com/go/assuredworkloads v1.11.4/go.mod h1:4pwwGNwy1RP0m+y12ef3Q/8PaiWrIDQ6nD2E8kvWI9U= +cloud.google.com/go/assuredworkloads v1.11.5/go.mod h1:FKJ3g3ZvkL2D7qtqIGnDufFkHxwIpNM9vtmhvt+6wqk= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8= cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM= cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU= cloud.google.com/go/automl v1.13.1/go.mod h1:1aowgAHWYZU27MybSCFiukPO7xnyawv7pt3zK4bheQE= +cloud.google.com/go/automl v1.13.2/go.mod h1:gNY/fUmDEN40sP8amAX3MaXkxcqPIn7F1UIIPZpy4Mg= +cloud.google.com/go/automl v1.13.3/go.mod h1:Y8KwvyAZFOsMAPqUCfNu1AyclbC6ivCUF/MTwORymyY= +cloud.google.com/go/automl v1.13.4/go.mod h1:ULqwX/OLZ4hBVfKQaMtxMSTlPx0GqGbWN8uA/1EqCP8= +cloud.google.com/go/automl v1.13.5/go.mod h1:MDw3vLem3yh+SvmSgeYUmUKqyls6NzSumDm9OJ3xJ1Y= cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc= cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI= cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss= cloud.google.com/go/baremetalsolution v1.1.1/go.mod h1:D1AV6xwOksJMV4OSlWHtWuFNZZYujJknMAP4Qa27QIA= +cloud.google.com/go/baremetalsolution v1.2.0/go.mod h1:68wi9AwPYkEWIUT4SvSGS9UJwKzNpshjHsH4lzk8iOw= +cloud.google.com/go/baremetalsolution v1.2.1/go.mod h1:3qKpKIw12RPXStwQXcbhfxVj1dqQGEvcmA+SX/mUR88= +cloud.google.com/go/baremetalsolution v1.2.2/go.mod h1:O5V6Uu1vzVelYahKfwEWRMaS3AbCkeYHy3145s1FkhM= +cloud.google.com/go/baremetalsolution v1.2.3/go.mod h1:/UAQ5xG3faDdy180rCUv47e0jvpp3BFxT+Cl0PFjw5g= +cloud.google.com/go/baremetalsolution v1.2.4/go.mod h1:BHCmxgpevw9IEryE99HbYEfxXkAEA3hkMJbYYsHtIuY= cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE= cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE= cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g= cloud.google.com/go/batch v1.3.1/go.mod h1:VguXeQKXIYaeeIYbuozUmBR13AfL4SJP7IltNPS+A4A= +cloud.google.com/go/batch v1.4.1/go.mod h1:KdBmDD61K0ovcxoRHGrN6GmOBWeAOyCgKD0Mugx4Fkk= +cloud.google.com/go/batch v1.5.0/go.mod h1:KdBmDD61K0ovcxoRHGrN6GmOBWeAOyCgKD0Mugx4Fkk= +cloud.google.com/go/batch v1.5.1/go.mod h1:RpBuIYLkQu8+CWDk3dFD/t/jOCGuUpkpX+Y0n1Xccs8= +cloud.google.com/go/batch v1.6.1/go.mod h1:urdpD13zPe6YOK+6iZs/8/x2VBRofvblLpx0t57vM98= +cloud.google.com/go/batch v1.6.3/go.mod h1:J64gD4vsNSA2O5TtDB5AAux3nJ9iV8U3ilg3JDBYejU= +cloud.google.com/go/batch v1.7.0/go.mod h1:J64gD4vsNSA2O5TtDB5AAux3nJ9iV8U3ilg3JDBYejU= +cloud.google.com/go/batch v1.8.0/go.mod h1:k8V7f6VE2Suc0zUM4WtoibNrA6D3dqBpB+++e3vSGYc= cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4= cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8= cloud.google.com/go/beyondcorp v0.4.0/go.mod h1:3ApA0mbhHx6YImmuubf5pyW8srKnCEPON32/5hj+RmM= cloud.google.com/go/beyondcorp v0.5.0/go.mod h1:uFqj9X+dSfrheVp7ssLTaRHd2EHqSL4QZmH4e8WXGGU= cloud.google.com/go/beyondcorp v0.6.1/go.mod h1:YhxDWw946SCbmcWo3fAhw3V4XZMSpQ/VYfcKGAEU8/4= cloud.google.com/go/beyondcorp v1.0.0/go.mod h1:YhxDWw946SCbmcWo3fAhw3V4XZMSpQ/VYfcKGAEU8/4= +cloud.google.com/go/beyondcorp v1.0.1/go.mod h1:zl/rWWAFVeV+kx+X2Javly7o1EIQThU4WlkynffL/lk= +cloud.google.com/go/beyondcorp v1.0.2/go.mod h1:m8cpG7caD+5su+1eZr+TSvF6r21NdLJk4f9u4SP2Ntc= +cloud.google.com/go/beyondcorp v1.0.3/go.mod h1:HcBvnEd7eYr+HGDd5ZbuVmBYX019C6CEXBonXbCVwJo= +cloud.google.com/go/beyondcorp v1.0.4/go.mod h1:Gx8/Rk2MxrvWfn4WIhHIG1NV7IBfg14pTKv1+EArVcc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -150,6 +240,11 @@ cloud.google.com/go/bigquery v1.49.0/go.mod h1:Sv8hMmTFFYBlt/ftw2uN6dFdQPzBlREY9 cloud.google.com/go/bigquery v1.50.0/go.mod h1:YrleYEh2pSEbgTBZYMJ5SuSr0ML3ypjRB1zgf7pvQLU= cloud.google.com/go/bigquery v1.52.0/go.mod h1:3b/iXjRQGU4nKa87cXeg6/gogLjO8C6PmuM8i5Bi/u4= cloud.google.com/go/bigquery v1.53.0/go.mod h1:3b/iXjRQGU4nKa87cXeg6/gogLjO8C6PmuM8i5Bi/u4= +cloud.google.com/go/bigquery v1.55.0/go.mod h1:9Y5I3PN9kQWuid6183JFhOGOW3GcirA5LpsKCUn+2ec= +cloud.google.com/go/bigquery v1.56.0/go.mod h1:KDcsploXTEY7XT3fDQzMUZlpQLHzE4itubHrnmhUrZA= +cloud.google.com/go/bigquery v1.57.1/go.mod h1:iYzC0tGVWt1jqSzBHqCr3lrRn0u13E8e+AqowBsDgug= +cloud.google.com/go/bigquery v1.58.0/go.mod h1:0eh4mWNY0KrBTjUzLjoYImapGORq9gEPT7MWjCy9lik= +cloud.google.com/go/bigquery v1.59.1/go.mod h1:VP1UJYgevyTwsV7desjzNzDND5p6hZB+Z8gZJN1GQUc= cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s= cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI= @@ -157,21 +252,44 @@ cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOA cloud.google.com/go/billing v1.12.0/go.mod h1:yKrZio/eu+okO/2McZEbch17O5CB5NpZhhXG6Z766ss= cloud.google.com/go/billing v1.13.0/go.mod h1:7kB2W9Xf98hP9Sr12KfECgfGclsH3CQR0R08tnRlRbc= cloud.google.com/go/billing v1.16.0/go.mod h1:y8vx09JSSJG02k5QxbycNRrN7FGZB6F3CAcgum7jvGA= +cloud.google.com/go/billing v1.17.0/go.mod h1:Z9+vZXEq+HwH7bhJkyI4OQcR6TSbeMrjlpEjO2vzY64= +cloud.google.com/go/billing v1.17.1/go.mod h1:Z9+vZXEq+HwH7bhJkyI4OQcR6TSbeMrjlpEjO2vzY64= +cloud.google.com/go/billing v1.17.2/go.mod h1:u/AdV/3wr3xoRBk5xvUzYMS1IawOAPwQMuHgHMdljDg= +cloud.google.com/go/billing v1.17.3/go.mod h1:z83AkoZ7mZwBGT3yTnt6rSGI1OOsHSIi6a5M3mJ8NaU= +cloud.google.com/go/billing v1.17.4/go.mod h1:5DOYQStCxquGprqfuid/7haD7th74kyMBHkjO/OvDtk= +cloud.google.com/go/billing v1.18.0/go.mod h1:5DOYQStCxquGprqfuid/7haD7th74kyMBHkjO/OvDtk= +cloud.google.com/go/billing v1.18.2/go.mod h1:PPIwVsOOQ7xzbADCwNe8nvK776QpfrOAUkvKjCUcpSE= cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI= cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0= cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk= cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q= cloud.google.com/go/binaryauthorization v1.6.1/go.mod h1:TKt4pa8xhowwffiBmbrbcxijJRZED4zrqnwZ1lKH51U= +cloud.google.com/go/binaryauthorization v1.7.0/go.mod h1:Zn+S6QqTMn6odcMU1zDZCJxPjU2tZPV1oDl45lWY154= +cloud.google.com/go/binaryauthorization v1.7.1/go.mod h1:GTAyfRWYgcbsP3NJogpV3yeunbUIjx2T9xVeYovtURE= +cloud.google.com/go/binaryauthorization v1.7.2/go.mod h1:kFK5fQtxEp97m92ziy+hbu+uKocka1qRRL8MVJIgjv0= +cloud.google.com/go/binaryauthorization v1.7.3/go.mod h1:VQ/nUGRKhrStlGr+8GMS8f6/vznYLkdK5vaKfdCIpvU= +cloud.google.com/go/binaryauthorization v1.8.0/go.mod h1:VQ/nUGRKhrStlGr+8GMS8f6/vznYLkdK5vaKfdCIpvU= +cloud.google.com/go/binaryauthorization v1.8.1/go.mod h1:1HVRyBerREA/nhI7yLang4Zn7vfNVA3okoAR9qYQJAQ= cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg= cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590= cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8= cloud.google.com/go/certificatemanager v1.7.1/go.mod h1:iW8J3nG6SaRYImIa+wXQ0g8IgoofDFRp5UMzaNk1UqI= +cloud.google.com/go/certificatemanager v1.7.2/go.mod h1:15SYTDQMd00kdoW0+XY5d9e+JbOPjp24AvF48D8BbcQ= +cloud.google.com/go/certificatemanager v1.7.3/go.mod h1:T/sZYuC30PTag0TLo28VedIRIj1KPGcOQzjWAptHa00= +cloud.google.com/go/certificatemanager v1.7.4/go.mod h1:FHAylPe/6IIKuaRmHbjbdLhGhVQ+CWHSD5Jq0k4+cCE= +cloud.google.com/go/certificatemanager v1.7.5/go.mod h1:uX+v7kWqy0Y3NG/ZhNvffh0kuqkKZIXdvlZRO7z0VtM= cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk= cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk= cloud.google.com/go/channel v1.11.0/go.mod h1:IdtI0uWGqhEeatSB62VOoJ8FSUhJ9/+iGkJVqp74CGE= cloud.google.com/go/channel v1.12.0/go.mod h1:VkxCGKASi4Cq7TbXxlaBezonAYpp1GCnKMY6tnMQnLU= cloud.google.com/go/channel v1.16.0/go.mod h1:eN/q1PFSl5gyu0dYdmxNXscY/4Fi7ABmeHCJNf/oHmc= +cloud.google.com/go/channel v1.17.0/go.mod h1:RpbhJsGi/lXWAUM1eF4IbQGbsfVlg2o8Iiy2/YLfVT0= +cloud.google.com/go/channel v1.17.1/go.mod h1:xqfzcOZAcP4b/hUDH0GkGg1Sd5to6di1HOJn/pi5uBQ= +cloud.google.com/go/channel v1.17.2/go.mod h1:aT2LhnftnyfQceFql5I/mP8mIbiiJS4lWqgXA815zMk= +cloud.google.com/go/channel v1.17.3/go.mod h1:QcEBuZLGGrUMm7kNj9IbU1ZfmJq2apotsV83hbxX7eE= +cloud.google.com/go/channel v1.17.4/go.mod h1:QcEBuZLGGrUMm7kNj9IbU1ZfmJq2apotsV83hbxX7eE= +cloud.google.com/go/channel v1.17.5/go.mod h1:FlpaOSINDAXgEext0KMaBq/vwpLMkkPAw9b2mApQeHc= cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U= cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA= cloud.google.com/go/cloudbuild v1.6.0/go.mod h1:UIbc/w9QCbH12xX+ezUsgblrWv+Cv4Tw83GiSMHOn9M= @@ -179,10 +297,21 @@ cloud.google.com/go/cloudbuild v1.7.0/go.mod h1:zb5tWh2XI6lR9zQmsm1VRA+7OCuve5d8 cloud.google.com/go/cloudbuild v1.9.0/go.mod h1:qK1d7s4QlO0VwfYn5YuClDGg2hfmLZEb4wQGAbIgL1s= cloud.google.com/go/cloudbuild v1.10.1/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU= cloud.google.com/go/cloudbuild v1.13.0/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU= +cloud.google.com/go/cloudbuild v1.14.0/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU= +cloud.google.com/go/cloudbuild v1.14.1/go.mod h1:K7wGc/3zfvmYWOWwYTgF/d/UVJhS4pu+HAy7PL7mCsU= +cloud.google.com/go/cloudbuild v1.14.2/go.mod h1:Bn6RO0mBYk8Vlrt+8NLrru7WXlQ9/RDWz2uo5KG1/sg= +cloud.google.com/go/cloudbuild v1.14.3/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM= +cloud.google.com/go/cloudbuild v1.15.0/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM= +cloud.google.com/go/cloudbuild v1.15.1/go.mod h1:gIofXZSu+XD2Uy+qkOrGKEx45zd7s28u/k8f99qKals= cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM= cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk= cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA= cloud.google.com/go/clouddms v1.6.1/go.mod h1:Ygo1vL52Ov4TBZQquhz5fiw2CQ58gvu+PlS6PVXCpZI= +cloud.google.com/go/clouddms v1.7.0/go.mod h1:MW1dC6SOtI/tPNCciTsXtsGNEM0i0OccykPvv3hiYeM= +cloud.google.com/go/clouddms v1.7.1/go.mod h1:o4SR8U95+P7gZ/TX+YbJxehOCsM+fe6/brlrFquiszk= +cloud.google.com/go/clouddms v1.7.2/go.mod h1:Rk32TmWmHo64XqDvW7jgkFQet1tUKNVzs7oajtJT3jU= +cloud.google.com/go/clouddms v1.7.3/go.mod h1:fkN2HQQNUYInAU3NQ3vRLkV2iWs8lIdmBKOx4nrL6Hc= +cloud.google.com/go/clouddms v1.7.4/go.mod h1:RdrVqoFG9RWI5AvZ81SxJ/xvxPdtcRhFotwdE79DieY= cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY= cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI= cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4= @@ -191,6 +320,10 @@ cloud.google.com/go/cloudtasks v1.9.0/go.mod h1:w+EyLsVkLWHcOaqNEyvcKAsWp9p29dL6 cloud.google.com/go/cloudtasks v1.10.0/go.mod h1:NDSoTLkZ3+vExFEWu2UJV1arUyzVDAiZtdWcsUyNwBs= cloud.google.com/go/cloudtasks v1.11.1/go.mod h1:a9udmnou9KO2iulGscKR0qBYjreuX8oHwpmFsKspEvM= cloud.google.com/go/cloudtasks v1.12.1/go.mod h1:a9udmnou9KO2iulGscKR0qBYjreuX8oHwpmFsKspEvM= +cloud.google.com/go/cloudtasks v1.12.2/go.mod h1:A7nYkjNlW2gUoROg1kvJrQGhJP/38UaWwsnuBDOBVUk= +cloud.google.com/go/cloudtasks v1.12.3/go.mod h1:GPVXhIOSGEaR+3xT4Fp72ScI+HjHffSS4B8+BaBB5Ys= +cloud.google.com/go/cloudtasks v1.12.4/go.mod h1:BEPu0Gtt2dU6FxZHNqqNdGqIG86qyWKBPGnsb7udGY0= +cloud.google.com/go/cloudtasks v1.12.6/go.mod h1:b7c7fe4+TJsFZfDyzO51F7cjq7HLUlRi/KZQLQjDsaY= cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= @@ -210,15 +343,29 @@ cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/ cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute v1.21.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.1/go.mod h1:CqB3xpmPKKt3OJpW2ndFIXnA9A4xAy/F3Xp1ixncW78= +cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= +cloud.google.com/go/compute v1.23.4/go.mod h1:/EJMj55asU6kAFnuZET8zqgwgJ9FvXWXOkkfQZa4ioI= +cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= +cloud.google.com/go/compute v1.25.1/go.mod h1:oopOIR53ly6viBYxaDhBfJwzUAxf1zE//uf3IB011ls= cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU= cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= +cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY= cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck= cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= cloud.google.com/go/contactcenterinsights v1.9.1/go.mod h1:bsg/R7zGLYMVxFFzfh9ooLTruLRCG9fnzhH9KznHhbM= cloud.google.com/go/contactcenterinsights v1.10.0/go.mod h1:bsg/R7zGLYMVxFFzfh9ooLTruLRCG9fnzhH9KznHhbM= +cloud.google.com/go/contactcenterinsights v1.11.0/go.mod h1:hutBdImE4XNZ1NV4vbPJKSFOnQruhC5Lj9bZqWMTKiU= +cloud.google.com/go/contactcenterinsights v1.11.1/go.mod h1:FeNP3Kg8iteKM80lMwSk3zZZKVxr+PGnAId6soKuXwE= +cloud.google.com/go/contactcenterinsights v1.11.2/go.mod h1:A9PIR5ov5cRcd28KlDbmmXE8Aay+Gccer2h4wzkYFso= +cloud.google.com/go/contactcenterinsights v1.11.3/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis= +cloud.google.com/go/contactcenterinsights v1.12.0/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis= +cloud.google.com/go/contactcenterinsights v1.12.1/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis= +cloud.google.com/go/contactcenterinsights v1.13.0/go.mod h1:ieq5d5EtHsu8vhe2y3amtZ+BE+AQwX5qAy7cpo0POsI= cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg= cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo= cloud.google.com/go/container v1.13.1/go.mod h1:6wgbMPeQRw9rSnKBCAJXnds3Pzj03C4JHamr8asWKy4= @@ -226,11 +373,24 @@ cloud.google.com/go/container v1.14.0/go.mod h1:3AoJMPhHfLDxLvrlVWaK57IXzaPnLaZq cloud.google.com/go/container v1.15.0/go.mod h1:ft+9S0WGjAyjDggg5S06DXj+fHJICWg8L7isCQe9pQA= cloud.google.com/go/container v1.22.1/go.mod h1:lTNExE2R7f+DLbAN+rJiKTisauFCaoDq6NURZ83eVH4= cloud.google.com/go/container v1.24.0/go.mod h1:lTNExE2R7f+DLbAN+rJiKTisauFCaoDq6NURZ83eVH4= +cloud.google.com/go/container v1.26.0/go.mod h1:YJCmRet6+6jnYYRS000T6k0D0xUXQgBSaJ7VwI8FBj4= +cloud.google.com/go/container v1.26.1/go.mod h1:5smONjPRUxeEpDG7bMKWfDL4sauswqEtnBK1/KKpR04= +cloud.google.com/go/container v1.26.2/go.mod h1:YlO84xCt5xupVbLaMY4s3XNE79MUJ+49VmkInr6HvF4= +cloud.google.com/go/container v1.27.1/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4= +cloud.google.com/go/container v1.28.0/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4= +cloud.google.com/go/container v1.29.0/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4= +cloud.google.com/go/container v1.30.1/go.mod h1:vkbfX0EnAKL/vgVECs5BZn24e1cJROzgszJirRKQ4Bg= +cloud.google.com/go/container v1.31.0/go.mod h1:7yABn5s3Iv3lmw7oMmyGbeV6tQj86njcTijkkGuvdZA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= cloud.google.com/go/containeranalysis v0.7.0/go.mod h1:9aUL+/vZ55P2CXfuZjS4UjQ9AgXoSw8Ts6lemfmxBxI= cloud.google.com/go/containeranalysis v0.9.0/go.mod h1:orbOANbwk5Ejoom+s+DUCTTJ7IBdBQJDcSylAx/on9s= cloud.google.com/go/containeranalysis v0.10.1/go.mod h1:Ya2jiILITMY68ZLPaogjmOMNkwsDrWBSTyBubGXO7j0= +cloud.google.com/go/containeranalysis v0.11.0/go.mod h1:4n2e99ZwpGxpNcz+YsFT1dfOHPQFGcAC8FN2M2/ne/U= +cloud.google.com/go/containeranalysis v0.11.1/go.mod h1:rYlUOM7nem1OJMKwE1SadufX0JP3wnXj844EtZAwWLY= +cloud.google.com/go/containeranalysis v0.11.2/go.mod h1:xibioGBC1MD2j4reTyV1xY1/MvKaz+fyM9ENWhmIeP8= +cloud.google.com/go/containeranalysis v0.11.3/go.mod h1:kMeST7yWFQMGjiG9K7Eov+fPNQcGhb8mXj/UcTiWw9U= +cloud.google.com/go/containeranalysis v0.11.4/go.mod h1:cVZT7rXYBS9NG1rhQbWL9pWbXCKHWJPYraE8/FTSYPE= cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs= cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc= @@ -242,38 +402,81 @@ cloud.google.com/go/datacatalog v1.13.0/go.mod h1:E4Rj9a5ZtAxcQJlEBTLgMTphfP11/l cloud.google.com/go/datacatalog v1.14.0/go.mod h1:h0PrGtlihoutNMp/uvwhawLQ9+c63Kz65UFqh49Yo+E= cloud.google.com/go/datacatalog v1.14.1/go.mod h1:d2CevwTG4yedZilwe+v3E3ZBDRMobQfSG/a6cCCN5R4= cloud.google.com/go/datacatalog v1.16.0/go.mod h1:d2CevwTG4yedZilwe+v3E3ZBDRMobQfSG/a6cCCN5R4= +cloud.google.com/go/datacatalog v1.17.1/go.mod h1:nCSYFHgtxh2MiEktWIz71s/X+7ds/UT9kp0PC7waCzE= +cloud.google.com/go/datacatalog v1.18.0/go.mod h1:nCSYFHgtxh2MiEktWIz71s/X+7ds/UT9kp0PC7waCzE= +cloud.google.com/go/datacatalog v1.18.1/go.mod h1:TzAWaz+ON1tkNr4MOcak8EBHX7wIRX/gZKM+yTVsv+A= +cloud.google.com/go/datacatalog v1.18.2/go.mod h1:SPVgWW2WEMuWHA+fHodYjmxPiMqcOiWfhc9OD5msigk= +cloud.google.com/go/datacatalog v1.18.3/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM= +cloud.google.com/go/datacatalog v1.19.0/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM= +cloud.google.com/go/datacatalog v1.19.2/go.mod h1:2YbODwmhpLM4lOFe3PuEhHK9EyTzQJ5AXgIy7EDKTEE= +cloud.google.com/go/datacatalog v1.19.3/go.mod h1:ra8V3UAsciBpJKQ+z9Whkxzxv7jmQg1hfODr3N3YPJ4= cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM= cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ= cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE= cloud.google.com/go/dataflow v0.9.1/go.mod h1:Wp7s32QjYuQDWqJPFFlnBKhkAtiFpMTdg00qGbnIHVw= +cloud.google.com/go/dataflow v0.9.2/go.mod h1:vBfdBZ/ejlTaYIGB3zB4T08UshH70vbtZeMD+urnUSo= +cloud.google.com/go/dataflow v0.9.3/go.mod h1:HI4kMVjcHGTs3jTHW/kv3501YW+eloiJSLxkJa/vqFE= +cloud.google.com/go/dataflow v0.9.4/go.mod h1:4G8vAkHYCSzU8b/kmsoR2lWyHJD85oMJPHMtan40K8w= +cloud.google.com/go/dataflow v0.9.5/go.mod h1:udl6oi8pfUHnL0z6UN9Lf9chGqzDMVqcYTcZ1aPnCZQ= cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo= cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE= cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0= cloud.google.com/go/dataform v0.6.0/go.mod h1:QPflImQy33e29VuapFdf19oPbE4aYTJxr31OAPV+ulA= cloud.google.com/go/dataform v0.7.0/go.mod h1:7NulqnVozfHvWUBpMDfKMUESr+85aJsC/2O0o3jWPDE= cloud.google.com/go/dataform v0.8.1/go.mod h1:3BhPSiw8xmppbgzeBbmDvmSWlwouuJkXsXsb8UBih9M= +cloud.google.com/go/dataform v0.8.2/go.mod h1:X9RIqDs6NbGPLR80tnYoPNiO1w0wenKTb8PxxlhTMKM= +cloud.google.com/go/dataform v0.8.3/go.mod h1:8nI/tvv5Fso0drO3pEjtowz58lodx8MVkdV2q0aPlqg= +cloud.google.com/go/dataform v0.9.1/go.mod h1:pWTg+zGQ7i16pyn0bS1ruqIE91SdL2FDMvEYu/8oQxs= +cloud.google.com/go/dataform v0.9.2/go.mod h1:S8cQUwPNWXo7m/g3DhWHsLBoufRNn9EgFrMgne2j7cI= cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38= cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w= cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8= cloud.google.com/go/datafusion v1.7.1/go.mod h1:KpoTBbFmoToDExJUso/fcCiguGDk7MEzOWXUsJo0wsI= +cloud.google.com/go/datafusion v1.7.2/go.mod h1:62K2NEC6DRlpNmI43WHMWf9Vg/YvN6QVi8EVwifElI0= +cloud.google.com/go/datafusion v1.7.3/go.mod h1:eoLt1uFXKGBq48jy9LZ+Is8EAVLnmn50lNncLzwYokE= +cloud.google.com/go/datafusion v1.7.4/go.mod h1:BBs78WTOLYkT4GVZIXQCZT3GFpkpDN4aBY4NDX/jVlM= +cloud.google.com/go/datafusion v1.7.5/go.mod h1:bYH53Oa5UiqahfbNK9YuYKteeD4RbQSNMx7JF7peGHc= cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I= cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ= cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM= cloud.google.com/go/datalabeling v0.8.1/go.mod h1:XS62LBSVPbYR54GfYQsPXZjTW8UxCK2fkDciSrpRFdY= +cloud.google.com/go/datalabeling v0.8.2/go.mod h1:cyDvGHuJWu9U/cLDA7d8sb9a0tWLEletStu2sTmg3BE= +cloud.google.com/go/datalabeling v0.8.3/go.mod h1:tvPhpGyS/V7lqjmb3V0TaDdGvhzgR1JoW7G2bpi2UTI= +cloud.google.com/go/datalabeling v0.8.4/go.mod h1:Z1z3E6LHtffBGrNUkKwbwbDxTiXEApLzIgmymj8A3S8= +cloud.google.com/go/datalabeling v0.8.5/go.mod h1:IABB2lxQnkdUbMnQaOl2prCOfms20mcPxDBm36lps+s= cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA= cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A= cloud.google.com/go/dataplex v1.5.2/go.mod h1:cVMgQHsmfRoI5KFYq4JtIBEUbYwc3c7tXmIDhRmNNVQ= cloud.google.com/go/dataplex v1.6.0/go.mod h1:bMsomC/aEJOSpHXdFKFGQ1b0TDPIeL28nJObeO1ppRs= cloud.google.com/go/dataplex v1.8.1/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE= cloud.google.com/go/dataplex v1.9.0/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE= +cloud.google.com/go/dataplex v1.9.1/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE= +cloud.google.com/go/dataplex v1.10.1/go.mod h1:1MzmBv8FvjYfc7vDdxhnLFNskikkB+3vl475/XdCDhs= +cloud.google.com/go/dataplex v1.10.2/go.mod h1:xdC8URdTrCrZMW6keY779ZT1cTOfV8KEPNsw+LTRT1Y= +cloud.google.com/go/dataplex v1.11.1/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c= +cloud.google.com/go/dataplex v1.11.2/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c= +cloud.google.com/go/dataplex v1.13.0/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c= +cloud.google.com/go/dataplex v1.14.0/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c= +cloud.google.com/go/dataplex v1.14.1/go.mod h1:bWxQAbg6Smg+sca2+Ex7s8D9a5qU6xfXtwmq4BVReps= +cloud.google.com/go/dataplex v1.14.2/go.mod h1:0oGOSFlEKef1cQeAHXy4GZPB/Ife0fz/PxBf+ZymA2U= cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s= cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI= cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4= cloud.google.com/go/dataproc/v2 v2.0.1/go.mod h1:7Ez3KRHdFGcfY7GcevBbvozX+zyWGcwLJvvAMwCaoZ4= +cloud.google.com/go/dataproc/v2 v2.2.0/go.mod h1:lZR7AQtwZPvmINx5J87DSOOpTfof9LVZju6/Qo4lmcY= +cloud.google.com/go/dataproc/v2 v2.2.1/go.mod h1:QdAJLaBjh+l4PVlVZcmrmhGccosY/omC1qwfQ61Zv/o= +cloud.google.com/go/dataproc/v2 v2.2.2/go.mod h1:aocQywVmQVF4i8CL740rNI/ZRpsaaC1Wh2++BJ7HEJ4= +cloud.google.com/go/dataproc/v2 v2.2.3/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY= +cloud.google.com/go/dataproc/v2 v2.3.0/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY= +cloud.google.com/go/dataproc/v2 v2.4.0/go.mod h1:3B1Ht2aRB8VZIteGxQS/iNSJGzt9+CA0WGnDVMEm7Z4= cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo= cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA= cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c= cloud.google.com/go/dataqna v0.8.1/go.mod h1:zxZM0Bl6liMePWsHA8RMGAfmTG34vJMapbHAxQ5+WA8= +cloud.google.com/go/dataqna v0.8.2/go.mod h1:KNEqgx8TTmUipnQsScOoDpq/VlXVptUqVMZnt30WAPs= +cloud.google.com/go/dataqna v0.8.3/go.mod h1:wXNBW2uvc9e7Gl5k8adyAMnLush1KVV6lZUhB+rqNu4= +cloud.google.com/go/dataqna v0.8.4/go.mod h1:mySRKjKg5Lz784P6sCov3p1QD+RZQONRMRjzGNcFd0c= +cloud.google.com/go/dataqna v0.8.5/go.mod h1:vgihg1mz6n7pb5q2YJF7KlXve6tCglInd6XO0JGOlWM= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM= @@ -281,6 +484,8 @@ cloud.google.com/go/datastore v1.11.0/go.mod h1:TvGxBIHCS50u8jzG+AW/ppf87v1of8nw cloud.google.com/go/datastore v1.12.0/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70= cloud.google.com/go/datastore v1.12.1/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70= cloud.google.com/go/datastore v1.13.0/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70= +cloud.google.com/go/datastore v1.14.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8= +cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8= cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo= cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ= cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g= @@ -289,12 +494,23 @@ cloud.google.com/go/datastream v1.6.0/go.mod h1:6LQSuswqLa7S4rPAOZFVjHIG3wJIjZcZ cloud.google.com/go/datastream v1.7.0/go.mod h1:uxVRMm2elUSPuh65IbZpzJNMbuzkcvu5CjMqVIUHrww= cloud.google.com/go/datastream v1.9.1/go.mod h1:hqnmr8kdUBmrnk65k5wNRoHSCYksvpdZIcZIEl8h43Q= cloud.google.com/go/datastream v1.10.0/go.mod h1:hqnmr8kdUBmrnk65k5wNRoHSCYksvpdZIcZIEl8h43Q= +cloud.google.com/go/datastream v1.10.1/go.mod h1:7ngSYwnw95YFyTd5tOGBxHlOZiL+OtpjheqU7t2/s/c= +cloud.google.com/go/datastream v1.10.2/go.mod h1:W42TFgKAs/om6x/CdXX5E4oiAsKlH+e8MTGy81zdYt0= +cloud.google.com/go/datastream v1.10.3/go.mod h1:YR0USzgjhqA/Id0Ycu1VvZe8hEWwrkjuXrGbzeDOSEA= +cloud.google.com/go/datastream v1.10.4/go.mod h1:7kRxPdxZxhPg3MFeCSulmAJnil8NJGGvSNdn4p1sRZo= cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c= cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s= cloud.google.com/go/deploy v1.6.0/go.mod h1:f9PTHehG/DjCom3QH0cntOVRm93uGBDt2vKzAPwpXQI= cloud.google.com/go/deploy v1.8.0/go.mod h1:z3myEJnA/2wnB4sgjqdMfgxCA0EqC3RBTNcVPs93mtQ= cloud.google.com/go/deploy v1.11.0/go.mod h1:tKuSUV5pXbn67KiubiUNUejqLs4f5cxxiCNCeyl0F2g= cloud.google.com/go/deploy v1.13.0/go.mod h1:tKuSUV5pXbn67KiubiUNUejqLs4f5cxxiCNCeyl0F2g= +cloud.google.com/go/deploy v1.13.1/go.mod h1:8jeadyLkH9qu9xgO3hVWw8jVr29N1mnW42gRJT8GY6g= +cloud.google.com/go/deploy v1.14.1/go.mod h1:N8S0b+aIHSEeSr5ORVoC0+/mOPUysVt8ae4QkZYolAw= +cloud.google.com/go/deploy v1.14.2/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g= +cloud.google.com/go/deploy v1.15.0/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g= +cloud.google.com/go/deploy v1.16.0/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g= +cloud.google.com/go/deploy v1.17.0/go.mod h1:XBr42U5jIr64t92gcpOXxNrqL2PStQCXHuKK5GRUuYo= +cloud.google.com/go/deploy v1.17.1/go.mod h1:SXQyfsXrk0fBmgBHRzBjQbZhMfKZ3hMQBw5ym7MN/50= cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4= cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0= cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8= @@ -305,10 +521,24 @@ cloud.google.com/go/dialogflow v1.31.0/go.mod h1:cuoUccuL1Z+HADhyIA7dci3N5zUssgp cloud.google.com/go/dialogflow v1.32.0/go.mod h1:jG9TRJl8CKrDhMEcvfcfFkkpp8ZhgPz3sBGmAUYJ2qE= cloud.google.com/go/dialogflow v1.38.0/go.mod h1:L7jnH+JL2mtmdChzAIcXQHXMvQkE3U4hTaNltEuxXn4= cloud.google.com/go/dialogflow v1.40.0/go.mod h1:L7jnH+JL2mtmdChzAIcXQHXMvQkE3U4hTaNltEuxXn4= +cloud.google.com/go/dialogflow v1.43.0/go.mod h1:pDUJdi4elL0MFmt1REMvFkdsUTYSHq+rTCS8wg0S3+M= +cloud.google.com/go/dialogflow v1.44.0/go.mod h1:pDUJdi4elL0MFmt1REMvFkdsUTYSHq+rTCS8wg0S3+M= +cloud.google.com/go/dialogflow v1.44.1/go.mod h1:n/h+/N2ouKOO+rbe/ZnI186xImpqvCVj2DdsWS/0EAk= +cloud.google.com/go/dialogflow v1.44.2/go.mod h1:QzFYndeJhpVPElnFkUXxdlptx0wPnBWLCBT9BvtC3/c= +cloud.google.com/go/dialogflow v1.44.3/go.mod h1:mHly4vU7cPXVweuB5R0zsYKPMzy240aQdAu06SqBbAQ= +cloud.google.com/go/dialogflow v1.47.0/go.mod h1:mHly4vU7cPXVweuB5R0zsYKPMzy240aQdAu06SqBbAQ= +cloud.google.com/go/dialogflow v1.48.0/go.mod h1:mHly4vU7cPXVweuB5R0zsYKPMzy240aQdAu06SqBbAQ= +cloud.google.com/go/dialogflow v1.48.1/go.mod h1:C1sjs2/g9cEwjCltkKeYp3FFpz8BOzNondEaAlCpt+A= +cloud.google.com/go/dialogflow v1.48.2/go.mod h1:7A2oDf6JJ1/+hdpnFRfb/RjJUOh2X3rhIa5P8wQSEX4= +cloud.google.com/go/dialogflow v1.49.0/go.mod h1:dhVrXKETtdPlpPhE7+2/k4Z8FRNUp6kMV3EW3oz/fe0= cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM= cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q= cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4= cloud.google.com/go/dlp v1.10.1/go.mod h1:IM8BWz1iJd8njcNcG0+Kyd9OPnqnRNkDV8j42VT5KOI= +cloud.google.com/go/dlp v1.10.2/go.mod h1:ZbdKIhcnyhILgccwVDzkwqybthh7+MplGC3kZVZsIOQ= +cloud.google.com/go/dlp v1.10.3/go.mod h1:iUaTc/ln8I+QT6Ai5vmuwfw8fqTk2kaz0FvCwhLCom0= +cloud.google.com/go/dlp v1.11.1/go.mod h1:/PA2EnioBeXTL/0hInwgj0rfsQb3lpE3R8XUJxqUNKI= +cloud.google.com/go/dlp v1.11.2/go.mod h1:9Czi+8Y/FegpWzgSfkRlyz+jwW6Te9Rv26P3UfU/h/w= cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU= cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k= @@ -317,34 +547,67 @@ cloud.google.com/go/documentai v1.16.0/go.mod h1:o0o0DLTEZ+YnJZ+J4wNfTxmDVyrkzFv cloud.google.com/go/documentai v1.18.0/go.mod h1:F6CK6iUH8J81FehpskRmhLq/3VlwQvb7TvwOceQ2tbs= cloud.google.com/go/documentai v1.20.0/go.mod h1:yJkInoMcK0qNAEdRnqY/D5asy73tnPe88I1YTZT+a8E= cloud.google.com/go/documentai v1.22.0/go.mod h1:yJkInoMcK0qNAEdRnqY/D5asy73tnPe88I1YTZT+a8E= +cloud.google.com/go/documentai v1.22.1/go.mod h1:LKs22aDHbJv7ufXuPypzRO7rG3ALLJxzdCXDPutw4Qc= +cloud.google.com/go/documentai v1.23.0/go.mod h1:LKs22aDHbJv7ufXuPypzRO7rG3ALLJxzdCXDPutw4Qc= +cloud.google.com/go/documentai v1.23.2/go.mod h1:Q/wcRT+qnuXOpjAkvOV4A+IeQl04q2/ReT7SSbytLSo= +cloud.google.com/go/documentai v1.23.4/go.mod h1:4MYAaEMnADPN1LPN5xboDR5QVB6AgsaxgFdJhitlE2Y= +cloud.google.com/go/documentai v1.23.5/go.mod h1:ghzBsyVTiVdkfKaUCum/9bGBEyBjDO4GfooEcYKhN+g= +cloud.google.com/go/documentai v1.23.6/go.mod h1:ghzBsyVTiVdkfKaUCum/9bGBEyBjDO4GfooEcYKhN+g= +cloud.google.com/go/documentai v1.23.7/go.mod h1:ghzBsyVTiVdkfKaUCum/9bGBEyBjDO4GfooEcYKhN+g= +cloud.google.com/go/documentai v1.23.8/go.mod h1:Vd/y5PosxCpUHmwC+v9arZyeMfTqBR9VIwOwIqQYYfA= +cloud.google.com/go/documentai v1.25.0/go.mod h1:ftLnzw5VcXkLItp6pw1mFic91tMRyfv6hHEY5br4KzY= cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y= cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE= cloud.google.com/go/domains v0.9.1/go.mod h1:aOp1c0MbejQQ2Pjf1iJvnVyT+z6R6s8pX66KaCSDYfE= +cloud.google.com/go/domains v0.9.2/go.mod h1:3YvXGYzZG1Temjbk7EyGCuGGiXHJwVNmwIf+E/cUp5I= +cloud.google.com/go/domains v0.9.3/go.mod h1:29k66YNDLDY9LCFKpGFeh6Nj9r62ZKm5EsUJxAl84KU= +cloud.google.com/go/domains v0.9.4/go.mod h1:27jmJGShuXYdUNjyDG0SodTfT5RwLi7xmH334Gvi3fY= +cloud.google.com/go/domains v0.9.5/go.mod h1:dBzlxgepazdFhvG7u23XMhmMKBjrkoUNaw0A8AQB55Y= cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= cloud.google.com/go/edgecontainer v0.3.0/go.mod h1:FLDpP4nykgwwIfcLt6zInhprzw0lEi2P1fjO6Ie0qbc= cloud.google.com/go/edgecontainer v1.0.0/go.mod h1:cttArqZpBB2q58W/upSG++ooo6EsblxDIolxa3jSjbY= cloud.google.com/go/edgecontainer v1.1.1/go.mod h1:O5bYcS//7MELQZs3+7mabRqoWQhXCzenBu0R8bz2rwk= +cloud.google.com/go/edgecontainer v1.1.2/go.mod h1:wQRjIzqxEs9e9wrtle4hQPSR1Y51kqN75dgF7UllZZ4= +cloud.google.com/go/edgecontainer v1.1.3/go.mod h1:Ll2DtIABzEfaxaVSbwj3QHFaOOovlDFiWVDu349jSsA= +cloud.google.com/go/edgecontainer v1.1.4/go.mod h1:AvFdVuZuVGdgaE5YvlL1faAoa1ndRR/5XhXZvPBHbsE= +cloud.google.com/go/edgecontainer v1.1.5/go.mod h1:rgcjrba3DEDEQAidT4yuzaKWTbkTI5zAMu3yy6ZWS0M= cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU= cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI= cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8= cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M= cloud.google.com/go/essentialcontacts v1.6.2/go.mod h1:T2tB6tX+TRak7i88Fb2N9Ok3PvY3UNbUsMag9/BARh4= +cloud.google.com/go/essentialcontacts v1.6.3/go.mod h1:yiPCD7f2TkP82oJEFXFTou8Jl8L6LBRPeBEkTaO0Ggo= +cloud.google.com/go/essentialcontacts v1.6.4/go.mod h1:iju5Vy3d9tJUg0PYMd1nHhjV7xoCXaOAVabrwLaPBEM= +cloud.google.com/go/essentialcontacts v1.6.5/go.mod h1:jjYbPzw0x+yglXC890l6ECJWdYeZ5dlYACTFL0U/VuM= +cloud.google.com/go/essentialcontacts v1.6.6/go.mod h1:XbqHJGaiH0v2UvtuucfOzFXN+rpL/aU5BCZLn4DYl1Q= cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc= cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw= cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjkr4BTdem2Kw= cloud.google.com/go/eventarc v1.11.0/go.mod h1:PyUjsUKPWoRBCHeOxZd/lbOOjahV41icXyUY5kSTvVY= cloud.google.com/go/eventarc v1.12.1/go.mod h1:mAFCW6lukH5+IZjkvrEss+jmt2kOdYlN8aMx3sRJiAI= cloud.google.com/go/eventarc v1.13.0/go.mod h1:mAFCW6lukH5+IZjkvrEss+jmt2kOdYlN8aMx3sRJiAI= +cloud.google.com/go/eventarc v1.13.1/go.mod h1:EqBxmGHFrruIara4FUQ3RHlgfCn7yo1HYsu2Hpt/C3Y= +cloud.google.com/go/eventarc v1.13.2/go.mod h1:X9A80ShVu19fb4e5sc/OLV7mpFUKZMwfJFeeWhcIObM= +cloud.google.com/go/eventarc v1.13.3/go.mod h1:RWH10IAZIRcj1s/vClXkBgMHwh59ts7hSWcqD3kaclg= +cloud.google.com/go/eventarc v1.13.4/go.mod h1:zV5sFVoAa9orc/52Q+OuYUG9xL2IIZTbbuTHC6JSY8s= cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w= cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI= cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs= cloud.google.com/go/filestore v1.6.0/go.mod h1:di5unNuss/qfZTw2U9nhFqo8/ZDSc466dre85Kydllg= cloud.google.com/go/filestore v1.7.1/go.mod h1:y10jsorq40JJnjR/lQ8AfFbbcGlw3g+Dp8oN7i7FjV4= +cloud.google.com/go/filestore v1.7.2/go.mod h1:TYOlyJs25f/omgj+vY7/tIG/E7BX369triSPzE4LdgE= +cloud.google.com/go/filestore v1.7.3/go.mod h1:Qp8WaEERR3cSkxToxFPHh/b8AACkSut+4qlCjAmKTV0= +cloud.google.com/go/filestore v1.7.4/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI= +cloud.google.com/go/filestore v1.8.0/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI= +cloud.google.com/go/filestore v1.8.1/go.mod h1:MbN9KcaM47DRTIuLfQhJEsjaocVebNtNQhSLhKCF5GM= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= cloud.google.com/go/firestore v1.11.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4= +cloud.google.com/go/firestore v1.12.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4= +cloud.google.com/go/firestore v1.13.0/go.mod h1:QojqqOh8IntInDUSTAh0c8ZsPYAr68Ma8c5DWOy8xb8= +cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ= cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY= @@ -353,6 +616,10 @@ cloud.google.com/go/functions v1.10.0/go.mod h1:0D3hEOe3DbEvCXtYOZHQZmD+SzYsi1Yb cloud.google.com/go/functions v1.12.0/go.mod h1:AXWGrF3e2C/5ehvwYo/GH6O5s09tOPksiKhz+hH8WkA= cloud.google.com/go/functions v1.13.0/go.mod h1:EU4O007sQm6Ef/PwRsI8N2umygGqPBS/IZQKBQBcJ3c= cloud.google.com/go/functions v1.15.1/go.mod h1:P5yNWUTkyU+LvW/S9O6V+V423VZooALQlqoXdoPz5AE= +cloud.google.com/go/functions v1.15.2/go.mod h1:CHAjtcR6OU4XF2HuiVeriEdELNcnvRZSk1Q8RMqy4lE= +cloud.google.com/go/functions v1.15.3/go.mod h1:r/AMHwBheapkkySEhiZYLDBwVJCdlRwsm4ieJu35/Ug= +cloud.google.com/go/functions v1.15.4/go.mod h1:CAsTc3VlRMVvx+XqXxKqVevguqJpnVip4DdonFsX28I= +cloud.google.com/go/functions v1.16.0/go.mod h1:nbNpfAG7SG7Duw/o1iZ6ohvL7mc6MapWQVpqtM29n8k= cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA= cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w= @@ -363,26 +630,49 @@ cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo= cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg= cloud.google.com/go/gkebackup v1.3.0/go.mod h1:vUDOu++N0U5qs4IhG1pcOnD1Mac79xWy6GoBFlWCWBU= +cloud.google.com/go/gkebackup v1.3.1/go.mod h1:vUDOu++N0U5qs4IhG1pcOnD1Mac79xWy6GoBFlWCWBU= +cloud.google.com/go/gkebackup v1.3.2/go.mod h1:OMZbXzEJloyXMC7gqdSB+EOEQ1AKcpGYvO3s1ec5ixk= +cloud.google.com/go/gkebackup v1.3.3/go.mod h1:eMk7/wVV5P22KBakhQnJxWSVftL1p4VBFLpv0kIft7I= +cloud.google.com/go/gkebackup v1.3.4/go.mod h1:gLVlbM8h/nHIs09ns1qx3q3eaXcGSELgNu1DWXYz1HI= +cloud.google.com/go/gkebackup v1.3.5/go.mod h1:KJ77KkNN7Wm1LdMopOelV6OodM01pMuK2/5Zt1t4Tvc= cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o= cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A= cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw= cloud.google.com/go/gkeconnect v0.8.1/go.mod h1:KWiK1g9sDLZqhxB2xEuPV8V9NYzrqTUmQR9shJHpOZw= +cloud.google.com/go/gkeconnect v0.8.2/go.mod h1:6nAVhwchBJYgQCXD2pHBFQNiJNyAd/wyxljpaa6ZPrY= +cloud.google.com/go/gkeconnect v0.8.3/go.mod h1:i9GDTrfzBSUZGCe98qSu1B8YB8qfapT57PenIb820Jo= +cloud.google.com/go/gkeconnect v0.8.4/go.mod h1:84hZz4UMlDCKl8ifVW8layK4WHlMAFeq8vbzjU0yJkw= +cloud.google.com/go/gkeconnect v0.8.5/go.mod h1:LC/rS7+CuJ5fgIbXv8tCD/mdfnlAadTaUufgOkmijuk= cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0= cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0= cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9Ascu3n0E= cloud.google.com/go/gkehub v0.12.0/go.mod h1:djiIwwzTTBrF5NaXCGv3mf7klpEMcST17VBTVVDcuaw= cloud.google.com/go/gkehub v0.14.1/go.mod h1:VEXKIJZ2avzrbd7u+zeMtW00Y8ddk/4V9511C9CQGTY= +cloud.google.com/go/gkehub v0.14.2/go.mod h1:iyjYH23XzAxSdhrbmfoQdePnlMj2EWcvnR+tHdBQsCY= +cloud.google.com/go/gkehub v0.14.3/go.mod h1:jAl6WafkHHW18qgq7kqcrXYzN08hXeK/Va3utN8VKg8= +cloud.google.com/go/gkehub v0.14.4/go.mod h1:Xispfu2MqnnFt8rV/2/3o73SK1snL8s9dYJ9G2oQMfc= +cloud.google.com/go/gkehub v0.14.5/go.mod h1:6bzqxM+a+vEH/h8W8ec4OJl4r36laxTs3A/fMNHJ0wA= cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA= cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI= cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y= cloud.google.com/go/gkemulticloud v0.6.1/go.mod h1:kbZ3HKyTsiwqKX7Yw56+wUGwwNZViRnxWK2DVknXWfw= cloud.google.com/go/gkemulticloud v1.0.0/go.mod h1:kbZ3HKyTsiwqKX7Yw56+wUGwwNZViRnxWK2DVknXWfw= +cloud.google.com/go/gkemulticloud v1.0.1/go.mod h1:AcrGoin6VLKT/fwZEYuqvVominLriQBCKmbjtnbMjG8= +cloud.google.com/go/gkemulticloud v1.0.2/go.mod h1:+ee5VXxKb3H1l4LZAcgWB/rvI16VTNTrInWxDjAGsGo= +cloud.google.com/go/gkemulticloud v1.0.3/go.mod h1:7NpJBN94U6DY1xHIbsDqB2+TFZUfjLUKLjUX8NGLor0= +cloud.google.com/go/gkemulticloud v1.1.0/go.mod h1:7NpJBN94U6DY1xHIbsDqB2+TFZUfjLUKLjUX8NGLor0= +cloud.google.com/go/gkemulticloud v1.1.1/go.mod h1:C+a4vcHlWeEIf45IB5FFR5XGjTeYhF83+AYIpTy4i2Q= cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/grafeas v0.3.0/go.mod h1:P7hgN24EyONOTMyeJH6DxG4zD7fwiYa5Q6GUgyFSOU8= +cloud.google.com/go/grafeas v0.3.4/go.mod h1:A5m316hcG+AulafjAbPKXBO/+I5itU4LOdKO2R/uDIc= cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM= cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o= cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo= cloud.google.com/go/gsuiteaddons v1.6.1/go.mod h1:CodrdOqRZcLp5WOwejHWYBjZvfY0kOphkAKpF/3qdZY= +cloud.google.com/go/gsuiteaddons v1.6.2/go.mod h1:K65m9XSgs8hTF3X9nNTPi8IQueljSdYo9F+Mi+s4MyU= +cloud.google.com/go/gsuiteaddons v1.6.3/go.mod h1:sCFJkZoMrLZT3JTb8uJqgKPNshH2tfXeCwTFRebTq48= +cloud.google.com/go/gsuiteaddons v1.6.4/go.mod h1:rxtstw7Fx22uLOXBpsvb9DUbC+fiXs7rF4U29KHM/pE= +cloud.google.com/go/gsuiteaddons v1.6.5/go.mod h1:Lo4P2IvO8uZ9W+RaC6s1JVxo42vgy+TX5a6hfBZ0ubs= cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= @@ -395,21 +685,39 @@ cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCta cloud.google.com/go/iam v1.0.1/go.mod h1:yR3tmSL8BcZB4bxByRv2jkSIahVmCtfKZwLYGBalRE8= cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk= cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= +cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= +cloud.google.com/go/iam v1.1.3/go.mod h1:3khUlaBXfPKKe7huYgEpDn6FtgRyMEqbkvBxrQyY5SE= +cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8= +cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= +cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc= cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A= cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk= cloud.google.com/go/iap v1.7.0/go.mod h1:beqQx56T9O1G1yNPph+spKpNibDlYIiIixiqsQXxLIo= cloud.google.com/go/iap v1.7.1/go.mod h1:WapEwPc7ZxGt2jFGB/C/bm+hP0Y6NXzOYGjpPnmMS74= cloud.google.com/go/iap v1.8.1/go.mod h1:sJCbeqg3mvWLqjZNsI6dfAtbbV1DL2Rl7e1mTyXYREQ= +cloud.google.com/go/iap v1.9.0/go.mod h1:01OFxd1R+NFrg78S+hoPV5PxEzv22HXaNqUUlmNHFuY= +cloud.google.com/go/iap v1.9.1/go.mod h1:SIAkY7cGMLohLSdBR25BuIxO+I4fXJiL06IBL7cy/5Q= +cloud.google.com/go/iap v1.9.2/go.mod h1:GwDTOs047PPSnwRD0Us5FKf4WDRcVvHg1q9WVkKBhdI= +cloud.google.com/go/iap v1.9.3/go.mod h1:DTdutSZBqkkOm2HEOTBzhZxh2mwwxshfD/h3yofAiCw= +cloud.google.com/go/iap v1.9.4/go.mod h1:vO4mSq0xNf/Pu6E5paORLASBwEmphXEjgCFg7aeNu1w= cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY= cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4= cloud.google.com/go/ids v1.4.1/go.mod h1:np41ed8YMU8zOgv53MMMoCntLTn2lF+SUzlM+O3u/jw= +cloud.google.com/go/ids v1.4.2/go.mod h1:3vw8DX6YddRu9BncxuzMyWn0g8+ooUjI2gslJ7FH3vk= +cloud.google.com/go/ids v1.4.3/go.mod h1:9CXPqI3GedjmkjbMWCUhMZ2P2N7TUMzAkVXYEH2orYU= +cloud.google.com/go/ids v1.4.4/go.mod h1:z+WUc2eEl6S/1aZWzwtVNWoSZslgzPxAboS0lZX0HjI= +cloud.google.com/go/ids v1.4.5/go.mod h1:p0ZnyzjMWxww6d2DvMGnFwCsSxDJM666Iir1bK1UuBo= cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs= cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g= cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o= cloud.google.com/go/iot v1.6.0/go.mod h1:IqdAsmE2cTYYNO1Fvjfzo9po179rAtJeVGUvkLN3rLE= cloud.google.com/go/iot v1.7.1/go.mod h1:46Mgw7ev1k9KqK1ao0ayW9h0lI+3hxeanz+L1zmbbbk= +cloud.google.com/go/iot v1.7.2/go.mod h1:q+0P5zr1wRFpw7/MOgDXrG/HVA+l+cSwdObffkrpnSg= +cloud.google.com/go/iot v1.7.3/go.mod h1:t8itFchkol4VgNbHnIq9lXoOOtHNR3uAACQMYbN9N4I= +cloud.google.com/go/iot v1.7.4/go.mod h1:3TWqDVvsddYBG++nHSZmluoCAVGr1hAcabbWZNKEZLk= +cloud.google.com/go/iot v1.7.5/go.mod h1:nq3/sqTz3HGaWJi1xNiX7F41ThOzpud67vwk0YsSsqs= cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0= @@ -420,42 +728,82 @@ cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyy cloud.google.com/go/kms v1.11.0/go.mod h1:hwdiYC0xjnWsKQQCQQmIQnS9asjYVSK6jtXm+zFqXLM= cloud.google.com/go/kms v1.12.1/go.mod h1:c9J991h5DTl+kg7gi3MYomh12YEENGrf48ee/N/2CDM= cloud.google.com/go/kms v1.15.0/go.mod h1:c9J991h5DTl+kg7gi3MYomh12YEENGrf48ee/N/2CDM= +cloud.google.com/go/kms v1.15.2/go.mod h1:3hopT4+7ooWRCjc2DxgnpESFxhIraaI2IpAVUEhbT/w= +cloud.google.com/go/kms v1.15.3/go.mod h1:AJdXqHxS2GlPyduM99s9iGqi2nwbviBbhV/hdmt4iOQ= +cloud.google.com/go/kms v1.15.4/go.mod h1:L3Sdj6QTHK8dfwK5D1JLsAyELsNMnd3tAIwGS4ltKpc= +cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI= +cloud.google.com/go/kms v1.15.6/go.mod h1:yF75jttnIdHfGBoE51AKsD/Yqf+/jICzB9v1s1acsms= +cloud.google.com/go/kms v1.15.7/go.mod h1:ub54lbsa6tDkUwnu4W7Yt1aAIFLnspgh0kPGToDukeI= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8= cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY= cloud.google.com/go/language v1.10.1/go.mod h1:CPp94nsdVNiQEt1CNjF5WkTcisLiHPyIbMhvR8H2AW0= +cloud.google.com/go/language v1.11.0/go.mod h1:uDx+pFDdAKTY8ehpWbiXyQdz8tDSYLJbQcXsCkjYyvQ= +cloud.google.com/go/language v1.11.1/go.mod h1:Xyid9MG9WOX3utvDbpX7j3tXDmmDooMyMDqgUVpH17U= +cloud.google.com/go/language v1.12.1/go.mod h1:zQhalE2QlQIxbKIZt54IASBzmZpN/aDASea5zl1l+J4= +cloud.google.com/go/language v1.12.2/go.mod h1:9idWapzr/JKXBBQ4lWqVX/hcadxB194ry20m/bTrhWc= +cloud.google.com/go/language v1.12.3/go.mod h1:evFX9wECX6mksEva8RbRnr/4wi/vKGYnAJrTRXU8+f8= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo= cloud.google.com/go/lifesciences v0.9.1/go.mod h1:hACAOd1fFbCGLr/+weUKRAJas82Y4vrL3O5326N//Wc= +cloud.google.com/go/lifesciences v0.9.2/go.mod h1:QHEOO4tDzcSAzeJg7s2qwnLM2ji8IRpQl4p6m5Z9yTA= +cloud.google.com/go/lifesciences v0.9.3/go.mod h1:gNGBOJV80IWZdkd+xz4GQj4mbqaz737SCLHn2aRhQKM= +cloud.google.com/go/lifesciences v0.9.4/go.mod h1:bhm64duKhMi7s9jR9WYJYvjAFJwRqNj+Nia7hF0Z7JA= +cloud.google.com/go/lifesciences v0.9.5/go.mod h1:OdBm0n7C0Osh5yZB7j9BXyrMnTRGBJIZonUMxo5CzPw= cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw= cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M= +cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI= +cloud.google.com/go/logging v1.9.0/go.mod h1:1Io0vnZv4onoUnsVUQY3HZ3Igb1nBchky0A0y7BBBhE= cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE= cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc= cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= cloud.google.com/go/longrunning v0.4.2/go.mod h1:OHrnaYyLUV6oqwh0xiS7e5sLQhP1m0QU9R+WhGDMgIQ= cloud.google.com/go/longrunning v0.5.0/go.mod h1:0JNuqRShmscVAhIACGtskSAWtqtOoPkwP0YF1oVEchc= cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc= +cloud.google.com/go/longrunning v0.5.2/go.mod h1:nqo6DQbNV2pXhGDbDMoN2bWz68MjZUzqv2YttZiveCs= +cloud.google.com/go/longrunning v0.5.3/go.mod h1:y/0ga59EYu58J6SHmmQOvekvND2qODbu8ywBBW7EK7Y= +cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI= +cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s= cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE= cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM= cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA= cloud.google.com/go/managedidentities v1.6.1/go.mod h1:h/irGhTN2SkZ64F43tfGPMbHnypMbu4RB3yl8YcuEak= +cloud.google.com/go/managedidentities v1.6.2/go.mod h1:5c2VG66eCa0WIq6IylRk3TBW83l161zkFvCj28X7jn8= +cloud.google.com/go/managedidentities v1.6.3/go.mod h1:tewiat9WLyFN0Fi7q1fDD5+0N4VUoL0SCX0OTCthZq4= +cloud.google.com/go/managedidentities v1.6.4/go.mod h1:WgyaECfHmF00t/1Uk8Oun3CQ2PGUtjc3e9Alh79wyiM= +cloud.google.com/go/managedidentities v1.6.5/go.mod h1:fkFI2PwwyRQbjLxlm5bQ8SjtObFMW3ChBGNqaMcgZjI= cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI= cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8VAJaCw= cloud.google.com/go/maps v0.7.0/go.mod h1:3GnvVl3cqeSvgMcpRlQidXsPYuDGQ8naBis7MVzpXsY= +cloud.google.com/go/maps v1.3.0/go.mod h1:6mWTUv+WhnOwAgjVsSW2QPPECmW+s3PcRyOa9vgG/5s= cloud.google.com/go/maps v1.4.0/go.mod h1:6mWTUv+WhnOwAgjVsSW2QPPECmW+s3PcRyOa9vgG/5s= +cloud.google.com/go/maps v1.4.1/go.mod h1:BxSa0BnW1g2U2gNdbq5zikLlHUuHW0GFWh7sgML2kIY= +cloud.google.com/go/maps v1.5.1/go.mod h1:NPMZw1LJwQZYCfz4y+EIw+SI+24A4bpdFJqdKVr0lt4= +cloud.google.com/go/maps v1.6.1/go.mod h1:4+buOHhYXFBp58Zj/K+Lc1rCmJssxxF4pJ5CJnhdz18= +cloud.google.com/go/maps v1.6.2/go.mod h1:4+buOHhYXFBp58Zj/K+Lc1rCmJssxxF4pJ5CJnhdz18= +cloud.google.com/go/maps v1.6.3/go.mod h1:VGAn809ADswi1ASofL5lveOHPnE6Rk/SFTTBx1yuOLw= +cloud.google.com/go/maps v1.6.4/go.mod h1:rhjqRy8NWmDJ53saCfsXQ0LKwBHfi6OSh5wkq6BaMhI= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I= cloud.google.com/go/mediatranslation v0.8.1/go.mod h1:L/7hBdEYbYHQJhX2sldtTO5SZZ1C1vkapubj0T2aGig= +cloud.google.com/go/mediatranslation v0.8.2/go.mod h1:c9pUaDRLkgHRx3irYE5ZC8tfXGrMYwNZdmDqKMSfFp8= +cloud.google.com/go/mediatranslation v0.8.3/go.mod h1:F9OnXTy336rteOEywtY7FOqCk+J43o2RF638hkOQl4Y= +cloud.google.com/go/mediatranslation v0.8.4/go.mod h1:9WstgtNVAdN53m6TQa5GjIjLqKQPXe74hwSCxUP6nj4= +cloud.google.com/go/mediatranslation v0.8.5/go.mod h1:y7kTHYIPCIfgyLbKncgqouXJtLsU+26hZhHEEy80fSs= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA= cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY= cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM= cloud.google.com/go/memcache v1.10.1/go.mod h1:47YRQIarv4I3QS5+hoETgKO40InqzLP6kpNLvyXuyaA= +cloud.google.com/go/memcache v1.10.2/go.mod h1:f9ZzJHLBrmd4BkguIAa/l/Vle6uTHzHokdnzSWOdQ6A= +cloud.google.com/go/memcache v1.10.3/go.mod h1:6z89A41MT2DVAW0P4iIRdu5cmRTsbsFn4cyiIx8gbwo= +cloud.google.com/go/memcache v1.10.4/go.mod h1:v/d8PuC8d1gD6Yn5+I3INzLR01IDn0N4Ym56RgikSI0= +cloud.google.com/go/memcache v1.10.5/go.mod h1:/FcblbNd0FdMsx4natdj+2GWzTq+cjZvMa1I+9QsuMA= cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8= @@ -463,11 +811,23 @@ cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo= cloud.google.com/go/metastore v1.11.1/go.mod h1:uZuSo80U3Wd4zi6C22ZZliOUJ3XeM/MlYi/z5OAOWRA= cloud.google.com/go/metastore v1.12.0/go.mod h1:uZuSo80U3Wd4zi6C22ZZliOUJ3XeM/MlYi/z5OAOWRA= +cloud.google.com/go/metastore v1.13.0/go.mod h1:URDhpG6XLeh5K+Glq0NOt74OfrPKTwS62gEPZzb5SOk= +cloud.google.com/go/metastore v1.13.1/go.mod h1:IbF62JLxuZmhItCppcIfzBBfUFq0DIB9HPDoLgWrVOU= +cloud.google.com/go/metastore v1.13.2/go.mod h1:KS59dD+unBji/kFebVp8XU/quNSyo8b6N6tPGspKszA= +cloud.google.com/go/metastore v1.13.3/go.mod h1:K+wdjXdtkdk7AQg4+sXS8bRrQa9gcOr+foOMF2tqINE= +cloud.google.com/go/metastore v1.13.4/go.mod h1:FMv9bvPInEfX9Ac1cVcRXp8EBBQnBcqH6gz3KvJ9BAE= cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk= cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4= cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w= cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw= cloud.google.com/go/monitoring v1.15.1/go.mod h1:lADlSAlFdbqQuwwpaImhsJXu1QSdd3ojypXrFSMr2rM= +cloud.google.com/go/monitoring v1.16.0/go.mod h1:Ptp15HgAyM1fNICAojDMoNc/wUmn67mLHQfyqbw+poY= +cloud.google.com/go/monitoring v1.16.1/go.mod h1:6HsxddR+3y9j+o/cMJH6q/KJ/CBTvM/38L/1m7bTRJ4= +cloud.google.com/go/monitoring v1.16.2/go.mod h1:B44KGwi4ZCF8Rk/5n+FWeispDXoKSk9oss2QNlXJBgc= +cloud.google.com/go/monitoring v1.16.3/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw= +cloud.google.com/go/monitoring v1.17.0/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw= +cloud.google.com/go/monitoring v1.17.1/go.mod h1:SJzPMakCF0GHOuKEH/r4hxVKF04zl+cRPQyc3d/fqII= +cloud.google.com/go/monitoring v1.18.0/go.mod h1:c92vVBCeq/OB4Ioyo+NbN2U7tlg5ZH41PZcdvfc+Lcg= cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM= @@ -475,15 +835,30 @@ cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5Mp cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E= cloud.google.com/go/networkconnectivity v1.11.0/go.mod h1:iWmDD4QF16VCDLXUqvyspJjIEtBR/4zq5hwnY2X3scM= cloud.google.com/go/networkconnectivity v1.12.1/go.mod h1:PelxSWYM7Sh9/guf8CFhi6vIqf19Ir/sbfZRUwXh92E= +cloud.google.com/go/networkconnectivity v1.13.0/go.mod h1:SAnGPes88pl7QRLUen2HmcBSE9AowVAcdug8c0RSBFk= +cloud.google.com/go/networkconnectivity v1.14.0/go.mod h1:SAnGPes88pl7QRLUen2HmcBSE9AowVAcdug8c0RSBFk= +cloud.google.com/go/networkconnectivity v1.14.1/go.mod h1:LyGPXR742uQcDxZ/wv4EI0Vu5N6NKJ77ZYVnDe69Zug= +cloud.google.com/go/networkconnectivity v1.14.2/go.mod h1:5UFlwIisZylSkGG1AdwK/WZUaoz12PKu6wODwIbFzJo= +cloud.google.com/go/networkconnectivity v1.14.3/go.mod h1:4aoeFdrJpYEXNvrnfyD5kIzs8YtHg945Og4koAjHQek= +cloud.google.com/go/networkconnectivity v1.14.4/go.mod h1:PU12q++/IMnDJAB+3r+tJtuCXCfwfN+C6Niyj6ji1Po= cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8= cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4= cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY= cloud.google.com/go/networkmanagement v1.8.0/go.mod h1:Ho/BUGmtyEqrttTgWEe7m+8vDdK74ibQc+Be0q7Fof0= +cloud.google.com/go/networkmanagement v1.9.0/go.mod h1:UTUaEU9YwbCAhhz3jEOHr+2/K/MrBk2XxOLS89LQzFw= +cloud.google.com/go/networkmanagement v1.9.1/go.mod h1:CCSYgrQQvW73EJawO2QamemYcOb57LvrDdDU51F0mcI= +cloud.google.com/go/networkmanagement v1.9.2/go.mod h1:iDGvGzAoYRghhp4j2Cji7sF899GnfGQcQRQwgVOWnDw= +cloud.google.com/go/networkmanagement v1.9.3/go.mod h1:y7WMO1bRLaP5h3Obm4tey+NquUvB93Co1oh4wpL+XcU= +cloud.google.com/go/networkmanagement v1.9.4/go.mod h1:daWJAl0KTFytFL7ar33I6R/oNBH8eEOX/rBNHrC/8TA= cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU= cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k= cloud.google.com/go/networksecurity v0.8.0/go.mod h1:B78DkqsxFG5zRSVuwYFRZ9Xz8IcQ5iECsNrPn74hKHU= cloud.google.com/go/networksecurity v0.9.1/go.mod h1:MCMdxOKQ30wsBI1eI659f9kEp4wuuAueoC9AJKSPWZQ= +cloud.google.com/go/networksecurity v0.9.2/go.mod h1:jG0SeAttWzPMUILEHDUvFYdQTl8L/E/KC8iZDj85lEI= +cloud.google.com/go/networksecurity v0.9.3/go.mod h1:l+C0ynM6P+KV9YjOnx+kk5IZqMSLccdBqW6GUoF4p/0= +cloud.google.com/go/networksecurity v0.9.4/go.mod h1:E9CeMZ2zDsNBkr8axKSYm8XyTqNhiCHf1JO/Vb8mD1w= +cloud.google.com/go/networksecurity v0.9.5/go.mod h1:KNkjH/RsylSGyyZ8wXpue8xpCEK+bTtvof8SBfIhMG8= cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY= cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34= cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA= @@ -491,19 +866,38 @@ cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vu cloud.google.com/go/notebooks v1.7.0/go.mod h1:PVlaDGfJgj1fl1S3dUwhFMXFgfYGhYQt2164xOMONmE= cloud.google.com/go/notebooks v1.8.0/go.mod h1:Lq6dYKOYOWUCTvw5t2q1gp1lAp0zxAxRycayS0iJcqQ= cloud.google.com/go/notebooks v1.9.1/go.mod h1:zqG9/gk05JrzgBt4ghLzEepPHNwE5jgPcHZRKhlC1A8= +cloud.google.com/go/notebooks v1.10.0/go.mod h1:SOPYMZnttHxqot0SGSFSkRrwE29eqnKPBJFqgWmiK2k= +cloud.google.com/go/notebooks v1.10.1/go.mod h1:5PdJc2SgAybE76kFQCWrTfJolCOUQXF97e+gteUUA6A= +cloud.google.com/go/notebooks v1.11.1/go.mod h1:V2Zkv8wX9kDCGRJqYoI+bQAaoVeE5kSiz4yYHd2yJwQ= +cloud.google.com/go/notebooks v1.11.2/go.mod h1:z0tlHI/lREXC8BS2mIsUeR3agM1AkgLiS+Isov3SS70= +cloud.google.com/go/notebooks v1.11.3/go.mod h1:0wQyI2dQC3AZyQqWnRsp+yA+kY4gC7ZIVP4Qg3AQcgo= cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4= cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs= cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI= cloud.google.com/go/optimization v1.4.1/go.mod h1:j64vZQP7h9bO49m2rVaTVoNM0vEBEN5eKPUPbZyXOrk= +cloud.google.com/go/optimization v1.5.0/go.mod h1:evo1OvTxeBRBu6ydPlrIRizKY/LJKo/drDMMRKqGEUU= +cloud.google.com/go/optimization v1.5.1/go.mod h1:NC0gnUD5MWVAF7XLdoYVPmYYVth93Q6BUzqAq3ZwtV8= +cloud.google.com/go/optimization v1.6.1/go.mod h1:hH2RYPTTM9e9zOiTaYPTiGPcGdNZVnBSBxjIAJzUkqo= +cloud.google.com/go/optimization v1.6.2/go.mod h1:mWNZ7B9/EyMCcwNl1frUGEuY6CPijSkz88Fz2vwKPOY= +cloud.google.com/go/optimization v1.6.3/go.mod h1:8ve3svp3W6NFcAEFr4SfJxrldzhUl4VMUJmhrqVKtYA= cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA= cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk= cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ= cloud.google.com/go/orchestration v1.8.1/go.mod h1:4sluRF3wgbYVRqz7zJ1/EUNc90TTprliq9477fGobD8= +cloud.google.com/go/orchestration v1.8.2/go.mod h1:T1cP+6WyTmh6LSZzeUhvGf0uZVmJyTx7t8z7Vg87+A0= +cloud.google.com/go/orchestration v1.8.3/go.mod h1:xhgWAYqlbYjlz2ftbFghdyqENYW+JXuhBx9KsjMoGHs= +cloud.google.com/go/orchestration v1.8.4/go.mod h1:d0lywZSVYtIoSZXb0iFjv9SaL13PGyVOKDxqGxEf/qI= +cloud.google.com/go/orchestration v1.8.5/go.mod h1:C1J7HesE96Ba8/hZ71ISTV2UAat0bwN+pi85ky38Yq8= cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE= cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc= cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc= cloud.google.com/go/orgpolicy v1.11.0/go.mod h1:2RK748+FtVvnfuynxBzdnyu7sygtoZa1za/0ZfpOs1M= cloud.google.com/go/orgpolicy v1.11.1/go.mod h1:8+E3jQcpZJQliP+zaFfayC2Pg5bmhuLK755wKhIIUCE= +cloud.google.com/go/orgpolicy v1.11.2/go.mod h1:biRDpNwfyytYnmCRWZWxrKF22Nkz9eNVj9zyaBdpm1o= +cloud.google.com/go/orgpolicy v1.11.3/go.mod h1:oKAtJ/gkMjum5icv2aujkP4CxROxPXsBbYGCDbPO8MM= +cloud.google.com/go/orgpolicy v1.11.4/go.mod h1:0+aNV/nrfoTQ4Mytv+Aw+stBDBjNf4d8fYRA9herfJI= +cloud.google.com/go/orgpolicy v1.12.0/go.mod h1:0+aNV/nrfoTQ4Mytv+Aw+stBDBjNf4d8fYRA9herfJI= +cloud.google.com/go/orgpolicy v1.12.1/go.mod h1:aibX78RDl5pcK3jA8ysDQCFkVxLj3aOQqrbBaUL2V5I= cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs= cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg= cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo= @@ -511,27 +905,50 @@ cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw= cloud.google.com/go/osconfig v1.12.0/go.mod h1:8f/PaYzoS3JMVfdfTubkowZYGmAhUCjjwnjqWI7NVBc= cloud.google.com/go/osconfig v1.12.1/go.mod h1:4CjBxND0gswz2gfYRCUoUzCm9zCABp91EeTtWXyz0tE= +cloud.google.com/go/osconfig v1.12.2/go.mod h1:eh9GPaMZpI6mEJEuhEjUJmaxvQ3gav+fFEJon1Y8Iw0= +cloud.google.com/go/osconfig v1.12.3/go.mod h1:L/fPS8LL6bEYUi1au832WtMnPeQNT94Zo3FwwV1/xGM= +cloud.google.com/go/osconfig v1.12.4/go.mod h1:B1qEwJ/jzqSRslvdOCI8Kdnp0gSng0xW4LOnIebQomA= +cloud.google.com/go/osconfig v1.12.5/go.mod h1:D9QFdxzfjgw3h/+ZaAb5NypM8bhOMqBzgmbhzWViiW8= cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E= cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU= cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70= cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo= cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs= cloud.google.com/go/oslogin v1.10.1/go.mod h1:x692z7yAue5nE7CsSnoG0aaMbNoRJRXO4sn73R+ZqAs= +cloud.google.com/go/oslogin v1.11.0/go.mod h1:8GMTJs4X2nOAUVJiPGqIWVcDaF0eniEto3xlOxaboXE= +cloud.google.com/go/oslogin v1.11.1/go.mod h1:OhD2icArCVNUxKqtK0mcSmKL7lgr0LVlQz+v9s1ujTg= +cloud.google.com/go/oslogin v1.12.1/go.mod h1:VfwTeFJGbnakxAY236eN8fsnglLiVXndlbcNomY4iZU= +cloud.google.com/go/oslogin v1.12.2/go.mod h1:CQ3V8Jvw4Qo4WRhNPF0o+HAM4DiLuE27Ul9CX9g2QdY= +cloud.google.com/go/oslogin v1.13.0/go.mod h1:xPJqLwpTZ90LSE5IL1/svko+6c5avZLluiyylMb/sRA= +cloud.google.com/go/oslogin v1.13.1/go.mod h1:vS8Sr/jR7QvPWpCjNqy6LYZr5Zs1e8ZGW/KPn9gmhws= cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0= cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA= cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk= cloud.google.com/go/phishingprotection v0.8.1/go.mod h1:AxonW7GovcA8qdEk13NfHq9hNx5KPtfxXNeUxTDxB6I= +cloud.google.com/go/phishingprotection v0.8.2/go.mod h1:LhJ91uyVHEYKSKcMGhOa14zMMWfbEdxG032oT6ECbC8= +cloud.google.com/go/phishingprotection v0.8.3/go.mod h1:3B01yO7T2Ra/TMojifn8EoGd4G9jts/6cIO0DgDY9J8= +cloud.google.com/go/phishingprotection v0.8.4/go.mod h1:6b3kNPAc2AQ6jZfFHioZKg9MQNybDg4ixFd4RPZZ2nE= +cloud.google.com/go/phishingprotection v0.8.5/go.mod h1:g1smd68F7mF1hgQPuYn3z8HDbNre8L6Z0b7XMYFmX7I= cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg= cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE= cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw= cloud.google.com/go/policytroubleshooter v1.6.0/go.mod h1:zYqaPTsmfvpjm5ULxAyD/lINQxJ0DDsnWOP/GZ7xzBc= cloud.google.com/go/policytroubleshooter v1.7.1/go.mod h1:0NaT5v3Ag1M7U5r0GfDCpUFkWd9YqpubBWsQlhanRv0= cloud.google.com/go/policytroubleshooter v1.8.0/go.mod h1:tmn5Ir5EToWe384EuboTcVQT7nTag2+DuH3uHmKd1HU= +cloud.google.com/go/policytroubleshooter v1.9.0/go.mod h1:+E2Lga7TycpeSTj2FsH4oXxTnrbHJGRlKhVZBLGgU64= +cloud.google.com/go/policytroubleshooter v1.9.1/go.mod h1:MYI8i0bCrL8cW+VHN1PoiBTyNZTstCg2WUw2eVC4c4U= +cloud.google.com/go/policytroubleshooter v1.10.1/go.mod h1:5C0rhT3TDZVxAu8813bwmTvd57Phbl8mr9F4ipOsxEs= +cloud.google.com/go/policytroubleshooter v1.10.2/go.mod h1:m4uF3f6LseVEnMV6nknlN2vYGRb+75ylQwJdnOXfnv0= +cloud.google.com/go/policytroubleshooter v1.10.3/go.mod h1:+ZqG3agHT7WPb4EBIRqUv4OyIwRTZvsVDHZ8GlZaoxk= cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0= cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI= cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg= cloud.google.com/go/privatecatalog v0.8.0/go.mod h1:nQ6pfaegeDAq/Q5lrfCQzQLhubPiZhSaNhIgfJlnIXs= cloud.google.com/go/privatecatalog v0.9.1/go.mod h1:0XlDXW2unJXdf9zFz968Hp35gl/bhF4twwpXZAW50JA= +cloud.google.com/go/privatecatalog v0.9.2/go.mod h1:RMA4ATa8IXfzvjrhhK8J6H4wwcztab+oZph3c6WmtFc= +cloud.google.com/go/privatecatalog v0.9.3/go.mod h1:K5pn2GrVmOPjXz3T26mzwXLcKivfIJ9R5N79AFCF9UE= +cloud.google.com/go/privatecatalog v0.9.4/go.mod h1:SOjm93f+5hp/U3PqMZAHTtBtluqLygrDrVO8X8tYtG0= +cloud.google.com/go/privatecatalog v0.9.5/go.mod h1:fVWeBOVe7uj2n3kWRGlUQqR/pOd450J9yZoOECcQqJk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -542,6 +959,8 @@ cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9 cloud.google.com/go/pubsub v1.30.0/go.mod h1:qWi1OPS0B+b5L+Sg6Gmc9zD1Y+HaM0MdUr7LsupY1P4= cloud.google.com/go/pubsub v1.32.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc= cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc= +cloud.google.com/go/pubsub v1.34.0/go.mod h1:alj4l4rBg+N3YTFDDC+/YyFTs6JAjam2QfYsddcAW4c= +cloud.google.com/go/pubsub v1.36.1/go.mod h1:iYjCa9EzWOoBiTdd4ps7QoMtMln5NwaZQpK1hbRfBDE= cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg= cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k= cloud.google.com/go/pubsublite v1.7.0/go.mod h1:8hVMwRXfDfvGm3fahVbtDbiLePT3gpoiJYJY+vxWxVM= @@ -555,43 +974,82 @@ cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91j cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA= cloud.google.com/go/recaptchaenterprise/v2 v2.7.0/go.mod h1:19wVj/fs5RtYtynAPJdDTb69oW0vNHYDBTbB4NvMD9c= cloud.google.com/go/recaptchaenterprise/v2 v2.7.2/go.mod h1:kR0KjsJS7Jt1YSyWFkseQ756D45kaYNTlDPPaRAvDBU= +cloud.google.com/go/recaptchaenterprise/v2 v2.8.0/go.mod h1:QuE8EdU9dEnesG8/kG3XuJyNsjEqMlMzg3v3scCJ46c= +cloud.google.com/go/recaptchaenterprise/v2 v2.8.1/go.mod h1:JZYZJOeZjgSSTGP4uz7NlQ4/d1w5hGmksVgM0lbEij0= +cloud.google.com/go/recaptchaenterprise/v2 v2.8.2/go.mod h1:kpaDBOpkwD4G0GVMzG1W6Doy1tFFC97XAV3xy+Rd/pw= +cloud.google.com/go/recaptchaenterprise/v2 v2.8.3/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w= +cloud.google.com/go/recaptchaenterprise/v2 v2.8.4/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w= +cloud.google.com/go/recaptchaenterprise/v2 v2.9.0/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w= +cloud.google.com/go/recaptchaenterprise/v2 v2.9.2/go.mod h1:trwwGkfhCmp05Ll5MSJPXY7yvnO0p4v3orGANAFHAuU= cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg= cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4= cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac= cloud.google.com/go/recommendationengine v0.8.1/go.mod h1:MrZihWwtFYWDzE6Hz5nKcNz3gLizXVIDI/o3G1DLcrE= +cloud.google.com/go/recommendationengine v0.8.2/go.mod h1:QIybYHPK58qir9CV2ix/re/M//Ty10OxjnnhWdaKS1Y= +cloud.google.com/go/recommendationengine v0.8.3/go.mod h1:m3b0RZV02BnODE9FeSvGv1qibFo8g0OnmB/RMwYy4V8= +cloud.google.com/go/recommendationengine v0.8.4/go.mod h1:GEteCf1PATl5v5ZsQ60sTClUE0phbWmo3rQ1Js8louU= +cloud.google.com/go/recommendationengine v0.8.5/go.mod h1:A38rIXHGFvoPvmy6pZLozr0g59NRNREz4cx7F58HAsQ= cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg= cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c= cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs= cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70= cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ= cloud.google.com/go/recommender v1.10.1/go.mod h1:XFvrE4Suqn5Cq0Lf+mCP6oBHD/yRMA8XxP5sb7Q7gpA= +cloud.google.com/go/recommender v1.11.0/go.mod h1:kPiRQhPyTJ9kyXPCG6u/dlPLbYfFlkwHNRwdzPVAoII= +cloud.google.com/go/recommender v1.11.1/go.mod h1:sGwFFAyI57v2Hc5LbIj+lTwXipGu9NW015rkaEM5B18= +cloud.google.com/go/recommender v1.11.2/go.mod h1:AeoJuzOvFR/emIcXdVFkspVXVTYpliRCmKNYDnyBv6Y= +cloud.google.com/go/recommender v1.11.3/go.mod h1:+FJosKKJSId1MBFeJ/TTyoGQZiEelQQIZMKYYD8ruK4= +cloud.google.com/go/recommender v1.12.0/go.mod h1:+FJosKKJSId1MBFeJ/TTyoGQZiEelQQIZMKYYD8ruK4= +cloud.google.com/go/recommender v1.12.1/go.mod h1:gf95SInWNND5aPas3yjwl0I572dtudMhMIG4ni8nr+0= cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y= cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A= cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA= cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM= cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ= cloud.google.com/go/redis v1.13.1/go.mod h1:VP7DGLpE91M6bcsDdMuyCm2hIpB6Vp2hI090Mfd1tcg= +cloud.google.com/go/redis v1.13.2/go.mod h1:0Hg7pCMXS9uz02q+LoEVl5dNHUkIQv+C/3L76fandSA= +cloud.google.com/go/redis v1.13.3/go.mod h1:vbUpCKUAZSYzFcWKmICnYgRAhTFg9r+djWqFxDYXi4U= +cloud.google.com/go/redis v1.14.1/go.mod h1:MbmBxN8bEnQI4doZPC1BzADU4HGocHBk2de3SbgOkqs= +cloud.google.com/go/redis v1.14.2/go.mod h1:g0Lu7RRRz46ENdFKQ2EcQZBAJ2PtJHJLuiiRuEXwyQw= cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA= cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0= cloud.google.com/go/resourcemanager v1.5.0/go.mod h1:eQoXNAiAvCf5PXxWxXjhKQoTMaUSNrEfg+6qdf/wots= cloud.google.com/go/resourcemanager v1.6.0/go.mod h1:YcpXGRs8fDzcUl1Xw8uOVmI8JEadvhRIkoXXUNVYcVo= cloud.google.com/go/resourcemanager v1.7.0/go.mod h1:HlD3m6+bwhzj9XCouqmeiGuni95NTrExfhoSrkC/3EI= cloud.google.com/go/resourcemanager v1.9.1/go.mod h1:dVCuosgrh1tINZ/RwBufr8lULmWGOkPS8gL5gqyjdT8= +cloud.google.com/go/resourcemanager v1.9.2/go.mod h1:OujkBg1UZg5lX2yIyMo5Vz9O5hf7XQOSV7WxqxxMtQE= +cloud.google.com/go/resourcemanager v1.9.3/go.mod h1:IqrY+g0ZgLsihcfcmqSe+RKp1hzjXwG904B92AwBz6U= +cloud.google.com/go/resourcemanager v1.9.4/go.mod h1:N1dhP9RFvo3lUfwtfLWVxfUWq8+KUQ+XLlHLH3BoFJ0= +cloud.google.com/go/resourcemanager v1.9.5/go.mod h1:hep6KjelHA+ToEjOfO3garMKi/CLYwTqeAw7YiEI9x8= cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU= cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg= cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA= cloud.google.com/go/resourcesettings v1.6.1/go.mod h1:M7mk9PIZrC5Fgsu1kZJci6mpgN8o0IUzVx3eJU3y4Jw= +cloud.google.com/go/resourcesettings v1.6.2/go.mod h1:mJIEDd9MobzunWMeniaMp6tzg4I2GvD3TTmPkc8vBXk= +cloud.google.com/go/resourcesettings v1.6.3/go.mod h1:pno5D+7oDYkMWZ5BpPsb4SO0ewg3IXcmmrUZaMJrFic= +cloud.google.com/go/resourcesettings v1.6.4/go.mod h1:pYTTkWdv2lmQcjsthbZLNBP4QW140cs7wqA3DuqErVI= +cloud.google.com/go/resourcesettings v1.6.5/go.mod h1:WBOIWZraXZOGAgoR4ukNj0o0HiSMO62H9RpFi9WjP9I= cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4= cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY= cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc= cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y= cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14= cloud.google.com/go/retail v1.14.1/go.mod h1:y3Wv3Vr2k54dLNIrCzenyKG8g8dhvhncT2NcNjb/6gE= +cloud.google.com/go/retail v1.14.2/go.mod h1:W7rrNRChAEChX336QF7bnMxbsjugcOCPU44i5kbLiL8= +cloud.google.com/go/retail v1.14.3/go.mod h1:Omz2akDHeSlfCq8ArPKiBxlnRpKEBjUH386JYFLUvXo= +cloud.google.com/go/retail v1.14.4/go.mod h1:l/N7cMtY78yRnJqp5JW8emy7MB1nz8E4t2yfOmklYfg= +cloud.google.com/go/retail v1.15.1/go.mod h1:In9nSBOYhLbDGa87QvWlnE1XA14xBN2FpQRiRsUs9wU= +cloud.google.com/go/retail v1.16.0/go.mod h1:LW7tllVveZo4ReWt68VnldZFWJRzsh9np+01J9dYWzE= cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do= cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo= cloud.google.com/go/run v0.8.0/go.mod h1:VniEnuBwqjigv0A7ONfQUaEItaiCRVujlMqerPPiktM= cloud.google.com/go/run v0.9.0/go.mod h1:Wwu+/vvg8Y+JUApMwEDfVfhetv30hCG4ZwDR/IXl2Qg= cloud.google.com/go/run v1.2.0/go.mod h1:36V1IlDzQ0XxbQjUx6IYbw8H3TJnWvhii963WW3B/bo= +cloud.google.com/go/run v1.3.0/go.mod h1:S/osX/4jIPZGg+ssuqh6GNgg7syixKe3YnprwehzHKU= +cloud.google.com/go/run v1.3.1/go.mod h1:cymddtZOzdwLIAsmS6s+Asl4JoXIDm/K1cpZTxV4Q5s= +cloud.google.com/go/run v1.3.2/go.mod h1:SIhmqArbjdU/D9M6JoHaAqnAMKLFtXaVdNeq04NjnVE= +cloud.google.com/go/run v1.3.3/go.mod h1:WSM5pGyJ7cfYyYbONVQBN4buz42zFqwG67Q3ch07iK4= +cloud.google.com/go/run v1.3.4/go.mod h1:FGieuZvQ3tj1e9GnzXqrMABSuir38AJg5xhiYq+SF3o= cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s= cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI= cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk= @@ -599,11 +1057,20 @@ cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJe cloud.google.com/go/scheduler v1.8.0/go.mod h1:TCET+Y5Gp1YgHT8py4nlg2Sew8nUHMqcpousDgXJVQc= cloud.google.com/go/scheduler v1.9.0/go.mod h1:yexg5t+KSmqu+njTIh3b7oYPheFtBWGcbVUYF1GGMIc= cloud.google.com/go/scheduler v1.10.1/go.mod h1:R63Ldltd47Bs4gnhQkmNDse5w8gBRrhObZ54PxgR2Oo= +cloud.google.com/go/scheduler v1.10.2/go.mod h1:O3jX6HRH5eKCA3FutMw375XHZJudNIKVonSCHv7ropY= +cloud.google.com/go/scheduler v1.10.3/go.mod h1:8ANskEM33+sIbpJ+R4xRfw/jzOG+ZFE8WVLy7/yGvbc= +cloud.google.com/go/scheduler v1.10.4/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI= +cloud.google.com/go/scheduler v1.10.5/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI= +cloud.google.com/go/scheduler v1.10.6/go.mod h1:pe2pNCtJ+R01E06XCDOJs1XvAMbv28ZsQEbqknxGOuE= cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4= cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4= cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU= cloud.google.com/go/secretmanager v1.11.1/go.mod h1:znq9JlXgTNdBeQk9TBW/FnR/W4uChEKGeqQWAJ8SXFw= +cloud.google.com/go/secretmanager v1.11.2/go.mod h1:MQm4t3deoSub7+WNwiC4/tRYgDBHJgJPvswqQVB1Vss= +cloud.google.com/go/secretmanager v1.11.3/go.mod h1:0bA2o6FabmShrEy328i67aV+65XoUFFSmVeLBn/51jI= +cloud.google.com/go/secretmanager v1.11.4/go.mod h1:wreJlbS9Zdq21lMzWmJ0XhWW2ZxgPeahsqeV/vZoJ3w= +cloud.google.com/go/secretmanager v1.11.5/go.mod h1:eAGv+DaCHkeVyQi0BeXgAHOU0RdrMeZIASKc+S7VqH4= cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4= cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0= cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU= @@ -612,6 +1079,10 @@ cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH cloud.google.com/go/security v1.12.0/go.mod h1:rV6EhrpbNHrrxqlvW0BWAIawFWq3X90SduMJdFwtLB8= cloud.google.com/go/security v1.13.0/go.mod h1:Q1Nvxl1PAgmeW0y3HTt54JYIvUdtcpYKVfIB8AOMZ+0= cloud.google.com/go/security v1.15.1/go.mod h1:MvTnnbsWnehoizHi09zoiZob0iCHVcL4AUBj76h9fXA= +cloud.google.com/go/security v1.15.2/go.mod h1:2GVE/v1oixIRHDaClVbHuPcZwAqFM28mXuAKCfMgYIg= +cloud.google.com/go/security v1.15.3/go.mod h1:gQ/7Q2JYUZZgOzqKtw9McShH+MjNvtDpL40J1cT+vBs= +cloud.google.com/go/security v1.15.4/go.mod h1:oN7C2uIZKhxCLiAAijKUCuHLZbIt/ghYEo8MqwD/Ty4= +cloud.google.com/go/security v1.15.5/go.mod h1:KS6X2eG3ynWjqcIX976fuToN5juVkF6Ra6c7MPnldtc= cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU= cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc= cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk= @@ -619,6 +1090,11 @@ cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZ cloud.google.com/go/securitycenter v1.18.1/go.mod h1:0/25gAzCM/9OL9vVx4ChPeM/+DlfGQJDwBy/UC8AKK0= cloud.google.com/go/securitycenter v1.19.0/go.mod h1:LVLmSg8ZkkyaNy4u7HCIshAngSQ8EcIRREP3xBnyfag= cloud.google.com/go/securitycenter v1.23.0/go.mod h1:8pwQ4n+Y9WCWM278R8W3nF65QtY172h4S8aXyI9/hsQ= +cloud.google.com/go/securitycenter v1.23.1/go.mod h1:w2HV3Mv/yKhbXKwOCu2i8bCuLtNP1IMHuiYQn4HJq5s= +cloud.google.com/go/securitycenter v1.24.1/go.mod h1:3h9IdjjHhVMXdQnmqzVnM7b0wMn/1O/U20eWVpMpZjI= +cloud.google.com/go/securitycenter v1.24.2/go.mod h1:l1XejOngggzqwr4Fa2Cn+iWZGf+aBLTXtB/vXjy5vXM= +cloud.google.com/go/securitycenter v1.24.3/go.mod h1:l1XejOngggzqwr4Fa2Cn+iWZGf+aBLTXtB/vXjy5vXM= +cloud.google.com/go/securitycenter v1.24.4/go.mod h1:PSccin+o1EMYKcFQzz9HMMnZ2r9+7jbc+LvPjXhpwcU= cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU= cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s= cloud.google.com/go/servicecontrol v1.10.0/go.mod h1:pQvyvSRh7YzUF2efw7H87V92mxU8FnFDawMClGCNuAA= @@ -632,6 +1108,10 @@ cloud.google.com/go/servicedirectory v1.8.0/go.mod h1:srXodfhY1GFIPvltunswqXpVxF cloud.google.com/go/servicedirectory v1.9.0/go.mod h1:29je5JjiygNYlmsGz8k6o+OZ8vd4f//bQLtvzkPPT/s= cloud.google.com/go/servicedirectory v1.10.1/go.mod h1:Xv0YVH8s4pVOwfM/1eMTl0XJ6bzIOSLDt8f8eLaGOxQ= cloud.google.com/go/servicedirectory v1.11.0/go.mod h1:Xv0YVH8s4pVOwfM/1eMTl0XJ6bzIOSLDt8f8eLaGOxQ= +cloud.google.com/go/servicedirectory v1.11.1/go.mod h1:tJywXimEWzNzw9FvtNjsQxxJ3/41jseeILgwU/QLrGI= +cloud.google.com/go/servicedirectory v1.11.2/go.mod h1:KD9hCLhncWRV5jJphwIpugKwM5bn1x0GyVVD4NO8mGg= +cloud.google.com/go/servicedirectory v1.11.3/go.mod h1:LV+cHkomRLr67YoQy3Xq2tUXBGOs5z5bPofdq7qtiAw= +cloud.google.com/go/servicedirectory v1.11.4/go.mod h1:Bz2T9t+/Ehg6x+Y7Ycq5xiShYLD96NfEsWNHyitj1qM= cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco= cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo= cloud.google.com/go/servicemanagement v1.6.0/go.mod h1:aWns7EeeCOtGEX4OvZUWCCJONRZeFKiptqKf1D0l/Jc= @@ -644,10 +1124,23 @@ cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IW cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw= cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A= cloud.google.com/go/shell v1.7.1/go.mod h1:u1RaM+huXFaTojTbW4g9P5emOrrmLE69KrxqQahKn4g= +cloud.google.com/go/shell v1.7.2/go.mod h1:KqRPKwBV0UyLickMn0+BY1qIyE98kKyI216sH/TuHmc= +cloud.google.com/go/shell v1.7.3/go.mod h1:cTTEz/JdaBsQAeTQ3B6HHldZudFoYBOqjteev07FbIc= +cloud.google.com/go/shell v1.7.4/go.mod h1:yLeXB8eKLxw0dpEmXQ/FjriYrBijNsONpwnWsdPqlKM= +cloud.google.com/go/shell v1.7.5/go.mod h1:hL2++7F47/IfpfTO53KYf1EC+F56k3ThfNEXd4zcuiE= cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos= cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk= cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M= cloud.google.com/go/spanner v1.47.0/go.mod h1:IXsJwVW2j4UKs0eYDqodab6HgGuA1bViSqW4uH9lfUI= +cloud.google.com/go/spanner v1.49.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= +cloud.google.com/go/spanner v1.50.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= +cloud.google.com/go/spanner v1.51.0/go.mod h1:c5KNo5LQ1X5tJwma9rSQZsXNBDNvj4/n8BVc3LNahq0= +cloud.google.com/go/spanner v1.53.0/go.mod h1:liG4iCeLqm5L3fFLU5whFITqP0e0orsAW1uUSrd4rws= +cloud.google.com/go/spanner v1.53.1/go.mod h1:liG4iCeLqm5L3fFLU5whFITqP0e0orsAW1uUSrd4rws= +cloud.google.com/go/spanner v1.54.0/go.mod h1:wZvSQVBgngF0Gq86fKup6KIYmN2be7uOKjtK97X+bQU= +cloud.google.com/go/spanner v1.55.0/go.mod h1:HXEznMUVhC+PC+HDyo9YFG2Ajj5BQDkcbqB9Z2Ffxi0= +cloud.google.com/go/spanner v1.56.0/go.mod h1:DndqtUKQAt3VLuV2Le+9Y3WTnq5cNKrnLb/Piqcj+h0= +cloud.google.com/go/spanner v1.57.0/go.mod h1:aXQ5QDdhPRIqVhYmnkAdwPYvj/DRN0FguclhEWw+jOo= cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0= @@ -656,6 +1149,11 @@ cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDF cloud.google.com/go/speech v1.15.0/go.mod h1:y6oH7GhqCaZANH7+Oe0BhgIogsNInLlz542tg3VqeYI= cloud.google.com/go/speech v1.17.1/go.mod h1:8rVNzU43tQvxDaGvqOhpDqgkJTFowBpDvCJ14kGlJYo= cloud.google.com/go/speech v1.19.0/go.mod h1:8rVNzU43tQvxDaGvqOhpDqgkJTFowBpDvCJ14kGlJYo= +cloud.google.com/go/speech v1.19.1/go.mod h1:WcuaWz/3hOlzPFOVo9DUsblMIHwxP589y6ZMtaG+iAA= +cloud.google.com/go/speech v1.19.2/go.mod h1:2OYFfj+Ch5LWjsaSINuCZsre/789zlcCI3SY4oAi2oI= +cloud.google.com/go/speech v1.20.1/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY= +cloud.google.com/go/speech v1.21.0/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY= +cloud.google.com/go/speech v1.21.1/go.mod h1:E5GHZXYQlkqWQwY5xRSLHw2ci5NMQNG52FfMU1aZrIA= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -668,30 +1166,53 @@ cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= +cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= +cloud.google.com/go/storage v1.37.0/go.mod h1:i34TiT2IhiNDmcj65PqwCjcoUX7Z5pLzS8DEmoiFq1k= +cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY= cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w= cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I= cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4= cloud.google.com/go/storagetransfer v1.8.0/go.mod h1:JpegsHHU1eXg7lMHkvf+KE5XDJ7EQu0GwNJbbVGanEw= cloud.google.com/go/storagetransfer v1.10.0/go.mod h1:DM4sTlSmGiNczmV6iZyceIh2dbs+7z2Ayg6YAiQlYfA= +cloud.google.com/go/storagetransfer v1.10.1/go.mod h1:rS7Sy0BtPviWYTTJVWCSV4QrbBitgPeuK4/FKa4IdLs= +cloud.google.com/go/storagetransfer v1.10.2/go.mod h1:meIhYQup5rg9juQJdyppnA/WLQCOguxtk1pr3/vBWzA= +cloud.google.com/go/storagetransfer v1.10.3/go.mod h1:Up8LY2p6X68SZ+WToswpQbQHnJpOty/ACcMafuey8gc= +cloud.google.com/go/storagetransfer v1.10.4/go.mod h1:vef30rZKu5HSEf/x1tK3WfWrL0XVoUQN/EPDRGPzjZs= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM= cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA= cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c= cloud.google.com/go/talent v1.6.2/go.mod h1:CbGvmKCG61mkdjcqTcLOkb2ZN1SrQI8MDyma2l7VD24= +cloud.google.com/go/talent v1.6.3/go.mod h1:xoDO97Qd4AK43rGjJvyBHMskiEf3KulgYzcH6YWOVoo= +cloud.google.com/go/talent v1.6.4/go.mod h1:QsWvi5eKeh6gG2DlBkpMaFYZYrYUnIpo34f6/V5QykY= +cloud.google.com/go/talent v1.6.5/go.mod h1:Mf5cma696HmE+P2BWJ/ZwYqeJXEeU0UqjHFXVLadEDI= +cloud.google.com/go/talent v1.6.6/go.mod h1:y/WQDKrhVz12WagoarpAIyKKMeKGKHWPoReZ0g8tseQ= cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8= cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4= cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc= cloud.google.com/go/texttospeech v1.7.1/go.mod h1:m7QfG5IXxeneGqTapXNxv2ItxP/FS0hCZBwXYqucgSk= +cloud.google.com/go/texttospeech v1.7.2/go.mod h1:VYPT6aTOEl3herQjFHYErTlSZJ4vB00Q2ZTmuVgluD4= +cloud.google.com/go/texttospeech v1.7.3/go.mod h1:Av/zpkcgWfXlDLRYob17lqMstGZ3GqlvJXqKMp2u8so= +cloud.google.com/go/texttospeech v1.7.4/go.mod h1:vgv0002WvR4liGuSd5BJbWy4nDn5Ozco0uJymY5+U74= +cloud.google.com/go/texttospeech v1.7.5/go.mod h1:tzpCuNWPwrNJnEa4Pu5taALuZL4QRRLcb+K9pbhXT6M= cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ= cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg= cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM= cloud.google.com/go/tpu v1.6.1/go.mod h1:sOdcHVIgDEEOKuqUoi6Fq53MKHJAtOwtz0GuKsWSH3E= +cloud.google.com/go/tpu v1.6.2/go.mod h1:NXh3NDwt71TsPZdtGWgAG5ThDfGd32X1mJ2cMaRlVgU= +cloud.google.com/go/tpu v1.6.3/go.mod h1:lxiueqfVMlSToZY1151IaZqp89ELPSrk+3HIQ5HRkbY= +cloud.google.com/go/tpu v1.6.4/go.mod h1:NAm9q3Rq2wIlGnOhpYICNI7+bpBebMJbh0yyp3aNw1Y= +cloud.google.com/go/tpu v1.6.5/go.mod h1:P9DFOEBIBhuEcZhXi+wPoVy/cji+0ICFi4TtTkMHSSs= cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28= cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y= cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA= cloud.google.com/go/trace v1.9.0/go.mod h1:lOQqpE5IaWY0Ixg7/r2SjixMuc6lfTFeO4QGM4dQWOk= cloud.google.com/go/trace v1.10.1/go.mod h1:gbtL94KE5AJLH3y+WVpfWILmqgc6dXcqgNXdOPAQTYk= +cloud.google.com/go/trace v1.10.2/go.mod h1:NPXemMi6MToRFcSxRl2uDnu/qAlAQ3oULUphcHGh1vA= +cloud.google.com/go/trace v1.10.3/go.mod h1:Ke1bgfc73RV3wUFml+uQp7EsDw4dGaETLxB7Iq/r4CY= +cloud.google.com/go/trace v1.10.4/go.mod h1:Nso99EDIK8Mj5/zmB+iGr9dosS/bzWCJ8wGmE6TXNWY= +cloud.google.com/go/trace v1.10.5/go.mod h1:9hjCV1nGBCtXbAE4YK7OqJ8pmPYSxPA0I67JwRd5s3M= cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs= cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg= cloud.google.com/go/translate v1.5.0/go.mod h1:29YDSYveqqpA1CQFD7NQuP49xymq17RXNaUDdc0mNu0= @@ -699,6 +1220,12 @@ cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV cloud.google.com/go/translate v1.7.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= cloud.google.com/go/translate v1.8.1/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs= cloud.google.com/go/translate v1.8.2/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs= +cloud.google.com/go/translate v1.9.0/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs= +cloud.google.com/go/translate v1.9.1/go.mod h1:TWIgDZknq2+JD4iRcojgeDtqGEp154HN/uL6hMvylS8= +cloud.google.com/go/translate v1.9.2/go.mod h1:E3Tc6rUTsQkVrXW6avbUhKJSr7ZE3j7zNmqzXKHqRrY= +cloud.google.com/go/translate v1.9.3/go.mod h1:Kbq9RggWsbqZ9W5YpM94Q1Xv4dshw/gr/SHfsl5yCZ0= +cloud.google.com/go/translate v1.10.0/go.mod h1:Kbq9RggWsbqZ9W5YpM94Q1Xv4dshw/gr/SHfsl5yCZ0= +cloud.google.com/go/translate v1.10.1/go.mod h1:adGZcQNom/3ogU65N9UXHOnnSvjPwA/jKQUMnsYXOyk= cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk= cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw= cloud.google.com/go/video v1.12.0/go.mod h1:MLQew95eTuaNDEGriQdcYn0dTwf9oWiA4uYebxM5kdg= @@ -707,12 +1234,21 @@ cloud.google.com/go/video v1.14.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxE cloud.google.com/go/video v1.15.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ= cloud.google.com/go/video v1.17.1/go.mod h1:9qmqPqw/Ib2tLqaeHgtakU+l5TcJxCJbhFXM7UJjVzU= cloud.google.com/go/video v1.19.0/go.mod h1:9qmqPqw/Ib2tLqaeHgtakU+l5TcJxCJbhFXM7UJjVzU= +cloud.google.com/go/video v1.20.0/go.mod h1:U3G3FTnsvAGqglq9LxgqzOiBc/Nt8zis8S+850N2DUM= +cloud.google.com/go/video v1.20.1/go.mod h1:3gJS+iDprnj8SY6pe0SwLeC5BUW80NjhwX7INWEuWGU= +cloud.google.com/go/video v1.20.2/go.mod h1:lrixr5JeKNThsgfM9gqtwb6Okuqzfo4VrY2xynaViTA= +cloud.google.com/go/video v1.20.3/go.mod h1:TnH/mNZKVHeNtpamsSPygSR0iHtvrR/cW1/GDjN5+GU= +cloud.google.com/go/video v1.20.4/go.mod h1:LyUVjyW+Bwj7dh3UJnUGZfyqjEto9DnrvTe1f/+QrW0= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M= cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU= cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU= cloud.google.com/go/videointelligence v1.11.1/go.mod h1:76xn/8InyQHarjTWsBR058SmlPCwQjgcvoW0aZykOvo= +cloud.google.com/go/videointelligence v1.11.2/go.mod h1:ocfIGYtIVmIcWk1DsSGOoDiXca4vaZQII1C85qtoplc= +cloud.google.com/go/videointelligence v1.11.3/go.mod h1:tf0NUaGTjU1iS2KEkGWvO5hRHeCkFK3nPo0/cOZhZAo= +cloud.google.com/go/videointelligence v1.11.4/go.mod h1:kPBMAYsTPFiQxMLmmjpcZUMklJp3nC9+ipJJtprccD8= +cloud.google.com/go/videointelligence v1.11.5/go.mod h1:/PkeQjpRponmOerPeJxNPuxvi12HlW7Em0lJO14FC3I= cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo= cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo= @@ -721,45 +1257,76 @@ cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98z cloud.google.com/go/vision/v2 v2.6.0/go.mod h1:158Hes0MvOS9Z/bDMSFpjwsUrZ5fPrdwuyyvKSGAGMY= cloud.google.com/go/vision/v2 v2.7.0/go.mod h1:H89VysHy21avemp6xcf9b9JvZHVehWbET0uT/bcuY/0= cloud.google.com/go/vision/v2 v2.7.2/go.mod h1:jKa8oSYBWhYiXarHPvP4USxYANYUEdEsQrloLjrSwJU= +cloud.google.com/go/vision/v2 v2.7.3/go.mod h1:V0IcLCY7W+hpMKXK1JYE0LV5llEqVmj+UJChjvA1WsM= +cloud.google.com/go/vision/v2 v2.7.4/go.mod h1:ynDKnsDN/0RtqkKxQZ2iatv3Dm9O+HfRb5djl7l4Vvw= +cloud.google.com/go/vision/v2 v2.7.5/go.mod h1:GcviprJLFfK9OLf0z8Gm6lQb6ZFUulvpZws+mm6yPLM= +cloud.google.com/go/vision/v2 v2.7.6/go.mod h1:ZkvWTVNPBU3YZYzgF9Y1jwEbD1NBOCyJn0KFdQfE6Bw= +cloud.google.com/go/vision/v2 v2.8.0/go.mod h1:ocqDiA2j97pvgogdyhoxiQp2ZkDCyr0HWpicywGGRhU= cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE= cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g= cloud.google.com/go/vmmigration v1.5.0/go.mod h1:E4YQ8q7/4W9gobHjQg4JJSgXXSgY21nA5r8swQV+Xxc= cloud.google.com/go/vmmigration v1.6.0/go.mod h1:bopQ/g4z+8qXzichC7GW1w2MjbErL54rk3/C843CjfY= cloud.google.com/go/vmmigration v1.7.1/go.mod h1:WD+5z7a/IpZ5bKK//YmT9E047AD+rjycCAvyMxGJbro= +cloud.google.com/go/vmmigration v1.7.2/go.mod h1:iA2hVj22sm2LLYXGPT1pB63mXHhrH1m/ruux9TwWLd8= +cloud.google.com/go/vmmigration v1.7.3/go.mod h1:ZCQC7cENwmSWlwyTrZcWivchn78YnFniEQYRWQ65tBo= +cloud.google.com/go/vmmigration v1.7.4/go.mod h1:yBXCmiLaB99hEl/G9ZooNx2GyzgsjKnw5fWcINRgD70= +cloud.google.com/go/vmmigration v1.7.5/go.mod h1:pkvO6huVnVWzkFioxSghZxIGcsstDvYiVCxQ9ZH3eYI= cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208= cloud.google.com/go/vmwareengine v0.2.2/go.mod h1:sKdctNJxb3KLZkE/6Oui94iw/xs9PRNC2wnNLXsHvH8= cloud.google.com/go/vmwareengine v0.3.0/go.mod h1:wvoyMvNWdIzxMYSpH/R7y2h5h3WFkx6d+1TIsP39WGY= cloud.google.com/go/vmwareengine v0.4.1/go.mod h1:Px64x+BvjPZwWuc4HdmVhoygcXqEkGHXoa7uyfTgSI0= cloud.google.com/go/vmwareengine v1.0.0/go.mod h1:Px64x+BvjPZwWuc4HdmVhoygcXqEkGHXoa7uyfTgSI0= +cloud.google.com/go/vmwareengine v1.0.1/go.mod h1:aT3Xsm5sNx0QShk1Jc1B8OddrxAScYLwzVoaiXfdzzk= +cloud.google.com/go/vmwareengine v1.0.2/go.mod h1:xMSNjIk8/itYrz1JA8nV3Ajg4L4n3N+ugP8JKzk3OaA= +cloud.google.com/go/vmwareengine v1.0.3/go.mod h1:QSpdZ1stlbfKtyt6Iu19M6XRxjmXO+vb5a/R6Fvy2y4= +cloud.google.com/go/vmwareengine v1.1.1/go.mod h1:nMpdsIVkUrSaX8UvmnBhzVzG7PPvNYc5BszcvIVudYs= cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w= cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8= cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes= cloud.google.com/go/vpcaccess v1.7.1/go.mod h1:FogoD46/ZU+JUBX9D606X21EnxiszYi2tArQwLY4SXs= +cloud.google.com/go/vpcaccess v1.7.2/go.mod h1:mmg/MnRHv+3e8FJUjeSibVFvQF1cCy2MsFaFqxeY1HU= +cloud.google.com/go/vpcaccess v1.7.3/go.mod h1:YX4skyfW3NC8vI3Fk+EegJnlYFatA+dXK4o236EUCUc= +cloud.google.com/go/vpcaccess v1.7.4/go.mod h1:lA0KTvhtEOb/VOdnH/gwPuOzGgM+CWsmGu6bb4IoMKk= +cloud.google.com/go/vpcaccess v1.7.5/go.mod h1:slc5ZRvvjP78c2dnL7m4l4R9GwL3wDLcpIWz6P/ziig= cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE= cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc= cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A= cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg= cloud.google.com/go/webrisk v1.9.1/go.mod h1:4GCmXKcOa2BZcZPn6DCEvE7HypmEJcJkr4mtM+sqYPc= +cloud.google.com/go/webrisk v1.9.2/go.mod h1:pY9kfDgAqxUpDBOrG4w8deLfhvJmejKB0qd/5uQIPBc= +cloud.google.com/go/webrisk v1.9.3/go.mod h1:RUYXe9X/wBDXhVilss7EDLW9ZNa06aowPuinUOPCXH8= +cloud.google.com/go/webrisk v1.9.4/go.mod h1:w7m4Ib4C+OseSr2GL66m0zMBywdrVNTDKsdEsfMl7X0= +cloud.google.com/go/webrisk v1.9.5/go.mod h1:aako0Fzep1Q714cPEM5E+mtYX8/jsfegAuS8aivxy3U= cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo= cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ= cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng= cloud.google.com/go/websecurityscanner v1.6.1/go.mod h1:Njgaw3rttgRHXzwCB8kgCYqv5/rGpFCsBOvPbYgszpg= +cloud.google.com/go/websecurityscanner v1.6.2/go.mod h1:7YgjuU5tun7Eg2kpKgGnDuEOXWIrh8x8lWrJT4zfmas= +cloud.google.com/go/websecurityscanner v1.6.3/go.mod h1:x9XANObUFR+83Cya3g/B9M/yoHVqzxPnFtgF8yYGAXw= +cloud.google.com/go/websecurityscanner v1.6.4/go.mod h1:mUiyMQ+dGpPPRkHgknIZeCzSHJ45+fY4F52nZFDHm2o= +cloud.google.com/go/websecurityscanner v1.6.5/go.mod h1:QR+DWaxAz2pWooylsBF854/Ijvuoa3FCyS1zBa1rAVQ= cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M= cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= cloud.google.com/go/workflows v1.11.1/go.mod h1:Z+t10G1wF7h8LgdY/EmRcQY8ptBD/nvofaL6FqlET6g= +cloud.google.com/go/workflows v1.12.0/go.mod h1:PYhSk2b6DhZ508tj8HXKaBh+OFe+xdl0dHF/tJdzPQM= +cloud.google.com/go/workflows v1.12.1/go.mod h1:5A95OhD/edtOhQd/O741NSfIMezNTbCwLM1P1tBRGHM= +cloud.google.com/go/workflows v1.12.2/go.mod h1:+OmBIgNqYJPVggnMo9nqmizW0qEXHhmnAzK/CnBqsHc= +cloud.google.com/go/workflows v1.12.3/go.mod h1:fmOUeeqEwPzIU81foMjTRQIdwQHADi/vEr1cx9R1m5g= +cloud.google.com/go/workflows v1.12.4/go.mod h1:yQ7HUqOkdJK4duVtMeBCAOPiN1ZF1E9pAMX51vpwB/w= cuelang.org/go v0.0.16-0.20200320220106-76252f4b7486/go.mod h1:NTaUCGX9N+OYqrQDaFuvROeLellLCkCnXp0sLS1StVY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= +github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -773,7 +1340,6 @@ github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -784,8 +1350,14 @@ github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= +github.com/alecthomas/assert/v2 v2.3.0/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE= github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= +github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= +github.com/alecthomas/participle/v2 v2.0.0/go.mod h1:rAKZdJldHu8084ojcWevWAL8KmEU+AT+Olodb+WoN2Y= +github.com/alecthomas/participle/v2 v2.1.0/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= +github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -793,13 +1365,17 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= +github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI= github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg= +github.com/apache/arrow/go/v12 v12.0.1/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWMLpY67QwZ/WWw= +github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= +github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4fPBx7Q= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -813,7 +1389,6 @@ github.com/avast/retry-go v2.2.0+incompatible h1:m+w7mVLWa/oKqX2xYqiEKQQkeGH8DDE github.com/avast/retry-go v2.2.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/avast/retry-go/v4 v4.3.3 h1:G56Bp6mU0b5HE1SkaoVjscZjlQb0oy4mezwY/cGH19w= github.com/avast/retry-go/v4 v4.3.3/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -824,8 +1399,8 @@ github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2y github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/cenkalti/backoff v0.0.0-20181003080854-62661b46c409/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= @@ -833,11 +1408,21 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= +github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs= +github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= +github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8= github.com/client9/gospell v0.0.0-20160306015952-90dfc71015df/go.mod h1:X4IDm8zK6KavjWkfKQCet43DKeLii9nJhUK/seHoSbA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -854,8 +1439,12 @@ github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230428030218-4003588d1b74/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= +github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50/go.mod h1:5e1+Vvlzido69INQaVO6d87Qn543Xr6nooe9Kz7oBFM= +github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b h1:ga8SEFjZ60pxLcmhnThWgvH2wg8376yUJmPhEH4H3kw= +github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/apd/v2 v2.0.1 h1:y1Rh3tEU89D+7Tgbw+lp52T6p/GJLpDmNvr10UWqLTE= @@ -875,13 +1464,14 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw= github.com/dgryski/go-minhash v0.0.0-20170608043002-7fe510aff544/go.mod h1:VBi0XHpFy0xiMySf6YpVbRqrupW4RprJ5QTyN+XvGSM= @@ -893,7 +1483,6 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/ekzhu/minhash-lsh v0.0.0-20171225071031-5c06ee8586a1/go.mod h1:yEtCVi+QamvzjEH4U/m6ZGkALIkF2xfQnFp0BcKmIOk= -github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/proto v1.6.15 h1:XbpwxmuOPrdES97FrSfpyy67SSCV/wBIKXqgJzh6hNw= @@ -911,8 +1500,9 @@ github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go. github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q= -github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM= github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g= +github.com/envoyproxy/go-control-plane v0.12.0 h1:4X+VP1GHd1Mhj6IB5mMeGbLCleqxjletLK6K0rbxyZI= +github.com/envoyproxy/go-control-plane v0.12.0/go.mod h1:ZBTaoJ23lqITozF0M6G4/IragXCQKCnYbmlmtHvwRG0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.1/go.mod h1:txg5va2Qkip90uYoSKH+nkAAmXrb2j3iq4FLwdrCbXQ= github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= @@ -920,15 +1510,18 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+ github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs= -github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= -github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= +github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= +github.com/evanphx/json-patch v0.5.2 h1:xVCHIVMUu1wtM/VkR9jVZ45N3FhZfYMMYGorLCR8P3k= +github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= +github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= +github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fgrosse/zaptest v1.1.0 h1:sK9hP0/xBoNX5qfFo3KWFluDXfc809APomI1QXuYELA= github.com/fgrosse/zaptest v1.1.0/go.mod h1:vMnRSul6kW7kIUXZgnZZcDwyTn8k49ODfAULL8nmL5w= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -940,6 +1533,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/gertd/go-pluralize v0.1.1 h1:fQhql/WRRwr4TVp+TCw12s2esCacvEVBdkTUUwNqF/Q= github.com/gertd/go-pluralize v0.1.1/go.mod h1:t5DfHcumb6m0RqyVJDrDLEzL2AGeaiqUXIcDNwLaeAs= github.com/getkin/kin-openapi v0.1.1-0.20190507152207-d3180292eead/go.mod h1:V1z9xl9oF5Wt7v32ne4FmiF1alpS4dM6mNzoywPOXlk= @@ -982,10 +1577,10 @@ github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -999,8 +1594,8 @@ github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwds github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= -github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= @@ -1026,16 +1621,22 @@ github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.8 h1:/9RjDSQ0vbFR+NyjGMkFTsA1IA0fmhKSThmfGZjicbw= -github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= @@ -1048,7 +1649,13 @@ github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wKg= github.com/gobuffalo/packr v1.30.1/go.mod h1:ljMyFO2EcrnzsHsN99cvbq055Y9OhRrIaviy289eRuk= github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-yaml v1.9.8/go.mod h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXKkTfoE= +github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFTWckfng= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -1063,8 +1670,10 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= -github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= +github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4= +github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -1098,16 +1707,20 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/cel-go v0.22.0/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -1127,8 +1740,9 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-pkcs11 v0.2.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= +github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -1152,24 +1766,35 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y= -github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -1184,13 +1809,16 @@ github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38 github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/googleapis/gax-go/v2 v2.10.0/go.mod h1:4UOEnMCrxsSqQ940WnTiD6qJ63le2ev3xfyagutxiPw= github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -1199,6 +1827,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0 h1:HXNYlRkkM/t+Y/Yhxtwcy02dlYwIaoxzvxPnS+cqy78= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= @@ -1244,6 +1874,7 @@ github.com/hashicorp/vault/api v1.0.5-0.20191108163347-bdd38fca2cff h1:cl94LQIrs github.com/hashicorp/vault/api v1.0.5-0.20191108163347-bdd38fca2cff/go.mod h1:Uf8LaHyrYsgVgHzO2tMZKhqRGlL3UJ6XaSwW2EA1Iqo= github.com/hashicorp/vault/sdk v0.1.14-0.20191108161836-82f2b5571044 h1:bXjbz4PFfOoMUrqe9upVa0SbJ2RqfbLzh4eprst/b40= github.com/hashicorp/vault/sdk v0.1.14-0.20191108161836-82f2b5571044/go.mod h1:PcekaFGiPJyHnFy+NZhP6ll650zEw51Ag7g/YEa+EOU= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hhatto/gorst v0.0.0-20181029133204-ca9f730cac5b/go.mod h1:HmaZGXHdSwQh1jnUlBGN2BeEYOHACLVGzYOXCbsLvxY= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= @@ -1254,11 +1885,13 @@ github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0 github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= +github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= +github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= +github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= @@ -1277,6 +1910,7 @@ github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= @@ -1307,14 +1941,16 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -1327,6 +1963,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY= @@ -1348,22 +1986,26 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-zglob v0.0.3 h1:6Ry4EYsScDyt5di4OI6xw1bYhOqfE5S33Z1OPy+d+To= github.com/mattn/go-zglob v0.0.3/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= @@ -1388,8 +2030,8 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1402,7 +2044,6 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwd github.com/montanaflynn/stats v0.0.0-20180911141734-db72e6cae808/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto= github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY= -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -1437,8 +2078,12 @@ github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3Ro github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0= github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY= -github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw= +github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= +github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= +github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= @@ -1457,10 +2102,15 @@ github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+q github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4= github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= -github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= +github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= +github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= +github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= @@ -1475,6 +2125,7 @@ github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1482,8 +2133,9 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prometheus/alertmanager v0.20.0/go.mod h1:9g2i48FAyZW6BtbsnvHtMHQXl2aVtrORKwKVCQ+nbrg= @@ -1497,17 +2149,20 @@ github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= -github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= -github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -1518,8 +2173,10 @@ github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+ github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= -github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= +github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -1529,9 +2186,10 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc h1:gSVONBi2HWMFXCa9jFdYvYk7IwW/mTLxWOF7rXS4LO0= github.com/protocolbuffers/txtpbfmt v0.0.0-20201118171849-f6a6b3f636fc/go.mod h1:KbKfKPy2I6ecOIGA9apfheFv14+P3RSmmQvshofQyMY= @@ -1569,8 +2227,9 @@ github.com/satori/go.uuid v0.0.0-20160603004225-b111a074d5ef/go.mod h1:dA0hQrYB0 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shogo82148/go-shuffle v0.0.0-20180218125048-27e6095f230d/go.mod h1:2htx6lmL0NGLHlO8ZCf+lQBGBHIbEujyywxJArf+2Yc= -github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= +github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= @@ -1578,9 +2237,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -1591,24 +2248,25 @@ github.com/solo-io/anyvendor v0.0.4 h1:9nI7o7Srml2uaOpT5HJSru06IHUZpzSCU/dEkseiG github.com/solo-io/anyvendor v0.0.4/go.mod h1:+TTkDGd11u8ugXccqtukBEWvkZkODaBbeWgdH/F/IWY= github.com/solo-io/cue v0.4.7 h1:X65mDmyBrS3ODvDvAgzIt9aTxbwBtdt+ayg4w9XKoaA= github.com/solo-io/cue v0.4.7/go.mod h1:P1tN9y6nBPAMoEK5aJxI8kn0VUcjVcRc+8esieRzQ7M= -github.com/solo-io/go-utils v0.24.8 h1:gukFEvQ0SSRzIwysulI6w0c/dG08TCohO9QxwCqW6Lg= -github.com/solo-io/go-utils v0.24.8/go.mod h1:bFFKO4Ih+sPViwNdVxv3z5dRrzMcJjNMHlx4zA8vxSg= -github.com/solo-io/k8s-utils v0.7.2 h1:pIRiTOpwymdCHUOSjzKDi/Ay16FNtF7JV7NIRlC2ZNQ= -github.com/solo-io/k8s-utils v0.7.2/go.mod h1:RrT6PVTSD1X0vteKCQmGzoAAfjI1U5oV/wA+T3T+NoM= -github.com/solo-io/protoc-gen-ext v0.0.18 h1:zSAL8NzWpJUGYoA5IyjHiKASNyHjR0uxBQ7eQS94i3A= -github.com/solo-io/protoc-gen-ext v0.0.18/go.mod h1:iGyCvmKmhJNXs5MgBcYFBF0om7LDnCVD2WwhOZGnqeA= -github.com/solo-io/skv2 v0.39.1 h1:dWaZTWgntAsvh4lTlojd3xE+g7NF4oYNonfcdpy0nXE= -github.com/solo-io/skv2 v0.39.1/go.mod h1:Zsnl+OYmOkj+6KeaMfkzYIxHTVMC0w2gVApzNJRadM8= -github.com/solo-io/solo-kit v0.35.0 h1:iX7Wl9h59M7sPAH+fLVdjalY+nAfeG2ry+zrXYuyXTo= -github.com/solo-io/solo-kit v0.35.0/go.mod h1:fxakm2fhYzT3UNsM4baURVz19wCa75sv/KBNi4lwv6Q= +github.com/solo-io/go-utils v0.27.4 h1:/VOXUZTsIfnP+aWeWdkiWI4hCyF8nODOr1x+TX+e+dk= +github.com/solo-io/go-utils v0.27.4/go.mod h1:xJncbCIrp5iovb95MReJQFf88q3P23NgB1RyGckzq7k= +github.com/solo-io/k8s-utils v0.9.0 h1:q3/KN8yJ0ps3eGWOjLOwSjdUpwsJHDl0puv0Ur7ZeBk= +github.com/solo-io/k8s-utils v0.9.0/go.mod h1:Yk4DdpjvFnTUl8+SwnoobjEy3/x9E9rdQ4ee5KLCBNI= +github.com/solo-io/protoc-gen-ext v0.0.20 h1:0cE+DvIp7G97/xlETL3didPQ1s5SHav5mkebljXk/Ws= +github.com/solo-io/protoc-gen-ext v0.0.20/go.mod h1:iGyCvmKmhJNXs5MgBcYFBF0om7LDnCVD2WwhOZGnqeA= +github.com/solo-io/skv2 v0.42.0 h1:MrrBJauarReCJdkVCB2PtWOVULE1IoJNTTWlQrfX4mc= +github.com/solo-io/skv2 v0.42.0/go.mod h1:LP0CYAp2tblmttNP4rlHbYUnIUHazh+LU8QLV36yHAo= +github.com/solo-io/solo-kit v0.37.0 h1:hQmxb4OkA24MuFAfERtyK1loUxXdgrEaIrwPLp57urs= +github.com/solo-io/solo-kit v0.37.0/go.mod h1:Jdj9cmv2gWF+KIDAlmz9XMmb2MnDTtR6dkbw5gWfJOY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= @@ -1617,7 +2275,7 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -1627,11 +2285,13 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1645,9 +2305,11 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/substrait-io/substrait-go v0.4.2/go.mod h1:qhpnLmrcvAnlZsUyPXZRqldiHapPTXC3t7xFgDi3aQg= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1656,11 +2318,14 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4= github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1672,15 +2337,16 @@ github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= +go.einride.tech/aip v0.66.0/go.mod h1:qAhMsfT7plxBX+Oy7Huol6YUvZ0ZzdUz26yZsQwfl1M= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI= -go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U= -go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA= -go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc= -go.etcd.io/etcd/pkg/v3 v3.5.10/go.mod h1:TKTuCKKcF1zxmfKWDkfz5qqYaE3JncKKZPFf8c1nFUs= -go.etcd.io/etcd/raft/v3 v3.5.10/go.mod h1:odD6kr8XQXTy9oQnyMPBOr0TVe+gT0neQhElQ6jbGRc= -go.etcd.io/etcd/server/v3 v3.5.10/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo= +go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= +go.etcd.io/etcd/api/v3 v3.5.16/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= +go.etcd.io/etcd/client/pkg/v3 v3.5.16/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= +go.etcd.io/etcd/client/v2 v2.305.16/go.mod h1:h9YxWCzcdvZENbfzBTFCnoNumr2ax3F19sKMqHFmXHE= +go.etcd.io/etcd/client/v3 v3.5.16/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= +go.etcd.io/etcd/pkg/v3 v3.5.16/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY= +go.etcd.io/etcd/raft/v3 v3.5.16/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= +go.etcd.io/etcd/server/v3 v3.5.16/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -1692,48 +2358,73 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48= -go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel v1.18.0/go.mod h1:9lWqYO0Db579XzVuCKFNPDl4s73Voa+zEck3wHaAYQI= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1/go.mod h1:Kv8liBeVNFkkkbilbgWRpV+wWuu+H5xdOT6HAgd30iw= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1/go.mod h1:xOvWoTOrQjxjW61xtOmD/WKGRYb/P4NzRo3bs65U6Rk= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/metric v1.18.0/go.mod h1:nNSpsVDjWGfb7chbRLUNW+PBNdcSTHD4Uu5pfFMOI0k= +go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= +go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= +go.opentelemetry.io/otel v1.23.0/go.mod h1:YCycw9ZeKhcJFrb34iVSkyT0iczq/zYDtZYFufObyB0= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0/go.mod h1:GijYcYmNpX1KazD5JmWGsi4P7dDTTTnfv1UbGn84MnU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0/go.mod h1:vNUq47TGFioo+ffTSnKNdob241vePmtNZnAODKapKd0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= -go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= +go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= +go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= +go.opentelemetry.io/otel/metric v1.23.0/go.mod h1:MqUW2X2a6Q8RN96E2/nqNoT+z9BSms20Jb7Bbp+HiTo= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= +go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= -go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= -go.opentelemetry.io/otel/trace v1.18.0/go.mod h1:T2+SGJGuYZY3bjj5rgh/hN7KIrlpWC5nS8Mjvzckz+0= +go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc= +go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= +go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= +go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= +go.opentelemetry.io/otel/trace v1.23.0/go.mod h1:GSGTbIClEsuZrGIzoEHqsVfxgn5UkggkflQwDScNUsk= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= +go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= -go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1753,6 +2444,7 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= @@ -1762,8 +2454,19 @@ golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIi golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1781,10 +2484,12 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20210126221216-84987778548c/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= -golang.org/x/exp v0.0.0-20220921164117-439092de6870 h1:j8b6j9gzSigH28O5SjSpQSSh9lFd6f5D/q0aHjNTulc= -golang.org/x/exp v0.0.0-20220921164117-439092de6870/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= +golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1809,7 +2514,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -1836,8 +2540,14 @@ golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1919,9 +2629,21 @@ golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1953,8 +2675,18 @@ golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= -golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= +golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= +golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= +golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= +golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= +golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1973,8 +2705,12 @@ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2039,7 +2775,6 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2062,8 +2797,10 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2072,6 +2809,7 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2090,9 +2828,21 @@ golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -2108,8 +2858,18 @@ golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2130,16 +2890,22 @@ golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= +golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2166,7 +2932,6 @@ golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -2189,7 +2954,6 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -2228,8 +2992,16 @@ golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM= golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= -golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2237,8 +3009,9 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= @@ -2246,6 +3019,7 @@ gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= +gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20191031114514-eccb95939662/go.mod h1:1LGLsuRLSwj1ge7tgC9ees7gfh1phRP5tuyDqlpChGE= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= @@ -2313,14 +3087,25 @@ google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZ google.golang.org/api v0.124.0/go.mod h1:xu2HQurE5gi/3t1aFCvhPD781p0a3p11sdunTJ2BlP4= google.golang.org/api v0.125.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= +google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= +google.golang.org/api v0.139.0/go.mod h1:CVagp6Eekz9CjGZ718Z+sloknzkDJE7Vc1Ckj9+viBk= +google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= +google.golang.org/api v0.150.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg= +google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk= +google.golang.org/api v0.157.0/go.mod h1:+z4v4ufbZ1WEpld6yMGHyggs+PmAHiaLNj5ytP3N01g= +google.golang.org/api v0.160.0/go.mod h1:0mu0TpK33qnydLvWqbImq2b1eQ5FHRSDCBzAxX9ZHyw= +google.golang.org/api v0.162.0/go.mod h1:6SulDkfoBIg4NFmCuZ39XeeAgSHCPecfSUuDyYlAHs0= +google.golang.org/api v0.164.0/go.mod h1:2OatzO7ZDQsoS7IFf3rvsE17/TldiU3F/zxFHeqUB5o= +google.golang.org/api v0.166.0/go.mod h1:4FcBc686KFi7QI/U51/2GKKevfZMpM17sCdibqe/bSA= +google.golang.org/api v0.169.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -2462,9 +3247,27 @@ google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mR google.golang.org/genproto v0.0.0-20230629202037-9506855d4529/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0= +google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:0ggbjUrZYpy1q+ANUS30SEoGZ53cdfwtbuG7Ptgy108= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= -google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= +google.golang.org/genproto v0.0.0-20230821184602-ccc8af3d0e93/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU= +google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= +google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:CgAqfJo+Xmu0GwA0411Ht3OU3OntXwsGmrmjI8ioGXI= +google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= +google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY= +google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY= +google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic= +google.golang.org/genproto v0.0.0-20231212172506-995d672761c0/go.mod h1:l/k7rMz0vFTBPy+tFSGvXEd3z+BcoG1k7EHbqm+YBsY= +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0= +google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto v0.0.0-20240205150955-31a09d347014/go.mod h1:xEgQu1e4stdSSsxPDK8Azkrk/ECl5HvdPf6nbZrTS5M= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8= google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= @@ -2473,9 +3276,43 @@ google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go. google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ= google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q= +google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:RdyHbowztCGQySiCvQPgWQWgWhGnouTdCflKoDBt32U= +google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= +google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:SUBoKXbI1Efip18FClrQVGjWcyd0QZd8KkvdP34t7ww= +google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= +google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405/go.mod h1:oT32Z4o8Zv2xPQTg0pbVaPr0MPOH6f14RgXt7zfIpwg= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= +google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI= +google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c= +google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917/go.mod h1:CmlNWB9lSezaYELKS5Ym1r44VrrbPUa7JTvw+6MbpJ0= +google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:B5xPO//w8qmBDjGReYLpR6UJPnkldGkCSMoH/2vxJeg= +google.golang.org/genproto/googleapis/api v0.0.0-20240122161410-6c6643bf1457/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= +google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= +google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014/go.mod h1:rbHMSEDyoYX62nRVLOCc4Qt1HbsdytAYoVwgjiOhF3I= +google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:PVreiBMirk8ypES6aw9d4p6iiBNSIfZEBqr3UGoAi2E= +google.golang.org/genproto/googleapis/api v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= +google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= +google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= +google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE= +google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8/go.mod h1:vPrPUTsDCYxXWjP7clS81mZ6/803D8K4iM9Ma27VKas= +google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:RGnPtTG7r4i8sPlNyDeikXF99hMM+hN6QMm4ooG9g2g= +google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= +google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 h1:YcyjlL1PRr2Q17/I0dPk2JmYS5CDXfcdb2Z3YRioEbw= +google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20231212172506-995d672761c0/go.mod h1:guYXGPwC6jwxgWKW5Y405fKWOFNwlvUlUnzyp9i0uqo= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:ZSvZ8l+AWJwXw91DoTjWjaVLpWU6o0eZ4YLYpH8aLeQ= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:SCz6T5xjNXM4QFPRwxHcfChp7V+9DcXR3ay2TkHR8Tg= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240205150955-31a09d347014/go.mod h1:EhZbXt+eY4Yr3YVaEGLdNZF5viWowOJZ8KTPqjYMKzg= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:om8Bj876Z0v9ei+RD1LnEWig7vpHQ371PUqsgjmLQEA= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:vh/N7795ftP0AkN1w8XKqN4w1OdUKXW5Eummda+ofv8= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= @@ -2484,8 +3321,41 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:8mL13HKkDa+IuJ8yruA3ci0q+0vsUz4m//+ottjwS5o= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920183334-c177e329c48b/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231211222908-989df2bf70f3/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240122161410-6c6643bf1457/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014/go.mod h1:SaPjaZGWb0lPqs6Ittu0spdfrOArqji4ZdeP5IC/9N4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240228201840-1f18d85a4ec2/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -2514,7 +3384,6 @@ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= @@ -2531,12 +3400,24 @@ google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5v google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= +google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2555,8 +3436,13 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= 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= @@ -2565,6 +3451,8 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= 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= @@ -2602,6 +3490,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -2615,45 +3504,48 @@ istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a/go.mod h1:OzpAts7jljZc istio.io/gogo-genproto v0.0.0-20191009201739-17d570f95998/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs= istio.io/tools v0.0.0-20200918020118-6d0a0e49b5d3 h1:mkMzZILOGNEvFqWEgVISubKWWTqGUTaK+72jMojyXzA= istio.io/tools v0.0.0-20200918020118-6d0a0e49b5d3/go.mod h1:+76apR/jbfB29HigSekPznsVFWl8oa0vu21UdQ8USvw= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= -k8s.io/apiextensions-apiserver v0.29.2 h1:UK3xB5lOWSnhaCk0RFZ0LUacPZz9RY4wi/yt2Iu+btg= -k8s.io/apiextensions-apiserver v0.29.2/go.mod h1:aLfYjpA5p3OwtqNXQFkhJ56TB+spV8Gc4wfMhUA3/b8= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/apiserver v0.29.2/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= -k8s.io/code-generator v0.29.2 h1:c9/iw2KnNpw2IRV+wwuG/Wns2TjPSgjWzbbjTevyiHI= -k8s.io/code-generator v0.29.2/go.mod h1:FwFi3C9jCrmbPjekhaCYcYG1n07CYiW1+PAPCockaos= -k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8= -k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM= +k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= +k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= +k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4= +k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA= +k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= +k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM= +k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= +k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= +k8s.io/code-generator v0.32.2 h1:CIvyPrLWP7cMgrqval2qYT839YAwCDeSvGfXgWSNpHQ= +k8s.io/code-generator v0.32.2/go.mod h1:plh7bWk7JztAUkHM4zpbdy0KOMdrhsePcZL2HLWFH7Y= +k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks= -k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= -k8s.io/kms v0.29.2/go.mod h1:s/9RC4sYRZ/6Tn6yhNjbfJuZdb8LzlXhdlBnKizeFDo= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kms v0.32.2/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= modernc.org/cc/v3 v3.36.3/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= modernc.org/cc/v3 v3.37.0/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20= +modernc.org/cc/v3 v3.38.1/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20= modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0= modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc= modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw= modernc.org/ccgo/v3 v3.0.0-20220904174949-82d86e1b6d56/go.mod h1:YSXjPL62P2AMSxBphRHPn7IkzhVHqkvOnRKAKh+W6ZI= +modernc.org/ccgo/v3 v3.0.0-20220910160915-348f15de615a/go.mod h1:8p47QxPkdugex9J4n9P2tLZ9bK01yngIVp00g4nomW0= modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws= @@ -2672,9 +3564,12 @@ modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0= modernc.org/libc v1.17.1/go.mod h1:FZ23b+8LjxZs7XtFMbSzL/EhPxNbfZbErxEHc7cbD9s= modernc.org/libc v1.17.4/go.mod h1:WNg2ZH56rDEwdropAJeZPQkXmDwh+JCA1s/htl6r2fA= modernc.org/libc v1.18.0/go.mod h1:vj6zehR5bfc98ipowQOM2nIDUZnVew/wNC/2tOGS+q0= +modernc.org/libc v1.19.0/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0= modernc.org/libc v1.20.3/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0= +modernc.org/libc v1.21.2/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI= modernc.org/libc v1.21.4/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI= modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug= +modernc.org/libc v1.22.4/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= @@ -2689,30 +3584,32 @@ modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4= modernc.org/sqlite v1.18.2/go.mod h1:kvrTLEWgxUcHa2GfHBQtanR1H9ht3hTJNtKpzH9k1u0= +modernc.org/sqlite v1.21.2/go.mod h1:cxbLkB5WS32DnQqeH4h4o1B0eMr8W/y8/RGuxQ3JsC0= modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= modernc.org/tcl v1.13.2/go.mod h1:7CLiGIPo1M8Rv1Mitpv5akc2+8fxUd2y2UzC/MfMzy0= +modernc.org/tcl v1.15.1/go.mod h1:aEjeGJX2gz1oWKOLDVZ2tnEWLUrIn8H+GFu+akoDhqs= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= +modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y= -sigs.k8s.io/controller-runtime v0.17.4 h1:AMf1E0+93/jLQ13fb76S6Atwqp24EQFCmNbG84GJxew= -sigs.k8s.io/controller-runtime v0.17.4/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE= +sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.clone.go b/pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.clone.go index 8c4c8742e..976f2650a 100644 --- a/pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.clone.go +++ b/pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.clone.go @@ -13,15 +13,15 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - github_com_golang_protobuf_ptypes_empty "github.com/golang/protobuf/ptypes/empty" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + google_golang_org_protobuf_types_known_emptypb "google.golang.org/protobuf/types/known/emptypb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -57,9 +57,9 @@ func (m *AuthConfigSpec) Clone() proto.Message { } if h, ok := interface{}(m.GetBooleanExpr()).(clone.Cloner); ok { - target.BooleanExpr = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.BooleanExpr = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.BooleanExpr = proto.Clone(m.GetBooleanExpr()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.BooleanExpr = proto.Clone(m.GetBooleanExpr()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } target.FailOnRedirect = m.GetFailOnRedirect() @@ -129,9 +129,9 @@ func (m *Settings) Clone() proto.Message { target.UserIdHeader = m.GetUserIdHeader() if h, ok := interface{}(m.GetRequestTimeout()).(clone.Cloner); ok { - target.RequestTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.FailureModeAllow = m.GetFailureModeAllow() @@ -273,9 +273,9 @@ func (m *AuthPlugin) Clone() proto.Message { target.ExportedSymbolName = m.GetExportedSymbolName() if h, ok := interface{}(m.GetConfig()).(clone.Cloner); ok { - target.Config = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Config = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Config = proto.Clone(m.GetConfig()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Config = proto.Clone(m.GetConfig()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -581,9 +581,9 @@ func (m *HeaderConfiguration) Clone() proto.Message { target.AccessTokenHeader = m.GetAccessTokenHeader() if h, ok := interface{}(m.GetUseBearerSchemaForAuthorization()).(clone.Cloner); ok { - target.UseBearerSchemaForAuthorization = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseBearerSchemaForAuthorization = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UseBearerSchemaForAuthorization = proto.Clone(m.GetUseBearerSchemaForAuthorization()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseBearerSchemaForAuthorization = proto.Clone(m.GetUseBearerSchemaForAuthorization()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -678,11 +678,11 @@ func (m *JwksOnDemandCacheRefreshPolicy) Clone() proto.Message { if h, ok := interface{}(m.GetNever()).(clone.Cloner); ok { target.Policy = &JwksOnDemandCacheRefreshPolicy_Never{ - Never: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + Never: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.Policy = &JwksOnDemandCacheRefreshPolicy_Never{ - Never: proto.Clone(m.GetNever()).(*github_com_golang_protobuf_ptypes_empty.Empty), + Never: proto.Clone(m.GetNever()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } @@ -690,11 +690,11 @@ func (m *JwksOnDemandCacheRefreshPolicy) Clone() proto.Message { if h, ok := interface{}(m.GetAlways()).(clone.Cloner); ok { target.Policy = &JwksOnDemandCacheRefreshPolicy_Always{ - Always: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + Always: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.Policy = &JwksOnDemandCacheRefreshPolicy_Always{ - Always: proto.Clone(m.GetAlways()).(*github_com_golang_protobuf_ptypes_empty.Empty), + Always: proto.Clone(m.GetAlways()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } @@ -851,9 +851,9 @@ func (m *OidcAuthorizationCode) Clone() proto.Message { } if h, ok := interface{}(m.GetDiscoveryPollInterval()).(clone.Cloner); ok { - target.DiscoveryPollInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DiscoveryPollInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.DiscoveryPollInterval = proto.Clone(m.GetDiscoveryPollInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DiscoveryPollInterval = proto.Clone(m.GetDiscoveryPollInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetJwksCacheRefreshPolicy()).(clone.Cloner); ok { @@ -888,9 +888,9 @@ func (m *OidcAuthorizationCode) Clone() proto.Message { } if h, ok := interface{}(m.GetDisableClientSecret()).(clone.Cloner); ok { - target.DisableClientSecret = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClientSecret = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableClientSecret = proto.Clone(m.GetDisableClientSecret()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClientSecret = proto.Clone(m.GetDisableClientSecret()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetAccessToken()).(clone.Cloner); ok { @@ -1012,9 +1012,9 @@ func (m *PlainOAuth2) Clone() proto.Message { target.RevocationEndpoint = m.GetRevocationEndpoint() if h, ok := interface{}(m.GetDisableClientSecret()).(clone.Cloner); ok { - target.DisableClientSecret = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClientSecret = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableClientSecret = proto.Clone(m.GetDisableClientSecret()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClientSecret = proto.Clone(m.GetDisableClientSecret()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1082,9 +1082,9 @@ func (m *IntrospectionValidation) Clone() proto.Message { target.UserIdAttributeName = m.GetUserIdAttributeName() if h, ok := interface{}(m.GetDisableClientSecret()).(clone.Cloner); ok { - target.DisableClientSecret = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClientSecret = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableClientSecret = proto.Clone(m.GetDisableClientSecret()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClientSecret = proto.Clone(m.GetDisableClientSecret()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1101,9 +1101,9 @@ func (m *AccessTokenValidation) Clone() proto.Message { target.UserinfoUrl = m.GetUserinfoUrl() if h, ok := interface{}(m.GetCacheTimeout()).(clone.Cloner); ok { - target.CacheTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.CacheTimeout = proto.Clone(m.GetCacheTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheTimeout = proto.Clone(m.GetCacheTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if m.GetDynamicMetadataFromClaims() != nil { @@ -1644,9 +1644,9 @@ func (m *PassThroughAuth) Clone() proto.Message { target = &PassThroughAuth{} if h, ok := interface{}(m.GetConfig()).(clone.Cloner); ok { - target.Config = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Config = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Config = proto.Clone(m.GetConfig()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Config = proto.Clone(m.GetConfig()).(*google_golang_org_protobuf_types_known_structpb.Struct) } target.FailureModeAllow = m.GetFailureModeAllow() @@ -1691,15 +1691,15 @@ func (m *BackoffStrategy) Clone() proto.Message { target = &BackoffStrategy{} if h, ok := interface{}(m.GetBaseInterval()).(clone.Cloner); ok { - target.BaseInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxInterval()).(clone.Cloner); ok { - target.MaxInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -1714,9 +1714,9 @@ func (m *RetryPolicy) Clone() proto.Message { target = &RetryPolicy{} if h, ok := interface{}(m.GetNumRetries()).(clone.Cloner); ok { - target.NumRetries = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.NumRetries = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.NumRetries = proto.Clone(m.GetNumRetries()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.NumRetries = proto.Clone(m.GetNumRetries()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } switch m.Strategy.(type) { @@ -1749,9 +1749,9 @@ func (m *PassThroughGrpc) Clone() proto.Message { target.Address = m.GetAddress() if h, ok := interface{}(m.GetConnectionTimeout()).(clone.Cloner); ok { - target.ConnectionTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ConnectionTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.ConnectionTimeout = proto.Clone(m.GetConnectionTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ConnectionTimeout = proto.Clone(m.GetConnectionTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetTlsConfig()).(clone.Cloner); ok { @@ -1803,9 +1803,9 @@ func (m *PassThroughHttp) Clone() proto.Message { } if h, ok := interface{}(m.GetConnectionTimeout()).(clone.Cloner); ok { - target.ConnectionTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ConnectionTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.ConnectionTimeout = proto.Clone(m.GetConnectionTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ConnectionTimeout = proto.Clone(m.GetConnectionTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -1830,15 +1830,15 @@ func (m *PortalAuth) Clone() proto.Message { } if h, ok := interface{}(m.GetCacheDuration()).(clone.Cloner); ok { - target.CacheDuration = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheDuration = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.CacheDuration = proto.Clone(m.GetCacheDuration()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheDuration = proto.Clone(m.GetCacheDuration()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRequestTimeout()).(clone.Cloner); ok { - target.RequestTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -1872,9 +1872,9 @@ func (m *AuthConfigStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -1913,9 +1913,9 @@ func (m *AuthConfigSpec_Config) Clone() proto.Message { target = &AuthConfigSpec_Config{} if h, ok := interface{}(m.GetName()).(clone.Cloner); ok { - target.Name = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Name = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Name = proto.Clone(m.GetName()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Name = proto.Clone(m.GetName()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } switch m.AuthConfig.(type) { @@ -2008,11 +2008,11 @@ func (m *AuthConfigSpec_Config) Clone() proto.Message { if h, ok := interface{}(m.GetJwt()).(clone.Cloner); ok { target.AuthConfig = &AuthConfigSpec_Config_Jwt{ - Jwt: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + Jwt: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.AuthConfig = &AuthConfigSpec_Config_Jwt{ - Jwt: proto.Clone(m.GetJwt()).(*github_com_golang_protobuf_ptypes_empty.Empty), + Jwt: proto.Clone(m.GetJwt()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } @@ -2293,9 +2293,9 @@ func (m *UserSession_InternalSession) Clone() proto.Message { target = &UserSession_InternalSession{} if h, ok := interface{}(m.GetAllowRefreshing()).(clone.Cloner); ok { - target.AllowRefreshing = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowRefreshing = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowRefreshing = proto.Clone(m.GetAllowRefreshing()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowRefreshing = proto.Clone(m.GetAllowRefreshing()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } target.KeyPrefix = m.GetKeyPrefix() @@ -2324,15 +2324,15 @@ func (m *UserSession_RedisSession) Clone() proto.Message { target.CookieName = m.GetCookieName() if h, ok := interface{}(m.GetAllowRefreshing()).(clone.Cloner); ok { - target.AllowRefreshing = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowRefreshing = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowRefreshing = proto.Clone(m.GetAllowRefreshing()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowRefreshing = proto.Clone(m.GetAllowRefreshing()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetPreExpiryBuffer()).(clone.Cloner); ok { - target.PreExpiryBuffer = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PreExpiryBuffer = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.PreExpiryBuffer = proto.Clone(m.GetPreExpiryBuffer()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PreExpiryBuffer = proto.Clone(m.GetPreExpiryBuffer()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.TargetDomain = m.GetTargetDomain() @@ -2351,23 +2351,23 @@ func (m *UserSession_CookieOptions) Clone() proto.Message { target = &UserSession_CookieOptions{} if h, ok := interface{}(m.GetMaxAge()).(clone.Cloner); ok { - target.MaxAge = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxAge = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxAge = proto.Clone(m.GetMaxAge()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxAge = proto.Clone(m.GetMaxAge()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.NotSecure = m.GetNotSecure() if h, ok := interface{}(m.GetHttpOnly()).(clone.Cloner); ok { - target.HttpOnly = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.HttpOnly = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.HttpOnly = proto.Clone(m.GetHttpOnly()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.HttpOnly = proto.Clone(m.GetHttpOnly()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetPath()).(clone.Cloner); ok { - target.Path = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Path = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Path = proto.Clone(m.GetPath()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Path = proto.Clone(m.GetPath()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } target.SameSite = m.GetSameSite() @@ -2530,9 +2530,9 @@ func (m *OidcAuthorizationCode_ClientAuthentication_ClientSecret) Clone() proto. } if h, ok := interface{}(m.GetDisableClientSecret()).(clone.Cloner); ok { - target.DisableClientSecret = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClientSecret = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableClientSecret = proto.Clone(m.GetDisableClientSecret()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClientSecret = proto.Clone(m.GetDisableClientSecret()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -2553,9 +2553,9 @@ func (m *OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt) Clone() proto } if h, ok := interface{}(m.GetValidFor()).(clone.Cloner); ok { - target.ValidFor = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ValidFor = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.ValidFor = proto.Clone(m.GetValidFor()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ValidFor = proto.Clone(m.GetValidFor()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -2572,9 +2572,9 @@ func (m *JwtValidation_RemoteJwks) Clone() proto.Message { target.Url = m.GetUrl() if h, ok := interface{}(m.GetRefreshInterval()).(clone.Cloner); ok { - target.RefreshInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RefreshInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.RefreshInterval = proto.Clone(m.GetRefreshInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RefreshInterval = proto.Clone(m.GetRefreshInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -2768,15 +2768,15 @@ func (m *Ldap_ConnectionPool) Clone() proto.Message { target = &Ldap_ConnectionPool{} if h, ok := interface{}(m.GetMaxSize()).(clone.Cloner); ok { - target.MaxSize = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxSize = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxSize = proto.Clone(m.GetMaxSize()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxSize = proto.Clone(m.GetMaxSize()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetInitialSize()).(clone.Cloner); ok { - target.InitialSize = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialSize = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.InitialSize = proto.Clone(m.GetInitialSize()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialSize = proto.Clone(m.GetInitialSize()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.go b/pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.go index 0819ff077..0099c4bd7 100644 --- a/pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.go +++ b/pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/enterprise.gloo/v1/auth_config.proto @@ -10,16 +10,16 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - empty "github.com/golang/protobuf/ptypes/empty" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -314,7 +314,7 @@ type AuthConfigSpec struct { // How to handle processing of named configs within an auth config chain. // An example config might be: `( basic1 \|\| basic2 \|\| (oidc1 && !oidc2) )` // The boolean expression is evaluated left to right but honors parenthesis and short-circuiting. - BooleanExpr *wrappers.StringValue `protobuf:"bytes,10,opt,name=boolean_expr,json=booleanExpr,proto3" json:"boolean_expr,omitempty"` + BooleanExpr *wrapperspb.StringValue `protobuf:"bytes,10,opt,name=boolean_expr,json=booleanExpr,proto3" json:"boolean_expr,omitempty"` // How the service should handle a redirect response from an OIDC issuer. In the default false mode, // the redirect will be considered a successful response, and the client will receive a 302 with a location header. // If this is set to true, the client will instead receive a 401 unauthorized response. This is useful in cases where @@ -324,11 +324,9 @@ type AuthConfigSpec struct { func (x *AuthConfigSpec) Reset() { *x = AuthConfigSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AuthConfigSpec) String() string { @@ -339,7 +337,7 @@ func (*AuthConfigSpec) ProtoMessage() {} func (x *AuthConfigSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -361,7 +359,7 @@ func (x *AuthConfigSpec) GetConfigs() []*AuthConfigSpec_Config { return nil } -func (x *AuthConfigSpec) GetBooleanExpr() *wrappers.StringValue { +func (x *AuthConfigSpec) GetBooleanExpr() *wrapperspb.StringValue { if x != nil { return x.BooleanExpr } @@ -391,11 +389,9 @@ type ExtAuthExtension struct { func (x *ExtAuthExtension) Reset() { *x = ExtAuthExtension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthExtension) String() string { @@ -406,7 +402,7 @@ func (*ExtAuthExtension) ProtoMessage() {} func (x *ExtAuthExtension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -491,7 +487,7 @@ type Settings struct { // Specifically this means that this header will be sanitized form the incoming request. UserIdHeader string `protobuf:"bytes,3,opt,name=user_id_header,json=userIdHeader,proto3" json:"user_id_header,omitempty"` // Timeout for the ext auth service to respond. Defaults to 200ms - RequestTimeout *duration.Duration `protobuf:"bytes,4,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` // In case of a failure or timeout querying the auth server, normally a request is denied. // if this is set to true, the request will be allowed. FailureModeAllow bool `protobuf:"varint,5,opt,name=failure_mode_allow,json=failureModeAllow,proto3" json:"failure_mode_allow,omitempty"` @@ -527,11 +523,9 @@ type Settings struct { func (x *Settings) Reset() { *x = Settings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Settings) String() string { @@ -542,7 +536,7 @@ func (*Settings) ProtoMessage() {} func (x *Settings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -592,7 +586,7 @@ func (x *Settings) GetUserIdHeader() string { return "" } -func (x *Settings) GetRequestTimeout() *duration.Duration { +func (x *Settings) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } @@ -670,11 +664,9 @@ type GrpcService struct { func (x *GrpcService) Reset() { *x = GrpcService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService) String() string { @@ -685,7 +677,7 @@ func (*GrpcService) ProtoMessage() {} func (x *GrpcService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -720,11 +712,9 @@ type HttpService struct { func (x *HttpService) Reset() { *x = HttpService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpService) String() string { @@ -735,7 +725,7 @@ func (*HttpService) ProtoMessage() {} func (x *HttpService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -792,11 +782,9 @@ type BufferSettings struct { func (x *BufferSettings) Reset() { *x = BufferSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BufferSettings) String() string { @@ -807,7 +795,7 @@ func (*BufferSettings) ProtoMessage() {} func (x *BufferSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -866,11 +854,9 @@ type CustomAuth struct { func (x *CustomAuth) Reset() { *x = CustomAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CustomAuth) String() string { @@ -881,7 +867,7 @@ func (*CustomAuth) ProtoMessage() {} func (x *CustomAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -924,16 +910,14 @@ type AuthPlugin struct { // If not specified, defaults to the name of the plugin ExportedSymbolName string `protobuf:"bytes,3,opt,name=exported_symbol_name,json=exportedSymbolName,proto3" json:"exported_symbol_name,omitempty"` // +kubebuilder:validation:Required - Config *_struct.Struct `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` + Config *structpb.Struct `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` } func (x *AuthPlugin) Reset() { *x = AuthPlugin{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AuthPlugin) String() string { @@ -944,7 +928,7 @@ func (*AuthPlugin) ProtoMessage() {} func (x *AuthPlugin) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -980,7 +964,7 @@ func (x *AuthPlugin) GetExportedSymbolName() string { return "" } -func (x *AuthPlugin) GetConfig() *_struct.Struct { +func (x *AuthPlugin) GetConfig() *structpb.Struct { if x != nil { return x.Config } @@ -1013,11 +997,9 @@ type BasicAuth struct { func (x *BasicAuth) Reset() { *x = BasicAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BasicAuth) String() string { @@ -1028,7 +1010,7 @@ func (*BasicAuth) ProtoMessage() {} func (x *BasicAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1111,11 +1093,9 @@ type HmacAuth struct { func (x *HmacAuth) Reset() { *x = HmacAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HmacAuth) String() string { @@ -1126,7 +1106,7 @@ func (*HmacAuth) ProtoMessage() {} func (x *HmacAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1204,11 +1184,9 @@ type SecretRefList struct { func (x *SecretRefList) Reset() { *x = SecretRefList{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SecretRefList) String() string { @@ -1219,7 +1197,7 @@ func (*SecretRefList) ProtoMessage() {} func (x *SecretRefList) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1250,11 +1228,9 @@ type HmacParametersInHeaders struct { func (x *HmacParametersInHeaders) Reset() { *x = HmacParametersInHeaders{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HmacParametersInHeaders) String() string { @@ -1265,7 +1241,7 @@ func (*HmacParametersInHeaders) ProtoMessage() {} func (x *HmacParametersInHeaders) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1324,11 +1300,9 @@ type OAuth struct { func (x *OAuth) Reset() { *x = OAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OAuth) String() string { @@ -1339,7 +1313,7 @@ func (*OAuth) ProtoMessage() {} func (x *OAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1425,11 +1399,9 @@ type OAuth2 struct { func (x *OAuth2) Reset() { *x = OAuth2{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OAuth2) String() string { @@ -1440,7 +1412,7 @@ func (*OAuth2) ProtoMessage() {} func (x *OAuth2) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1547,11 +1519,9 @@ type RedisOptions struct { func (x *RedisOptions) Reset() { *x = RedisOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RedisOptions) String() string { @@ -1562,7 +1532,7 @@ func (*RedisOptions) ProtoMessage() {} func (x *RedisOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1633,11 +1603,9 @@ type UserSession struct { func (x *UserSession) Reset() { *x = UserSession{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UserSession) String() string { @@ -1648,7 +1616,7 @@ func (*UserSession) ProtoMessage() {} func (x *UserSession) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1733,16 +1701,14 @@ type HeaderConfiguration struct { // If set, the access token will be forward upstream using this header name. AccessTokenHeader string `protobuf:"bytes,2,opt,name=access_token_header,json=accessTokenHeader,proto3" json:"access_token_header,omitempty"` // If true, adds the "Bearer" prefix to the upstream access token header value. - UseBearerSchemaForAuthorization *wrappers.BoolValue `protobuf:"bytes,3,opt,name=use_bearer_schema_for_authorization,json=useBearerSchemaForAuthorization,proto3" json:"use_bearer_schema_for_authorization,omitempty"` + UseBearerSchemaForAuthorization *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=use_bearer_schema_for_authorization,json=useBearerSchemaForAuthorization,proto3" json:"use_bearer_schema_for_authorization,omitempty"` } func (x *HeaderConfiguration) Reset() { *x = HeaderConfiguration{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderConfiguration) String() string { @@ -1753,7 +1719,7 @@ func (*HeaderConfiguration) ProtoMessage() {} func (x *HeaderConfiguration) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1782,7 +1748,7 @@ func (x *HeaderConfiguration) GetAccessTokenHeader() string { return "" } -func (x *HeaderConfiguration) GetUseBearerSchemaForAuthorization() *wrappers.BoolValue { +func (x *HeaderConfiguration) GetUseBearerSchemaForAuthorization() *wrapperspb.BoolValue { if x != nil { return x.UseBearerSchemaForAuthorization } @@ -1823,11 +1789,9 @@ type DiscoveryOverride struct { func (x *DiscoveryOverride) Reset() { *x = DiscoveryOverride{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DiscoveryOverride) String() string { @@ -1838,7 +1802,7 @@ func (*DiscoveryOverride) ProtoMessage() {} func (x *DiscoveryOverride) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1953,11 +1917,9 @@ type JwksOnDemandCacheRefreshPolicy struct { func (x *JwksOnDemandCacheRefreshPolicy) Reset() { *x = JwksOnDemandCacheRefreshPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwksOnDemandCacheRefreshPolicy) String() string { @@ -1968,7 +1930,7 @@ func (*JwksOnDemandCacheRefreshPolicy) ProtoMessage() {} func (x *JwksOnDemandCacheRefreshPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1990,14 +1952,14 @@ func (m *JwksOnDemandCacheRefreshPolicy) GetPolicy() isJwksOnDemandCacheRefreshP return nil } -func (x *JwksOnDemandCacheRefreshPolicy) GetNever() *empty.Empty { +func (x *JwksOnDemandCacheRefreshPolicy) GetNever() *emptypb.Empty { if x, ok := x.GetPolicy().(*JwksOnDemandCacheRefreshPolicy_Never); ok { return x.Never } return nil } -func (x *JwksOnDemandCacheRefreshPolicy) GetAlways() *empty.Empty { +func (x *JwksOnDemandCacheRefreshPolicy) GetAlways() *emptypb.Empty { if x, ok := x.GetPolicy().(*JwksOnDemandCacheRefreshPolicy_Always); ok { return x.Always } @@ -2019,7 +1981,7 @@ type JwksOnDemandCacheRefreshPolicy_Never struct { // Never refresh the local JWKS cache on demand. If a key is not in the cache, it is assumed to be malicious. // This is the default policy since we assume that IdPs publish keys before they rotate them, // and frequent polling finds the newest keys. - Never *empty.Empty `protobuf:"bytes,1,opt,name=never,proto3,oneof"` + Never *emptypb.Empty `protobuf:"bytes,1,opt,name=never,proto3,oneof"` } type JwksOnDemandCacheRefreshPolicy_Always struct { @@ -2027,7 +1989,7 @@ type JwksOnDemandCacheRefreshPolicy_Always struct { // NOTE: This should only be done in trusted environments, since missing keys will each trigger // a request to the IdP. Using this in an environment exposed to the internet will allow malicious agents to // execute a DDoS attack by spamming protected endpoints with tokens signed by invalid keys. - Always *empty.Empty `protobuf:"bytes,2,opt,name=always,proto3,oneof"` + Always *emptypb.Empty `protobuf:"bytes,2,opt,name=always,proto3,oneof"` } type JwksOnDemandCacheRefreshPolicy_MaxIdpReqPerPollingInterval struct { @@ -2055,11 +2017,9 @@ type AutoMapFromMetadata struct { func (x *AutoMapFromMetadata) Reset() { *x = AutoMapFromMetadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AutoMapFromMetadata) String() string { @@ -2070,7 +2030,7 @@ func (*AutoMapFromMetadata) ProtoMessage() {} func (x *AutoMapFromMetadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2103,11 +2063,9 @@ type EndSessionProperties struct { func (x *EndSessionProperties) Reset() { *x = EndSessionProperties{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EndSessionProperties) String() string { @@ -2118,7 +2076,7 @@ func (*EndSessionProperties) ProtoMessage() {} func (x *EndSessionProperties) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2156,11 +2114,9 @@ type ClaimToHeader struct { func (x *ClaimToHeader) Reset() { *x = ClaimToHeader{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ClaimToHeader) String() string { @@ -2171,7 +2127,7 @@ func (*ClaimToHeader) ProtoMessage() {} func (x *ClaimToHeader) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2234,11 +2190,9 @@ type Azure struct { func (x *Azure) Reset() { *x = Azure{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Azure) String() string { @@ -2249,7 +2203,7 @@ func (*Azure) ProtoMessage() {} func (x *Azure) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2376,7 +2330,7 @@ type OidcAuthorizationCode struct { DiscoveryOverride *DiscoveryOverride `protobuf:"bytes,11,opt,name=discovery_override,json=discoveryOverride,proto3" json:"discovery_override,omitempty"` // The interval at which OIDC configuration is discovered at /.well-known/openid-configuration // If not specified, the default value is 30 minutes. - DiscoveryPollInterval *duration.Duration `protobuf:"bytes,12,opt,name=discovery_poll_interval,json=discoveryPollInterval,proto3" json:"discovery_poll_interval,omitempty"` + DiscoveryPollInterval *durationpb.Duration `protobuf:"bytes,12,opt,name=discovery_poll_interval,json=discoveryPollInterval,proto3" json:"discovery_poll_interval,omitempty"` // If a user executes a request with a key that is not found in the JWKS, it could be // that the keys have rotated on the remote source, and not yet in the local cache. // This policy lets you define the behavior for how to refresh the local cache during a request @@ -2415,7 +2369,7 @@ type OidcAuthorizationCode struct { // This field has been deprecated and can be set in the client_secret option of client_authentication // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/enterprise.gloo/v1/auth_config.proto. - DisableClientSecret *wrappers.BoolValue `protobuf:"bytes,21,opt,name=disable_client_secret,json=disableClientSecret,proto3" json:"disable_client_secret,omitempty"` + DisableClientSecret *wrapperspb.BoolValue `protobuf:"bytes,21,opt,name=disable_client_secret,json=disableClientSecret,proto3" json:"disable_client_secret,omitempty"` // Optional: Configuration specific to the OAuth2 access token received and processed by the ext-auth-service. AccessToken *OidcAuthorizationCode_AccessToken `protobuf:"bytes,23,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"` // Optional: Configuration specific to the OIDC identity token received and processed by the ext-auth-service. @@ -2434,11 +2388,9 @@ type OidcAuthorizationCode struct { func (x *OidcAuthorizationCode) Reset() { *x = OidcAuthorizationCode{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OidcAuthorizationCode) String() string { @@ -2449,7 +2401,7 @@ func (*OidcAuthorizationCode) ProtoMessage() {} func (x *OidcAuthorizationCode) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2556,7 +2508,7 @@ func (x *OidcAuthorizationCode) GetDiscoveryOverride() *DiscoveryOverride { return nil } -func (x *OidcAuthorizationCode) GetDiscoveryPollInterval() *duration.Duration { +func (x *OidcAuthorizationCode) GetDiscoveryPollInterval() *durationpb.Duration { if x != nil { return x.DiscoveryPollInterval } @@ -2607,7 +2559,7 @@ func (x *OidcAuthorizationCode) GetDynamicMetadataFromClaims() map[string]string } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/enterprise.gloo/v1/auth_config.proto. -func (x *OidcAuthorizationCode) GetDisableClientSecret() *wrappers.BoolValue { +func (x *OidcAuthorizationCode) GetDisableClientSecret() *wrapperspb.BoolValue { if x != nil { return x.DisableClientSecret } @@ -2739,16 +2691,14 @@ type PlainOAuth2 struct { // If true, do not check for or use the client secret. // Generally the client secret is required and AuthConfigs will be rejected if it isn't set. // However certain implementations of the PKCE flow do not use a client secret (including Okta) so this setting allows configuring Oauth2 without a client secret. - DisableClientSecret *wrappers.BoolValue `protobuf:"bytes,14,opt,name=disable_client_secret,json=disableClientSecret,proto3" json:"disable_client_secret,omitempty"` + DisableClientSecret *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=disable_client_secret,json=disableClientSecret,proto3" json:"disable_client_secret,omitempty"` } func (x *PlainOAuth2) Reset() { *x = PlainOAuth2{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PlainOAuth2) String() string { @@ -2759,7 +2709,7 @@ func (*PlainOAuth2) ProtoMessage() {} func (x *PlainOAuth2) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2865,7 +2815,7 @@ func (x *PlainOAuth2) GetRevocationEndpoint() string { return "" } -func (x *PlainOAuth2) GetDisableClientSecret() *wrappers.BoolValue { +func (x *PlainOAuth2) GetDisableClientSecret() *wrapperspb.BoolValue { if x != nil { return x.DisableClientSecret } @@ -2907,11 +2857,9 @@ type JwtValidation struct { func (x *JwtValidation) Reset() { *x = JwtValidation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtValidation) String() string { @@ -2922,7 +2870,7 @@ func (*JwtValidation) ProtoMessage() {} func (x *JwtValidation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3015,16 +2963,14 @@ type IntrospectionValidation struct { // This field is optional and by default the server will not try to derive the user ID. UserIdAttributeName string `protobuf:"bytes,4,opt,name=user_id_attribute_name,json=userIdAttributeName,proto3" json:"user_id_attribute_name,omitempty"` // Allows setting a client id but not a client secret. - DisableClientSecret *wrappers.BoolValue `protobuf:"bytes,5,opt,name=disable_client_secret,json=disableClientSecret,proto3" json:"disable_client_secret,omitempty"` + DisableClientSecret *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=disable_client_secret,json=disableClientSecret,proto3" json:"disable_client_secret,omitempty"` } func (x *IntrospectionValidation) Reset() { *x = IntrospectionValidation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *IntrospectionValidation) String() string { @@ -3035,7 +2981,7 @@ func (*IntrospectionValidation) ProtoMessage() {} func (x *IntrospectionValidation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3078,7 +3024,7 @@ func (x *IntrospectionValidation) GetUserIdAttributeName() string { return "" } -func (x *IntrospectionValidation) GetDisableClientSecret() *wrappers.BoolValue { +func (x *IntrospectionValidation) GetDisableClientSecret() *wrapperspb.BoolValue { if x != nil { return x.DisableClientSecret } @@ -3105,7 +3051,7 @@ type AccessTokenValidation struct { // How long the token introspection and userinfo endpoint response for a specific access token should be kept // in the in-memory cache. The result will be invalidated at this timeout, or at "exp" time from the introspection // result, whichever comes sooner. If omitted, defaults to 10 minutes. If zero, then no caching will be done. - CacheTimeout *duration.Duration `protobuf:"bytes,5,opt,name=cache_timeout,json=cacheTimeout,proto3" json:"cache_timeout,omitempty"` + CacheTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=cache_timeout,json=cacheTimeout,proto3" json:"cache_timeout,omitempty"` // Optional criteria for validating the scopes of a token. // // Types that are assignable to ScopeValidation: @@ -3135,11 +3081,9 @@ type AccessTokenValidation struct { func (x *AccessTokenValidation) Reset() { *x = AccessTokenValidation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AccessTokenValidation) String() string { @@ -3150,7 +3094,7 @@ func (*AccessTokenValidation) ProtoMessage() {} func (x *AccessTokenValidation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3201,7 +3145,7 @@ func (x *AccessTokenValidation) GetUserinfoUrl() string { return "" } -func (x *AccessTokenValidation) GetCacheTimeout() *duration.Duration { +func (x *AccessTokenValidation) GetCacheTimeout() *durationpb.Duration { if x != nil { return x.CacheTimeout } @@ -3336,11 +3280,9 @@ type OauthSecret struct { func (x *OauthSecret) Reset() { *x = OauthSecret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OauthSecret) String() string { @@ -3351,7 +3293,7 @@ func (*OauthSecret) ProtoMessage() {} func (x *OauthSecret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3430,11 +3372,9 @@ type ApiKeyAuth struct { func (x *ApiKeyAuth) Reset() { *x = ApiKeyAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[29] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[29] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyAuth) String() string { @@ -3445,7 +3385,7 @@ func (*ApiKeyAuth) ProtoMessage() {} func (x *ApiKeyAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[29] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3559,11 +3499,9 @@ type K8SSecretApiKeyStorage struct { func (x *K8SSecretApiKeyStorage) Reset() { *x = K8SSecretApiKeyStorage{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[30] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[30] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *K8SSecretApiKeyStorage) String() string { @@ -3574,7 +3512,7 @@ func (*K8SSecretApiKeyStorage) ProtoMessage() {} func (x *K8SSecretApiKeyStorage) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[30] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3657,11 +3595,9 @@ type AerospikeApiKeyStorage struct { func (x *AerospikeApiKeyStorage) Reset() { *x = AerospikeApiKeyStorage{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[31] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[31] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AerospikeApiKeyStorage) String() string { @@ -3672,7 +3608,7 @@ func (*AerospikeApiKeyStorage) ProtoMessage() {} func (x *AerospikeApiKeyStorage) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[31] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3840,11 +3776,9 @@ type ServerDefaultApiKeyStorage struct { func (x *ServerDefaultApiKeyStorage) Reset() { *x = ServerDefaultApiKeyStorage{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[32] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[32] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServerDefaultApiKeyStorage) String() string { @@ -3855,7 +3789,7 @@ func (*ServerDefaultApiKeyStorage) ProtoMessage() {} func (x *ServerDefaultApiKeyStorage) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[32] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3888,11 +3822,9 @@ type ApiKey struct { func (x *ApiKey) Reset() { *x = ApiKey{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[33] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[33] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKey) String() string { @@ -3903,7 +3835,7 @@ func (*ApiKey) ProtoMessage() {} func (x *ApiKey) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[33] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3963,11 +3895,9 @@ type ApiKeySecret struct { func (x *ApiKeySecret) Reset() { *x = ApiKeySecret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[34] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeySecret) String() string { @@ -3978,7 +3908,7 @@ func (*ApiKeySecret) ProtoMessage() {} func (x *ApiKeySecret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[34] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4040,11 +3970,9 @@ type OpaAuth struct { func (x *OpaAuth) Reset() { *x = OpaAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[35] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[35] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OpaAuth) String() string { @@ -4055,7 +3983,7 @@ func (*OpaAuth) ProtoMessage() {} func (x *OpaAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[35] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4119,11 +4047,9 @@ type OpaAuthOptions struct { func (x *OpaAuthOptions) Reset() { *x = OpaAuthOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[36] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[36] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OpaAuthOptions) String() string { @@ -4134,7 +4060,7 @@ func (*OpaAuthOptions) ProtoMessage() {} func (x *OpaAuthOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[36] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4194,11 +4120,9 @@ type OpaServerAuth struct { func (x *OpaServerAuth) Reset() { *x = OpaServerAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[37] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[37] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OpaServerAuth) String() string { @@ -4209,7 +4133,7 @@ func (*OpaServerAuth) ProtoMessage() {} func (x *OpaServerAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[37] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4294,11 +4218,9 @@ type Ldap struct { func (x *Ldap) Reset() { *x = Ldap{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[38] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[38] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Ldap) String() string { @@ -4309,7 +4231,7 @@ func (*Ldap) ProtoMessage() {} func (x *Ldap) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[38] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4393,11 +4315,9 @@ type LdapServiceAccount struct { func (x *LdapServiceAccount) Reset() { *x = LdapServiceAccount{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[39] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[39] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LdapServiceAccount) String() string { @@ -4408,7 +4328,7 @@ func (*LdapServiceAccount) ProtoMessage() {} func (x *LdapServiceAccount) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[39] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4449,7 +4369,7 @@ type PassThroughAuth struct { // *PassThroughAuth_Http Protocol isPassThroughAuth_Protocol `protobuf_oneof:"protocol"` // Custom config to be passed per request to the passthrough auth service. - Config *_struct.Struct `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` + Config *structpb.Struct `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"` // If set to true, the service will accept client request even if the communication with // // the authorization service has failed, or if the authorization service has returned a server error. @@ -4460,11 +4380,9 @@ type PassThroughAuth struct { func (x *PassThroughAuth) Reset() { *x = PassThroughAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[40] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[40] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PassThroughAuth) String() string { @@ -4475,7 +4393,7 @@ func (*PassThroughAuth) ProtoMessage() {} func (x *PassThroughAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[40] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4511,7 +4429,7 @@ func (x *PassThroughAuth) GetHttp() *PassThroughHttp { return nil } -func (x *PassThroughAuth) GetConfig() *_struct.Struct { +func (x *PassThroughAuth) GetConfig() *structpb.Struct { if x != nil { return x.Config } @@ -4549,19 +4467,17 @@ type BackoffStrategy struct { // The base interval to be used for the next back off computation. // Defaults to 1000 milliseconds - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum delay between retries. // Defaults to 10 times the base interval. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *BackoffStrategy) Reset() { *x = BackoffStrategy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[41] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[41] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BackoffStrategy) String() string { @@ -4572,7 +4488,7 @@ func (*BackoffStrategy) ProtoMessage() {} func (x *BackoffStrategy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[41] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4587,14 +4503,14 @@ func (*BackoffStrategy) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_rawDescGZIP(), []int{41} } -func (x *BackoffStrategy) GetBaseInterval() *duration.Duration { +func (x *BackoffStrategy) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *BackoffStrategy) GetMaxInterval() *duration.Duration { +func (x *BackoffStrategy) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -4609,7 +4525,7 @@ type RetryPolicy struct { // Specifies the allowed number of retries. This parameter is optional and // defaults to 1. - NumRetries *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` + NumRetries *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` // Types that are assignable to Strategy: // // *RetryPolicy_RetryBackOff @@ -4618,11 +4534,9 @@ type RetryPolicy struct { func (x *RetryPolicy) Reset() { *x = RetryPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[42] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[42] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy) String() string { @@ -4633,7 +4547,7 @@ func (*RetryPolicy) ProtoMessage() {} func (x *RetryPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[42] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4648,7 +4562,7 @@ func (*RetryPolicy) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_rawDescGZIP(), []int{42} } -func (x *RetryPolicy) GetNumRetries() *wrappers.UInt32Value { +func (x *RetryPolicy) GetNumRetries() *wrapperspb.UInt32Value { if x != nil { return x.NumRetries } @@ -4696,7 +4610,7 @@ type PassThroughGrpc struct { // +kubebuilder:validation:MinLength=1 Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Timeout for the auth server to respond. Defaults to 5s - ConnectionTimeout *duration.Duration `protobuf:"bytes,2,opt,name=connection_timeout,json=connectionTimeout,proto3" json:"connection_timeout,omitempty"` + ConnectionTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=connection_timeout,json=connectionTimeout,proto3" json:"connection_timeout,omitempty"` // TLS config for the Grpc passthrough, if not configured the connection will use insecure. TlsConfig *PassThroughGrpcTLSConfig `protobuf:"bytes,3,opt,name=tlsConfig,proto3" json:"tlsConfig,omitempty"` // Indicates the retry policy for re-establishing the gRPC stream. @@ -4706,11 +4620,9 @@ type PassThroughGrpc struct { func (x *PassThroughGrpc) Reset() { *x = PassThroughGrpc{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[43] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[43] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PassThroughGrpc) String() string { @@ -4721,7 +4633,7 @@ func (*PassThroughGrpc) ProtoMessage() {} func (x *PassThroughGrpc) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[43] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4743,7 +4655,7 @@ func (x *PassThroughGrpc) GetAddress() string { return "" } -func (x *PassThroughGrpc) GetConnectionTimeout() *duration.Duration { +func (x *PassThroughGrpc) GetConnectionTimeout() *durationpb.Duration { if x != nil { return x.ConnectionTimeout } @@ -4773,11 +4685,9 @@ type PassThroughGrpcTLSConfig struct { func (x *PassThroughGrpcTLSConfig) Reset() { *x = PassThroughGrpcTLSConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[44] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[44] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PassThroughGrpcTLSConfig) String() string { @@ -4788,7 +4698,7 @@ func (*PassThroughGrpcTLSConfig) ProtoMessage() {} func (x *PassThroughGrpcTLSConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[44] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4826,16 +4736,14 @@ type PassThroughHttp struct { // For more information, see the [PassThrough Http Response description](#response-1). Response *PassThroughHttp_Response `protobuf:"bytes,4,opt,name=response,proto3" json:"response,omitempty"` // Timeout for the auth server to respond. Defaults to 5s - ConnectionTimeout *duration.Duration `protobuf:"bytes,8,opt,name=connection_timeout,json=connectionTimeout,proto3" json:"connection_timeout,omitempty"` + ConnectionTimeout *durationpb.Duration `protobuf:"bytes,8,opt,name=connection_timeout,json=connectionTimeout,proto3" json:"connection_timeout,omitempty"` } func (x *PassThroughHttp) Reset() { *x = PassThroughHttp{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[45] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[45] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PassThroughHttp) String() string { @@ -4846,7 +4754,7 @@ func (*PassThroughHttp) ProtoMessage() {} func (x *PassThroughHttp) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[45] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4882,7 +4790,7 @@ func (x *PassThroughHttp) GetResponse() *PassThroughHttp_Response { return nil } -func (x *PassThroughHttp) GetConnectionTimeout() *duration.Duration { +func (x *PassThroughHttp) GetConnectionTimeout() *durationpb.Duration { if x != nil { return x.ConnectionTimeout } @@ -4905,18 +4813,16 @@ type PortalAuth struct { // Options to connect to redis. If not provided, data will be cached in memory. RedisOptions *RedisOptions `protobuf:"bytes,3,opt,name=redis_options,json=redisOptions,proto3" json:"redis_options,omitempty"` // The frequency at which the validated credential data should be refreshed by quering the portal web server. Defaults to 60s. - CacheDuration *duration.Duration `protobuf:"bytes,4,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` + CacheDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` // Timeout for the portal web server to respond. Defaults to 200ms - RequestTimeout *duration.Duration `protobuf:"bytes,5,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` } func (x *PortalAuth) Reset() { *x = PortalAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[46] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[46] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PortalAuth) String() string { @@ -4927,7 +4833,7 @@ func (*PortalAuth) ProtoMessage() {} func (x *PortalAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[46] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4963,14 +4869,14 @@ func (x *PortalAuth) GetRedisOptions() *RedisOptions { return nil } -func (x *PortalAuth) GetCacheDuration() *duration.Duration { +func (x *PortalAuth) GetCacheDuration() *durationpb.Duration { if x != nil { return x.CacheDuration } return nil } -func (x *PortalAuth) GetRequestTimeout() *duration.Duration { +func (x *PortalAuth) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } @@ -4991,16 +4897,14 @@ type AuthConfigStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*AuthConfigStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *AuthConfigStatus) Reset() { *x = AuthConfigStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[47] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[47] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AuthConfigStatus) String() string { @@ -5011,7 +4915,7 @@ func (*AuthConfigStatus) ProtoMessage() {} func (x *AuthConfigStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[47] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5054,7 +4958,7 @@ func (x *AuthConfigStatus) GetSubresourceStatuses() map[string]*AuthConfigStatus return nil } -func (x *AuthConfigStatus) GetDetails() *_struct.Struct { +func (x *AuthConfigStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -5071,11 +4975,9 @@ type AuthConfigNamespacedStatuses struct { func (x *AuthConfigNamespacedStatuses) Reset() { *x = AuthConfigNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[48] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[48] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AuthConfigNamespacedStatuses) String() string { @@ -5086,7 +4988,7 @@ func (*AuthConfigNamespacedStatuses) ProtoMessage() {} func (x *AuthConfigNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[48] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5117,7 +5019,7 @@ type AuthConfigSpec_Config struct { // in logging. If omitted, an automatically generated name will be used (e.g. config_0, of the // pattern 'config_$INDEX_IN_CHAIN'). In the case of plugin auth, this field is ignored in favor of // the name assigned on the plugin config itself. - Name *wrappers.StringValue `protobuf:"bytes,9,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,9,opt,name=name,proto3" json:"name,omitempty"` // Types that are assignable to AuthConfig: // // *AuthConfigSpec_Config_BasicAuth @@ -5137,11 +5039,9 @@ type AuthConfigSpec_Config struct { func (x *AuthConfigSpec_Config) Reset() { *x = AuthConfigSpec_Config{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[49] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[49] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AuthConfigSpec_Config) String() string { @@ -5152,7 +5052,7 @@ func (*AuthConfigSpec_Config) ProtoMessage() {} func (x *AuthConfigSpec_Config) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[49] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5167,7 +5067,7 @@ func (*AuthConfigSpec_Config) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_rawDescGZIP(), []int{0, 0} } -func (x *AuthConfigSpec_Config) GetName() *wrappers.StringValue { +func (x *AuthConfigSpec_Config) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } @@ -5232,7 +5132,7 @@ func (x *AuthConfigSpec_Config) GetLdap() *Ldap { return nil } -func (x *AuthConfigSpec_Config) GetJwt() *empty.Empty { +func (x *AuthConfigSpec_Config) GetJwt() *emptypb.Empty { if x, ok := x.GetAuthConfig().(*AuthConfigSpec_Config_Jwt); ok { return x.Jwt } @@ -5306,7 +5206,7 @@ type AuthConfigSpec_Config_Jwt struct { // This is a "dummy" extauth service which can be used to support multiple auth mechanisms with JWT authentication. // If Jwt authentication is to be used in the [boolean expression](https://docs.solo.io/gloo-edge/latest/reference/api/github.com/solo-io/solo-apis/api/gloo/enterprise.gloo/v1/auth_config.proto.sk/#authconfig) in an AuthConfig, you can use this auth config type to include Jwt as an Auth config. // In addition, `allow_missing_or_failed_jwt` must be set on the Virtual Host or Route that uses JWT auth or else the JWT filter will short circuit this behaviour. - Jwt *empty.Empty `protobuf:"bytes,11,opt,name=jwt,proto3,oneof"` + Jwt *emptypb.Empty `protobuf:"bytes,11,opt,name=jwt,proto3,oneof"` } type AuthConfigSpec_Config_PassThroughAuth struct { @@ -5373,11 +5273,9 @@ type HttpService_Request struct { func (x *HttpService_Request) Reset() { *x = HttpService_Request{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[50] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[50] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpService_Request) String() string { @@ -5388,7 +5286,7 @@ func (*HttpService_Request) ProtoMessage() {} func (x *HttpService_Request) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[50] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5444,11 +5342,9 @@ type HttpService_Response struct { func (x *HttpService_Response) Reset() { *x = HttpService_Response{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[51] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[51] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpService_Response) String() string { @@ -5459,7 +5355,7 @@ func (*HttpService_Response) ProtoMessage() {} func (x *HttpService_Response) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[51] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5507,11 +5403,9 @@ type BasicAuth_Apr struct { func (x *BasicAuth_Apr) Reset() { *x = BasicAuth_Apr{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[54] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[54] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BasicAuth_Apr) String() string { @@ -5522,7 +5416,7 @@ func (*BasicAuth_Apr) ProtoMessage() {} func (x *BasicAuth_Apr) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[54] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5559,11 +5453,9 @@ type BasicAuth_EncryptionType struct { func (x *BasicAuth_EncryptionType) Reset() { *x = BasicAuth_EncryptionType{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[55] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[55] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BasicAuth_EncryptionType) String() string { @@ -5574,7 +5466,7 @@ func (*BasicAuth_EncryptionType) ProtoMessage() {} func (x *BasicAuth_EncryptionType) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[55] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5640,11 +5532,9 @@ type BasicAuth_User struct { func (x *BasicAuth_User) Reset() { *x = BasicAuth_User{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[56] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[56] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BasicAuth_User) String() string { @@ -5655,7 +5545,7 @@ func (*BasicAuth_User) ProtoMessage() {} func (x *BasicAuth_User) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[56] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5695,11 +5585,9 @@ type BasicAuth_UserList struct { func (x *BasicAuth_UserList) Reset() { *x = BasicAuth_UserList{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[57] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[57] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BasicAuth_UserList) String() string { @@ -5710,7 +5598,7 @@ func (*BasicAuth_UserList) ProtoMessage() {} func (x *BasicAuth_UserList) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[57] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5746,11 +5634,9 @@ type BasicAuth_Apr_SaltedHashedPassword struct { func (x *BasicAuth_Apr_SaltedHashedPassword) Reset() { *x = BasicAuth_Apr_SaltedHashedPassword{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[58] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[58] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BasicAuth_Apr_SaltedHashedPassword) String() string { @@ -5761,7 +5647,7 @@ func (*BasicAuth_Apr_SaltedHashedPassword) ProtoMessage() {} func (x *BasicAuth_Apr_SaltedHashedPassword) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[58] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5800,11 +5686,9 @@ type BasicAuth_EncryptionType_Sha1 struct { func (x *BasicAuth_EncryptionType_Sha1) Reset() { *x = BasicAuth_EncryptionType_Sha1{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[60] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[60] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BasicAuth_EncryptionType_Sha1) String() string { @@ -5815,7 +5699,7 @@ func (*BasicAuth_EncryptionType_Sha1) ProtoMessage() {} func (x *BasicAuth_EncryptionType_Sha1) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[60] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5839,11 +5723,9 @@ type BasicAuth_EncryptionType_Apr struct { func (x *BasicAuth_EncryptionType_Apr) Reset() { *x = BasicAuth_EncryptionType_Apr{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[61] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[61] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BasicAuth_EncryptionType_Apr) String() string { @@ -5854,7 +5736,7 @@ func (*BasicAuth_EncryptionType_Apr) ProtoMessage() {} func (x *BasicAuth_EncryptionType_Apr) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[61] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5876,7 +5758,7 @@ type UserSession_InternalSession struct { // Refresh expired id-tokens using the refresh-token. The tokens refreshes when the client issues a call. // Defaults to false. To enable refreshing, set to true. - AllowRefreshing *wrappers.BoolValue `protobuf:"bytes,1,opt,name=allow_refreshing,json=allowRefreshing,proto3" json:"allow_refreshing,omitempty"` + AllowRefreshing *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=allow_refreshing,json=allowRefreshing,proto3" json:"allow_refreshing,omitempty"` // Prefix to append to cookie keys, such as for separate domain and subdomain prefixes. // Cookie keys are stored in the form `_`. // For more information, see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes @@ -5889,11 +5771,9 @@ type UserSession_InternalSession struct { func (x *UserSession_InternalSession) Reset() { *x = UserSession_InternalSession{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[64] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[64] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UserSession_InternalSession) String() string { @@ -5904,7 +5784,7 @@ func (*UserSession_InternalSession) ProtoMessage() {} func (x *UserSession_InternalSession) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[64] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -5919,7 +5799,7 @@ func (*UserSession_InternalSession) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_rawDescGZIP(), []int{15, 0} } -func (x *UserSession_InternalSession) GetAllowRefreshing() *wrappers.BoolValue { +func (x *UserSession_InternalSession) GetAllowRefreshing() *wrapperspb.BoolValue { if x != nil { return x.AllowRefreshing } @@ -5953,12 +5833,12 @@ type UserSession_RedisSession struct { CookieName string `protobuf:"bytes,3,opt,name=cookie_name,json=cookieName,proto3" json:"cookie_name,omitempty"` // Refresh expired id-tokens using the refresh-token. The tokens refreshes when the client issues a call. // Defaults to true. To disable refreshing, set to false. - AllowRefreshing *wrappers.BoolValue `protobuf:"bytes,4,opt,name=allow_refreshing,json=allowRefreshing,proto3" json:"allow_refreshing,omitempty"` + AllowRefreshing *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=allow_refreshing,json=allowRefreshing,proto3" json:"allow_refreshing,omitempty"` // Specifies a time buffer in which an id-token will be refreshed prior to its // actual expiration. Defaults to 2 seconds. A duration of 0 will only refresh // tokens after they have already expired. To refresh tokens, you must also set // 'allowRefreshing' to 'true'; otherwise, this field is ignored. - PreExpiryBuffer *duration.Duration `protobuf:"bytes,5,opt,name=pre_expiry_buffer,json=preExpiryBuffer,proto3" json:"pre_expiry_buffer,omitempty"` + PreExpiryBuffer *durationpb.Duration `protobuf:"bytes,5,opt,name=pre_expiry_buffer,json=preExpiryBuffer,proto3" json:"pre_expiry_buffer,omitempty"` // Domain used to validate against requests in order to ensure that request host name matches target domain. // If the target domain is provided will prevent requests that do not match the target domain according to // the domain matching specifications in RFC 6265. For more information, see https://datatracker.ietf.org/doc/html/rfc6265#section-5.1.3 @@ -5970,11 +5850,9 @@ type UserSession_RedisSession struct { func (x *UserSession_RedisSession) Reset() { *x = UserSession_RedisSession{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[65] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[65] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UserSession_RedisSession) String() string { @@ -5985,7 +5863,7 @@ func (*UserSession_RedisSession) ProtoMessage() {} func (x *UserSession_RedisSession) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[65] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6021,14 +5899,14 @@ func (x *UserSession_RedisSession) GetCookieName() string { return "" } -func (x *UserSession_RedisSession) GetAllowRefreshing() *wrappers.BoolValue { +func (x *UserSession_RedisSession) GetAllowRefreshing() *wrapperspb.BoolValue { if x != nil { return x.AllowRefreshing } return nil } -func (x *UserSession_RedisSession) GetPreExpiryBuffer() *duration.Duration { +func (x *UserSession_RedisSession) GetPreExpiryBuffer() *durationpb.Duration { if x != nil { return x.PreExpiryBuffer } @@ -6056,15 +5934,15 @@ type UserSession_CookieOptions struct { // Max age for the cookie. Leave unset for a default of 30 days (2592000 seconds). // To disable cookie expiry, set explicitly to 0. - MaxAge *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` + MaxAge *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // Use a non-secure cookie. Note - this should only be used for testing and in trusted // environments. NotSecure bool `protobuf:"varint,2,opt,name=not_secure,json=notSecure,proto3" json:"not_secure,omitempty"` // Set the cookie to be HttpOnly. defaults to true. Set explicity to false to disable. - HttpOnly *wrappers.BoolValue `protobuf:"bytes,5,opt,name=http_only,json=httpOnly,proto3" json:"http_only,omitempty"` + HttpOnly *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=http_only,json=httpOnly,proto3" json:"http_only,omitempty"` // Path of the cookie. If unset, defaults to "/". Set it explicitly to "" to avoid setting a // path. - Path *wrappers.StringValue `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` + Path *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` // Whether the cookie should be restricted to a first-party or same-site context. // The default mode is LaxMode. SameSite UserSession_CookieOptions_SameSite `protobuf:"varint,6,opt,name=same_site,json=sameSite,proto3,enum=enterprise.gloo.solo.io.UserSession_CookieOptions_SameSite" json:"same_site,omitempty"` @@ -6074,11 +5952,9 @@ type UserSession_CookieOptions struct { func (x *UserSession_CookieOptions) Reset() { *x = UserSession_CookieOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[66] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[66] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UserSession_CookieOptions) String() string { @@ -6089,7 +5965,7 @@ func (*UserSession_CookieOptions) ProtoMessage() {} func (x *UserSession_CookieOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[66] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6104,7 +5980,7 @@ func (*UserSession_CookieOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_rawDescGZIP(), []int{15, 2} } -func (x *UserSession_CookieOptions) GetMaxAge() *wrappers.UInt32Value { +func (x *UserSession_CookieOptions) GetMaxAge() *wrapperspb.UInt32Value { if x != nil { return x.MaxAge } @@ -6118,14 +5994,14 @@ func (x *UserSession_CookieOptions) GetNotSecure() bool { return false } -func (x *UserSession_CookieOptions) GetHttpOnly() *wrappers.BoolValue { +func (x *UserSession_CookieOptions) GetHttpOnly() *wrapperspb.BoolValue { if x != nil { return x.HttpOnly } return nil } -func (x *UserSession_CookieOptions) GetPath() *wrappers.StringValue { +func (x *UserSession_CookieOptions) GetPath() *wrapperspb.StringValue { if x != nil { return x.Path } @@ -6163,11 +6039,9 @@ type UserSession_CipherConfig struct { func (x *UserSession_CipherConfig) Reset() { *x = UserSession_CipherConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[67] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[67] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UserSession_CipherConfig) String() string { @@ -6178,7 +6052,7 @@ func (*UserSession_CipherConfig) ProtoMessage() {} func (x *UserSession_CipherConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[67] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6233,11 +6107,9 @@ type OidcAuthorizationCode_AccessToken struct { func (x *OidcAuthorizationCode_AccessToken) Reset() { *x = OidcAuthorizationCode_AccessToken{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[71] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[71] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OidcAuthorizationCode_AccessToken) String() string { @@ -6248,7 +6120,7 @@ func (*OidcAuthorizationCode_AccessToken) ProtoMessage() {} func (x *OidcAuthorizationCode_AccessToken) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[71] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6282,11 +6154,9 @@ type OidcAuthorizationCode_IdentityToken struct { func (x *OidcAuthorizationCode_IdentityToken) Reset() { *x = OidcAuthorizationCode_IdentityToken{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[72] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[72] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OidcAuthorizationCode_IdentityToken) String() string { @@ -6297,7 +6167,7 @@ func (*OidcAuthorizationCode_IdentityToken) ProtoMessage() {} func (x *OidcAuthorizationCode_IdentityToken) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[72] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6336,11 +6206,9 @@ type OidcAuthorizationCode_ClientAuthentication struct { func (x *OidcAuthorizationCode_ClientAuthentication) Reset() { *x = OidcAuthorizationCode_ClientAuthentication{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[73] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[73] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OidcAuthorizationCode_ClientAuthentication) String() string { @@ -6351,7 +6219,7 @@ func (*OidcAuthorizationCode_ClientAuthentication) ProtoMessage() {} func (x *OidcAuthorizationCode_ClientAuthentication) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[73] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6418,11 +6286,9 @@ type OidcAuthorizationCode_Default struct { func (x *OidcAuthorizationCode_Default) Reset() { *x = OidcAuthorizationCode_Default{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[74] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[74] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OidcAuthorizationCode_Default) String() string { @@ -6433,7 +6299,7 @@ func (*OidcAuthorizationCode_Default) ProtoMessage() {} func (x *OidcAuthorizationCode_Default) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[74] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6460,11 +6326,9 @@ type OidcAuthorizationCode_FrontChannelLogout struct { func (x *OidcAuthorizationCode_FrontChannelLogout) Reset() { *x = OidcAuthorizationCode_FrontChannelLogout{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[75] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[75] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OidcAuthorizationCode_FrontChannelLogout) String() string { @@ -6475,7 +6339,7 @@ func (*OidcAuthorizationCode_FrontChannelLogout) ProtoMessage() {} func (x *OidcAuthorizationCode_FrontChannelLogout) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[75] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6509,16 +6373,14 @@ type OidcAuthorizationCode_ClientAuthentication_ClientSecret struct { // If true, do not check for or use the client secret. // Generally the client secret is required and AuthConfigs will be rejected if it isn't set. // However certain implementations of the PKCE flow do not use a client secret (including Okta) so this setting allows configuring Oidc without a client secret. - DisableClientSecret *wrappers.BoolValue `protobuf:"bytes,2,opt,name=disable_client_secret,json=disableClientSecret,proto3" json:"disable_client_secret,omitempty"` + DisableClientSecret *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=disable_client_secret,json=disableClientSecret,proto3" json:"disable_client_secret,omitempty"` } func (x *OidcAuthorizationCode_ClientAuthentication_ClientSecret) Reset() { *x = OidcAuthorizationCode_ClientAuthentication_ClientSecret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[76] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[76] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OidcAuthorizationCode_ClientAuthentication_ClientSecret) String() string { @@ -6529,7 +6391,7 @@ func (*OidcAuthorizationCode_ClientAuthentication_ClientSecret) ProtoMessage() { func (x *OidcAuthorizationCode_ClientAuthentication_ClientSecret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[76] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6551,7 +6413,7 @@ func (x *OidcAuthorizationCode_ClientAuthentication_ClientSecret) GetClientSecre return nil } -func (x *OidcAuthorizationCode_ClientAuthentication_ClientSecret) GetDisableClientSecret() *wrappers.BoolValue { +func (x *OidcAuthorizationCode_ClientAuthentication_ClientSecret) GetDisableClientSecret() *wrapperspb.BoolValue { if x != nil { return x.DisableClientSecret } @@ -6570,16 +6432,14 @@ type OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt struct { SigningKeyRef *core.ResourceRef `protobuf:"bytes,1,opt,name=signing_key_ref,json=signingKeyRef,proto3" json:"signing_key_ref,omitempty"` // Amount of time for which the JWT is valid. No maximum is enforced, but different IDPs may impose limits on how far in // the future the expiration time is allowed to be. If omitted, default is 5s. - ValidFor *duration.Duration `protobuf:"bytes,2,opt,name=valid_for,json=validFor,proto3" json:"valid_for,omitempty"` + ValidFor *durationpb.Duration `protobuf:"bytes,2,opt,name=valid_for,json=validFor,proto3" json:"valid_for,omitempty"` } func (x *OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt) Reset() { *x = OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[77] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[77] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt) String() string { @@ -6590,7 +6450,7 @@ func (*OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt) ProtoMessage() func (x *OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[77] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6612,7 +6472,7 @@ func (x *OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt) GetSigningKey return nil } -func (x *OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt) GetValidFor() *duration.Duration { +func (x *OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt) GetValidFor() *durationpb.Duration { if x != nil { return x.ValidFor } @@ -6632,16 +6492,14 @@ type JwtValidation_RemoteJwks struct { Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` // The frequency at which the JWKS should be refreshed. // If not specified, the default value is 5 minutes. - RefreshInterval *duration.Duration `protobuf:"bytes,2,opt,name=refresh_interval,json=refreshInterval,proto3" json:"refresh_interval,omitempty"` + RefreshInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=refresh_interval,json=refreshInterval,proto3" json:"refresh_interval,omitempty"` } func (x *JwtValidation_RemoteJwks) Reset() { *x = JwtValidation_RemoteJwks{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[80] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[80] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtValidation_RemoteJwks) String() string { @@ -6652,7 +6510,7 @@ func (*JwtValidation_RemoteJwks) ProtoMessage() {} func (x *JwtValidation_RemoteJwks) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[80] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6674,7 +6532,7 @@ func (x *JwtValidation_RemoteJwks) GetUrl() string { return "" } -func (x *JwtValidation_RemoteJwks) GetRefreshInterval() *duration.Duration { +func (x *JwtValidation_RemoteJwks) GetRefreshInterval() *durationpb.Duration { if x != nil { return x.RefreshInterval } @@ -6696,11 +6554,9 @@ type JwtValidation_LocalJwks struct { func (x *JwtValidation_LocalJwks) Reset() { *x = JwtValidation_LocalJwks{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[81] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[81] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtValidation_LocalJwks) String() string { @@ -6711,7 +6567,7 @@ func (*JwtValidation_LocalJwks) ProtoMessage() {} func (x *JwtValidation_LocalJwks) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[81] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6742,11 +6598,9 @@ type AccessTokenValidation_Default struct { func (x *AccessTokenValidation_Default) Reset() { *x = AccessTokenValidation_Default{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[83] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[83] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AccessTokenValidation_Default) String() string { @@ -6757,7 +6611,7 @@ func (*AccessTokenValidation_Default) ProtoMessage() {} func (x *AccessTokenValidation_Default) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[83] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6782,11 +6636,9 @@ type AccessTokenValidation_ScopeList struct { func (x *AccessTokenValidation_ScopeList) Reset() { *x = AccessTokenValidation_ScopeList{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[84] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[84] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AccessTokenValidation_ScopeList) String() string { @@ -6797,7 +6649,7 @@ func (*AccessTokenValidation_ScopeList) ProtoMessage() {} func (x *AccessTokenValidation_ScopeList) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[84] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6837,11 +6689,9 @@ type ApiKeyAuth_SecretKey struct { func (x *ApiKeyAuth_SecretKey) Reset() { *x = ApiKeyAuth_SecretKey{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[88] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[88] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyAuth_SecretKey) String() string { @@ -6852,7 +6702,7 @@ func (*ApiKeyAuth_SecretKey) ProtoMessage() {} func (x *ApiKeyAuth_SecretKey) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[88] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6898,11 +6748,9 @@ type ApiKeyAuth_MetadataEntry struct { func (x *ApiKeyAuth_MetadataEntry) Reset() { *x = ApiKeyAuth_MetadataEntry{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[89] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[89] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyAuth_MetadataEntry) String() string { @@ -6913,7 +6761,7 @@ func (*ApiKeyAuth_MetadataEntry) ProtoMessage() {} func (x *ApiKeyAuth_MetadataEntry) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[89] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6958,11 +6806,9 @@ type AerospikeApiKeyStorageReadModeSc struct { func (x *AerospikeApiKeyStorageReadModeSc) Reset() { *x = AerospikeApiKeyStorageReadModeSc{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[91] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[91] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AerospikeApiKeyStorageReadModeSc) String() string { @@ -6973,7 +6819,7 @@ func (*AerospikeApiKeyStorageReadModeSc) ProtoMessage() {} func (x *AerospikeApiKeyStorageReadModeSc) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[91] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -7077,11 +6923,9 @@ type AerospikeApiKeyStorageReadModeAp struct { func (x *AerospikeApiKeyStorageReadModeAp) Reset() { *x = AerospikeApiKeyStorageReadModeAp{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[92] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[92] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AerospikeApiKeyStorageReadModeAp) String() string { @@ -7092,7 +6936,7 @@ func (*AerospikeApiKeyStorageReadModeAp) ProtoMessage() {} func (x *AerospikeApiKeyStorageReadModeAp) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[92] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -7165,11 +7009,9 @@ type AerospikeApiKeyStorageTlsCurveID struct { func (x *AerospikeApiKeyStorageTlsCurveID) Reset() { *x = AerospikeApiKeyStorageTlsCurveID{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[93] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[93] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AerospikeApiKeyStorageTlsCurveID) String() string { @@ -7180,7 +7022,7 @@ func (*AerospikeApiKeyStorageTlsCurveID) ProtoMessage() {} func (x *AerospikeApiKeyStorageTlsCurveID) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[93] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -7266,18 +7108,16 @@ type Ldap_ConnectionPool struct { unknownFields protoimpl.UnknownFields // Maximum number connections that are pooled at any give time. The default value is 5. - MaxSize *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=maxSize,proto3" json:"maxSize,omitempty"` + MaxSize *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=maxSize,proto3" json:"maxSize,omitempty"` // Number of connections that the pool will be pre-populated with upon initialization. The default value is 2. - InitialSize *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=initialSize,proto3" json:"initialSize,omitempty"` + InitialSize *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=initialSize,proto3" json:"initialSize,omitempty"` } func (x *Ldap_ConnectionPool) Reset() { *x = Ldap_ConnectionPool{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[97] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[97] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Ldap_ConnectionPool) String() string { @@ -7288,7 +7128,7 @@ func (*Ldap_ConnectionPool) ProtoMessage() {} func (x *Ldap_ConnectionPool) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[97] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -7303,14 +7143,14 @@ func (*Ldap_ConnectionPool) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_rawDescGZIP(), []int{38, 0} } -func (x *Ldap_ConnectionPool) GetMaxSize() *wrappers.UInt32Value { +func (x *Ldap_ConnectionPool) GetMaxSize() *wrapperspb.UInt32Value { if x != nil { return x.MaxSize } return nil } -func (x *Ldap_ConnectionPool) GetInitialSize() *wrappers.UInt32Value { +func (x *Ldap_ConnectionPool) GetInitialSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialSize } @@ -7371,11 +7211,9 @@ type PassThroughHttp_Request struct { func (x *PassThroughHttp_Request) Reset() { *x = PassThroughHttp_Request{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[98] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[98] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PassThroughHttp_Request) String() string { @@ -7386,7 +7224,7 @@ func (*PassThroughHttp_Request) ProtoMessage() {} func (x *PassThroughHttp_Request) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[98] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -7470,11 +7308,9 @@ type PassThroughHttp_Response struct { func (x *PassThroughHttp_Response) Reset() { *x = PassThroughHttp_Response{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[99] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[99] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PassThroughHttp_Response) String() string { @@ -7485,7 +7321,7 @@ func (*PassThroughHttp_Response) ProtoMessage() {} func (x *PassThroughHttp_Response) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[99] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -8936,7 +8772,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_p var file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_enumTypes = make([]protoimpl.EnumInfo, 5) var file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes = make([]protoimpl.MessageInfo, 103) -var file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_goTypes = []any{ (Settings_ApiVersion)(0), // 0: enterprise.gloo.solo.io.Settings.ApiVersion (RedisOptions_SocketType)(0), // 1: enterprise.gloo.solo.io.RedisOptions.SocketType (UserSession_CookieOptions_SameSite)(0), // 2: enterprise.gloo.solo.io.UserSession.CookieOptions.SameSite @@ -9045,13 +8881,13 @@ var file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_pr nil, // 105: enterprise.gloo.solo.io.PassThroughHttp.Request.HeadersToAddEntry nil, // 106: enterprise.gloo.solo.io.AuthConfigStatus.SubresourceStatusesEntry nil, // 107: enterprise.gloo.solo.io.AuthConfigNamespacedStatuses.StatusesEntry - (*wrappers.StringValue)(nil), // 108: google.protobuf.StringValue + (*wrapperspb.StringValue)(nil), // 108: google.protobuf.StringValue (*core.ResourceRef)(nil), // 109: core.solo.io.ResourceRef - (*duration.Duration)(nil), // 110: google.protobuf.Duration - (*_struct.Struct)(nil), // 111: google.protobuf.Struct - (*wrappers.BoolValue)(nil), // 112: google.protobuf.BoolValue - (*empty.Empty)(nil), // 113: google.protobuf.Empty - (*wrappers.UInt32Value)(nil), // 114: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 110: google.protobuf.Duration + (*structpb.Struct)(nil), // 111: google.protobuf.Struct + (*wrapperspb.BoolValue)(nil), // 112: google.protobuf.BoolValue + (*emptypb.Empty)(nil), // 113: google.protobuf.Empty + (*wrapperspb.UInt32Value)(nil), // 114: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_depIdxs = []int32{ 54, // 0: enterprise.gloo.solo.io.AuthConfigSpec.configs:type_name -> enterprise.gloo.solo.io.AuthConfigSpec.Config @@ -9222,1031 +9058,45 @@ func file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_p if File_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AuthConfigSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthExtension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Settings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BufferSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CustomAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AuthPlugin); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BasicAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HmacAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SecretRefList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HmacParametersInHeaders); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OAuth2); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RedisOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserSession); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderConfiguration); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DiscoveryOverride); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwksOnDemandCacheRefreshPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AutoMapFromMetadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EndSessionProperties); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ClaimToHeader); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Azure); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OidcAuthorizationCode); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PlainOAuth2); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtValidation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*IntrospectionValidation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AccessTokenValidation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OauthSecret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*K8SSecretApiKeyStorage); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AerospikeApiKeyStorage); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServerDefaultApiKeyStorage); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeySecret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OpaAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OpaAuthOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OpaServerAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Ldap); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LdapServiceAccount); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PassThroughAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BackoffStrategy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PassThroughGrpc); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PassThroughGrpcTLSConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PassThroughHttp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PortalAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AuthConfigStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AuthConfigNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AuthConfigSpec_Config); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpService_Request); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpService_Response); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BasicAuth_Apr); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BasicAuth_EncryptionType); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BasicAuth_User); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BasicAuth_UserList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BasicAuth_Apr_SaltedHashedPassword); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BasicAuth_EncryptionType_Sha1); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BasicAuth_EncryptionType_Apr); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserSession_InternalSession); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserSession_RedisSession); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserSession_CookieOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserSession_CipherConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OidcAuthorizationCode_AccessToken); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OidcAuthorizationCode_IdentityToken); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OidcAuthorizationCode_ClientAuthentication); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OidcAuthorizationCode_Default); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OidcAuthorizationCode_FrontChannelLogout); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OidcAuthorizationCode_ClientAuthentication_ClientSecret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtValidation_RemoteJwks); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtValidation_LocalJwks); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AccessTokenValidation_Default); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[84].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AccessTokenValidation_ScopeList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[88].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyAuth_SecretKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[89].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyAuth_MetadataEntry); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[91].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AerospikeApiKeyStorageReadModeSc); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[92].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AerospikeApiKeyStorageReadModeAp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[93].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AerospikeApiKeyStorageTlsCurveID); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[97].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Ldap_ConnectionPool); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[98].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PassThroughHttp_Request); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[99].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PassThroughHttp_Response); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[1].OneofWrappers = []any{ (*ExtAuthExtension_Disable)(nil), (*ExtAuthExtension_ConfigRef)(nil), (*ExtAuthExtension_CustomAuth)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[2].OneofWrappers = []any{ (*Settings_HttpService)(nil), (*Settings_GrpcService)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[8].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[8].OneofWrappers = []any{ (*BasicAuth_UserList_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[9].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[9].OneofWrappers = []any{ (*HmacAuth_SecretRefs)(nil), (*HmacAuth_ParametersInHeaders)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[13].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[13].OneofWrappers = []any{ (*OAuth2_OidcAuthorizationCode)(nil), (*OAuth2_AccessTokenValidation)(nil), (*OAuth2_Oauth2)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[15].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[15].OneofWrappers = []any{ (*UserSession_Cookie)(nil), (*UserSession_Redis)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[18].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[18].OneofWrappers = []any{ (*JwksOnDemandCacheRefreshPolicy_Never)(nil), (*JwksOnDemandCacheRefreshPolicy_Always)(nil), (*JwksOnDemandCacheRefreshPolicy_MaxIdpReqPerPollingInterval)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[23].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[23].OneofWrappers = []any{ (*OidcAuthorizationCode_Default_)(nil), (*OidcAuthorizationCode_Azure)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[25].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[25].OneofWrappers = []any{ (*JwtValidation_RemoteJwks_)(nil), (*JwtValidation_LocalJwks_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[27].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[27].OneofWrappers = []any{ (*AccessTokenValidation_IntrospectionUrl)(nil), (*AccessTokenValidation_Jwt)(nil), (*AccessTokenValidation_Introspection)(nil), @@ -10254,22 +9104,22 @@ func file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_p (*AccessTokenValidation_Default_)(nil), (*AccessTokenValidation_Azure)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[29].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[29].OneofWrappers = []any{ (*ApiKeyAuth_K8SSecretApikeyStorage)(nil), (*ApiKeyAuth_AerospikeApikeyStorage)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[31].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[31].OneofWrappers = []any{ (*AerospikeApiKeyStorage_CommitAll)(nil), (*AerospikeApiKeyStorage_CommitMaster)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[40].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[40].OneofWrappers = []any{ (*PassThroughAuth_Grpc)(nil), (*PassThroughAuth_Http)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[42].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[42].OneofWrappers = []any{ (*RetryPolicy_RetryBackOff)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[49].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[49].OneofWrappers = []any{ (*AuthConfigSpec_Config_BasicAuth)(nil), (*AuthConfigSpec_Config_Oauth)(nil), (*AuthConfigSpec_Config_Oauth2)(nil), @@ -10283,28 +9133,28 @@ func file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_p (*AuthConfigSpec_Config_OpaServerAuth)(nil), (*AuthConfigSpec_Config_PortalAuth)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[55].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[55].OneofWrappers = []any{ (*BasicAuth_EncryptionType_Apr_)(nil), (*BasicAuth_EncryptionType_Sha1_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[67].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[67].OneofWrappers = []any{ (*UserSession_CipherConfig_KeyRef)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[73].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[73].OneofWrappers = []any{ (*OidcAuthorizationCode_ClientAuthentication_ClientSecret_)(nil), (*OidcAuthorizationCode_ClientAuthentication_PrivateKeyJwt_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[91].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[91].OneofWrappers = []any{ (*AerospikeApiKeyStorageReadModeSc_ReadModeScSession)(nil), (*AerospikeApiKeyStorageReadModeSc_ReadModeScLinearize)(nil), (*AerospikeApiKeyStorageReadModeSc_ReadModeScReplica)(nil), (*AerospikeApiKeyStorageReadModeSc_ReadModeScAllowUnavailable)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[92].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[92].OneofWrappers = []any{ (*AerospikeApiKeyStorageReadModeAp_ReadModeApOne)(nil), (*AerospikeApiKeyStorageReadModeAp_ReadModeApAll)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[93].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_msgTypes[93].OneofWrappers = []any{ (*AerospikeApiKeyStorageTlsCurveID_CurveP256)(nil), (*AerospikeApiKeyStorageTlsCurveID_CurveP384)(nil), (*AerospikeApiKeyStorageTlsCurveID_CurveP521)(nil), diff --git a/pkg/api/enterprise.gloo.solo.io/v1/extauth-internal.pb.clone.go b/pkg/api/enterprise.gloo.solo.io/v1/extauth-internal.pb.clone.go index 1bc5f589e..cbffa2795 100644 --- a/pkg/api/enterprise.gloo.solo.io/v1/extauth-internal.pb.clone.go +++ b/pkg/api/enterprise.gloo.solo.io/v1/extauth-internal.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_empty "github.com/golang/protobuf/ptypes/empty" + google_golang_org_protobuf_types_known_emptypb "google.golang.org/protobuf/types/known/emptypb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -55,9 +55,9 @@ func (m *ExtAuthConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetBooleanExpr()).(clone.Cloner); ok { - target.BooleanExpr = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.BooleanExpr = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.BooleanExpr = proto.Clone(m.GetBooleanExpr()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.BooleanExpr = proto.Clone(m.GetBooleanExpr()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } target.FailOnRedirect = m.GetFailOnRedirect() @@ -509,9 +509,9 @@ func (m *ExtAuthConfig_OidcAuthorizationCodeConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetDiscoveryPollInterval()).(clone.Cloner); ok { - target.DiscoveryPollInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DiscoveryPollInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.DiscoveryPollInterval = proto.Clone(m.GetDiscoveryPollInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DiscoveryPollInterval = proto.Clone(m.GetDiscoveryPollInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetJwksCacheRefreshPolicy()).(clone.Cloner); ok { @@ -617,9 +617,9 @@ func (m *ExtAuthConfig_AccessTokenValidationConfig) Clone() proto.Message { target.UserinfoUrl = m.GetUserinfoUrl() if h, ok := interface{}(m.GetCacheTimeout()).(clone.Cloner); ok { - target.CacheTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.CacheTimeout = proto.Clone(m.GetCacheTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheTimeout = proto.Clone(m.GetCacheTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if m.GetDynamicMetadataFromClaims() != nil { @@ -1093,15 +1093,15 @@ func (m *ExtAuthConfig_PortalAuthConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetCacheDuration()).(clone.Cloner); ok { - target.CacheDuration = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheDuration = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.CacheDuration = proto.Clone(m.GetCacheDuration()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheDuration = proto.Clone(m.GetCacheDuration()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRequestTimeout()).(clone.Cloner); ok { - target.RequestTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -1136,9 +1136,9 @@ func (m *ExtAuthConfig_Config) Clone() proto.Message { target = &ExtAuthConfig_Config{} if h, ok := interface{}(m.GetName()).(clone.Cloner); ok { - target.Name = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Name = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Name = proto.Clone(m.GetName()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Name = proto.Clone(m.GetName()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } switch m.AuthConfig.(type) { @@ -1255,11 +1255,11 @@ func (m *ExtAuthConfig_Config) Clone() proto.Message { if h, ok := interface{}(m.GetJwt()).(clone.Cloner); ok { target.AuthConfig = &ExtAuthConfig_Config_Jwt{ - Jwt: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + Jwt: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.AuthConfig = &ExtAuthConfig_Config_Jwt{ - Jwt: proto.Clone(m.GetJwt()).(*github_com_golang_protobuf_ptypes_empty.Empty), + Jwt: proto.Clone(m.GetJwt()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } @@ -1440,9 +1440,9 @@ func (m *ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConf target.SigningKey = m.GetSigningKey() if h, ok := interface{}(m.GetValidFor()).(clone.Cloner); ok { - target.ValidFor = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ValidFor = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.ValidFor = proto.Clone(m.GetValidFor()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ValidFor = proto.Clone(m.GetValidFor()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -1622,9 +1622,9 @@ func (m *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks) Clo target.Url = m.GetUrl() if h, ok := interface{}(m.GetRefreshInterval()).(clone.Cloner); ok { - target.RefreshInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RefreshInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.RefreshInterval = proto.Clone(m.GetRefreshInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RefreshInterval = proto.Clone(m.GetRefreshInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target diff --git a/pkg/api/enterprise.gloo.solo.io/v1/extauth-internal.pb.go b/pkg/api/enterprise.gloo.solo.io/v1/extauth-internal.pb.go index c3b8b4fa8..6295f0b8f 100644 --- a/pkg/api/enterprise.gloo.solo.io/v1/extauth-internal.pb.go +++ b/pkg/api/enterprise.gloo.solo.io/v1/extauth-internal.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/extauth/v1/extauth-internal.proto @@ -11,10 +11,6 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - empty "github.com/golang/protobuf/ptypes/empty" - _ "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v2 "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2" _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" @@ -24,6 +20,10 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" + _ "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -59,7 +59,7 @@ type ExtAuthConfig struct { // An example config might be: `( basic1 || basic2 || (oidc1 && !oidc2) )` // The boolean expression is evaluated left to right but honors parenthesis and short-circuiting. // Defaults to an empty string, which is interpreted as `and`-ing the configs. - BooleanExpr *wrappers.StringValue `protobuf:"bytes,10,opt,name=boolean_expr,json=booleanExpr,proto3" json:"boolean_expr,omitempty"` + BooleanExpr *wrapperspb.StringValue `protobuf:"bytes,10,opt,name=boolean_expr,json=booleanExpr,proto3" json:"boolean_expr,omitempty"` // How the service should handle a redirect response from an OIDC issuer. In the default false mode, // the redirect will be considered a successful response, and the client will receive a 302 with a location header. // If this is set to true, the client will instead receive a 401 unauthorized response. This is useful in cases where @@ -69,11 +69,9 @@ type ExtAuthConfig struct { func (x *ExtAuthConfig) Reset() { *x = ExtAuthConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig) String() string { @@ -84,7 +82,7 @@ func (*ExtAuthConfig) ProtoMessage() {} func (x *ExtAuthConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -113,7 +111,7 @@ func (x *ExtAuthConfig) GetConfigs() []*ExtAuthConfig_Config { return nil } -func (x *ExtAuthConfig) GetBooleanExpr() *wrappers.StringValue { +func (x *ExtAuthConfig) GetBooleanExpr() *wrapperspb.StringValue { if x != nil { return x.BooleanExpr } @@ -138,11 +136,9 @@ type ApiKeyCreateRequest struct { func (x *ApiKeyCreateRequest) Reset() { *x = ApiKeyCreateRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyCreateRequest) String() string { @@ -153,7 +149,7 @@ func (*ApiKeyCreateRequest) ProtoMessage() {} func (x *ApiKeyCreateRequest) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -192,11 +188,9 @@ type ApiKeyCreateResponse struct { func (x *ApiKeyCreateResponse) Reset() { *x = ApiKeyCreateResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyCreateResponse) String() string { @@ -207,7 +201,7 @@ func (*ApiKeyCreateResponse) ProtoMessage() {} func (x *ApiKeyCreateResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -240,11 +234,9 @@ type ApiKeyReadRequest struct { func (x *ApiKeyReadRequest) Reset() { *x = ApiKeyReadRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyReadRequest) String() string { @@ -255,7 +247,7 @@ func (*ApiKeyReadRequest) ProtoMessage() {} func (x *ApiKeyReadRequest) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -294,11 +286,9 @@ type ApiKeyReadResponse struct { func (x *ApiKeyReadResponse) Reset() { *x = ApiKeyReadResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyReadResponse) String() string { @@ -309,7 +299,7 @@ func (*ApiKeyReadResponse) ProtoMessage() {} func (x *ApiKeyReadResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -343,11 +333,9 @@ type ApiKeyUpdateRequest struct { func (x *ApiKeyUpdateRequest) Reset() { *x = ApiKeyUpdateRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyUpdateRequest) String() string { @@ -358,7 +346,7 @@ func (*ApiKeyUpdateRequest) ProtoMessage() {} func (x *ApiKeyUpdateRequest) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -404,11 +392,9 @@ type ApiKeyUpdateResponse struct { func (x *ApiKeyUpdateResponse) Reset() { *x = ApiKeyUpdateResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyUpdateResponse) String() string { @@ -419,7 +405,7 @@ func (*ApiKeyUpdateResponse) ProtoMessage() {} func (x *ApiKeyUpdateResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -452,11 +438,9 @@ type ApiKeyDeleteRequest struct { func (x *ApiKeyDeleteRequest) Reset() { *x = ApiKeyDeleteRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyDeleteRequest) String() string { @@ -467,7 +451,7 @@ func (*ApiKeyDeleteRequest) ProtoMessage() {} func (x *ApiKeyDeleteRequest) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -504,11 +488,9 @@ type ApiKeyDeleteResponse struct { func (x *ApiKeyDeleteResponse) Reset() { *x = ApiKeyDeleteResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiKeyDeleteResponse) String() string { @@ -519,7 +501,7 @@ func (*ApiKeyDeleteResponse) ProtoMessage() {} func (x *ApiKeyDeleteResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -560,11 +542,9 @@ type ExtAuthConfig_Azure struct { func (x *ExtAuthConfig_Azure) Reset() { *x = ExtAuthConfig_Azure{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_Azure) String() string { @@ -575,7 +555,7 @@ func (*ExtAuthConfig_Azure) ProtoMessage() {} func (x *ExtAuthConfig_Azure) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -634,11 +614,9 @@ type ExtAuthConfig_ClaimToHeader struct { func (x *ExtAuthConfig_ClaimToHeader) Reset() { *x = ExtAuthConfig_ClaimToHeader{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_ClaimToHeader) String() string { @@ -649,7 +627,7 @@ func (*ExtAuthConfig_ClaimToHeader) ProtoMessage() {} func (x *ExtAuthConfig_ClaimToHeader) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -707,11 +685,9 @@ type ExtAuthConfig_BasicAuthInternal struct { func (x *ExtAuthConfig_BasicAuthInternal) Reset() { *x = ExtAuthConfig_BasicAuthInternal{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_BasicAuthInternal) String() string { @@ -722,7 +698,7 @@ func (*ExtAuthConfig_BasicAuthInternal) ProtoMessage() {} func (x *ExtAuthConfig_BasicAuthInternal) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -816,11 +792,9 @@ type ExtAuthConfig_OAuthConfig struct { func (x *ExtAuthConfig_OAuthConfig) Reset() { *x = ExtAuthConfig_OAuthConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OAuthConfig) String() string { @@ -831,7 +805,7 @@ func (*ExtAuthConfig_OAuthConfig) ProtoMessage() {} func (x *ExtAuthConfig_OAuthConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -923,11 +897,9 @@ type ExtAuthConfig_UserSessionConfig struct { func (x *ExtAuthConfig_UserSessionConfig) Reset() { *x = ExtAuthConfig_UserSessionConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_UserSessionConfig) String() string { @@ -938,7 +910,7 @@ func (*ExtAuthConfig_UserSessionConfig) ProtoMessage() {} func (x *ExtAuthConfig_UserSessionConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1084,7 +1056,7 @@ type ExtAuthConfig_OidcAuthorizationCodeConfig struct { DiscoveryOverride *DiscoveryOverride `protobuf:"bytes,11,opt,name=discovery_override,json=discoveryOverride,proto3" json:"discovery_override,omitempty"` // The interval at which OIDC configuration is discovered at /.well-known/openid-configuration // If not specified, the default value is 30 minutes. - DiscoveryPollInterval *duration.Duration `protobuf:"bytes,12,opt,name=discovery_poll_interval,json=discoveryPollInterval,proto3" json:"discovery_poll_interval,omitempty"` + DiscoveryPollInterval *durationpb.Duration `protobuf:"bytes,12,opt,name=discovery_poll_interval,json=discoveryPollInterval,proto3" json:"discovery_poll_interval,omitempty"` // If a user executes a request with a key that is not found in the JWKS, it could be // that the keys have rotated on the remote source, and not yet in the local cache. // This policy lets you define the behavior for how to refresh the local cache during a request @@ -1135,11 +1107,9 @@ type ExtAuthConfig_OidcAuthorizationCodeConfig struct { func (x *ExtAuthConfig_OidcAuthorizationCodeConfig) Reset() { *x = ExtAuthConfig_OidcAuthorizationCodeConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OidcAuthorizationCodeConfig) String() string { @@ -1150,7 +1120,7 @@ func (*ExtAuthConfig_OidcAuthorizationCodeConfig) ProtoMessage() {} func (x *ExtAuthConfig_OidcAuthorizationCodeConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1257,7 +1227,7 @@ func (x *ExtAuthConfig_OidcAuthorizationCodeConfig) GetDiscoveryOverride() *Disc return nil } -func (x *ExtAuthConfig_OidcAuthorizationCodeConfig) GetDiscoveryPollInterval() *duration.Duration { +func (x *ExtAuthConfig_OidcAuthorizationCodeConfig) GetDiscoveryPollInterval() *durationpb.Duration { if x != nil { return x.DiscoveryPollInterval } @@ -1400,7 +1370,7 @@ type ExtAuthConfig_AccessTokenValidationConfig struct { // How long the token introspection and userinfo endpoint response for a specific access token should be kept // in the in-memory cache. The result will be invalidated at this timeout, or at "exp" time from the introspection // result, whichever comes sooner. If omitted, defaults to 10 minutes. If zero, then no caching will be done. - CacheTimeout *duration.Duration `protobuf:"bytes,5,opt,name=cache_timeout,json=cacheTimeout,proto3" json:"cache_timeout,omitempty"` + CacheTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=cache_timeout,json=cacheTimeout,proto3" json:"cache_timeout,omitempty"` // Optional criteria for validating the scopes of a token. // // Types that are assignable to ScopeValidation: @@ -1429,11 +1399,9 @@ type ExtAuthConfig_AccessTokenValidationConfig struct { func (x *ExtAuthConfig_AccessTokenValidationConfig) Reset() { *x = ExtAuthConfig_AccessTokenValidationConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_AccessTokenValidationConfig) String() string { @@ -1444,7 +1412,7 @@ func (*ExtAuthConfig_AccessTokenValidationConfig) ProtoMessage() {} func (x *ExtAuthConfig_AccessTokenValidationConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1495,7 +1463,7 @@ func (x *ExtAuthConfig_AccessTokenValidationConfig) GetUserinfoUrl() string { return "" } -func (x *ExtAuthConfig_AccessTokenValidationConfig) GetCacheTimeout() *duration.Duration { +func (x *ExtAuthConfig_AccessTokenValidationConfig) GetCacheTimeout() *durationpb.Duration { if x != nil { return x.CacheTimeout } @@ -1671,11 +1639,9 @@ type ExtAuthConfig_PlainOAuth2Config struct { func (x *ExtAuthConfig_PlainOAuth2Config) Reset() { *x = ExtAuthConfig_PlainOAuth2Config{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_PlainOAuth2Config) String() string { @@ -1686,7 +1652,7 @@ func (*ExtAuthConfig_PlainOAuth2Config) ProtoMessage() {} func (x *ExtAuthConfig_PlainOAuth2Config) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1815,11 +1781,9 @@ type ExtAuthConfig_OAuth2Config struct { func (x *ExtAuthConfig_OAuth2Config) Reset() { *x = ExtAuthConfig_OAuth2Config{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OAuth2Config) String() string { @@ -1830,7 +1794,7 @@ func (*ExtAuthConfig_OAuth2Config) ProtoMessage() {} func (x *ExtAuthConfig_OAuth2Config) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1940,11 +1904,9 @@ type ExtAuthConfig_ApiKeyAuthConfig struct { func (x *ExtAuthConfig_ApiKeyAuthConfig) Reset() { *x = ExtAuthConfig_ApiKeyAuthConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_ApiKeyAuthConfig) String() string { @@ -1955,7 +1917,7 @@ func (*ExtAuthConfig_ApiKeyAuthConfig) ProtoMessage() {} func (x *ExtAuthConfig_ApiKeyAuthConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2070,11 +2032,9 @@ type ExtAuthConfig_OpaAuthConfig struct { func (x *ExtAuthConfig_OpaAuthConfig) Reset() { *x = ExtAuthConfig_OpaAuthConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OpaAuthConfig) String() string { @@ -2085,7 +2045,7 @@ func (*ExtAuthConfig_OpaAuthConfig) ProtoMessage() {} func (x *ExtAuthConfig_OpaAuthConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2148,11 +2108,9 @@ type ExtAuthConfig_OpaServerAuthConfig struct { func (x *ExtAuthConfig_OpaServerAuthConfig) Reset() { *x = ExtAuthConfig_OpaServerAuthConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OpaServerAuthConfig) String() string { @@ -2163,7 +2121,7 @@ func (*ExtAuthConfig_OpaServerAuthConfig) ProtoMessage() {} func (x *ExtAuthConfig_OpaServerAuthConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2240,11 +2198,9 @@ type ExtAuthConfig_LdapConfig struct { func (x *ExtAuthConfig_LdapConfig) Reset() { *x = ExtAuthConfig_LdapConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_LdapConfig) String() string { @@ -2255,7 +2211,7 @@ func (*ExtAuthConfig_LdapConfig) ProtoMessage() {} func (x *ExtAuthConfig_LdapConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2340,11 +2296,9 @@ type ExtAuthConfig_LdapServiceAccountConfig struct { func (x *ExtAuthConfig_LdapServiceAccountConfig) Reset() { *x = ExtAuthConfig_LdapServiceAccountConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_LdapServiceAccountConfig) String() string { @@ -2355,7 +2309,7 @@ func (*ExtAuthConfig_LdapServiceAccountConfig) ProtoMessage() {} func (x *ExtAuthConfig_LdapServiceAccountConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2410,11 +2364,9 @@ type ExtAuthConfig_HmacAuthConfig struct { func (x *ExtAuthConfig_HmacAuthConfig) Reset() { *x = ExtAuthConfig_HmacAuthConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_HmacAuthConfig) String() string { @@ -2425,7 +2377,7 @@ func (*ExtAuthConfig_HmacAuthConfig) ProtoMessage() {} func (x *ExtAuthConfig_HmacAuthConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2501,18 +2453,16 @@ type ExtAuthConfig_PortalAuthConfig struct { // Options to connect to redis. If not provided, data will be cached in memory. RedisOptions *RedisOptions `protobuf:"bytes,3,opt,name=redis_options,json=redisOptions,proto3" json:"redis_options,omitempty"` // The frequency at which the validated credential data should be refreshed by quering the portal web server. Defaults to 60s - CacheDuration *duration.Duration `protobuf:"bytes,4,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` + CacheDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` // Timeout for the portal web server to respond. Defaults to 200ms - RequestTimeout *duration.Duration `protobuf:"bytes,5,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` } func (x *ExtAuthConfig_PortalAuthConfig) Reset() { *x = ExtAuthConfig_PortalAuthConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_PortalAuthConfig) String() string { @@ -2523,7 +2473,7 @@ func (*ExtAuthConfig_PortalAuthConfig) ProtoMessage() {} func (x *ExtAuthConfig_PortalAuthConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2559,14 +2509,14 @@ func (x *ExtAuthConfig_PortalAuthConfig) GetRedisOptions() *RedisOptions { return nil } -func (x *ExtAuthConfig_PortalAuthConfig) GetCacheDuration() *duration.Duration { +func (x *ExtAuthConfig_PortalAuthConfig) GetCacheDuration() *durationpb.Duration { if x != nil { return x.CacheDuration } return nil } -func (x *ExtAuthConfig_PortalAuthConfig) GetRequestTimeout() *duration.Duration { +func (x *ExtAuthConfig_PortalAuthConfig) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } @@ -2584,11 +2534,9 @@ type ExtAuthConfig_InMemorySecretList struct { func (x *ExtAuthConfig_InMemorySecretList) Reset() { *x = ExtAuthConfig_InMemorySecretList{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_InMemorySecretList) String() string { @@ -2599,7 +2547,7 @@ func (*ExtAuthConfig_InMemorySecretList) ProtoMessage() {} func (x *ExtAuthConfig_InMemorySecretList) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2630,7 +2578,7 @@ type ExtAuthConfig_Config struct { // in logging. If omitted, an automatically generated name will be used (e.g. config_0, of the // pattern 'config_$INDEX_IN_CHAIN'). In the case of plugin auth, this field is ignored in favor of // the name assigned on the plugin config itself. - Name *wrappers.StringValue `protobuf:"bytes,11,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,11,opt,name=name,proto3" json:"name,omitempty"` // Types that are assignable to AuthConfig: // // *ExtAuthConfig_Config_Oauth @@ -2652,11 +2600,9 @@ type ExtAuthConfig_Config struct { func (x *ExtAuthConfig_Config) Reset() { *x = ExtAuthConfig_Config{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_Config) String() string { @@ -2667,7 +2613,7 @@ func (*ExtAuthConfig_Config) ProtoMessage() {} func (x *ExtAuthConfig_Config) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2682,7 +2628,7 @@ func (*ExtAuthConfig_Config) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_rawDescGZIP(), []int{0, 17} } -func (x *ExtAuthConfig_Config) GetName() *wrappers.StringValue { +func (x *ExtAuthConfig_Config) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } @@ -2762,7 +2708,7 @@ func (x *ExtAuthConfig_Config) GetLdapInternal() *ExtAuthConfig_LdapConfig { return nil } -func (x *ExtAuthConfig_Config) GetJwt() *empty.Empty { +func (x *ExtAuthConfig_Config) GetJwt() *emptypb.Empty { if x, ok := x.GetAuthConfig().(*ExtAuthConfig_Config_Jwt); ok { return x.Jwt } @@ -2845,7 +2791,7 @@ type ExtAuthConfig_Config_Jwt struct { // This is a "dummy" extauth service which can be used to support multiple auth mechanisms with JWT authentication. // If Jwt authentication is to be used in the [boolean expression](https://docs.solo.io/gloo-edge/latest/reference/api/github.com/solo-io/solo-apis/api/gloo/enterprise.gloo/v1/auth_config.proto.sk/#authconfig) in an AuthConfig, you can use this auth config type to include Jwt as an Auth config. // In addition, `allow_missing_or_failed_jwt` must be set on the Virtual Host or Route that uses JWT auth or else the JWT filter will short circuit this behaviour. - Jwt *empty.Empty `protobuf:"bytes,12,opt,name=jwt,proto3,oneof"` + Jwt *emptypb.Empty `protobuf:"bytes,12,opt,name=jwt,proto3,oneof"` } type ExtAuthConfig_Config_PassThroughAuth struct { @@ -2907,11 +2853,9 @@ type ExtAuthConfig_BasicAuthInternal_EncryptionType struct { func (x *ExtAuthConfig_BasicAuthInternal_EncryptionType) Reset() { *x = ExtAuthConfig_BasicAuthInternal_EncryptionType{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_BasicAuthInternal_EncryptionType) String() string { @@ -2922,7 +2866,7 @@ func (*ExtAuthConfig_BasicAuthInternal_EncryptionType) ProtoMessage() {} func (x *ExtAuthConfig_BasicAuthInternal_EncryptionType) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2988,11 +2932,9 @@ type ExtAuthConfig_BasicAuthInternal_User struct { func (x *ExtAuthConfig_BasicAuthInternal_User) Reset() { *x = ExtAuthConfig_BasicAuthInternal_User{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_BasicAuthInternal_User) String() string { @@ -3003,7 +2945,7 @@ func (*ExtAuthConfig_BasicAuthInternal_User) ProtoMessage() {} func (x *ExtAuthConfig_BasicAuthInternal_User) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3043,11 +2985,9 @@ type ExtAuthConfig_BasicAuthInternal_UserList struct { func (x *ExtAuthConfig_BasicAuthInternal_UserList) Reset() { *x = ExtAuthConfig_BasicAuthInternal_UserList{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[29] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[29] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_BasicAuthInternal_UserList) String() string { @@ -3058,7 +2998,7 @@ func (*ExtAuthConfig_BasicAuthInternal_UserList) ProtoMessage() {} func (x *ExtAuthConfig_BasicAuthInternal_UserList) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[29] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3088,11 +3028,9 @@ type ExtAuthConfig_BasicAuthInternal_EncryptionType_Sha1 struct { func (x *ExtAuthConfig_BasicAuthInternal_EncryptionType_Sha1) Reset() { *x = ExtAuthConfig_BasicAuthInternal_EncryptionType_Sha1{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[30] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[30] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_BasicAuthInternal_EncryptionType_Sha1) String() string { @@ -3103,7 +3041,7 @@ func (*ExtAuthConfig_BasicAuthInternal_EncryptionType_Sha1) ProtoMessage() {} func (x *ExtAuthConfig_BasicAuthInternal_EncryptionType_Sha1) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[30] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3126,11 +3064,9 @@ type ExtAuthConfig_BasicAuthInternal_EncryptionType_Apr struct { func (x *ExtAuthConfig_BasicAuthInternal_EncryptionType_Apr) Reset() { *x = ExtAuthConfig_BasicAuthInternal_EncryptionType_Apr{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[31] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[31] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_BasicAuthInternal_EncryptionType_Apr) String() string { @@ -3141,7 +3077,7 @@ func (*ExtAuthConfig_BasicAuthInternal_EncryptionType_Apr) ProtoMessage() {} func (x *ExtAuthConfig_BasicAuthInternal_EncryptionType_Apr) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[31] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3168,11 +3104,9 @@ type ExtAuthConfig_UserSessionConfig_CipherConfig struct { func (x *ExtAuthConfig_UserSessionConfig_CipherConfig) Reset() { *x = ExtAuthConfig_UserSessionConfig_CipherConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[34] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_UserSessionConfig_CipherConfig) String() string { @@ -3183,7 +3117,7 @@ func (*ExtAuthConfig_UserSessionConfig_CipherConfig) ProtoMessage() {} func (x *ExtAuthConfig_UserSessionConfig_CipherConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[34] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3215,16 +3149,14 @@ type ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConfig s SigningKey string `protobuf:"bytes,1,opt,name=signing_key,json=signingKey,proto3" json:"signing_key,omitempty"` // Amount of time for which the JWT is valid. No maximum is enforced, but different IDPs may impose limits on how far in // the future the expiration time is allowed to be. Defaults in 5s in front end, but expected to be set explicitly here - ValidFor *duration.Duration `protobuf:"bytes,2,opt,name=valid_for,json=validFor,proto3" json:"valid_for,omitempty"` + ValidFor *durationpb.Duration `protobuf:"bytes,2,opt,name=valid_for,json=validFor,proto3" json:"valid_for,omitempty"` } func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConfig) Reset() { *x = ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[37] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[37] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConfig) String() string { @@ -3235,7 +3167,7 @@ func (*ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConfig func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[37] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3257,7 +3189,7 @@ func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConf return "" } -func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConfig) GetValidFor() *duration.Duration { +func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConfig) GetValidFor() *durationpb.Duration { if x != nil { return x.ValidFor } @@ -3276,11 +3208,9 @@ type ExtAuthConfig_OidcAuthorizationCodeConfig_AccessToken struct { func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_AccessToken) Reset() { *x = ExtAuthConfig_OidcAuthorizationCodeConfig_AccessToken{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[38] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[38] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_AccessToken) String() string { @@ -3291,7 +3221,7 @@ func (*ExtAuthConfig_OidcAuthorizationCodeConfig_AccessToken) ProtoMessage() {} func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_AccessToken) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[38] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3325,11 +3255,9 @@ type ExtAuthConfig_OidcAuthorizationCodeConfig_IdentityToken struct { func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_IdentityToken) Reset() { *x = ExtAuthConfig_OidcAuthorizationCodeConfig_IdentityToken{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[39] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[39] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_IdentityToken) String() string { @@ -3340,7 +3268,7 @@ func (*ExtAuthConfig_OidcAuthorizationCodeConfig_IdentityToken) ProtoMessage() { func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_IdentityToken) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[39] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3371,11 +3299,9 @@ type ExtAuthConfig_OidcAuthorizationCodeConfig_Default struct { func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_Default) Reset() { *x = ExtAuthConfig_OidcAuthorizationCodeConfig_Default{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[40] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[40] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_Default) String() string { @@ -3386,7 +3312,7 @@ func (*ExtAuthConfig_OidcAuthorizationCodeConfig_Default) ProtoMessage() {} func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_Default) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[40] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3413,11 +3339,9 @@ type ExtAuthConfig_OidcAuthorizationCodeConfig_FrontChannelLogout struct { func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_FrontChannelLogout) Reset() { *x = ExtAuthConfig_OidcAuthorizationCodeConfig_FrontChannelLogout{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[41] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[41] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_FrontChannelLogout) String() string { @@ -3428,7 +3352,7 @@ func (*ExtAuthConfig_OidcAuthorizationCodeConfig_FrontChannelLogout) ProtoMessag func (x *ExtAuthConfig_OidcAuthorizationCodeConfig_FrontChannelLogout) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[41] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3485,11 +3409,9 @@ type ExtAuthConfig_AccessTokenValidationConfig_JwtValidation struct { func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation) Reset() { *x = ExtAuthConfig_AccessTokenValidationConfig_JwtValidation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[43] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[43] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation) String() string { @@ -3500,7 +3422,7 @@ func (*ExtAuthConfig_AccessTokenValidationConfig_JwtValidation) ProtoMessage() { func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[43] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3595,11 +3517,9 @@ type ExtAuthConfig_AccessTokenValidationConfig_IntrospectionValidation struct { func (x *ExtAuthConfig_AccessTokenValidationConfig_IntrospectionValidation) Reset() { *x = ExtAuthConfig_AccessTokenValidationConfig_IntrospectionValidation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[44] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[44] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_AccessTokenValidationConfig_IntrospectionValidation) String() string { @@ -3610,7 +3530,7 @@ func (*ExtAuthConfig_AccessTokenValidationConfig_IntrospectionValidation) ProtoM func (x *ExtAuthConfig_AccessTokenValidationConfig_IntrospectionValidation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[44] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3663,11 +3583,9 @@ type ExtAuthConfig_AccessTokenValidationConfig_ScopeList struct { func (x *ExtAuthConfig_AccessTokenValidationConfig_ScopeList) Reset() { *x = ExtAuthConfig_AccessTokenValidationConfig_ScopeList{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[45] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[45] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_AccessTokenValidationConfig_ScopeList) String() string { @@ -3678,7 +3596,7 @@ func (*ExtAuthConfig_AccessTokenValidationConfig_ScopeList) ProtoMessage() {} func (x *ExtAuthConfig_AccessTokenValidationConfig_ScopeList) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[45] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3709,11 +3627,9 @@ type ExtAuthConfig_AccessTokenValidationConfig_Default struct { func (x *ExtAuthConfig_AccessTokenValidationConfig_Default) Reset() { *x = ExtAuthConfig_AccessTokenValidationConfig_Default{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[47] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[47] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_AccessTokenValidationConfig_Default) String() string { @@ -3724,7 +3640,7 @@ func (*ExtAuthConfig_AccessTokenValidationConfig_Default) ProtoMessage() {} func (x *ExtAuthConfig_AccessTokenValidationConfig_Default) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[47] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3749,16 +3665,14 @@ type ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks struct { Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` // The frequency at which the JWKS should be refreshed. // If not specified, the default value is 5 minutes. - RefreshInterval *duration.Duration `protobuf:"bytes,2,opt,name=refresh_interval,json=refreshInterval,proto3" json:"refresh_interval,omitempty"` + RefreshInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=refresh_interval,json=refreshInterval,proto3" json:"refresh_interval,omitempty"` } func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks) Reset() { *x = ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[48] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[48] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks) String() string { @@ -3769,7 +3683,7 @@ func (*ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks) Proto func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[48] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3791,7 +3705,7 @@ func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks) Get return "" } -func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks) GetRefreshInterval() *duration.Duration { +func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks) GetRefreshInterval() *durationpb.Duration { if x != nil { return x.RefreshInterval } @@ -3810,11 +3724,9 @@ type ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_LocalJwks struct { func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_LocalJwks) Reset() { *x = ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_LocalJwks{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[49] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[49] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_LocalJwks) String() string { @@ -3825,7 +3737,7 @@ func (*ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_LocalJwks) ProtoM func (x *ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_LocalJwks) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[49] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3860,11 +3772,9 @@ type ExtAuthConfig_ApiKeyAuthConfig_KeyMetadata struct { func (x *ExtAuthConfig_ApiKeyAuthConfig_KeyMetadata) Reset() { *x = ExtAuthConfig_ApiKeyAuthConfig_KeyMetadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[52] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[52] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtAuthConfig_ApiKeyAuthConfig_KeyMetadata) String() string { @@ -3875,7 +3785,7 @@ func (*ExtAuthConfig_ApiKeyAuthConfig_KeyMetadata) ProtoMessage() {} func (x *ExtAuthConfig_ApiKeyAuthConfig_KeyMetadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[52] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4854,7 +4764,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extau } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes = make([]protoimpl.MessageInfo, 58) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_goTypes = []any{ (*ExtAuthConfig)(nil), // 0: enterprise.gloo.solo.io.ExtAuthConfig (*ApiKeyCreateRequest)(nil), // 1: enterprise.gloo.solo.io.ApiKeyCreateRequest (*ApiKeyCreateResponse)(nil), // 2: enterprise.gloo.solo.io.ApiKeyCreateResponse @@ -4913,7 +4823,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extaut nil, // 55: enterprise.gloo.solo.io.ExtAuthConfig.ApiKeyAuthConfig.KeyMetadata.MetadataEntry nil, // 56: enterprise.gloo.solo.io.ExtAuthConfig.OpaAuthConfig.ModulesEntry nil, // 57: enterprise.gloo.solo.io.ExtAuthConfig.InMemorySecretList.SecretListEntry - (*wrappers.StringValue)(nil), // 58: google.protobuf.StringValue + (*wrapperspb.StringValue)(nil), // 58: google.protobuf.StringValue (*ApiKey)(nil), // 59: enterprise.gloo.solo.io.ApiKey (*RedisOptions)(nil), // 60: enterprise.gloo.solo.io.RedisOptions (*UserSession_CookieOptions)(nil), // 61: enterprise.gloo.solo.io.UserSession.CookieOptions @@ -4922,7 +4832,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extaut (*UserSession)(nil), // 64: enterprise.gloo.solo.io.UserSession (*HeaderConfiguration)(nil), // 65: enterprise.gloo.solo.io.HeaderConfiguration (*DiscoveryOverride)(nil), // 66: enterprise.gloo.solo.io.DiscoveryOverride - (*duration.Duration)(nil), // 67: google.protobuf.Duration + (*durationpb.Duration)(nil), // 67: google.protobuf.Duration (*JwksOnDemandCacheRefreshPolicy)(nil), // 68: enterprise.gloo.solo.io.JwksOnDemandCacheRefreshPolicy (*AutoMapFromMetadata)(nil), // 69: enterprise.gloo.solo.io.AutoMapFromMetadata (*EndSessionProperties)(nil), // 70: enterprise.gloo.solo.io.EndSessionProperties @@ -4935,7 +4845,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extaut (*BasicAuth)(nil), // 77: enterprise.gloo.solo.io.BasicAuth (*AuthPlugin)(nil), // 78: enterprise.gloo.solo.io.AuthPlugin (*Ldap)(nil), // 79: enterprise.gloo.solo.io.Ldap - (*empty.Empty)(nil), // 80: google.protobuf.Empty + (*emptypb.Empty)(nil), // 80: google.protobuf.Empty (*PassThroughAuth)(nil), // 81: enterprise.gloo.solo.io.PassThroughAuth (*v2.DiscoveryRequest)(nil), // 82: envoy.api.v2.DiscoveryRequest (*v2.DeltaDiscoveryRequest)(nil), // 83: envoy.api.v2.DeltaDiscoveryRequest @@ -5062,560 +4972,18 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extau return } file_github_com_solo_io_solo_apis_api_gloo_enterprise_gloo_v1_auth_config_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyCreateRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyCreateResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyReadRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyReadResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyUpdateRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyUpdateResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyDeleteRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiKeyDeleteResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_Azure); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_ClaimToHeader); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_BasicAuthInternal); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OAuthConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_UserSessionConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OidcAuthorizationCodeConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_AccessTokenValidationConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_PlainOAuth2Config); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OAuth2Config); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_ApiKeyAuthConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OpaAuthConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OpaServerAuthConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_LdapConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_LdapServiceAccountConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_HmacAuthConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_PortalAuthConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_InMemorySecretList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_Config); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_BasicAuthInternal_EncryptionType); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_BasicAuthInternal_User); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_BasicAuthInternal_UserList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_BasicAuthInternal_EncryptionType_Sha1); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_BasicAuthInternal_EncryptionType_Apr); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_UserSessionConfig_CipherConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OidcAuthorizationCodeConfig_PkJwtClientAuthenticationConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OidcAuthorizationCodeConfig_AccessToken); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OidcAuthorizationCodeConfig_IdentityToken); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OidcAuthorizationCodeConfig_Default); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_OidcAuthorizationCodeConfig_FrontChannelLogout); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_AccessTokenValidationConfig_JwtValidation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_AccessTokenValidationConfig_IntrospectionValidation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_AccessTokenValidationConfig_ScopeList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_AccessTokenValidationConfig_Default); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_LocalJwks); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtAuthConfig_ApiKeyAuthConfig_KeyMetadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[11].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[11].OneofWrappers = []any{ (*ExtAuthConfig_BasicAuthInternal_UserList_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[13].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[13].OneofWrappers = []any{ (*ExtAuthConfig_UserSessionConfig_Cookie)(nil), (*ExtAuthConfig_UserSessionConfig_Redis)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[14].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[14].OneofWrappers = []any{ (*ExtAuthConfig_OidcAuthorizationCodeConfig_Default_)(nil), (*ExtAuthConfig_OidcAuthorizationCodeConfig_Azure)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[15].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[15].OneofWrappers = []any{ (*ExtAuthConfig_AccessTokenValidationConfig_IntrospectionUrl)(nil), (*ExtAuthConfig_AccessTokenValidationConfig_Jwt)(nil), (*ExtAuthConfig_AccessTokenValidationConfig_Introspection)(nil), @@ -5623,21 +4991,21 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extau (*ExtAuthConfig_AccessTokenValidationConfig_Default_)(nil), (*ExtAuthConfig_AccessTokenValidationConfig_Azure)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[17].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[17].OneofWrappers = []any{ (*ExtAuthConfig_OAuth2Config_OidcAuthorizationCode)(nil), (*ExtAuthConfig_OAuth2Config_AccessTokenValidationConfig)(nil), (*ExtAuthConfig_OAuth2Config_Oauth2Config)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[18].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[18].OneofWrappers = []any{ (*ExtAuthConfig_ApiKeyAuthConfig_K8SSecretApikeyStorage)(nil), (*ExtAuthConfig_ApiKeyAuthConfig_AerospikeApikeyStorage)(nil), (*ExtAuthConfig_ApiKeyAuthConfig_ServerDefaultApikeyStorage)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[23].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[23].OneofWrappers = []any{ (*ExtAuthConfig_HmacAuthConfig_SecretList)(nil), (*ExtAuthConfig_HmacAuthConfig_ParametersInHeaders)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[26].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[26].OneofWrappers = []any{ (*ExtAuthConfig_Config_Oauth)(nil), (*ExtAuthConfig_Config_Oauth2)(nil), (*ExtAuthConfig_Config_BasicAuth)(nil), @@ -5653,11 +5021,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extau (*ExtAuthConfig_Config_OpaServerAuth)(nil), (*ExtAuthConfig_Config_PortalAuth)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[27].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[27].OneofWrappers = []any{ (*ExtAuthConfig_BasicAuthInternal_EncryptionType_Apr_)(nil), (*ExtAuthConfig_BasicAuthInternal_EncryptionType_Sha1_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[43].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extauth_v1_extauth_internal_proto_msgTypes[43].OneofWrappers = []any{ (*ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_RemoteJwks_)(nil), (*ExtAuthConfig_AccessTokenValidationConfig_JwtValidation_LocalJwks_)(nil), } diff --git a/pkg/api/fed.enterprise.gloo.solo.io/v1/types/auth_config.pb.go b/pkg/api/fed.enterprise.gloo.solo.io/v1/types/auth_config.pb.go index 24be52dc0..260592c62 100644 --- a/pkg/api/fed.enterprise.gloo.solo.io/v1/types/auth_config.pb.go +++ b/pkg/api/fed.enterprise.gloo.solo.io/v1/types/auth_config.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.enterprise.gloo/v1/auth_config.proto @@ -39,11 +39,9 @@ type FederatedAuthConfigSpec struct { func (x *FederatedAuthConfigSpec) Reset() { *x = FederatedAuthConfigSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedAuthConfigSpec) String() string { @@ -54,7 +52,7 @@ func (*FederatedAuthConfigSpec) ProtoMessage() {} func (x *FederatedAuthConfigSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -94,11 +92,9 @@ type FederatedAuthConfigStatus struct { func (x *FederatedAuthConfigStatus) Reset() { *x = FederatedAuthConfigStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedAuthConfigStatus) String() string { @@ -109,7 +105,7 @@ func (*FederatedAuthConfigStatus) ProtoMessage() {} func (x *FederatedAuthConfigStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -149,11 +145,9 @@ type FederatedAuthConfigSpec_Template struct { func (x *FederatedAuthConfigSpec_Template) Reset() { *x = FederatedAuthConfigSpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedAuthConfigSpec_Template) String() string { @@ -164,7 +158,7 @@ func (*FederatedAuthConfigSpec_Template) ProtoMessage() {} func (x *FederatedAuthConfigSpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -284,7 +278,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_ } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_goTypes = []any{ (*FederatedAuthConfigSpec)(nil), // 0: fed.enterprise.gloo.solo.io.FederatedAuthConfigSpec (*FederatedAuthConfigStatus)(nil), // 1: fed.enterprise.gloo.solo.io.FederatedAuthConfigStatus (*FederatedAuthConfigSpec_Template)(nil), // 2: fed.enterprise.gloo.solo.io.FederatedAuthConfigSpec.Template @@ -316,44 +310,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_ if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedAuthConfigSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedAuthConfigStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_enterprise_gloo_v1_auth_config_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedAuthConfigSpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.gateway.solo.io/v1/types/gateway.pb.go b/pkg/api/fed.gateway.solo.io/v1/types/gateway.pb.go index e4072ee4d..3f4c8d9cb 100644 --- a/pkg/api/fed.gateway.solo.io/v1/types/gateway.pb.go +++ b/pkg/api/fed.gateway.solo.io/v1/types/gateway.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gateway/v1/gateway.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/fed.solo.io/core/v1" v11 "github.com/solo-io/solo-apis/pkg/api/gateway.solo.io/v1" types "github.com/solo-io/solo-apis/pkg/api/multicluster.solo.io/v1alpha1/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -40,11 +40,9 @@ type FederatedGatewaySpec struct { func (x *FederatedGatewaySpec) Reset() { *x = FederatedGatewaySpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedGatewaySpec) String() string { @@ -55,7 +53,7 @@ func (*FederatedGatewaySpec) ProtoMessage() {} func (x *FederatedGatewaySpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -95,11 +93,9 @@ type FederatedGatewayStatus struct { func (x *FederatedGatewayStatus) Reset() { *x = FederatedGatewayStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedGatewayStatus) String() string { @@ -110,7 +106,7 @@ func (*FederatedGatewayStatus) ProtoMessage() {} func (x *FederatedGatewayStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -150,11 +146,9 @@ type FederatedGatewaySpec_Template struct { func (x *FederatedGatewaySpec_Template) Reset() { *x = FederatedGatewaySpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedGatewaySpec_Template) String() string { @@ -165,7 +159,7 @@ func (*FederatedGatewaySpec_Template) ProtoMessage() {} func (x *FederatedGatewaySpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -282,7 +276,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_goTypes = []any{ (*FederatedGatewaySpec)(nil), // 0: fed.gateway.solo.io.FederatedGatewaySpec (*FederatedGatewayStatus)(nil), // 1: fed.gateway.solo.io.FederatedGatewayStatus (*FederatedGatewaySpec_Template)(nil), // 2: fed.gateway.solo.io.FederatedGatewaySpec.Template @@ -312,44 +306,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedGatewaySpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedGatewayStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_gateway_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedGatewaySpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.gateway.solo.io/v1/types/matchable_http_gateway.pb.go b/pkg/api/fed.gateway.solo.io/v1/types/matchable_http_gateway.pb.go index 0bf75a196..68a661ff2 100644 --- a/pkg/api/fed.gateway.solo.io/v1/types/matchable_http_gateway.pb.go +++ b/pkg/api/fed.gateway.solo.io/v1/types/matchable_http_gateway.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gateway/v1/matchable_http_gateway.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/fed.solo.io/core/v1" v11 "github.com/solo-io/solo-apis/pkg/api/gateway.solo.io/v1" types "github.com/solo-io/solo-apis/pkg/api/multicluster.solo.io/v1alpha1/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -40,11 +40,9 @@ type FederatedMatchableHttpGatewaySpec struct { func (x *FederatedMatchableHttpGatewaySpec) Reset() { *x = FederatedMatchableHttpGatewaySpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedMatchableHttpGatewaySpec) String() string { @@ -55,7 +53,7 @@ func (*FederatedMatchableHttpGatewaySpec) ProtoMessage() {} func (x *FederatedMatchableHttpGatewaySpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -95,11 +93,9 @@ type FederatedMatchableHttpGatewayStatus struct { func (x *FederatedMatchableHttpGatewayStatus) Reset() { *x = FederatedMatchableHttpGatewayStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedMatchableHttpGatewayStatus) String() string { @@ -110,7 +106,7 @@ func (*FederatedMatchableHttpGatewayStatus) ProtoMessage() {} func (x *FederatedMatchableHttpGatewayStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -150,11 +146,9 @@ type FederatedMatchableHttpGatewaySpec_Template struct { func (x *FederatedMatchableHttpGatewaySpec_Template) Reset() { *x = FederatedMatchableHttpGatewaySpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedMatchableHttpGatewaySpec_Template) String() string { @@ -165,7 +159,7 @@ func (*FederatedMatchableHttpGatewaySpec_Template) ProtoMessage() {} func (x *FederatedMatchableHttpGatewaySpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -288,7 +282,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_htt } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_goTypes = []any{ (*FederatedMatchableHttpGatewaySpec)(nil), // 0: fed.gateway.solo.io.FederatedMatchableHttpGatewaySpec (*FederatedMatchableHttpGatewayStatus)(nil), // 1: fed.gateway.solo.io.FederatedMatchableHttpGatewayStatus (*FederatedMatchableHttpGatewaySpec_Template)(nil), // 2: fed.gateway.solo.io.FederatedMatchableHttpGatewaySpec.Template @@ -320,44 +314,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_htt if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedMatchableHttpGatewaySpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedMatchableHttpGatewayStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_http_gateway_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedMatchableHttpGatewaySpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.gateway.solo.io/v1/types/matchable_tcp_gateway.pb.go b/pkg/api/fed.gateway.solo.io/v1/types/matchable_tcp_gateway.pb.go index 754f82be9..e7a575534 100644 --- a/pkg/api/fed.gateway.solo.io/v1/types/matchable_tcp_gateway.pb.go +++ b/pkg/api/fed.gateway.solo.io/v1/types/matchable_tcp_gateway.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gateway/v1/matchable_tcp_gateway.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/fed.solo.io/core/v1" v11 "github.com/solo-io/solo-apis/pkg/api/gateway.solo.io/v1" types "github.com/solo-io/solo-apis/pkg/api/multicluster.solo.io/v1alpha1/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -40,11 +40,9 @@ type FederatedMatchableTcpGatewaySpec struct { func (x *FederatedMatchableTcpGatewaySpec) Reset() { *x = FederatedMatchableTcpGatewaySpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedMatchableTcpGatewaySpec) String() string { @@ -55,7 +53,7 @@ func (*FederatedMatchableTcpGatewaySpec) ProtoMessage() {} func (x *FederatedMatchableTcpGatewaySpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -95,11 +93,9 @@ type FederatedMatchableTcpGatewayStatus struct { func (x *FederatedMatchableTcpGatewayStatus) Reset() { *x = FederatedMatchableTcpGatewayStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedMatchableTcpGatewayStatus) String() string { @@ -110,7 +106,7 @@ func (*FederatedMatchableTcpGatewayStatus) ProtoMessage() {} func (x *FederatedMatchableTcpGatewayStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -150,11 +146,9 @@ type FederatedMatchableTcpGatewaySpec_Template struct { func (x *FederatedMatchableTcpGatewaySpec_Template) Reset() { *x = FederatedMatchableTcpGatewaySpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedMatchableTcpGatewaySpec_Template) String() string { @@ -165,7 +159,7 @@ func (*FederatedMatchableTcpGatewaySpec_Template) ProtoMessage() {} func (x *FederatedMatchableTcpGatewaySpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -287,7 +281,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_goTypes = []any{ (*FederatedMatchableTcpGatewaySpec)(nil), // 0: fed.gateway.solo.io.FederatedMatchableTcpGatewaySpec (*FederatedMatchableTcpGatewayStatus)(nil), // 1: fed.gateway.solo.io.FederatedMatchableTcpGatewayStatus (*FederatedMatchableTcpGatewaySpec_Template)(nil), // 2: fed.gateway.solo.io.FederatedMatchableTcpGatewaySpec.Template @@ -319,44 +313,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedMatchableTcpGatewaySpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedMatchableTcpGatewayStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_matchable_tcp_gateway_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedMatchableTcpGatewaySpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.gateway.solo.io/v1/types/route_table.pb.go b/pkg/api/fed.gateway.solo.io/v1/types/route_table.pb.go index 7164d9a90..9399a81e3 100644 --- a/pkg/api/fed.gateway.solo.io/v1/types/route_table.pb.go +++ b/pkg/api/fed.gateway.solo.io/v1/types/route_table.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gateway/v1/route_table.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/fed.solo.io/core/v1" v11 "github.com/solo-io/solo-apis/pkg/api/gateway.solo.io/v1" types "github.com/solo-io/solo-apis/pkg/api/multicluster.solo.io/v1alpha1/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -40,11 +40,9 @@ type FederatedRouteTableSpec struct { func (x *FederatedRouteTableSpec) Reset() { *x = FederatedRouteTableSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedRouteTableSpec) String() string { @@ -55,7 +53,7 @@ func (*FederatedRouteTableSpec) ProtoMessage() {} func (x *FederatedRouteTableSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -95,11 +93,9 @@ type FederatedRouteTableStatus struct { func (x *FederatedRouteTableStatus) Reset() { *x = FederatedRouteTableStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedRouteTableStatus) String() string { @@ -110,7 +106,7 @@ func (*FederatedRouteTableStatus) ProtoMessage() {} func (x *FederatedRouteTableStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -150,11 +146,9 @@ type FederatedRouteTableSpec_Template struct { func (x *FederatedRouteTableSpec_Template) Reset() { *x = FederatedRouteTableSpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedRouteTableSpec_Template) String() string { @@ -165,7 +159,7 @@ func (*FederatedRouteTableSpec_Template) ProtoMessage() {} func (x *FederatedRouteTableSpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -283,7 +277,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_p } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_goTypes = []any{ (*FederatedRouteTableSpec)(nil), // 0: fed.gateway.solo.io.FederatedRouteTableSpec (*FederatedRouteTableStatus)(nil), // 1: fed.gateway.solo.io.FederatedRouteTableStatus (*FederatedRouteTableSpec_Template)(nil), // 2: fed.gateway.solo.io.FederatedRouteTableSpec.Template @@ -313,44 +307,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_p if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedRouteTableSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedRouteTableStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_route_table_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedRouteTableSpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.gateway.solo.io/v1/types/virtual_service.pb.go b/pkg/api/fed.gateway.solo.io/v1/types/virtual_service.pb.go index 405fe92d6..c1ea688ab 100644 --- a/pkg/api/fed.gateway.solo.io/v1/types/virtual_service.pb.go +++ b/pkg/api/fed.gateway.solo.io/v1/types/virtual_service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gateway/v1/virtual_service.proto @@ -39,11 +39,9 @@ type FederatedVirtualServiceSpec struct { func (x *FederatedVirtualServiceSpec) Reset() { *x = FederatedVirtualServiceSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedVirtualServiceSpec) String() string { @@ -54,7 +52,7 @@ func (*FederatedVirtualServiceSpec) ProtoMessage() {} func (x *FederatedVirtualServiceSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -94,11 +92,9 @@ type FederatedVirtualServiceStatus struct { func (x *FederatedVirtualServiceStatus) Reset() { *x = FederatedVirtualServiceStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedVirtualServiceStatus) String() string { @@ -109,7 +105,7 @@ func (*FederatedVirtualServiceStatus) ProtoMessage() {} func (x *FederatedVirtualServiceStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -149,11 +145,9 @@ type FederatedVirtualServiceSpec_Template struct { func (x *FederatedVirtualServiceSpec_Template) Reset() { *x = FederatedVirtualServiceSpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedVirtualServiceSpec_Template) String() string { @@ -164,7 +158,7 @@ func (*FederatedVirtualServiceSpec_Template) ProtoMessage() {} func (x *FederatedVirtualServiceSpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -282,7 +276,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_servi } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_goTypes = []any{ (*FederatedVirtualServiceSpec)(nil), // 0: fed.gateway.solo.io.FederatedVirtualServiceSpec (*FederatedVirtualServiceStatus)(nil), // 1: fed.gateway.solo.io.FederatedVirtualServiceStatus (*FederatedVirtualServiceSpec_Template)(nil), // 2: fed.gateway.solo.io.FederatedVirtualServiceSpec.Template @@ -314,44 +308,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_servi if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedVirtualServiceSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedVirtualServiceStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gateway_v1_virtual_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedVirtualServiceSpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.gloo.solo.io/v1/types/settings.pb.go b/pkg/api/fed.gloo.solo.io/v1/types/settings.pb.go index 7eea1c915..1df9846fc 100644 --- a/pkg/api/fed.gloo.solo.io/v1/types/settings.pb.go +++ b/pkg/api/fed.gloo.solo.io/v1/types/settings.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gloo/v1/settings.proto @@ -39,11 +39,9 @@ type FederatedSettingsSpec struct { func (x *FederatedSettingsSpec) Reset() { *x = FederatedSettingsSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedSettingsSpec) String() string { @@ -54,7 +52,7 @@ func (*FederatedSettingsSpec) ProtoMessage() {} func (x *FederatedSettingsSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -94,11 +92,9 @@ type FederatedSettingsStatus struct { func (x *FederatedSettingsStatus) Reset() { *x = FederatedSettingsStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedSettingsStatus) String() string { @@ -109,7 +105,7 @@ func (*FederatedSettingsStatus) ProtoMessage() {} func (x *FederatedSettingsStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -149,11 +145,9 @@ type FederatedSettingsSpec_Template struct { func (x *FederatedSettingsSpec_Template) Reset() { *x = FederatedSettingsSpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedSettingsSpec_Template) String() string { @@ -164,7 +158,7 @@ func (*FederatedSettingsSpec_Template) ProtoMessage() {} func (x *FederatedSettingsSpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -278,7 +272,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_r } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_goTypes = []any{ (*FederatedSettingsSpec)(nil), // 0: fed.gloo.solo.io.FederatedSettingsSpec (*FederatedSettingsStatus)(nil), // 1: fed.gloo.solo.io.FederatedSettingsStatus (*FederatedSettingsSpec_Template)(nil), // 2: fed.gloo.solo.io.FederatedSettingsSpec.Template @@ -308,44 +302,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_i if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedSettingsSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedSettingsStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_settings_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedSettingsSpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.gloo.solo.io/v1/types/upstream.pb.go b/pkg/api/fed.gloo.solo.io/v1/types/upstream.pb.go index e82d6848c..28e72c030 100644 --- a/pkg/api/fed.gloo.solo.io/v1/types/upstream.pb.go +++ b/pkg/api/fed.gloo.solo.io/v1/types/upstream.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gloo/v1/upstream.proto @@ -39,11 +39,9 @@ type FederatedUpstreamSpec struct { func (x *FederatedUpstreamSpec) Reset() { *x = FederatedUpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedUpstreamSpec) String() string { @@ -54,7 +52,7 @@ func (*FederatedUpstreamSpec) ProtoMessage() {} func (x *FederatedUpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -94,11 +92,9 @@ type FederatedUpstreamStatus struct { func (x *FederatedUpstreamStatus) Reset() { *x = FederatedUpstreamStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedUpstreamStatus) String() string { @@ -109,7 +105,7 @@ func (*FederatedUpstreamStatus) ProtoMessage() {} func (x *FederatedUpstreamStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -149,11 +145,9 @@ type FederatedUpstreamSpec_Template struct { func (x *FederatedUpstreamSpec_Template) Reset() { *x = FederatedUpstreamSpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedUpstreamSpec_Template) String() string { @@ -164,7 +158,7 @@ func (*FederatedUpstreamSpec_Template) ProtoMessage() {} func (x *FederatedUpstreamSpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -278,7 +272,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_r } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_goTypes = []any{ (*FederatedUpstreamSpec)(nil), // 0: fed.gloo.solo.io.FederatedUpstreamSpec (*FederatedUpstreamStatus)(nil), // 1: fed.gloo.solo.io.FederatedUpstreamStatus (*FederatedUpstreamSpec_Template)(nil), // 2: fed.gloo.solo.io.FederatedUpstreamSpec.Template @@ -308,44 +302,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_i if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedUpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedUpstreamStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedUpstreamSpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.gloo.solo.io/v1/types/upstream_group.pb.go b/pkg/api/fed.gloo.solo.io/v1/types/upstream_group.pb.go index 08559f63a..997b55e2c 100644 --- a/pkg/api/fed.gloo.solo.io/v1/types/upstream_group.pb.go +++ b/pkg/api/fed.gloo.solo.io/v1/types/upstream_group.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gloo/v1/upstream_group.proto @@ -39,11 +39,9 @@ type FederatedUpstreamGroupSpec struct { func (x *FederatedUpstreamGroupSpec) Reset() { *x = FederatedUpstreamGroupSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedUpstreamGroupSpec) String() string { @@ -54,7 +52,7 @@ func (*FederatedUpstreamGroupSpec) ProtoMessage() {} func (x *FederatedUpstreamGroupSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -94,11 +92,9 @@ type FederatedUpstreamGroupStatus struct { func (x *FederatedUpstreamGroupStatus) Reset() { *x = FederatedUpstreamGroupStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedUpstreamGroupStatus) String() string { @@ -109,7 +105,7 @@ func (*FederatedUpstreamGroupStatus) ProtoMessage() {} func (x *FederatedUpstreamGroupStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -149,11 +145,9 @@ type FederatedUpstreamGroupSpec_Template struct { func (x *FederatedUpstreamGroupSpec_Template) Reset() { *x = FederatedUpstreamGroupSpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedUpstreamGroupSpec_Template) String() string { @@ -164,7 +158,7 @@ func (*FederatedUpstreamGroupSpec_Template) ProtoMessage() {} func (x *FederatedUpstreamGroupSpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -280,7 +274,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_p } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_goTypes = []any{ (*FederatedUpstreamGroupSpec)(nil), // 0: fed.gloo.solo.io.FederatedUpstreamGroupSpec (*FederatedUpstreamGroupStatus)(nil), // 1: fed.gloo.solo.io.FederatedUpstreamGroupStatus (*FederatedUpstreamGroupSpec_Template)(nil), // 2: fed.gloo.solo.io.FederatedUpstreamGroupSpec.Template @@ -310,44 +304,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_p if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedUpstreamGroupSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedUpstreamGroupStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_gloo_v1_upstream_group_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedUpstreamGroupSpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.ratelimit.solo.io/v1alpha1/types/rate_limit_config.pb.go b/pkg/api/fed.ratelimit.solo.io/v1alpha1/types/rate_limit_config.pb.go index c82d6193f..9340e16fd 100644 --- a/pkg/api/fed.ratelimit.solo.io/v1alpha1/types/rate_limit_config.pb.go +++ b/pkg/api/fed.ratelimit.solo.io/v1alpha1/types/rate_limit_config.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.ratelimit/v1alpha1/rate_limit_config.proto @@ -39,11 +39,9 @@ type FederatedRateLimitConfigSpec struct { func (x *FederatedRateLimitConfigSpec) Reset() { *x = FederatedRateLimitConfigSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedRateLimitConfigSpec) String() string { @@ -54,7 +52,7 @@ func (*FederatedRateLimitConfigSpec) ProtoMessage() {} func (x *FederatedRateLimitConfigSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -94,11 +92,9 @@ type FederatedRateLimitConfigStatus struct { func (x *FederatedRateLimitConfigStatus) Reset() { *x = FederatedRateLimitConfigStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedRateLimitConfigStatus) String() string { @@ -109,7 +105,7 @@ func (*FederatedRateLimitConfigStatus) ProtoMessage() {} func (x *FederatedRateLimitConfigStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -149,11 +145,9 @@ type FederatedRateLimitConfigSpec_Template struct { func (x *FederatedRateLimitConfigSpec_Template) Reset() { *x = FederatedRateLimitConfigSpec_Template{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FederatedRateLimitConfigSpec_Template) String() string { @@ -164,7 +158,7 @@ func (*FederatedRateLimitConfigSpec_Template) ProtoMessage() {} func (x *FederatedRateLimitConfigSpec_Template) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -284,7 +278,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_ } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_goTypes = []any{ (*FederatedRateLimitConfigSpec)(nil), // 0: fed.ratelimit.solo.io.FederatedRateLimitConfigSpec (*FederatedRateLimitConfigStatus)(nil), // 1: fed.ratelimit.solo.io.FederatedRateLimitConfigStatus (*FederatedRateLimitConfigSpec_Template)(nil), // 2: fed.ratelimit.solo.io.FederatedRateLimitConfigSpec.Template @@ -316,44 +310,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_ if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedRateLimitConfigSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedRateLimitConfigStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_ratelimit_v1alpha1_rate_limit_config_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FederatedRateLimitConfigSpec_Template); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.solo.io/core/v1/placement.pb.go b/pkg/api/fed.solo.io/core/v1/placement.pb.go index 7fa34c617..ad8894d9d 100644 --- a/pkg/api/fed.solo.io/core/v1/placement.pb.go +++ b/pkg/api/fed.solo.io/core/v1/placement.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed/core/v1/placement.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -100,11 +100,9 @@ type TemplateMetadata struct { func (x *TemplateMetadata) Reset() { *x = TemplateMetadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TemplateMetadata) String() string { @@ -115,7 +113,7 @@ func (*TemplateMetadata) ProtoMessage() {} func (x *TemplateMetadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -170,11 +168,9 @@ type PlacementStatus struct { func (x *PlacementStatus) Reset() { *x = PlacementStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PlacementStatus) String() string { @@ -185,7 +181,7 @@ func (*PlacementStatus) ProtoMessage() {} func (x *PlacementStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -246,11 +242,9 @@ type PlacementStatus_Namespace struct { func (x *PlacementStatus_Namespace) Reset() { *x = PlacementStatus_Namespace{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PlacementStatus_Namespace) String() string { @@ -261,7 +255,7 @@ func (*PlacementStatus_Namespace) ProtoMessage() {} func (x *PlacementStatus_Namespace) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -301,11 +295,9 @@ type PlacementStatus_Cluster struct { func (x *PlacementStatus_Cluster) Reset() { *x = PlacementStatus_Cluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PlacementStatus_Cluster) String() string { @@ -316,7 +308,7 @@ func (*PlacementStatus_Cluster) ProtoMessage() {} func (x *PlacementStatus_Cluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -439,7 +431,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_ var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_goTypes = []any{ (PlacementStatus_State)(0), // 0: core.fed.solo.io.PlacementStatus.State (*TemplateMetadata)(nil), // 1: core.fed.solo.io.TemplateMetadata (*PlacementStatus)(nil), // 2: core.fed.solo.io.PlacementStatus @@ -471,56 +463,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_ if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TemplateMetadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PlacementStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PlacementStatus_Namespace); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_core_v1_placement_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PlacementStatus_Cluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.solo.io/v1/types/failover.pb.go b/pkg/api/fed.solo.io/v1/types/failover.pb.go index 8774773e8..da295d2bf 100644 --- a/pkg/api/fed.solo.io/v1/types/failover.pb.go +++ b/pkg/api/fed.solo.io/v1/types/failover.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed/v1/failover.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -132,11 +132,9 @@ type FailoverSchemeSpec struct { func (x *FailoverSchemeSpec) Reset() { *x = FailoverSchemeSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FailoverSchemeSpec) String() string { @@ -147,7 +145,7 @@ func (*FailoverSchemeSpec) ProtoMessage() {} func (x *FailoverSchemeSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -193,18 +191,16 @@ type FailoverSchemeStatus struct { ObservedGeneration int64 `protobuf:"varint,3,opt,name=observed_generation,json=observedGeneration,proto3" json:"observed_generation,omitempty"` // The time at which this status was recorded. // Deprecated: use namespacedStatuses instead. - ProcessingTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=processing_time,json=processingTime,proto3" json:"processing_time,omitempty"` + ProcessingTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=processing_time,json=processingTime,proto3" json:"processing_time,omitempty"` // Map of gloo fed controller namespace to FailoverScheme status. NamespacedStatuses map[string]*FailoverSchemeStatus_Status `protobuf:"bytes,5,rep,name=namespaced_statuses,json=namespacedStatuses,proto3" json:"namespaced_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *FailoverSchemeStatus) Reset() { *x = FailoverSchemeStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FailoverSchemeStatus) String() string { @@ -215,7 +211,7 @@ func (*FailoverSchemeStatus) ProtoMessage() {} func (x *FailoverSchemeStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -251,7 +247,7 @@ func (x *FailoverSchemeStatus) GetObservedGeneration() int64 { return 0 } -func (x *FailoverSchemeStatus) GetProcessingTime() *timestamp.Timestamp { +func (x *FailoverSchemeStatus) GetProcessingTime() *timestamppb.Timestamp { if x != nil { return x.ProcessingTime } @@ -275,11 +271,9 @@ type FailoverSchemeSpec_FailoverEndpoints struct { func (x *FailoverSchemeSpec_FailoverEndpoints) Reset() { *x = FailoverSchemeSpec_FailoverEndpoints{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FailoverSchemeSpec_FailoverEndpoints) String() string { @@ -290,7 +284,7 @@ func (*FailoverSchemeSpec_FailoverEndpoints) ProtoMessage() {} func (x *FailoverSchemeSpec_FailoverEndpoints) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -326,16 +320,14 @@ type FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets struct { // targets within a given priority, who are located in the zame zone. // See envoy Locality Weighted Load Balancing for more information: // https://www.envoyproxy.io/docs/envoy/v1.14.1/intro/arch_overview/upstream/load_balancing/locality_weight#arch-overview-load-balancing-locality-weighted-lb - LocalityWeight *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=locality_weight,json=localityWeight,proto3" json:"locality_weight,omitempty"` + LocalityWeight *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=locality_weight,json=localityWeight,proto3" json:"locality_weight,omitempty"` } func (x *FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets) Reset() { *x = FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets) String() string { @@ -346,7 +338,7 @@ func (*FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets) ProtoMessage() {} func (x *FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -375,7 +367,7 @@ func (x *FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets) GetUpstreams() return nil } -func (x *FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets) GetLocalityWeight() *wrappers.UInt32Value { +func (x *FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets) GetLocalityWeight() *wrapperspb.UInt32Value { if x != nil { return x.LocalityWeight } @@ -395,16 +387,14 @@ type FailoverSchemeStatus_Status struct { // a kubernetes resource. ObservedGeneration int64 `protobuf:"varint,3,opt,name=observed_generation,json=observedGeneration,proto3" json:"observed_generation,omitempty"` // The time at which this status was recorded. - ProcessingTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=processing_time,json=processingTime,proto3" json:"processing_time,omitempty"` + ProcessingTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=processing_time,json=processingTime,proto3" json:"processing_time,omitempty"` } func (x *FailoverSchemeStatus_Status) Reset() { *x = FailoverSchemeStatus_Status{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FailoverSchemeStatus_Status) String() string { @@ -415,7 +405,7 @@ func (*FailoverSchemeStatus_Status) ProtoMessage() {} func (x *FailoverSchemeStatus_Status) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -451,7 +441,7 @@ func (x *FailoverSchemeStatus_Status) GetObservedGeneration() int64 { return 0 } -func (x *FailoverSchemeStatus_Status) GetProcessingTime() *timestamp.Timestamp { +func (x *FailoverSchemeStatus_Status) GetProcessingTime() *timestamppb.Timestamp { if x != nil { return x.ProcessingTime } @@ -573,7 +563,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_rawDes var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_goTypes = []any{ (FailoverSchemeStatus_State)(0), // 0: fed.solo.io.FailoverSchemeStatus.State (*FailoverSchemeSpec)(nil), // 1: fed.solo.io.FailoverSchemeSpec (*FailoverSchemeStatus)(nil), // 2: fed.solo.io.FailoverSchemeStatus @@ -582,9 +572,9 @@ var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_goTypes nil, // 5: fed.solo.io.FailoverSchemeStatus.NamespacedStatusesEntry (*FailoverSchemeStatus_Status)(nil), // 6: fed.solo.io.FailoverSchemeStatus.Status (*v1.ClusterObjectRef)(nil), // 7: core.skv2.solo.io.ClusterObjectRef - (*timestamp.Timestamp)(nil), // 8: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp (*v1.ObjectRef)(nil), // 9: core.skv2.solo.io.ObjectRef - (*wrappers.UInt32Value)(nil), // 10: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 10: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_depIdxs = []int32{ 7, // 0: fed.solo.io.FailoverSchemeSpec.primary:type_name -> core.skv2.solo.io.ClusterObjectRef @@ -610,68 +600,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_init() if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FailoverSchemeSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FailoverSchemeStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FailoverSchemeSpec_FailoverEndpoints); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FailoverSchemeSpec_FailoverEndpoints_LocalityLbTargets); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_failover_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FailoverSchemeStatus_Status); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/fed.solo.io/v1/types/instance.pb.go b/pkg/api/fed.solo.io/v1/types/instance.pb.go index 4558b872d..1386964ca 100644 --- a/pkg/api/fed.solo.io/v1/types/instance.pb.go +++ b/pkg/api/fed.solo.io/v1/types/instance.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed/v1/instance.proto @@ -91,11 +91,9 @@ type GlooInstanceSpec struct { func (x *GlooInstanceSpec) Reset() { *x = GlooInstanceSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceSpec) String() string { @@ -106,7 +104,7 @@ func (*GlooInstanceSpec) ProtoMessage() {} func (x *GlooInstanceSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -178,11 +176,9 @@ type GlooInstanceStatus struct { func (x *GlooInstanceStatus) Reset() { *x = GlooInstanceStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceStatus) String() string { @@ -193,7 +189,7 @@ func (*GlooInstanceStatus) ProtoMessage() {} func (x *GlooInstanceStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -224,11 +220,9 @@ type GlooInstanceSpec_ControlPlane struct { func (x *GlooInstanceSpec_ControlPlane) Reset() { *x = GlooInstanceSpec_ControlPlane{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceSpec_ControlPlane) String() string { @@ -239,7 +233,7 @@ func (*GlooInstanceSpec_ControlPlane) ProtoMessage() {} func (x *GlooInstanceSpec_ControlPlane) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -307,11 +301,9 @@ type GlooInstanceSpec_Proxy struct { func (x *GlooInstanceSpec_Proxy) Reset() { *x = GlooInstanceSpec_Proxy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceSpec_Proxy) String() string { @@ -322,7 +314,7 @@ func (*GlooInstanceSpec_Proxy) ProtoMessage() {} func (x *GlooInstanceSpec_Proxy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -427,11 +419,9 @@ type GlooInstanceSpec_Admin struct { func (x *GlooInstanceSpec_Admin) Reset() { *x = GlooInstanceSpec_Admin{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceSpec_Admin) String() string { @@ -442,7 +432,7 @@ func (*GlooInstanceSpec_Admin) ProtoMessage() {} func (x *GlooInstanceSpec_Admin) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -507,11 +497,9 @@ type GlooInstanceSpec_Check struct { func (x *GlooInstanceSpec_Check) Reset() { *x = GlooInstanceSpec_Check{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceSpec_Check) String() string { @@ -522,7 +510,7 @@ func (*GlooInstanceSpec_Check) ProtoMessage() {} func (x *GlooInstanceSpec_Check) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -641,11 +629,9 @@ type GlooInstanceSpec_Proxy_IngressEndpoint struct { func (x *GlooInstanceSpec_Proxy_IngressEndpoint) Reset() { *x = GlooInstanceSpec_Proxy_IngressEndpoint{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceSpec_Proxy_IngressEndpoint) String() string { @@ -656,7 +642,7 @@ func (*GlooInstanceSpec_Proxy_IngressEndpoint) ProtoMessage() {} func (x *GlooInstanceSpec_Proxy_IngressEndpoint) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -703,11 +689,9 @@ type GlooInstanceSpec_Proxy_IngressEndpoint_Port struct { func (x *GlooInstanceSpec_Proxy_IngressEndpoint_Port) Reset() { *x = GlooInstanceSpec_Proxy_IngressEndpoint_Port{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceSpec_Proxy_IngressEndpoint_Port) String() string { @@ -718,7 +702,7 @@ func (*GlooInstanceSpec_Proxy_IngressEndpoint_Port) ProtoMessage() {} func (x *GlooInstanceSpec_Proxy_IngressEndpoint_Port) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -763,11 +747,9 @@ type GlooInstanceSpec_Check_Summary struct { func (x *GlooInstanceSpec_Check_Summary) Reset() { *x = GlooInstanceSpec_Check_Summary{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceSpec_Check_Summary) String() string { @@ -778,7 +760,7 @@ func (*GlooInstanceSpec_Check_Summary) ProtoMessage() {} func (x *GlooInstanceSpec_Check_Summary) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -826,11 +808,9 @@ type GlooInstanceSpec_Check_Summary_ResourceReport struct { func (x *GlooInstanceSpec_Check_Summary_ResourceReport) Reset() { *x = GlooInstanceSpec_Check_Summary_ResourceReport{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooInstanceSpec_Check_Summary_ResourceReport) String() string { @@ -841,7 +821,7 @@ func (*GlooInstanceSpec_Check_Summary_ResourceReport) ProtoMessage() {} func (x *GlooInstanceSpec_Check_Summary_ResourceReport) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1079,7 +1059,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_rawDes var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes = make([]protoimpl.MessageInfo, 10) -var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_goTypes = []any{ (GlooInstanceSpec_Proxy_WorkloadController)(0), // 0: fed.solo.io.GlooInstanceSpec.Proxy.WorkloadController (*GlooInstanceSpec)(nil), // 1: fed.solo.io.GlooInstanceSpec (*GlooInstanceStatus)(nil), // 2: fed.solo.io.GlooInstanceStatus @@ -1130,128 +1110,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_init() if File_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceSpec_ControlPlane); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceSpec_Proxy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceSpec_Admin); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceSpec_Check); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceSpec_Proxy_IngressEndpoint); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceSpec_Proxy_IngressEndpoint_Port); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceSpec_Check_Summary); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_fed_v1_instance_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooInstanceSpec_Check_Summary_ResourceReport); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gateway.solo.io/v1/external_options.pb.clone.go b/pkg/api/gateway.solo.io/v1/external_options.pb.clone.go index 71d039304..362b3abdf 100644 --- a/pkg/api/gateway.solo.io/v1/external_options.pb.clone.go +++ b/pkg/api/gateway.solo.io/v1/external_options.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - github_com_solo_io_skv2_pkg_api_core_skv2_solo_io_v1 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" ) // ensure the imports are used @@ -179,9 +179,9 @@ func (m *HttpListenerOptionStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -239,9 +239,9 @@ func (m *ListenerOptionStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -299,9 +299,9 @@ func (m *RouteOptionStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -359,9 +359,9 @@ func (m *VirtualHostOptionStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target diff --git a/pkg/api/gateway.solo.io/v1/external_options.pb.go b/pkg/api/gateway.solo.io/v1/external_options.pb.go index 59005e27d..e51802ff3 100644 --- a/pkg/api/gateway.solo.io/v1/external_options.pb.go +++ b/pkg/api/gateway.solo.io/v1/external_options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/external_options.proto @@ -10,14 +10,14 @@ import ( reflect "reflect" sync "sync" - _struct "github.com/golang/protobuf/ptypes/struct" - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v11 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" v1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1" _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + _ "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -387,11 +387,9 @@ type VirtualHostOptionSpec struct { func (x *VirtualHostOptionSpec) Reset() { *x = VirtualHostOptionSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualHostOptionSpec) String() string { @@ -402,7 +400,7 @@ func (*VirtualHostOptionSpec) ProtoMessage() {} func (x *VirtualHostOptionSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -560,11 +558,9 @@ type RouteOptionSpec struct { func (x *RouteOptionSpec) Reset() { *x = RouteOptionSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteOptionSpec) String() string { @@ -575,7 +571,7 @@ func (*RouteOptionSpec) ProtoMessage() {} func (x *RouteOptionSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -621,11 +617,9 @@ type ListenerOptionSpec struct { func (x *ListenerOptionSpec) Reset() { *x = ListenerOptionSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListenerOptionSpec) String() string { @@ -636,7 +630,7 @@ func (*ListenerOptionSpec) ProtoMessage() {} func (x *ListenerOptionSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -682,11 +676,9 @@ type HttpListenerOptionSpec struct { func (x *HttpListenerOptionSpec) Reset() { *x = HttpListenerOptionSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpListenerOptionSpec) String() string { @@ -697,7 +689,7 @@ func (*HttpListenerOptionSpec) ProtoMessage() {} func (x *HttpListenerOptionSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -740,16 +732,14 @@ type HttpListenerOptionStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*HttpListenerOptionStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *HttpListenerOptionStatus) Reset() { *x = HttpListenerOptionStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpListenerOptionStatus) String() string { @@ -760,7 +750,7 @@ func (*HttpListenerOptionStatus) ProtoMessage() {} func (x *HttpListenerOptionStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -803,7 +793,7 @@ func (x *HttpListenerOptionStatus) GetSubresourceStatuses() map[string]*HttpList return nil } -func (x *HttpListenerOptionStatus) GetDetails() *_struct.Struct { +func (x *HttpListenerOptionStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -820,11 +810,9 @@ type HttpListenerOptionNamespacedStatuses struct { func (x *HttpListenerOptionNamespacedStatuses) Reset() { *x = HttpListenerOptionNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpListenerOptionNamespacedStatuses) String() string { @@ -835,7 +823,7 @@ func (*HttpListenerOptionNamespacedStatuses) ProtoMessage() {} func (x *HttpListenerOptionNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -871,16 +859,14 @@ type ListenerOptionStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*ListenerOptionStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *ListenerOptionStatus) Reset() { *x = ListenerOptionStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListenerOptionStatus) String() string { @@ -891,7 +877,7 @@ func (*ListenerOptionStatus) ProtoMessage() {} func (x *ListenerOptionStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -934,7 +920,7 @@ func (x *ListenerOptionStatus) GetSubresourceStatuses() map[string]*ListenerOpti return nil } -func (x *ListenerOptionStatus) GetDetails() *_struct.Struct { +func (x *ListenerOptionStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -951,11 +937,9 @@ type ListenerOptionNamespacedStatuses struct { func (x *ListenerOptionNamespacedStatuses) Reset() { *x = ListenerOptionNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListenerOptionNamespacedStatuses) String() string { @@ -966,7 +950,7 @@ func (*ListenerOptionNamespacedStatuses) ProtoMessage() {} func (x *ListenerOptionNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1002,16 +986,14 @@ type RouteOptionStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*RouteOptionStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *RouteOptionStatus) Reset() { *x = RouteOptionStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteOptionStatus) String() string { @@ -1022,7 +1004,7 @@ func (*RouteOptionStatus) ProtoMessage() {} func (x *RouteOptionStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1065,7 +1047,7 @@ func (x *RouteOptionStatus) GetSubresourceStatuses() map[string]*RouteOptionStat return nil } -func (x *RouteOptionStatus) GetDetails() *_struct.Struct { +func (x *RouteOptionStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -1082,11 +1064,9 @@ type RouteOptionNamespacedStatuses struct { func (x *RouteOptionNamespacedStatuses) Reset() { *x = RouteOptionNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteOptionNamespacedStatuses) String() string { @@ -1097,7 +1077,7 @@ func (*RouteOptionNamespacedStatuses) ProtoMessage() {} func (x *RouteOptionNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1133,16 +1113,14 @@ type VirtualHostOptionStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*VirtualHostOptionStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *VirtualHostOptionStatus) Reset() { *x = VirtualHostOptionStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualHostOptionStatus) String() string { @@ -1153,7 +1131,7 @@ func (*VirtualHostOptionStatus) ProtoMessage() {} func (x *VirtualHostOptionStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1196,7 +1174,7 @@ func (x *VirtualHostOptionStatus) GetSubresourceStatuses() map[string]*VirtualHo return nil } -func (x *VirtualHostOptionStatus) GetDetails() *_struct.Struct { +func (x *VirtualHostOptionStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -1213,11 +1191,9 @@ type VirtualHostOptionNamespacedStatuses struct { func (x *VirtualHostOptionNamespacedStatuses) Reset() { *x = VirtualHostOptionNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualHostOptionNamespacedStatuses) String() string { @@ -1228,7 +1204,7 @@ func (*VirtualHostOptionNamespacedStatuses) ProtoMessage() {} func (x *VirtualHostOptionNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1536,7 +1512,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_prot var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_enumTypes = make([]protoimpl.EnumInfo, 4) var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes = make([]protoimpl.MessageInfo, 20) -var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_goTypes = []any{ (HttpListenerOptionStatus_State)(0), // 0: gateway.solo.io.HttpListenerOptionStatus.State (ListenerOptionStatus_State)(0), // 1: gateway.solo.io.ListenerOptionStatus.State (RouteOptionStatus_State)(0), // 2: gateway.solo.io.RouteOptionStatus.State @@ -1567,7 +1543,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto (*v11.PolicyTargetReference)(nil), // 27: core.skv2.solo.io.PolicyTargetReference (*v1.ListenerOptions)(nil), // 28: gloo.solo.io.ListenerOptions (*v1.HttpListenerOptions)(nil), // 29: gloo.solo.io.HttpListenerOptions - (*_struct.Struct)(nil), // 30: google.protobuf.Struct + (*structpb.Struct)(nil), // 30: google.protobuf.Struct } var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_depIdxs = []int32{ 24, // 0: gateway.solo.io.VirtualHostOptionSpec.options:type_name -> gloo.solo.io.VirtualHostOptions @@ -1614,152 +1590,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_prot if File_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualHostOptionSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteOptionSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListenerOptionSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpListenerOptionSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpListenerOptionStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpListenerOptionNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListenerOptionStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListenerOptionNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteOptionStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteOptionNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualHostOptionStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_external_options_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualHostOptionNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gateway.solo.io/v1/gateway.pb.clone.go b/pkg/api/gateway.solo.io/v1/gateway.pb.clone.go index 4bb3c7b46..ddf18ddd1 100644 --- a/pkg/api/gateway.solo.io/v1/gateway.pb.clone.go +++ b/pkg/api/gateway.solo.io/v1/gateway.pb.clone.go @@ -13,10 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1" @@ -28,6 +24,10 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -62,9 +62,9 @@ func (m *GatewaySpec) Clone() proto.Message { } if h, ok := interface{}(m.GetUseProxyProto()).(clone.Cloner); ok { - target.UseProxyProto = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseProxyProto = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UseProxyProto = proto.Clone(m.GetUseProxyProto()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseProxyProto = proto.Clone(m.GetUseProxyProto()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetProxyNames() != nil { @@ -395,9 +395,9 @@ func (m *GatewayStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target diff --git a/pkg/api/gateway.solo.io/v1/gateway.pb.go b/pkg/api/gateway.solo.io/v1/gateway.pb.go index 94f61d313..a0646c87a 100644 --- a/pkg/api/gateway.solo.io/v1/gateway.pb.go +++ b/pkg/api/gateway.solo.io/v1/gateway.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/gateway.proto @@ -10,8 +10,6 @@ import ( reflect "reflect" sync "sync" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" v1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1" @@ -21,6 +19,8 @@ import ( core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -110,7 +110,7 @@ type GatewaySpec struct { // If configured, the listener option (filter config) overrides any setting here. // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gateway/v1/gateway.proto. - UseProxyProto *wrappers.BoolValue `protobuf:"bytes,8,opt,name=use_proxy_proto,json=useProxyProto,proto3" json:"use_proxy_proto,omitempty"` + UseProxyProto *wrapperspb.BoolValue `protobuf:"bytes,8,opt,name=use_proxy_proto,json=useProxyProto,proto3" json:"use_proxy_proto,omitempty"` // The type of gateway being created // HttpGateway creates a listener with an http_connection_manager // TcpGateway creates a listener with a tcp proxy filter @@ -146,11 +146,9 @@ type GatewaySpec struct { func (x *GatewaySpec) Reset() { *x = GatewaySpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GatewaySpec) String() string { @@ -161,7 +159,7 @@ func (*GatewaySpec) ProtoMessage() {} func (x *GatewaySpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -205,7 +203,7 @@ func (x *GatewaySpec) GetOptions() *v1.ListenerOptions { } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gateway/v1/gateway.proto. -func (x *GatewaySpec) GetUseProxyProto() *wrappers.BoolValue { +func (x *GatewaySpec) GetUseProxyProto() *wrapperspb.BoolValue { if x != nil { return x.UseProxyProto } @@ -289,11 +287,9 @@ type TcpGateway struct { func (x *TcpGateway) Reset() { *x = TcpGateway{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TcpGateway) String() string { @@ -304,7 +300,7 @@ func (*TcpGateway) ProtoMessage() {} func (x *TcpGateway) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -355,11 +351,9 @@ type HybridGateway struct { func (x *HybridGateway) Reset() { *x = HybridGateway{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HybridGateway) String() string { @@ -370,7 +364,7 @@ func (*HybridGateway) ProtoMessage() {} func (x *HybridGateway) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -434,11 +428,9 @@ type DelegatedHttpGateway struct { func (x *DelegatedHttpGateway) Reset() { *x = DelegatedHttpGateway{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DelegatedHttpGateway) String() string { @@ -449,7 +441,7 @@ func (*DelegatedHttpGateway) ProtoMessage() {} func (x *DelegatedHttpGateway) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -540,11 +532,9 @@ type DelegatedTcpGateway struct { func (x *DelegatedTcpGateway) Reset() { *x = DelegatedTcpGateway{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DelegatedTcpGateway) String() string { @@ -555,7 +545,7 @@ func (*DelegatedTcpGateway) ProtoMessage() {} func (x *DelegatedTcpGateway) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -628,11 +618,9 @@ type MatchedGateway struct { func (x *MatchedGateway) Reset() { *x = MatchedGateway{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchedGateway) String() string { @@ -643,7 +631,7 @@ func (*MatchedGateway) ProtoMessage() {} func (x *MatchedGateway) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -723,11 +711,9 @@ type Matcher struct { func (x *Matcher) Reset() { *x = Matcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Matcher) String() string { @@ -738,7 +724,7 @@ func (*Matcher) ProtoMessage() {} func (x *Matcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -788,16 +774,14 @@ type GatewayStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*GatewayStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *GatewayStatus) Reset() { *x = GatewayStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GatewayStatus) String() string { @@ -808,7 +792,7 @@ func (*GatewayStatus) ProtoMessage() {} func (x *GatewayStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -851,7 +835,7 @@ func (x *GatewayStatus) GetSubresourceStatuses() map[string]*GatewayStatus { return nil } -func (x *GatewayStatus) GetDetails() *_struct.Struct { +func (x *GatewayStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -868,11 +852,9 @@ type GatewayNamespacedStatuses struct { func (x *GatewayNamespacedStatuses) Reset() { *x = GatewayNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GatewayNamespacedStatuses) String() string { @@ -883,7 +865,7 @@ func (*GatewayNamespacedStatuses) ProtoMessage() {} func (x *GatewayNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1151,7 +1133,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_rawDesc var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 11) -var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_goTypes = []any{ (GatewayStatus_State)(0), // 0: gateway.solo.io.GatewayStatus.State (*GatewaySpec)(nil), // 1: gateway.solo.io.GatewaySpec (*TcpGateway)(nil), // 2: gateway.solo.io.TcpGateway @@ -1165,7 +1147,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_goTypes nil, // 10: gateway.solo.io.GatewayStatus.SubresourceStatusesEntry nil, // 11: gateway.solo.io.GatewayNamespacedStatuses.StatusesEntry (*v1.ListenerOptions)(nil), // 12: gloo.solo.io.ListenerOptions - (*wrappers.BoolValue)(nil), // 13: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 13: google.protobuf.BoolValue (*HttpGateway)(nil), // 14: gateway.solo.io.HttpGateway (*v1.RouteConfigurationOptions)(nil), // 15: gloo.solo.io.RouteConfigurationOptions (*v1.TcpHost)(nil), // 16: gloo.solo.io.TcpHost @@ -1175,7 +1157,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_goTypes (*hcm.HttpConnectionManagerSettings)(nil), // 20: hcm.options.gloo.solo.io.HttpConnectionManagerSettings (*ssl.SslConfig)(nil), // 21: gloo.solo.io.SslConfig (*v3.CidrRange)(nil), // 22: solo.io.envoy.config.core.v3.CidrRange - (*_struct.Struct)(nil), // 23: google.protobuf.Struct + (*structpb.Struct)(nil), // 23: google.protobuf.Struct } var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_depIdxs = []int32{ 12, // 0: gateway.solo.io.GatewaySpec.options:type_name -> gloo.solo.io.ListenerOptions @@ -1219,130 +1201,20 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_init() return } file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GatewaySpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TcpGateway); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HybridGateway); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DelegatedHttpGateway); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DelegatedTcpGateway); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchedGateway); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Matcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GatewayStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GatewayNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[0].OneofWrappers = []any{ (*GatewaySpec_HttpGateway)(nil), (*GatewaySpec_TcpGateway)(nil), (*GatewaySpec_HybridGateway)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[3].OneofWrappers = []any{ (*DelegatedHttpGateway_Ref)(nil), (*DelegatedHttpGateway_Selector)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[4].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[4].OneofWrappers = []any{ (*DelegatedTcpGateway_Ref)(nil), (*DelegatedTcpGateway_Selector)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_msgTypes[5].OneofWrappers = []any{ (*MatchedGateway_HttpGateway)(nil), (*MatchedGateway_TcpGateway)(nil), } diff --git a/pkg/api/gateway.solo.io/v1/http_gateway.pb.go b/pkg/api/gateway.solo.io/v1/http_gateway.pb.go index e77e2698a..6ebb608d6 100644 --- a/pkg/api/gateway.solo.io/v1/http_gateway.pb.go +++ b/pkg/api/gateway.solo.io/v1/http_gateway.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/http_gateway.proto @@ -132,11 +132,9 @@ type HttpGateway struct { func (x *HttpGateway) Reset() { *x = HttpGateway{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpGateway) String() string { @@ -147,7 +145,7 @@ func (*HttpGateway) ProtoMessage() {} func (x *HttpGateway) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -215,11 +213,9 @@ type VirtualServiceSelectorExpressions struct { func (x *VirtualServiceSelectorExpressions) Reset() { *x = VirtualServiceSelectorExpressions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualServiceSelectorExpressions) String() string { @@ -230,7 +226,7 @@ func (*VirtualServiceSelectorExpressions) ProtoMessage() {} func (x *VirtualServiceSelectorExpressions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -267,11 +263,9 @@ type VirtualServiceSelectorExpressions_Expression struct { func (x *VirtualServiceSelectorExpressions_Expression) Reset() { *x = VirtualServiceSelectorExpressions_Expression{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualServiceSelectorExpressions_Expression) String() string { @@ -282,7 +276,7 @@ func (*VirtualServiceSelectorExpressions_Expression) ProtoMessage() {} func (x *VirtualServiceSelectorExpressions_Expression) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -419,7 +413,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_ra var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_goTypes = []any{ (VirtualServiceSelectorExpressions_Expression_Operator)(0), // 0: gateway.solo.io.VirtualServiceSelectorExpressions.Expression.Operator (*HttpGateway)(nil), // 1: gateway.solo.io.HttpGateway (*VirtualServiceSelectorExpressions)(nil), // 2: gateway.solo.io.VirtualServiceSelectorExpressions @@ -447,44 +441,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_in if File_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpGateway); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualServiceSelectorExpressions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualServiceSelectorExpressions_Expression); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gateway.solo.io/v1/matchable_http_gateway.pb.clone.go b/pkg/api/gateway.solo.io/v1/matchable_http_gateway.pb.clone.go index 885cfbda7..89fd0b961 100644 --- a/pkg/api/gateway.solo.io/v1/matchable_http_gateway.pb.clone.go +++ b/pkg/api/gateway.solo.io/v1/matchable_http_gateway.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" ) // ensure the imports are used @@ -82,9 +82,9 @@ func (m *MatchableHttpGatewayStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target diff --git a/pkg/api/gateway.solo.io/v1/matchable_http_gateway.pb.go b/pkg/api/gateway.solo.io/v1/matchable_http_gateway.pb.go index b20c7da3d..c0c57a2f5 100644 --- a/pkg/api/gateway.solo.io/v1/matchable_http_gateway.pb.go +++ b/pkg/api/gateway.solo.io/v1/matchable_http_gateway.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/matchable_http_gateway.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" ) const ( @@ -108,11 +108,9 @@ type MatchableHttpGatewaySpec struct { func (x *MatchableHttpGatewaySpec) Reset() { *x = MatchableHttpGatewaySpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchableHttpGatewaySpec) String() string { @@ -123,7 +121,7 @@ func (*MatchableHttpGatewaySpec) ProtoMessage() {} func (x *MatchableHttpGatewaySpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -166,16 +164,14 @@ type MatchableHttpGatewayStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*MatchableHttpGatewayStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *MatchableHttpGatewayStatus) Reset() { *x = MatchableHttpGatewayStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchableHttpGatewayStatus) String() string { @@ -186,7 +182,7 @@ func (*MatchableHttpGatewayStatus) ProtoMessage() {} func (x *MatchableHttpGatewayStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -229,7 +225,7 @@ func (x *MatchableHttpGatewayStatus) GetSubresourceStatuses() map[string]*Matcha return nil } -func (x *MatchableHttpGatewayStatus) GetDetails() *_struct.Struct { +func (x *MatchableHttpGatewayStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -246,11 +242,9 @@ type MatchableHttpGatewayNamespacedStatuses struct { func (x *MatchableHttpGatewayNamespacedStatuses) Reset() { *x = MatchableHttpGatewayNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchableHttpGatewayNamespacedStatuses) String() string { @@ -261,7 +255,7 @@ func (*MatchableHttpGatewayNamespacedStatuses) ProtoMessage() {} func (x *MatchableHttpGatewayNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -299,11 +293,9 @@ type MatchableHttpGatewaySpec_Matcher struct { func (x *MatchableHttpGatewaySpec_Matcher) Reset() { *x = MatchableHttpGatewaySpec_Matcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchableHttpGatewaySpec_Matcher) String() string { @@ -314,7 +306,7 @@ func (*MatchableHttpGatewaySpec_Matcher) ProtoMessage() {} func (x *MatchableHttpGatewaySpec_Matcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -464,7 +456,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gatewa var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_goTypes = []any{ (MatchableHttpGatewayStatus_State)(0), // 0: gateway.solo.io.MatchableHttpGatewayStatus.State (*MatchableHttpGatewaySpec)(nil), // 1: gateway.solo.io.MatchableHttpGatewaySpec (*MatchableHttpGatewayStatus)(nil), // 2: gateway.solo.io.MatchableHttpGatewayStatus @@ -473,7 +465,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway nil, // 5: gateway.solo.io.MatchableHttpGatewayStatus.SubresourceStatusesEntry nil, // 6: gateway.solo.io.MatchableHttpGatewayNamespacedStatuses.StatusesEntry (*HttpGateway)(nil), // 7: gateway.solo.io.HttpGateway - (*_struct.Struct)(nil), // 8: google.protobuf.Struct + (*structpb.Struct)(nil), // 8: google.protobuf.Struct (*v3.CidrRange)(nil), // 9: solo.io.envoy.config.core.v3.CidrRange (*ssl.SslConfig)(nil), // 10: gloo.solo.io.SslConfig } @@ -503,56 +495,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gatewa return } file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_http_gateway_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchableHttpGatewaySpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchableHttpGatewayStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchableHttpGatewayNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_http_gateway_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchableHttpGatewaySpec_Matcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gateway.solo.io/v1/matchable_tcp_gateway.pb.clone.go b/pkg/api/gateway.solo.io/v1/matchable_tcp_gateway.pb.clone.go index c5c58ec77..eb4741754 100644 --- a/pkg/api/gateway.solo.io/v1/matchable_tcp_gateway.pb.clone.go +++ b/pkg/api/gateway.solo.io/v1/matchable_tcp_gateway.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" ) // ensure the imports are used @@ -82,9 +82,9 @@ func (m *MatchableTcpGatewayStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target diff --git a/pkg/api/gateway.solo.io/v1/matchable_tcp_gateway.pb.go b/pkg/api/gateway.solo.io/v1/matchable_tcp_gateway.pb.go index 40d180155..57a844541 100644 --- a/pkg/api/gateway.solo.io/v1/matchable_tcp_gateway.pb.go +++ b/pkg/api/gateway.solo.io/v1/matchable_tcp_gateway.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/matchable_tcp_gateway.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" ) const ( @@ -106,11 +106,9 @@ type MatchableTcpGatewaySpec struct { func (x *MatchableTcpGatewaySpec) Reset() { *x = MatchableTcpGatewaySpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchableTcpGatewaySpec) String() string { @@ -121,7 +119,7 @@ func (*MatchableTcpGatewaySpec) ProtoMessage() {} func (x *MatchableTcpGatewaySpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -164,16 +162,14 @@ type MatchableTcpGatewayStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*MatchableTcpGatewayStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *MatchableTcpGatewayStatus) Reset() { *x = MatchableTcpGatewayStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchableTcpGatewayStatus) String() string { @@ -184,7 +180,7 @@ func (*MatchableTcpGatewayStatus) ProtoMessage() {} func (x *MatchableTcpGatewayStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -227,7 +223,7 @@ func (x *MatchableTcpGatewayStatus) GetSubresourceStatuses() map[string]*Matchab return nil } -func (x *MatchableTcpGatewayStatus) GetDetails() *_struct.Struct { +func (x *MatchableTcpGatewayStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -244,11 +240,9 @@ type MatchableTcpGatewayNamespacedStatuses struct { func (x *MatchableTcpGatewayNamespacedStatuses) Reset() { *x = MatchableTcpGatewayNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchableTcpGatewayNamespacedStatuses) String() string { @@ -259,7 +253,7 @@ func (*MatchableTcpGatewayNamespacedStatuses) ProtoMessage() {} func (x *MatchableTcpGatewayNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -301,11 +295,9 @@ type MatchableTcpGatewaySpec_Matcher struct { func (x *MatchableTcpGatewaySpec_Matcher) Reset() { *x = MatchableTcpGatewaySpec_Matcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchableTcpGatewaySpec_Matcher) String() string { @@ -316,7 +308,7 @@ func (*MatchableTcpGatewaySpec_Matcher) ProtoMessage() {} func (x *MatchableTcpGatewaySpec_Matcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -476,7 +468,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_goTypes = []any{ (MatchableTcpGatewayStatus_State)(0), // 0: gateway.solo.io.MatchableTcpGatewayStatus.State (*MatchableTcpGatewaySpec)(nil), // 1: gateway.solo.io.MatchableTcpGatewaySpec (*MatchableTcpGatewayStatus)(nil), // 2: gateway.solo.io.MatchableTcpGatewayStatus @@ -485,7 +477,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_ nil, // 5: gateway.solo.io.MatchableTcpGatewayStatus.SubresourceStatusesEntry nil, // 6: gateway.solo.io.MatchableTcpGatewayNamespacedStatuses.StatusesEntry (*TcpGateway)(nil), // 7: gateway.solo.io.TcpGateway - (*_struct.Struct)(nil), // 8: google.protobuf.Struct + (*structpb.Struct)(nil), // 8: google.protobuf.Struct (*v3.CidrRange)(nil), // 9: solo.io.envoy.config.core.v3.CidrRange (*ssl.SslConfig)(nil), // 10: gloo.solo.io.SslConfig } @@ -513,56 +505,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway return } file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_gateway_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchableTcpGatewaySpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchableTcpGatewayStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchableTcpGatewayNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_matchable_tcp_gateway_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchableTcpGatewaySpec_Matcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gateway.solo.io/v1/route_table.pb.clone.go b/pkg/api/gateway.solo.io/v1/route_table.pb.clone.go index 2ba9cb987..45a286ce6 100644 --- a/pkg/api/gateway.solo.io/v1/route_table.pb.clone.go +++ b/pkg/api/gateway.solo.io/v1/route_table.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -51,9 +51,9 @@ func (m *RouteTableSpec) Clone() proto.Message { } if h, ok := interface{}(m.GetWeight()).(clone.Cloner); ok { - target.Weight = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.Int32Value) + target.Weight = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.Int32Value) } else { - target.Weight = proto.Clone(m.GetWeight()).(*github_com_golang_protobuf_ptypes_wrappers.Int32Value) + target.Weight = proto.Clone(m.GetWeight()).(*google_golang_org_protobuf_types_known_wrapperspb.Int32Value) } return target @@ -87,9 +87,9 @@ func (m *RouteTableStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target diff --git a/pkg/api/gateway.solo.io/v1/route_table.pb.go b/pkg/api/gateway.solo.io/v1/route_table.pb.go index a3b90c52b..f07e1c0c0 100644 --- a/pkg/api/gateway.solo.io/v1/route_table.pb.go +++ b/pkg/api/gateway.solo.io/v1/route_table.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/route_table.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -258,16 +258,14 @@ type RouteTableSpec struct { // routes which belong to those tables to avoid short-circuiting (e.g. making sure `/foo/bar` comes before `/foo`). // In this scenario, Gloo will also alert the user by adding a warning to the status of the parent resource // (the one that specifies the `RouteTableSelector`). - Weight *wrappers.Int32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` + Weight *wrapperspb.Int32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` } func (x *RouteTableSpec) Reset() { *x = RouteTableSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTableSpec) String() string { @@ -278,7 +276,7 @@ func (*RouteTableSpec) ProtoMessage() {} func (x *RouteTableSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -300,7 +298,7 @@ func (x *RouteTableSpec) GetRoutes() []*Route { return nil } -func (x *RouteTableSpec) GetWeight() *wrappers.Int32Value { +func (x *RouteTableSpec) GetWeight() *wrapperspb.Int32Value { if x != nil { return x.Weight } @@ -321,16 +319,14 @@ type RouteTableStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*RouteTableStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *RouteTableStatus) Reset() { *x = RouteTableStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTableStatus) String() string { @@ -341,7 +337,7 @@ func (*RouteTableStatus) ProtoMessage() {} func (x *RouteTableStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -384,7 +380,7 @@ func (x *RouteTableStatus) GetSubresourceStatuses() map[string]*RouteTableStatus return nil } -func (x *RouteTableStatus) GetDetails() *_struct.Struct { +func (x *RouteTableStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -401,11 +397,9 @@ type RouteTableNamespacedStatuses struct { func (x *RouteTableNamespacedStatuses) Reset() { *x = RouteTableNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTableNamespacedStatuses) String() string { @@ -416,7 +410,7 @@ func (*RouteTableNamespacedStatuses) ProtoMessage() {} func (x *RouteTableNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -532,7 +526,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_raw var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_goTypes = []any{ (RouteTableStatus_State)(0), // 0: gateway.solo.io.RouteTableStatus.State (*RouteTableSpec)(nil), // 1: gateway.solo.io.RouteTableSpec (*RouteTableStatus)(nil), // 2: gateway.solo.io.RouteTableStatus @@ -540,8 +534,8 @@ var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_goTy nil, // 4: gateway.solo.io.RouteTableStatus.SubresourceStatusesEntry nil, // 5: gateway.solo.io.RouteTableNamespacedStatuses.StatusesEntry (*Route)(nil), // 6: gateway.solo.io.Route - (*wrappers.Int32Value)(nil), // 7: google.protobuf.Int32Value - (*_struct.Struct)(nil), // 8: google.protobuf.Struct + (*wrapperspb.Int32Value)(nil), // 7: google.protobuf.Int32Value + (*structpb.Struct)(nil), // 8: google.protobuf.Struct } var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_depIdxs = []int32{ 6, // 0: gateway.solo.io.RouteTableSpec.routes:type_name -> gateway.solo.io.Route @@ -565,44 +559,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_ini return } file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTableSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTableStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_route_table_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTableNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gateway.solo.io/v1/virtual_service.pb.clone.go b/pkg/api/gateway.solo.io/v1/virtual_service.pb.clone.go index 5a63fcc42..2c667a848 100644 --- a/pkg/api/gateway.solo.io/v1/virtual_service.pb.clone.go +++ b/pkg/api/gateway.solo.io/v1/virtual_service.pb.clone.go @@ -13,10 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_core_matchers "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/core/matchers" @@ -24,6 +20,10 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -139,15 +139,15 @@ func (m *Route) Clone() proto.Message { } if h, ok := interface{}(m.GetInheritableMatchers()).(clone.Cloner); ok { - target.InheritableMatchers = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.InheritableMatchers = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.InheritableMatchers = proto.Clone(m.GetInheritableMatchers()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.InheritableMatchers = proto.Clone(m.GetInheritableMatchers()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetInheritablePathMatchers()).(clone.Cloner); ok { - target.InheritablePathMatchers = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.InheritablePathMatchers = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.InheritablePathMatchers = proto.Clone(m.GetInheritablePathMatchers()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.InheritablePathMatchers = proto.Clone(m.GetInheritablePathMatchers()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetOptions()).(clone.Cloner); ok { @@ -378,9 +378,9 @@ func (m *VirtualServiceStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target diff --git a/pkg/api/gateway.solo.io/v1/virtual_service.pb.go b/pkg/api/gateway.solo.io/v1/virtual_service.pb.go index afd5f166c..7a7b078de 100644 --- a/pkg/api/gateway.solo.io/v1/virtual_service.pb.go +++ b/pkg/api/gateway.solo.io/v1/virtual_service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/virtual_service.proto @@ -10,8 +10,6 @@ import ( reflect "reflect" sync "sync" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1" matchers "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/core/matchers" @@ -19,6 +17,8 @@ import ( core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -281,11 +281,9 @@ type VirtualServiceSpec struct { func (x *VirtualServiceSpec) Reset() { *x = VirtualServiceSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualServiceSpec) String() string { @@ -296,7 +294,7 @@ func (*VirtualServiceSpec) ProtoMessage() {} func (x *VirtualServiceSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -367,11 +365,9 @@ type VirtualHost struct { func (x *VirtualHost) Reset() { *x = VirtualHost{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualHost) String() string { @@ -382,7 +378,7 @@ func (*VirtualHost) ProtoMessage() {} func (x *VirtualHost) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -470,10 +466,10 @@ type Route struct { Matchers []*matchers.Matcher `protobuf:"bytes,1,rep,name=matchers,proto3" json:"matchers,omitempty"` // Whether this route as a child should inherit headers, methods, and query parameter matchers from the parent. // Defaults to value of parent; for virtual services (no parent) defaults to false. - InheritableMatchers *wrappers.BoolValue `protobuf:"bytes,8,opt,name=inheritable_matchers,json=inheritableMatchers,proto3" json:"inheritable_matchers,omitempty"` + InheritableMatchers *wrapperspb.BoolValue `protobuf:"bytes,8,opt,name=inheritable_matchers,json=inheritableMatchers,proto3" json:"inheritable_matchers,omitempty"` // Whether this route as a child should inherit path matchers (i.e., path itself, case-sensitive setting) from // the parent. Defaults to value of parent; for virtual services (no parent) defaults to false. - InheritablePathMatchers *wrappers.BoolValue `protobuf:"bytes,9,opt,name=inheritable_path_matchers,json=inheritablePathMatchers,proto3" json:"inheritable_path_matchers,omitempty"` + InheritablePathMatchers *wrapperspb.BoolValue `protobuf:"bytes,9,opt,name=inheritable_path_matchers,json=inheritablePathMatchers,proto3" json:"inheritable_path_matchers,omitempty"` // The Route Action Defines what action the proxy should take when a request matches the route. // // Types that are assignable to Action: @@ -498,11 +494,9 @@ type Route struct { func (x *Route) Reset() { *x = Route{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Route) String() string { @@ -513,7 +507,7 @@ func (*Route) ProtoMessage() {} func (x *Route) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -535,14 +529,14 @@ func (x *Route) GetMatchers() []*matchers.Matcher { return nil } -func (x *Route) GetInheritableMatchers() *wrappers.BoolValue { +func (x *Route) GetInheritableMatchers() *wrapperspb.BoolValue { if x != nil { return x.InheritableMatchers } return nil } -func (x *Route) GetInheritablePathMatchers() *wrappers.BoolValue { +func (x *Route) GetInheritablePathMatchers() *wrapperspb.BoolValue { if x != nil { return x.InheritablePathMatchers } @@ -692,11 +686,9 @@ type DelegateOptionsRefs struct { func (x *DelegateOptionsRefs) Reset() { *x = DelegateOptionsRefs{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DelegateOptionsRefs) String() string { @@ -707,7 +699,7 @@ func (*DelegateOptionsRefs) ProtoMessage() {} func (x *DelegateOptionsRefs) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -756,11 +748,9 @@ type DelegateAction struct { func (x *DelegateAction) Reset() { *x = DelegateAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DelegateAction) String() string { @@ -771,7 +761,7 @@ func (*DelegateAction) ProtoMessage() {} func (x *DelegateAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -860,11 +850,9 @@ type RouteTableSelector struct { func (x *RouteTableSelector) Reset() { *x = RouteTableSelector{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTableSelector) String() string { @@ -875,7 +863,7 @@ func (*RouteTableSelector) ProtoMessage() {} func (x *RouteTableSelector) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -925,16 +913,14 @@ type VirtualServiceStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*VirtualServiceStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *VirtualServiceStatus) Reset() { *x = VirtualServiceStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualServiceStatus) String() string { @@ -945,7 +931,7 @@ func (*VirtualServiceStatus) ProtoMessage() {} func (x *VirtualServiceStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -988,7 +974,7 @@ func (x *VirtualServiceStatus) GetSubresourceStatuses() map[string]*VirtualServi return nil } -func (x *VirtualServiceStatus) GetDetails() *_struct.Struct { +func (x *VirtualServiceStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -1005,11 +991,9 @@ type VirtualServiceNamespacedStatuses struct { func (x *VirtualServiceNamespacedStatuses) Reset() { *x = VirtualServiceNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualServiceNamespacedStatuses) String() string { @@ -1020,7 +1004,7 @@ func (*VirtualServiceNamespacedStatuses) ProtoMessage() {} func (x *VirtualServiceNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1057,11 +1041,9 @@ type RouteTableSelector_Expression struct { func (x *RouteTableSelector_Expression) Reset() { *x = RouteTableSelector_Expression{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTableSelector_Expression) String() string { @@ -1072,7 +1054,7 @@ func (*RouteTableSelector_Expression) ProtoMessage() {} func (x *RouteTableSelector_Expression) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1348,7 +1330,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes = make([]protoimpl.MessageInfo, 12) -var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_goTypes = []any{ (RouteTableSelector_Expression_Operator)(0), // 0: gateway.solo.io.RouteTableSelector.Expression.Operator (VirtualServiceStatus_State)(0), // 1: gateway.solo.io.VirtualServiceStatus.State (*VirtualServiceSpec)(nil), // 2: gateway.solo.io.VirtualServiceSpec @@ -1366,13 +1348,13 @@ var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_ (*ssl.SslConfig)(nil), // 14: gloo.solo.io.SslConfig (*v1.VirtualHostOptions)(nil), // 15: gloo.solo.io.VirtualHostOptions (*matchers.Matcher)(nil), // 16: matchers.core.gloo.solo.io.Matcher - (*wrappers.BoolValue)(nil), // 17: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 17: google.protobuf.BoolValue (*v1.RouteAction)(nil), // 18: gloo.solo.io.RouteAction (*v1.RedirectAction)(nil), // 19: gloo.solo.io.RedirectAction (*v1.DirectResponseAction)(nil), // 20: gloo.solo.io.DirectResponseAction (*core.ResourceRef)(nil), // 21: core.solo.io.ResourceRef (*v1.RouteOptions)(nil), // 22: gloo.solo.io.RouteOptions - (*_struct.Struct)(nil), // 23: google.protobuf.Struct + (*structpb.Struct)(nil), // 23: google.protobuf.Struct } var file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_depIdxs = []int32{ 3, // 0: gateway.solo.io.VirtualServiceSpec.virtual_host:type_name -> gateway.solo.io.VirtualHost @@ -1414,120 +1396,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto if File_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualServiceSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualHost); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Route); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DelegateOptionsRefs); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DelegateAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTableSelector); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualServiceStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualServiceNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTableSelector_Expression); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[1].OneofWrappers = []any{ (*VirtualHost_OptionsConfigRefs)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[2].OneofWrappers = []any{ (*Route_RouteAction)(nil), (*Route_RedirectAction)(nil), (*Route_DirectResponseAction)(nil), @@ -1535,7 +1407,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto (*Route_GraphqlApiRef)(nil), (*Route_OptionsConfigRefs)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[4].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gateway_v1_virtual_service_proto_msgTypes[4].OneofWrappers = []any{ (*DelegateAction_Ref)(nil), (*DelegateAction_Selector)(nil), } diff --git a/pkg/api/gloo.solo.io/config/tap/output_sink/v3/grpc_output_sink.pb.go b/pkg/api/gloo.solo.io/config/tap/output_sink/v3/grpc_output_sink.pb.go index b1d97b509..dbb342dcf 100644 --- a/pkg/api/gloo.solo.io/config/tap/output_sink/v3/grpc_output_sink.pb.go +++ b/pkg/api/gloo.solo.io/config/tap/output_sink/v3/grpc_output_sink.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/tap/output_sink/v3/grpc_output_sink.proto @@ -35,11 +35,9 @@ type GrpcOutputSink struct { func (x *GrpcOutputSink) Reset() { *x = GrpcOutputSink{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_grpc_output_sink_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_grpc_output_sink_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcOutputSink) String() string { @@ -50,7 +48,7 @@ func (*GrpcOutputSink) ProtoMessage() {} func (x *GrpcOutputSink) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_grpc_output_sink_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -123,7 +121,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_o } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_grpc_output_sink_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_grpc_output_sink_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_grpc_output_sink_proto_goTypes = []any{ (*GrpcOutputSink)(nil), // 0: envoy.config.tap.output_sink.v3.GrpcOutputSink (*v3.GrpcService)(nil), // 1: solo.io.envoy.config.core.v3.GrpcService } @@ -143,20 +141,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_o if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_grpc_output_sink_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_grpc_output_sink_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcOutputSink); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/config/tap/output_sink/v3/http_output_sink.pb.go b/pkg/api/gloo.solo.io/config/tap/output_sink/v3/http_output_sink.pb.go index 19d5cf197..bb41fd737 100644 --- a/pkg/api/gloo.solo.io/config/tap/output_sink/v3/http_output_sink.pb.go +++ b/pkg/api/gloo.solo.io/config/tap/output_sink/v3/http_output_sink.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/tap/output_sink/v3/http_output_sink.proto @@ -35,11 +35,9 @@ type HttpOutputSink struct { func (x *HttpOutputSink) Reset() { *x = HttpOutputSink{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_http_output_sink_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_http_output_sink_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpOutputSink) String() string { @@ -50,7 +48,7 @@ func (*HttpOutputSink) ProtoMessage() {} func (x *HttpOutputSink) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_http_output_sink_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -122,7 +120,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_o } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_http_output_sink_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_http_output_sink_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_http_output_sink_proto_goTypes = []any{ (*HttpOutputSink)(nil), // 0: envoy.config.tap.output_sink.v3.HttpOutputSink (*v3.HttpUri)(nil), // 1: solo.io.envoy.config.core.v3.HttpUri } @@ -142,20 +140,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_o if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_http_output_sink_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_tap_output_sink_v3_http_output_sink_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpOutputSink); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/annotations/deprecation.pb.go b/pkg/api/gloo.solo.io/external/envoy/annotations/deprecation.pb.go index ce9544010..1049f78a3 100644 --- a/pkg/api/gloo.solo.io/external/envoy/annotations/deprecation.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/annotations/deprecation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/annotations/deprecation.proto @@ -9,10 +9,10 @@ package annotations import ( reflect "reflect" - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" ) const ( @@ -24,7 +24,7 @@ const ( var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_deprecation_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 246172783, Name: "solo.io.envoy.annotations.disallowed_by_default", @@ -32,7 +32,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_d Filename: "github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/annotations/deprecation.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*string)(nil), Field: 246172784, Name: "solo.io.envoy.annotations.deprecated_at_minor_version", @@ -40,7 +40,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_d Filename: "github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/annotations/deprecation.proto", }, { - ExtendedType: (*descriptor.EnumValueOptions)(nil), + ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*bool)(nil), Field: 178329844, Name: "solo.io.envoy.annotations.disallowed_by_default_enum", @@ -49,7 +49,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_d }, } -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // optional bool disallowed_by_default = 246172783; E_DisallowedByDefault = &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_deprecation_proto_extTypes[0] @@ -60,7 +60,7 @@ var ( E_DeprecatedAtMinorVersion = &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_deprecation_proto_extTypes[1] ) -// Extension fields to descriptor.EnumValueOptions. +// Extension fields to descriptorpb.EnumValueOptions. var ( // optional bool disallowed_by_default_enum = 178329844; E_DisallowedByDefaultEnum = &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_deprecation_proto_extTypes[2] @@ -106,9 +106,9 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_d 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_deprecation_proto_goTypes = []interface{}{ - (*descriptor.FieldOptions)(nil), // 0: google.protobuf.FieldOptions - (*descriptor.EnumValueOptions)(nil), // 1: google.protobuf.EnumValueOptions +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_deprecation_proto_goTypes = []any{ + (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions + (*descriptorpb.EnumValueOptions)(nil), // 1: google.protobuf.EnumValueOptions } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_deprecation_proto_depIdxs = []int32{ 0, // 0: solo.io.envoy.annotations.disallowed_by_default:extendee -> google.protobuf.FieldOptions diff --git a/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster/outlier_detection.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster/outlier_detection.pb.clone.go index f66ec4b5a..00e39d3ab 100644 --- a/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster/outlier_detection.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster/outlier_detection.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -38,89 +38,89 @@ func (m *OutlierDetection) Clone() proto.Message { target = &OutlierDetection{} if h, ok := interface{}(m.GetConsecutive_5Xx()).(clone.Cloner); ok { - target.Consecutive_5Xx = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Consecutive_5Xx = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.Consecutive_5Xx = proto.Clone(m.GetConsecutive_5Xx()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Consecutive_5Xx = proto.Clone(m.GetConsecutive_5Xx()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetInterval()).(clone.Cloner); ok { - target.Interval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Interval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Interval = proto.Clone(m.GetInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Interval = proto.Clone(m.GetInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetBaseEjectionTime()).(clone.Cloner); ok { - target.BaseEjectionTime = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseEjectionTime = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.BaseEjectionTime = proto.Clone(m.GetBaseEjectionTime()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseEjectionTime = proto.Clone(m.GetBaseEjectionTime()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxEjectionPercent()).(clone.Cloner); ok { - target.MaxEjectionPercent = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxEjectionPercent = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxEjectionPercent = proto.Clone(m.GetMaxEjectionPercent()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxEjectionPercent = proto.Clone(m.GetMaxEjectionPercent()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetEnforcingConsecutive_5Xx()).(clone.Cloner); ok { - target.EnforcingConsecutive_5Xx = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingConsecutive_5Xx = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.EnforcingConsecutive_5Xx = proto.Clone(m.GetEnforcingConsecutive_5Xx()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingConsecutive_5Xx = proto.Clone(m.GetEnforcingConsecutive_5Xx()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetEnforcingSuccessRate()).(clone.Cloner); ok { - target.EnforcingSuccessRate = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingSuccessRate = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.EnforcingSuccessRate = proto.Clone(m.GetEnforcingSuccessRate()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingSuccessRate = proto.Clone(m.GetEnforcingSuccessRate()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetSuccessRateMinimumHosts()).(clone.Cloner); ok { - target.SuccessRateMinimumHosts = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.SuccessRateMinimumHosts = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.SuccessRateMinimumHosts = proto.Clone(m.GetSuccessRateMinimumHosts()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.SuccessRateMinimumHosts = proto.Clone(m.GetSuccessRateMinimumHosts()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetSuccessRateRequestVolume()).(clone.Cloner); ok { - target.SuccessRateRequestVolume = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.SuccessRateRequestVolume = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.SuccessRateRequestVolume = proto.Clone(m.GetSuccessRateRequestVolume()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.SuccessRateRequestVolume = proto.Clone(m.GetSuccessRateRequestVolume()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetSuccessRateStdevFactor()).(clone.Cloner); ok { - target.SuccessRateStdevFactor = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.SuccessRateStdevFactor = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.SuccessRateStdevFactor = proto.Clone(m.GetSuccessRateStdevFactor()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.SuccessRateStdevFactor = proto.Clone(m.GetSuccessRateStdevFactor()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetConsecutiveGatewayFailure()).(clone.Cloner); ok { - target.ConsecutiveGatewayFailure = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.ConsecutiveGatewayFailure = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.ConsecutiveGatewayFailure = proto.Clone(m.GetConsecutiveGatewayFailure()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.ConsecutiveGatewayFailure = proto.Clone(m.GetConsecutiveGatewayFailure()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetEnforcingConsecutiveGatewayFailure()).(clone.Cloner); ok { - target.EnforcingConsecutiveGatewayFailure = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingConsecutiveGatewayFailure = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.EnforcingConsecutiveGatewayFailure = proto.Clone(m.GetEnforcingConsecutiveGatewayFailure()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingConsecutiveGatewayFailure = proto.Clone(m.GetEnforcingConsecutiveGatewayFailure()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.SplitExternalLocalOriginErrors = m.GetSplitExternalLocalOriginErrors() if h, ok := interface{}(m.GetConsecutiveLocalOriginFailure()).(clone.Cloner); ok { - target.ConsecutiveLocalOriginFailure = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.ConsecutiveLocalOriginFailure = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.ConsecutiveLocalOriginFailure = proto.Clone(m.GetConsecutiveLocalOriginFailure()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.ConsecutiveLocalOriginFailure = proto.Clone(m.GetConsecutiveLocalOriginFailure()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetEnforcingConsecutiveLocalOriginFailure()).(clone.Cloner); ok { - target.EnforcingConsecutiveLocalOriginFailure = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingConsecutiveLocalOriginFailure = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.EnforcingConsecutiveLocalOriginFailure = proto.Clone(m.GetEnforcingConsecutiveLocalOriginFailure()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingConsecutiveLocalOriginFailure = proto.Clone(m.GetEnforcingConsecutiveLocalOriginFailure()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetEnforcingLocalOriginSuccessRate()).(clone.Cloner); ok { - target.EnforcingLocalOriginSuccessRate = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingLocalOriginSuccessRate = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.EnforcingLocalOriginSuccessRate = proto.Clone(m.GetEnforcingLocalOriginSuccessRate()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.EnforcingLocalOriginSuccessRate = proto.Clone(m.GetEnforcingLocalOriginSuccessRate()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster/outlier_detection.pb.go b/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster/outlier_detection.pb.go index 1106e9157..8bc68e685 100644 --- a/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster/outlier_detection.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster/outlier_detection.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/api/v2/cluster/outlier_detection.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -35,37 +35,37 @@ type OutlierDetection struct { // The number of consecutive 5xx responses or local origin errors that are mapped // to 5xx error codes before a consecutive 5xx ejection // occurs. Defaults to 5. - Consecutive_5Xx *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=consecutive_5xx,json=consecutive5xx,proto3" json:"consecutive_5xx,omitempty"` + Consecutive_5Xx *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=consecutive_5xx,json=consecutive5xx,proto3" json:"consecutive_5xx,omitempty"` // The time interval between ejection analysis sweeps. This can result in // both new ejections as well as hosts being returned to service. Defaults // to 10000ms or 10s. - Interval *duration.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` // The base time that a host is ejected for. The real time is equal to the // base time multiplied by the number of times the host has been ejected. // Defaults to 30000ms or 30s. - BaseEjectionTime *duration.Duration `protobuf:"bytes,3,opt,name=base_ejection_time,json=baseEjectionTime,proto3" json:"base_ejection_time,omitempty"` + BaseEjectionTime *durationpb.Duration `protobuf:"bytes,3,opt,name=base_ejection_time,json=baseEjectionTime,proto3" json:"base_ejection_time,omitempty"` // The maximum % of an upstream cluster that can be ejected due to outlier // detection. Defaults to 10% but will eject at least one host regardless of the value. - MaxEjectionPercent *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_ejection_percent,json=maxEjectionPercent,proto3" json:"max_ejection_percent,omitempty"` + MaxEjectionPercent *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_ejection_percent,json=maxEjectionPercent,proto3" json:"max_ejection_percent,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through consecutive 5xx. This setting can be used to disable // ejection or to ramp it up slowly. Defaults to 100. - EnforcingConsecutive_5Xx *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=enforcing_consecutive_5xx,json=enforcingConsecutive5xx,proto3" json:"enforcing_consecutive_5xx,omitempty"` + EnforcingConsecutive_5Xx *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=enforcing_consecutive_5xx,json=enforcingConsecutive5xx,proto3" json:"enforcing_consecutive_5xx,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through success rate statistics. This setting can be used to // disable ejection or to ramp it up slowly. Defaults to 100. - EnforcingSuccessRate *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=enforcing_success_rate,json=enforcingSuccessRate,proto3" json:"enforcing_success_rate,omitempty"` + EnforcingSuccessRate *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=enforcing_success_rate,json=enforcingSuccessRate,proto3" json:"enforcing_success_rate,omitempty"` // The number of hosts in a cluster that must have enough request volume to // detect success rate outliers. If the number of hosts is less than this // setting, outlier detection via success rate statistics is not performed // for any host in the cluster. Defaults to 5. - SuccessRateMinimumHosts *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=success_rate_minimum_hosts,json=successRateMinimumHosts,proto3" json:"success_rate_minimum_hosts,omitempty"` + SuccessRateMinimumHosts *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=success_rate_minimum_hosts,json=successRateMinimumHosts,proto3" json:"success_rate_minimum_hosts,omitempty"` // The minimum number of total requests that must be collected in one // interval (as defined by the interval duration above) to include this host // in success rate based outlier detection. If the volume is lower than this // setting, outlier detection via success rate statistics is not performed // for that host. Defaults to 100. - SuccessRateRequestVolume *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=success_rate_request_volume,json=successRateRequestVolume,proto3" json:"success_rate_request_volume,omitempty"` + SuccessRateRequestVolume *wrapperspb.UInt32Value `protobuf:"bytes,8,opt,name=success_rate_request_volume,json=successRateRequestVolume,proto3" json:"success_rate_request_volume,omitempty"` // This factor is used to determine the ejection threshold for success rate // outlier ejection. The ejection threshold is the difference between the // mean success rate, and the product of this factor and the standard @@ -73,14 +73,14 @@ type OutlierDetection struct { // success_rate_stdev_factor). This factor is divided by a thousand to get a // double. That is, if the desired factor is 1.9, the runtime value should // be 1900. Defaults to 1900. - SuccessRateStdevFactor *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=success_rate_stdev_factor,json=successRateStdevFactor,proto3" json:"success_rate_stdev_factor,omitempty"` + SuccessRateStdevFactor *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=success_rate_stdev_factor,json=successRateStdevFactor,proto3" json:"success_rate_stdev_factor,omitempty"` // The number of consecutive gateway failures (502, 503, 504 status codes) // before a consecutive gateway failure ejection occurs. Defaults to 5. - ConsecutiveGatewayFailure *wrappers.UInt32Value `protobuf:"bytes,10,opt,name=consecutive_gateway_failure,json=consecutiveGatewayFailure,proto3" json:"consecutive_gateway_failure,omitempty"` + ConsecutiveGatewayFailure *wrapperspb.UInt32Value `protobuf:"bytes,10,opt,name=consecutive_gateway_failure,json=consecutiveGatewayFailure,proto3" json:"consecutive_gateway_failure,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through consecutive gateway failures. This setting can be // used to disable ejection or to ramp it up slowly. Defaults to 0. - EnforcingConsecutiveGatewayFailure *wrappers.UInt32Value `protobuf:"bytes,11,opt,name=enforcing_consecutive_gateway_failure,json=enforcingConsecutiveGatewayFailure,proto3" json:"enforcing_consecutive_gateway_failure,omitempty"` + EnforcingConsecutiveGatewayFailure *wrapperspb.UInt32Value `protobuf:"bytes,11,opt,name=enforcing_consecutive_gateway_failure,json=enforcingConsecutiveGatewayFailure,proto3" json:"enforcing_consecutive_gateway_failure,omitempty"` // Determines whether to distinguish local origin failures from external errors. If set to true // the following configuration parameters are taken into account: // `consecutive_local_origin_failure (envoy_api_field_cluster.OutlierDetection.consecutive_local_origin_failure)`, @@ -93,30 +93,28 @@ type OutlierDetection struct { // occurs. Defaults to 5. Parameter takes effect only when // `split_external_local_origin_errors (envoy_api_field_cluster.OutlierDetection.split_external_local_origin_errors)` // is set to true. - ConsecutiveLocalOriginFailure *wrappers.UInt32Value `protobuf:"bytes,13,opt,name=consecutive_local_origin_failure,json=consecutiveLocalOriginFailure,proto3" json:"consecutive_local_origin_failure,omitempty"` + ConsecutiveLocalOriginFailure *wrapperspb.UInt32Value `protobuf:"bytes,13,opt,name=consecutive_local_origin_failure,json=consecutiveLocalOriginFailure,proto3" json:"consecutive_local_origin_failure,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through consecutive locally originated failures. This setting can be // used to disable ejection or to ramp it up slowly. Defaults to 100. // Parameter takes effect only when // `split_external_local_origin_errors (envoy_api_field_cluster.OutlierDetection.split_external_local_origin_errors)` // is set to true. - EnforcingConsecutiveLocalOriginFailure *wrappers.UInt32Value `protobuf:"bytes,14,opt,name=enforcing_consecutive_local_origin_failure,json=enforcingConsecutiveLocalOriginFailure,proto3" json:"enforcing_consecutive_local_origin_failure,omitempty"` + EnforcingConsecutiveLocalOriginFailure *wrapperspb.UInt32Value `protobuf:"bytes,14,opt,name=enforcing_consecutive_local_origin_failure,json=enforcingConsecutiveLocalOriginFailure,proto3" json:"enforcing_consecutive_local_origin_failure,omitempty"` // The % chance that a host will be actually ejected when an outlier status // is detected through success rate statistics for locally originated errors. // This setting can be used to disable ejection or to ramp it up slowly. Defaults to 100. // Parameter takes effect only when // `split_external_local_origin_errors (envoy_api_field_cluster.OutlierDetection.split_external_local_origin_errors)` // is set to true. - EnforcingLocalOriginSuccessRate *wrappers.UInt32Value `protobuf:"bytes,15,opt,name=enforcing_local_origin_success_rate,json=enforcingLocalOriginSuccessRate,proto3" json:"enforcing_local_origin_success_rate,omitempty"` + EnforcingLocalOriginSuccessRate *wrapperspb.UInt32Value `protobuf:"bytes,15,opt,name=enforcing_local_origin_success_rate,json=enforcingLocalOriginSuccessRate,proto3" json:"enforcing_local_origin_success_rate,omitempty"` } func (x *OutlierDetection) Reset() { *x = OutlierDetection{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OutlierDetection) String() string { @@ -127,7 +125,7 @@ func (*OutlierDetection) ProtoMessage() {} func (x *OutlierDetection) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -142,77 +140,77 @@ func (*OutlierDetection) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto_rawDescGZIP(), []int{0} } -func (x *OutlierDetection) GetConsecutive_5Xx() *wrappers.UInt32Value { +func (x *OutlierDetection) GetConsecutive_5Xx() *wrapperspb.UInt32Value { if x != nil { return x.Consecutive_5Xx } return nil } -func (x *OutlierDetection) GetInterval() *duration.Duration { +func (x *OutlierDetection) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *OutlierDetection) GetBaseEjectionTime() *duration.Duration { +func (x *OutlierDetection) GetBaseEjectionTime() *durationpb.Duration { if x != nil { return x.BaseEjectionTime } return nil } -func (x *OutlierDetection) GetMaxEjectionPercent() *wrappers.UInt32Value { +func (x *OutlierDetection) GetMaxEjectionPercent() *wrapperspb.UInt32Value { if x != nil { return x.MaxEjectionPercent } return nil } -func (x *OutlierDetection) GetEnforcingConsecutive_5Xx() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingConsecutive_5Xx() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingConsecutive_5Xx } return nil } -func (x *OutlierDetection) GetEnforcingSuccessRate() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingSuccessRate() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingSuccessRate } return nil } -func (x *OutlierDetection) GetSuccessRateMinimumHosts() *wrappers.UInt32Value { +func (x *OutlierDetection) GetSuccessRateMinimumHosts() *wrapperspb.UInt32Value { if x != nil { return x.SuccessRateMinimumHosts } return nil } -func (x *OutlierDetection) GetSuccessRateRequestVolume() *wrappers.UInt32Value { +func (x *OutlierDetection) GetSuccessRateRequestVolume() *wrapperspb.UInt32Value { if x != nil { return x.SuccessRateRequestVolume } return nil } -func (x *OutlierDetection) GetSuccessRateStdevFactor() *wrappers.UInt32Value { +func (x *OutlierDetection) GetSuccessRateStdevFactor() *wrapperspb.UInt32Value { if x != nil { return x.SuccessRateStdevFactor } return nil } -func (x *OutlierDetection) GetConsecutiveGatewayFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetConsecutiveGatewayFailure() *wrapperspb.UInt32Value { if x != nil { return x.ConsecutiveGatewayFailure } return nil } -func (x *OutlierDetection) GetEnforcingConsecutiveGatewayFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingConsecutiveGatewayFailure() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingConsecutiveGatewayFailure } @@ -226,21 +224,21 @@ func (x *OutlierDetection) GetSplitExternalLocalOriginErrors() bool { return false } -func (x *OutlierDetection) GetConsecutiveLocalOriginFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetConsecutiveLocalOriginFailure() *wrapperspb.UInt32Value { if x != nil { return x.ConsecutiveLocalOriginFailure } return nil } -func (x *OutlierDetection) GetEnforcingConsecutiveLocalOriginFailure() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingConsecutiveLocalOriginFailure() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingConsecutiveLocalOriginFailure } return nil } -func (x *OutlierDetection) GetEnforcingLocalOriginSuccessRate() *wrappers.UInt32Value { +func (x *OutlierDetection) GetEnforcingLocalOriginSuccessRate() *wrapperspb.UInt32Value { if x != nil { return x.EnforcingLocalOriginSuccessRate } @@ -381,10 +379,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_clust } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto_goTypes = []interface{}{ - (*OutlierDetection)(nil), // 0: solo.io.envoy.api.v2.cluster.OutlierDetection - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 2: google.protobuf.Duration +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto_goTypes = []any{ + (*OutlierDetection)(nil), // 0: solo.io.envoy.api.v2.cluster.OutlierDetection + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto_depIdxs = []int32{ 1, // 0: solo.io.envoy.api.v2.cluster.OutlierDetection.consecutive_5xx:type_name -> google.protobuf.UInt32Value @@ -415,20 +413,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_clust if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_cluster_outlier_detection_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OutlierDetection); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/api/v2/core/health_check.pb.go b/pkg/api/gloo.solo.io/external/envoy/api/v2/core/health_check.pb.go index 5655cd239..623865d35 100644 --- a/pkg/api/gloo.solo.io/external/envoy/api/v2/core/health_check.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/api/v2/core/health_check.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/api/v2/core/health_check.proto @@ -11,10 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" _type "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type" @@ -22,6 +18,10 @@ import ( core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -108,16 +108,16 @@ type HealthCheck struct { // The time to wait for a health check response. If the timeout is reached the // health check attempt will be considered a failure. - Timeout *duration.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` // The interval between health checks. - Interval *duration.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` // An optional jitter amount in milliseconds. If specified, Envoy will start health // checking after for a random time in ms between 0 and initial_jitter. This only // applies to the first health check. - InitialJitter *duration.Duration `protobuf:"bytes,20,opt,name=initial_jitter,json=initialJitter,proto3" json:"initial_jitter,omitempty"` + InitialJitter *durationpb.Duration `protobuf:"bytes,20,opt,name=initial_jitter,json=initialJitter,proto3" json:"initial_jitter,omitempty"` // An optional jitter amount in milliseconds. If specified, during every // interval Envoy will add interval_jitter to the wait time. - IntervalJitter *duration.Duration `protobuf:"bytes,3,opt,name=interval_jitter,json=intervalJitter,proto3" json:"interval_jitter,omitempty"` + IntervalJitter *durationpb.Duration `protobuf:"bytes,3,opt,name=interval_jitter,json=intervalJitter,proto3" json:"interval_jitter,omitempty"` // An optional jitter amount as a percentage of interval_ms. If specified, // during every interval Envoy will add interval_ms * // interval_jitter_percent / 100 to the wait time. @@ -128,13 +128,13 @@ type HealthCheck struct { // The number of unhealthy health checks required before a host is marked // unhealthy. Note that for *http* health checking if a host responds with 503 // this threshold is ignored and the host is considered unhealthy immediately. - UnhealthyThreshold *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=unhealthy_threshold,json=unhealthyThreshold,proto3" json:"unhealthy_threshold,omitempty"` + UnhealthyThreshold *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=unhealthy_threshold,json=unhealthyThreshold,proto3" json:"unhealthy_threshold,omitempty"` // The number of healthy health checks required before a host is marked // healthy. Note that during startup, only a single successful health check is // required to mark a host healthy. - HealthyThreshold *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=healthy_threshold,json=healthyThreshold,proto3" json:"healthy_threshold,omitempty"` + HealthyThreshold *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=healthy_threshold,json=healthyThreshold,proto3" json:"healthy_threshold,omitempty"` // Reuse health check connection between health checks. Default is true. - ReuseConnection *wrappers.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"` + ReuseConnection *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"` // Types that are assignable to HealthChecker: // // *HealthCheck_HttpHealthCheck_ @@ -150,26 +150,26 @@ type HealthCheck struct { // any other. // // The default value for "no traffic interval" is 60 seconds. - NoTrafficInterval *duration.Duration `protobuf:"bytes,12,opt,name=no_traffic_interval,json=noTrafficInterval,proto3" json:"no_traffic_interval,omitempty"` + NoTrafficInterval *durationpb.Duration `protobuf:"bytes,12,opt,name=no_traffic_interval,json=noTrafficInterval,proto3" json:"no_traffic_interval,omitempty"` // The "unhealthy interval" is a health check interval that is used for hosts that are marked as // unhealthy. As soon as the host is marked as healthy, Envoy will shift back to using the // standard health check interval that is defined. // // The default value for "unhealthy interval" is the same as "interval". - UnhealthyInterval *duration.Duration `protobuf:"bytes,14,opt,name=unhealthy_interval,json=unhealthyInterval,proto3" json:"unhealthy_interval,omitempty"` + UnhealthyInterval *durationpb.Duration `protobuf:"bytes,14,opt,name=unhealthy_interval,json=unhealthyInterval,proto3" json:"unhealthy_interval,omitempty"` // The "unhealthy edge interval" is a special health check interval that is used for the first // health check right after a host is marked as unhealthy. For subsequent health checks // Envoy will shift back to using either "unhealthy interval" if present or the standard health // check interval that is defined. // // The default value for "unhealthy edge interval" is the same as "unhealthy interval". - UnhealthyEdgeInterval *duration.Duration `protobuf:"bytes,15,opt,name=unhealthy_edge_interval,json=unhealthyEdgeInterval,proto3" json:"unhealthy_edge_interval,omitempty"` + UnhealthyEdgeInterval *durationpb.Duration `protobuf:"bytes,15,opt,name=unhealthy_edge_interval,json=unhealthyEdgeInterval,proto3" json:"unhealthy_edge_interval,omitempty"` // The "healthy edge interval" is a special health check interval that is used for the first // health check right after a host is marked as healthy. For subsequent health checks // Envoy will shift back to using the standard health check interval that is defined. // // The default value for "healthy edge interval" is the same as the default interval. - HealthyEdgeInterval *duration.Duration `protobuf:"bytes,16,opt,name=healthy_edge_interval,json=healthyEdgeInterval,proto3" json:"healthy_edge_interval,omitempty"` + HealthyEdgeInterval *durationpb.Duration `protobuf:"bytes,16,opt,name=healthy_edge_interval,json=healthyEdgeInterval,proto3" json:"healthy_edge_interval,omitempty"` // Specifies the path to the `health check event log (arch_overview_health_check_logging)`. // If empty, no event log will be written. EventLogPath string `protobuf:"bytes,17,opt,name=event_log_path,json=eventLogPath,proto3" json:"event_log_path,omitempty"` @@ -181,11 +181,9 @@ type HealthCheck struct { func (x *HealthCheck) Reset() { *x = HealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck) String() string { @@ -196,7 +194,7 @@ func (*HealthCheck) ProtoMessage() {} func (x *HealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -211,28 +209,28 @@ func (*HealthCheck) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_rawDescGZIP(), []int{0} } -func (x *HealthCheck) GetTimeout() *duration.Duration { +func (x *HealthCheck) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *HealthCheck) GetInterval() *duration.Duration { +func (x *HealthCheck) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *HealthCheck) GetInitialJitter() *duration.Duration { +func (x *HealthCheck) GetInitialJitter() *durationpb.Duration { if x != nil { return x.InitialJitter } return nil } -func (x *HealthCheck) GetIntervalJitter() *duration.Duration { +func (x *HealthCheck) GetIntervalJitter() *durationpb.Duration { if x != nil { return x.IntervalJitter } @@ -246,21 +244,21 @@ func (x *HealthCheck) GetIntervalJitterPercent() uint32 { return 0 } -func (x *HealthCheck) GetUnhealthyThreshold() *wrappers.UInt32Value { +func (x *HealthCheck) GetUnhealthyThreshold() *wrapperspb.UInt32Value { if x != nil { return x.UnhealthyThreshold } return nil } -func (x *HealthCheck) GetHealthyThreshold() *wrappers.UInt32Value { +func (x *HealthCheck) GetHealthyThreshold() *wrapperspb.UInt32Value { if x != nil { return x.HealthyThreshold } return nil } -func (x *HealthCheck) GetReuseConnection() *wrappers.BoolValue { +func (x *HealthCheck) GetReuseConnection() *wrapperspb.BoolValue { if x != nil { return x.ReuseConnection } @@ -302,28 +300,28 @@ func (x *HealthCheck) GetCustomHealthCheck() *HealthCheck_CustomHealthCheck { return nil } -func (x *HealthCheck) GetNoTrafficInterval() *duration.Duration { +func (x *HealthCheck) GetNoTrafficInterval() *durationpb.Duration { if x != nil { return x.NoTrafficInterval } return nil } -func (x *HealthCheck) GetUnhealthyInterval() *duration.Duration { +func (x *HealthCheck) GetUnhealthyInterval() *durationpb.Duration { if x != nil { return x.UnhealthyInterval } return nil } -func (x *HealthCheck) GetUnhealthyEdgeInterval() *duration.Duration { +func (x *HealthCheck) GetUnhealthyEdgeInterval() *durationpb.Duration { if x != nil { return x.UnhealthyEdgeInterval } return nil } -func (x *HealthCheck) GetHealthyEdgeInterval() *duration.Duration { +func (x *HealthCheck) GetHealthyEdgeInterval() *durationpb.Duration { if x != nil { return x.HealthyEdgeInterval } @@ -390,11 +388,9 @@ type HealthCheck_Payload struct { func (x *HealthCheck_Payload) Reset() { *x = HealthCheck_Payload{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_Payload) String() string { @@ -405,7 +401,7 @@ func (*HealthCheck_Payload) ProtoMessage() {} func (x *HealthCheck_Payload) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -488,11 +484,9 @@ type HealthCheck_HttpHealthCheck struct { func (x *HealthCheck_HttpHealthCheck) Reset() { *x = HealthCheck_HttpHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_HttpHealthCheck) String() string { @@ -503,7 +497,7 @@ func (*HealthCheck_HttpHealthCheck) ProtoMessage() {} func (x *HealthCheck_HttpHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -596,11 +590,9 @@ type HealthCheck_TcpHealthCheck struct { func (x *HealthCheck_TcpHealthCheck) Reset() { *x = HealthCheck_TcpHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_TcpHealthCheck) String() string { @@ -611,7 +603,7 @@ func (*HealthCheck_TcpHealthCheck) ProtoMessage() {} func (x *HealthCheck_TcpHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -654,11 +646,9 @@ type HealthCheck_RedisHealthCheck struct { func (x *HealthCheck_RedisHealthCheck) Reset() { *x = HealthCheck_RedisHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_RedisHealthCheck) String() string { @@ -669,7 +659,7 @@ func (*HealthCheck_RedisHealthCheck) ProtoMessage() {} func (x *HealthCheck_RedisHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -714,11 +704,9 @@ type HealthCheck_GrpcHealthCheck struct { func (x *HealthCheck_GrpcHealthCheck) Reset() { *x = HealthCheck_GrpcHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_GrpcHealthCheck) String() string { @@ -729,7 +717,7 @@ func (*HealthCheck_GrpcHealthCheck) ProtoMessage() {} func (x *HealthCheck_GrpcHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -785,11 +773,9 @@ type HealthCheck_CustomHealthCheck struct { func (x *HealthCheck_CustomHealthCheck) Reset() { *x = HealthCheck_CustomHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_CustomHealthCheck) String() string { @@ -800,7 +786,7 @@ func (*HealthCheck_CustomHealthCheck) ProtoMessage() {} func (x *HealthCheck_CustomHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -829,14 +815,14 @@ func (m *HealthCheck_CustomHealthCheck) GetConfigType() isHealthCheck_CustomHeal return nil } -func (x *HealthCheck_CustomHealthCheck) GetConfig() *_struct.Struct { +func (x *HealthCheck_CustomHealthCheck) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*HealthCheck_CustomHealthCheck_Config); ok { return x.Config } return nil } -func (x *HealthCheck_CustomHealthCheck) GetTypedConfig() *any1.Any { +func (x *HealthCheck_CustomHealthCheck) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*HealthCheck_CustomHealthCheck_TypedConfig); ok { return x.TypedConfig } @@ -848,11 +834,11 @@ type isHealthCheck_CustomHealthCheck_ConfigType interface { } type HealthCheck_CustomHealthCheck_Config struct { - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type HealthCheck_CustomHealthCheck_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*HealthCheck_CustomHealthCheck_Config) isHealthCheck_CustomHealthCheck_ConfigType() {} @@ -1099,7 +1085,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_goTypes = []any{ (HealthStatus)(0), // 0: solo.io.envoy.api.v2.core.HealthStatus (*HealthCheck)(nil), // 1: solo.io.envoy.api.v2.core.HealthCheck (*HealthCheck_Payload)(nil), // 2: solo.io.envoy.api.v2.core.HealthCheck.Payload @@ -1108,15 +1094,15 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_h (*HealthCheck_RedisHealthCheck)(nil), // 5: solo.io.envoy.api.v2.core.HealthCheck.RedisHealthCheck (*HealthCheck_GrpcHealthCheck)(nil), // 6: solo.io.envoy.api.v2.core.HealthCheck.GrpcHealthCheck (*HealthCheck_CustomHealthCheck)(nil), // 7: solo.io.envoy.api.v2.core.HealthCheck.CustomHealthCheck - (*duration.Duration)(nil), // 8: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 10: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 10: google.protobuf.BoolValue (*core.HeaderValueOption)(nil), // 11: solo.io.envoy.api.v2.core.HeaderValueOption (*_type.Int64Range)(nil), // 12: solo.io.envoy.type.Int64Range (*advanced_http.ResponseAssertions)(nil), // 13: advancedhttp.options.gloo.solo.io.ResponseAssertions (v3.RequestMethod)(0), // 14: solo.io.envoy.config.core.v3.RequestMethod - (*_struct.Struct)(nil), // 15: google.protobuf.Struct - (*any1.Any)(nil), // 16: google.protobuf.Any + (*structpb.Struct)(nil), // 15: google.protobuf.Struct + (*anypb.Any)(nil), // 16: google.protobuf.Any } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_depIdxs = []int32{ 8, // 0: solo.io.envoy.api.v2.core.HealthCheck.timeout:type_name -> google.protobuf.Duration @@ -1157,102 +1143,16 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_Payload); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_HttpHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_TcpHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_RedisHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_GrpcHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_CustomHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[0].OneofWrappers = []any{ (*HealthCheck_HttpHealthCheck_)(nil), (*HealthCheck_TcpHealthCheck_)(nil), (*HealthCheck_GrpcHealthCheck_)(nil), (*HealthCheck_CustomHealthCheck_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[1].OneofWrappers = []any{ (*HealthCheck_Payload_Text)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[6].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_core_health_check_proto_msgTypes[6].OneofWrappers = []any{ (*HealthCheck_CustomHealthCheck_Config)(nil), (*HealthCheck_CustomHealthCheck_TypedConfig)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/api/v2/route/route.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/api/v2/route/route.pb.clone.go index 90a44d010..24559a787 100644 --- a/pkg/api/gloo.solo.io/external/envoy/api/v2/route/route.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/api/v2/route/route.pb.clone.go @@ -13,19 +13,19 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" + github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + github_com_solo_io_solo_kit_pkg_api_external_envoy_api_v2_core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + github_com_solo_io_solo_kit_pkg_api_external_envoy_type "github.com/solo-io/solo-kit/pkg/api/external/envoy/type" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_solo_io_solo_kit_pkg_api_external_envoy_api_v2_core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_solo_io_solo_kit_pkg_api_external_envoy_type "github.com/solo-io/solo-kit/pkg/api/external/envoy/type" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -150,26 +150,26 @@ func (m *VirtualHost) Clone() proto.Message { } if m.GetPerFilterConfig() != nil { - target.PerFilterConfig = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetPerFilterConfig())) + target.PerFilterConfig = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetPerFilterConfig())) for k, v := range m.GetPerFilterConfig() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.PerFilterConfig[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.PerFilterConfig[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.PerFilterConfig[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.PerFilterConfig[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } } if m.GetTypedPerFilterConfig() != nil { - target.TypedPerFilterConfig = make(map[string]*github_com_golang_protobuf_ptypes_any.Any, len(m.GetTypedPerFilterConfig())) + target.TypedPerFilterConfig = make(map[string]*google_golang_org_protobuf_types_known_anypb.Any, len(m.GetTypedPerFilterConfig())) for k, v := range m.GetTypedPerFilterConfig() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.TypedPerFilterConfig[k] = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.TypedPerFilterConfig[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_anypb.Any) } } @@ -221,26 +221,26 @@ func (m *Route) Clone() proto.Message { } if m.GetPerFilterConfig() != nil { - target.PerFilterConfig = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetPerFilterConfig())) + target.PerFilterConfig = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetPerFilterConfig())) for k, v := range m.GetPerFilterConfig() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.PerFilterConfig[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.PerFilterConfig[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.PerFilterConfig[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.PerFilterConfig[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } } if m.GetTypedPerFilterConfig() != nil { - target.TypedPerFilterConfig = make(map[string]*github_com_golang_protobuf_ptypes_any.Any, len(m.GetTypedPerFilterConfig())) + target.TypedPerFilterConfig = make(map[string]*google_golang_org_protobuf_types_known_anypb.Any, len(m.GetTypedPerFilterConfig())) for k, v := range m.GetTypedPerFilterConfig() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.TypedPerFilterConfig[k] = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.TypedPerFilterConfig[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_anypb.Any) } } @@ -361,9 +361,9 @@ func (m *WeightedCluster) Clone() proto.Message { } if h, ok := interface{}(m.GetTotalWeight()).(clone.Cloner); ok { - target.TotalWeight = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.TotalWeight = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.TotalWeight = proto.Clone(m.GetTotalWeight()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.TotalWeight = proto.Clone(m.GetTotalWeight()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.RuntimeKeyPrefix = m.GetRuntimeKeyPrefix() @@ -380,9 +380,9 @@ func (m *RouteMatch) Clone() proto.Message { target = &RouteMatch{} if h, ok := interface{}(m.GetCaseSensitive()).(clone.Cloner); ok { - target.CaseSensitive = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.CaseSensitive = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.CaseSensitive = proto.Clone(m.GetCaseSensitive()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.CaseSensitive = proto.Clone(m.GetCaseSensitive()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetRuntimeFraction()).(clone.Cloner); ok { @@ -495,9 +495,9 @@ func (m *CorsPolicy) Clone() proto.Message { target.MaxAge = m.GetMaxAge() if h, ok := interface{}(m.GetAllowCredentials()).(clone.Cloner); ok { - target.AllowCredentials = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowCredentials = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowCredentials = proto.Clone(m.GetAllowCredentials()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowCredentials = proto.Clone(m.GetAllowCredentials()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetShadowEnabled()).(clone.Cloner); ok { @@ -512,11 +512,11 @@ func (m *CorsPolicy) Clone() proto.Message { if h, ok := interface{}(m.GetEnabled()).(clone.Cloner); ok { target.EnabledSpecifier = &CorsPolicy_Enabled{ - Enabled: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + Enabled: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } else { target.EnabledSpecifier = &CorsPolicy_Enabled{ - Enabled: proto.Clone(m.GetEnabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + Enabled: proto.Clone(m.GetEnabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } @@ -556,15 +556,15 @@ func (m *RouteAction) Clone() proto.Message { target.PrefixRewrite = m.GetPrefixRewrite() if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetIdleTimeout()).(clone.Cloner); ok { - target.IdleTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRetryPolicy()).(clone.Cloner); ok { @@ -595,9 +595,9 @@ func (m *RouteAction) Clone() proto.Message { } if h, ok := interface{}(m.GetIncludeVhRateLimits()).(clone.Cloner); ok { - target.IncludeVhRateLimits = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IncludeVhRateLimits = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.IncludeVhRateLimits = proto.Clone(m.GetIncludeVhRateLimits()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IncludeVhRateLimits = proto.Clone(m.GetIncludeVhRateLimits()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetHashPolicy() != nil { @@ -620,15 +620,15 @@ func (m *RouteAction) Clone() proto.Message { } if h, ok := interface{}(m.GetMaxGrpcTimeout()).(clone.Cloner); ok { - target.MaxGrpcTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxGrpcTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxGrpcTimeout = proto.Clone(m.GetMaxGrpcTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxGrpcTimeout = proto.Clone(m.GetMaxGrpcTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetGrpcTimeoutOffset()).(clone.Cloner); ok { - target.GrpcTimeoutOffset = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.GrpcTimeoutOffset = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.GrpcTimeoutOffset = proto.Clone(m.GetGrpcTimeoutOffset()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.GrpcTimeoutOffset = proto.Clone(m.GetGrpcTimeoutOffset()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if m.GetUpgradeConfigs() != nil { @@ -692,11 +692,11 @@ func (m *RouteAction) Clone() proto.Message { if h, ok := interface{}(m.GetAutoHostRewrite()).(clone.Cloner); ok { target.HostRewriteSpecifier = &RouteAction_AutoHostRewrite{ - AutoHostRewrite: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + AutoHostRewrite: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } else { target.HostRewriteSpecifier = &RouteAction_AutoHostRewrite{ - AutoHostRewrite: proto.Clone(m.GetAutoHostRewrite()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + AutoHostRewrite: proto.Clone(m.GetAutoHostRewrite()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } @@ -722,15 +722,15 @@ func (m *RetryPolicy) Clone() proto.Message { target.RetryOn = m.GetRetryOn() if h, ok := interface{}(m.GetNumRetries()).(clone.Cloner); ok { - target.NumRetries = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.NumRetries = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.NumRetries = proto.Clone(m.GetNumRetries()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.NumRetries = proto.Clone(m.GetNumRetries()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetPerTryTimeout()).(clone.Cloner); ok { - target.PerTryTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PerTryTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.PerTryTimeout = proto.Clone(m.GetPerTryTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PerTryTimeout = proto.Clone(m.GetPerTryTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRetryPriority()).(clone.Cloner); ok { @@ -781,9 +781,9 @@ func (m *HedgePolicy) Clone() proto.Message { target = &HedgePolicy{} if h, ok := interface{}(m.GetInitialRequests()).(clone.Cloner); ok { - target.InitialRequests = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialRequests = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.InitialRequests = proto.Clone(m.GetInitialRequests()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialRequests = proto.Clone(m.GetInitialRequests()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetAdditionalRequestChance()).(clone.Cloner); ok { @@ -935,9 +935,9 @@ func (m *RateLimit) Clone() proto.Message { target = &RateLimit{} if h, ok := interface{}(m.GetStage()).(clone.Cloner); ok { - target.Stage = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Stage = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.Stage = proto.Clone(m.GetStage()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Stage = proto.Clone(m.GetStage()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.DisableKey = m.GetDisableKey() @@ -1032,9 +1032,9 @@ func (m *QueryParameterMatcher) Clone() proto.Message { target.Value = m.GetValue() if h, ok := interface{}(m.GetRegex()).(clone.Cloner); ok { - target.Regex = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Regex = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Regex = proto.Clone(m.GetRegex()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Regex = proto.Clone(m.GetRegex()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1051,9 +1051,9 @@ func (m *WeightedCluster_ClusterWeight) Clone() proto.Message { target.Name = m.GetName() if h, ok := interface{}(m.GetWeight()).(clone.Cloner); ok { - target.Weight = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Weight = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.Weight = proto.Clone(m.GetWeight()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Weight = proto.Clone(m.GetWeight()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetMetadataMatch()).(clone.Cloner); ok { @@ -1107,26 +1107,26 @@ func (m *WeightedCluster_ClusterWeight) Clone() proto.Message { } if m.GetPerFilterConfig() != nil { - target.PerFilterConfig = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetPerFilterConfig())) + target.PerFilterConfig = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetPerFilterConfig())) for k, v := range m.GetPerFilterConfig() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.PerFilterConfig[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.PerFilterConfig[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.PerFilterConfig[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.PerFilterConfig[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } } if m.GetTypedPerFilterConfig() != nil { - target.TypedPerFilterConfig = make(map[string]*github_com_golang_protobuf_ptypes_any.Any, len(m.GetTypedPerFilterConfig())) + target.TypedPerFilterConfig = make(map[string]*google_golang_org_protobuf_types_known_anypb.Any, len(m.GetTypedPerFilterConfig())) for k, v := range m.GetTypedPerFilterConfig() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.TypedPerFilterConfig[k] = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.TypedPerFilterConfig[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_anypb.Any) } } @@ -1242,9 +1242,9 @@ func (m *RouteAction_UpgradeConfig) Clone() proto.Message { target.UpgradeType = m.GetUpgradeType() if h, ok := interface{}(m.GetEnabled()).(clone.Cloner); ok { - target.Enabled = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Enabled = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Enabled = proto.Clone(m.GetEnabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Enabled = proto.Clone(m.GetEnabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1274,9 +1274,9 @@ func (m *RouteAction_HashPolicy_Cookie) Clone() proto.Message { target.Name = m.GetName() if h, ok := interface{}(m.GetTtl()).(clone.Cloner); ok { - target.Ttl = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Ttl = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Ttl = proto.Clone(m.GetTtl()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Ttl = proto.Clone(m.GetTtl()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.Path = m.GetPath() @@ -1313,11 +1313,11 @@ func (m *RetryPolicy_RetryPriority) Clone() proto.Message { if h, ok := interface{}(m.GetConfig()).(clone.Cloner); ok { target.ConfigType = &RetryPolicy_RetryPriority_Config{ - Config: h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct), + Config: h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct), } } else { target.ConfigType = &RetryPolicy_RetryPriority_Config{ - Config: proto.Clone(m.GetConfig()).(*github_com_golang_protobuf_ptypes_struct.Struct), + Config: proto.Clone(m.GetConfig()).(*google_golang_org_protobuf_types_known_structpb.Struct), } } @@ -1325,11 +1325,11 @@ func (m *RetryPolicy_RetryPriority) Clone() proto.Message { if h, ok := interface{}(m.GetTypedConfig()).(clone.Cloner); ok { target.ConfigType = &RetryPolicy_RetryPriority_TypedConfig{ - TypedConfig: h.Clone().(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any), } } else { target.ConfigType = &RetryPolicy_RetryPriority_TypedConfig{ - TypedConfig: proto.Clone(m.GetTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: proto.Clone(m.GetTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any), } } @@ -1354,11 +1354,11 @@ func (m *RetryPolicy_RetryHostPredicate) Clone() proto.Message { if h, ok := interface{}(m.GetConfig()).(clone.Cloner); ok { target.ConfigType = &RetryPolicy_RetryHostPredicate_Config{ - Config: h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct), + Config: h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct), } } else { target.ConfigType = &RetryPolicy_RetryHostPredicate_Config{ - Config: proto.Clone(m.GetConfig()).(*github_com_golang_protobuf_ptypes_struct.Struct), + Config: proto.Clone(m.GetConfig()).(*google_golang_org_protobuf_types_known_structpb.Struct), } } @@ -1366,11 +1366,11 @@ func (m *RetryPolicy_RetryHostPredicate) Clone() proto.Message { if h, ok := interface{}(m.GetTypedConfig()).(clone.Cloner); ok { target.ConfigType = &RetryPolicy_RetryHostPredicate_TypedConfig{ - TypedConfig: h.Clone().(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any), } } else { target.ConfigType = &RetryPolicy_RetryHostPredicate_TypedConfig{ - TypedConfig: proto.Clone(m.GetTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: proto.Clone(m.GetTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any), } } @@ -1388,15 +1388,15 @@ func (m *RetryPolicy_RetryBackOff) Clone() proto.Message { target = &RetryPolicy_RetryBackOff{} if h, ok := interface{}(m.GetBaseInterval()).(clone.Cloner); ok { - target.BaseInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxInterval()).(clone.Cloner); ok { - target.MaxInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -1561,9 +1561,9 @@ func (m *RateLimit_Action_HeaderValueMatch) Clone() proto.Message { target.DescriptorValue = m.GetDescriptorValue() if h, ok := interface{}(m.GetExpectMatch()).(clone.Cloner); ok { - target.ExpectMatch = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ExpectMatch = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.ExpectMatch = proto.Clone(m.GetExpectMatch()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ExpectMatch = proto.Clone(m.GetExpectMatch()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetHeaders() != nil { diff --git a/pkg/api/gloo.solo.io/external/envoy/api/v2/route/route.pb.go b/pkg/api/gloo.solo.io/external/envoy/api/v2/route/route.pb.go index e9feabe51..ffebbf2e0 100644 --- a/pkg/api/gloo.solo.io/external/envoy/api/v2/route/route.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/api/v2/route/route.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/api/v2/route/route.proto @@ -11,16 +11,16 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _type1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type" core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" _type "github.com/solo-io/solo-kit/pkg/api/external/envoy/type" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -310,13 +310,13 @@ type VirtualHost struct { // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the `HTTP filter documentation (config_http_filters)` // for if and how it is utilized. - PerFilterConfig map[string]*_struct.Struct `protobuf:"bytes,12,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + PerFilterConfig map[string]*structpb.Struct `protobuf:"bytes,12,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // The per_filter_config field can be used to provide virtual host-specific // configurations for filters. The key should match the filter name, such as // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the `HTTP filter documentation (config_http_filters)` // for if and how it is utilized. - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,15,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,15,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Decides whether the `x-envoy-attempt-count // (config_http_filters_router_x-envoy-attempt-count)` header should be included // in the upstream request. Setting this option will cause it to override any existing header @@ -338,11 +338,9 @@ type VirtualHost struct { func (x *VirtualHost) Reset() { *x = VirtualHost{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualHost) String() string { @@ -353,7 +351,7 @@ func (*VirtualHost) ProtoMessage() {} func (x *VirtualHost) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -445,14 +443,14 @@ func (x *VirtualHost) GetCors() *CorsPolicy { return nil } -func (x *VirtualHost) GetPerFilterConfig() map[string]*_struct.Struct { +func (x *VirtualHost) GetPerFilterConfig() map[string]*structpb.Struct { if x != nil { return x.PerFilterConfig } return nil } -func (x *VirtualHost) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *VirtualHost) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -513,13 +511,13 @@ type Route struct { // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the `HTTP filter documentation (config_http_filters)` for // if and how it is utilized. - PerFilterConfig map[string]*_struct.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + PerFilterConfig map[string]*structpb.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // The per_filter_config field can be used to provide route-specific // configurations for filters. The key should match the filter name, such as // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the `HTTP filter documentation (config_http_filters)` for // if and how it is utilized. - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,13,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,13,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Specifies a set of headers that will be added to requests matching this // route. Headers specified at this level are applied before headers from the // enclosing `envoy_api_msg_route.VirtualHost` and @@ -547,11 +545,9 @@ type Route struct { func (x *Route) Reset() { *x = Route{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Route) String() string { @@ -562,7 +558,7 @@ func (*Route) ProtoMessage() {} func (x *Route) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -633,14 +629,14 @@ func (x *Route) GetDecorator() *Decorator { return nil } -func (x *Route) GetPerFilterConfig() map[string]*_struct.Struct { +func (x *Route) GetPerFilterConfig() map[string]*structpb.Struct { if x != nil { return x.PerFilterConfig } return nil } -func (x *Route) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *Route) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -722,7 +718,7 @@ type WeightedCluster struct { Clusters []*WeightedCluster_ClusterWeight `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"` // Specifies the total weight across all clusters. The sum of all cluster weights must equal this // value, which must be greater than 0. Defaults to 100. - TotalWeight *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=total_weight,json=totalWeight,proto3" json:"total_weight,omitempty"` + TotalWeight *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=total_weight,json=totalWeight,proto3" json:"total_weight,omitempty"` // Specifies the runtime key prefix that should be used to construct the // runtime keys associated with each cluster. When the *runtime_key_prefix* is // specified, the router will look for weights associated with each upstream @@ -736,11 +732,9 @@ type WeightedCluster struct { func (x *WeightedCluster) Reset() { *x = WeightedCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *WeightedCluster) String() string { @@ -751,7 +745,7 @@ func (*WeightedCluster) ProtoMessage() {} func (x *WeightedCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -773,7 +767,7 @@ func (x *WeightedCluster) GetClusters() []*WeightedCluster_ClusterWeight { return nil } -func (x *WeightedCluster) GetTotalWeight() *wrappers.UInt32Value { +func (x *WeightedCluster) GetTotalWeight() *wrapperspb.UInt32Value { if x != nil { return x.TotalWeight } @@ -801,7 +795,7 @@ type RouteMatch struct { PathSpecifier isRouteMatch_PathSpecifier `protobuf_oneof:"path_specifier"` // Indicates that prefix/path matching should be case insensitive. The default // is true. - CaseSensitive *wrappers.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` + CaseSensitive *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` // Indicates that the route should additionally match on a runtime key. Every time the route // is considered for a match, it must also fall under the percentage of matches indicated by // this field. For some fraction N/D, a random number in the range [0,D) is selected. If the @@ -837,11 +831,9 @@ type RouteMatch struct { func (x *RouteMatch) Reset() { *x = RouteMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteMatch) String() string { @@ -852,7 +844,7 @@ func (*RouteMatch) ProtoMessage() {} func (x *RouteMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -902,7 +894,7 @@ func (x *RouteMatch) GetConnectMatcher() *RouteMatch_ConnectMatcher { return nil } -func (x *RouteMatch) GetCaseSensitive() *wrappers.BoolValue { +func (x *RouteMatch) GetCaseSensitive() *wrapperspb.BoolValue { if x != nil { return x.CaseSensitive } @@ -1010,7 +1002,7 @@ type CorsPolicy struct { // Specifies the content for the *access-control-max-age* header. MaxAge string `protobuf:"bytes,5,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // Specifies whether the resource allows credentials. - AllowCredentials *wrappers.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` + AllowCredentials *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` // Types that are assignable to EnabledSpecifier: // // *CorsPolicy_Enabled @@ -1029,11 +1021,9 @@ type CorsPolicy struct { func (x *CorsPolicy) Reset() { *x = CorsPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CorsPolicy) String() string { @@ -1044,7 +1034,7 @@ func (*CorsPolicy) ProtoMessage() {} func (x *CorsPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1101,7 +1091,7 @@ func (x *CorsPolicy) GetMaxAge() string { return "" } -func (x *CorsPolicy) GetAllowCredentials() *wrappers.BoolValue { +func (x *CorsPolicy) GetAllowCredentials() *wrapperspb.BoolValue { if x != nil { return x.AllowCredentials } @@ -1116,7 +1106,7 @@ func (m *CorsPolicy) GetEnabledSpecifier() isCorsPolicy_EnabledSpecifier { } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/api/v2/route/route.proto. -func (x *CorsPolicy) GetEnabled() *wrappers.BoolValue { +func (x *CorsPolicy) GetEnabled() *wrapperspb.BoolValue { if x, ok := x.GetEnabledSpecifier().(*CorsPolicy_Enabled); ok { return x.Enabled } @@ -1148,7 +1138,7 @@ type CorsPolicy_Enabled struct { // `filter_enabled (envoy_api_field_route.CorsPolicy.filter_enabled)` field instead. // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/api/v2/route/route.proto. - Enabled *wrappers.BoolValue `protobuf:"bytes,7,opt,name=enabled,proto3,oneof"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=enabled,proto3,oneof"` } type CorsPolicy_FilterEnabled struct { @@ -1225,7 +1215,7 @@ type RouteAction struct { // `config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, // `config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the // `retry overview (arch_overview_http_routing_retry)`. - Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"` // Specifies the idle timeout for the route. If not specified, there is no per-route idle timeout, // although the connection manager wide `stream_idle_timeout // (envoy_api_field_config.filter.network.http_connection_manager.v2.HttpConnectionManager.stream_idle_timeout)` @@ -1244,7 +1234,7 @@ type RouteAction struct { // fires, the stream is terminated with a 408 Request Timeout error code if no // upstream response header has been received, otherwise a stream reset // occurs. - IdleTimeout *duration.Duration `protobuf:"bytes,24,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,24,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // Indicates that the route has a retry policy. Note that if this is set, // it'll take precedence over the virtual host level retry policy entirely // (e.g.: policies are not merged, most internal one becomes the enforced policy). @@ -1261,7 +1251,7 @@ type RouteAction struct { // limits. By default, if the route configured rate limits, the virtual host // `rate_limits (envoy_api_field_route.VirtualHost.rate_limits)` are not applied to the // request. - IncludeVhRateLimits *wrappers.BoolValue `protobuf:"bytes,14,opt,name=include_vh_rate_limits,json=includeVhRateLimits,proto3" json:"include_vh_rate_limits,omitempty"` + IncludeVhRateLimits *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=include_vh_rate_limits,json=includeVhRateLimits,proto3" json:"include_vh_rate_limits,omitempty"` // Specifies a list of hash policies to use for ring hash load balancing. Each // hash policy is evaluated individually and the combined result is used to // route the request. The method of combination is deterministic such that @@ -1287,7 +1277,7 @@ type RouteAction struct { // `timeout (envoy_api_field_route.RouteAction.timeout)` or its default. // This can be used to prevent unexpected upstream request timeouts due to potentially long // time gaps between gRPC request and response in gRPC streaming mode. - MaxGrpcTimeout *duration.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"` + MaxGrpcTimeout *durationpb.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"` // If present, Envoy will adjust the timeout provided by the `grpc-timeout` header by subtracting // the provided duration from the header. This is useful in allowing Envoy to set its global // timeout to be less than that of the deadline imposed by the calling client, which makes it more @@ -1295,7 +1285,7 @@ type RouteAction struct { // The offset will only be applied if the provided grpc_timeout is greater than the offset. This // ensures that the offset will only ever decrease the timeout and never set it to 0 (meaning // infinity). - GrpcTimeoutOffset *duration.Duration `protobuf:"bytes,28,opt,name=grpc_timeout_offset,json=grpcTimeoutOffset,proto3" json:"grpc_timeout_offset,omitempty"` + GrpcTimeoutOffset *durationpb.Duration `protobuf:"bytes,28,opt,name=grpc_timeout_offset,json=grpcTimeoutOffset,proto3" json:"grpc_timeout_offset,omitempty"` UpgradeConfigs []*RouteAction_UpgradeConfig `protobuf:"bytes,25,rep,name=upgrade_configs,json=upgradeConfigs,proto3" json:"upgrade_configs,omitempty"` InternalRedirectAction RouteAction_InternalRedirectAction `protobuf:"varint,26,opt,name=internal_redirect_action,json=internalRedirectAction,proto3,enum=solo.io.envoy.api.v2.route.RouteAction_InternalRedirectAction" json:"internal_redirect_action,omitempty"` // Indicates that the route has a hedge policy. Note that if this is set, @@ -1306,11 +1296,9 @@ type RouteAction struct { func (x *RouteAction) Reset() { *x = RouteAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction) String() string { @@ -1321,7 +1309,7 @@ func (*RouteAction) ProtoMessage() {} func (x *RouteAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1399,7 +1387,7 @@ func (x *RouteAction) GetHostRewrite() string { return "" } -func (x *RouteAction) GetAutoHostRewrite() *wrappers.BoolValue { +func (x *RouteAction) GetAutoHostRewrite() *wrapperspb.BoolValue { if x, ok := x.GetHostRewriteSpecifier().(*RouteAction_AutoHostRewrite); ok { return x.AutoHostRewrite } @@ -1413,14 +1401,14 @@ func (x *RouteAction) GetAutoHostRewriteHeader() string { return "" } -func (x *RouteAction) GetTimeout() *duration.Duration { +func (x *RouteAction) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *RouteAction) GetIdleTimeout() *duration.Duration { +func (x *RouteAction) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -1455,7 +1443,7 @@ func (x *RouteAction) GetRateLimits() []*RateLimit { return nil } -func (x *RouteAction) GetIncludeVhRateLimits() *wrappers.BoolValue { +func (x *RouteAction) GetIncludeVhRateLimits() *wrapperspb.BoolValue { if x != nil { return x.IncludeVhRateLimits } @@ -1476,14 +1464,14 @@ func (x *RouteAction) GetCors() *CorsPolicy { return nil } -func (x *RouteAction) GetMaxGrpcTimeout() *duration.Duration { +func (x *RouteAction) GetMaxGrpcTimeout() *durationpb.Duration { if x != nil { return x.MaxGrpcTimeout } return nil } -func (x *RouteAction) GetGrpcTimeoutOffset() *duration.Duration { +func (x *RouteAction) GetGrpcTimeoutOffset() *durationpb.Duration { if x != nil { return x.GrpcTimeoutOffset } @@ -1563,7 +1551,7 @@ type RouteAction_AutoHostRewrite struct { // option is applicable only when the destination cluster for a route is of // type *strict_dns* or *logical_dns*. Setting this to true with other cluster // types has no effect. - AutoHostRewrite *wrappers.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` + AutoHostRewrite *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` } type RouteAction_AutoHostRewriteHeader struct { @@ -1595,7 +1583,7 @@ type RetryPolicy struct { // Specifies the allowed number of retries. This parameter is optional and // defaults to 1. These are the same conditions documented for // `config_http_filters_router_x-envoy-max-retries`. - NumRetries *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` + NumRetries *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` // Specifies a non-zero upstream timeout per retry attempt. This parameter is optional. The // same conditions documented for // `config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms` apply. @@ -1605,7 +1593,7 @@ type RetryPolicy struct { // Consequently, when using a `5xx (config_http_filters_router_x-envoy-retry-on)` based // retry policy, a request that times out will not be retried as the total timeout budget // would have been exhausted. - PerTryTimeout *duration.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` + PerTryTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` // Specifies an implementation of a RetryPriority which is used to determine the // distribution of load across priorities used for retries. Refer to // `retry plugin configuration (arch_overview_http_retry_plugins)` for more details. @@ -1631,11 +1619,9 @@ type RetryPolicy struct { func (x *RetryPolicy) Reset() { *x = RetryPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy) String() string { @@ -1646,7 +1632,7 @@ func (*RetryPolicy) ProtoMessage() {} func (x *RetryPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1668,14 +1654,14 @@ func (x *RetryPolicy) GetRetryOn() string { return "" } -func (x *RetryPolicy) GetNumRetries() *wrappers.UInt32Value { +func (x *RetryPolicy) GetNumRetries() *wrapperspb.UInt32Value { if x != nil { return x.NumRetries } return nil } -func (x *RetryPolicy) GetPerTryTimeout() *duration.Duration { +func (x *RetryPolicy) GetPerTryTimeout() *durationpb.Duration { if x != nil { return x.PerTryTimeout } @@ -1727,7 +1713,7 @@ type HedgePolicy struct { // Must be at least 1. // Defaults to 1. // [#not-implemented-hide:] - InitialRequests *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=initial_requests,json=initialRequests,proto3" json:"initial_requests,omitempty"` + InitialRequests *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=initial_requests,json=initialRequests,proto3" json:"initial_requests,omitempty"` // Specifies a probability that an additional upstream request should be sent // on top of what is specified by initial_requests. // Defaults to 0. @@ -1746,11 +1732,9 @@ type HedgePolicy struct { func (x *HedgePolicy) Reset() { *x = HedgePolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HedgePolicy) String() string { @@ -1761,7 +1745,7 @@ func (*HedgePolicy) ProtoMessage() {} func (x *HedgePolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1776,7 +1760,7 @@ func (*HedgePolicy) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_rawDescGZIP(), []int{7} } -func (x *HedgePolicy) GetInitialRequests() *wrappers.UInt32Value { +func (x *HedgePolicy) GetInitialRequests() *wrapperspb.UInt32Value { if x != nil { return x.InitialRequests } @@ -1832,11 +1816,9 @@ type RedirectAction struct { func (x *RedirectAction) Reset() { *x = RedirectAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RedirectAction) String() string { @@ -1847,7 +1829,7 @@ func (*RedirectAction) ProtoMessage() {} func (x *RedirectAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1991,11 +1973,9 @@ type DirectResponseAction struct { func (x *DirectResponseAction) Reset() { *x = DirectResponseAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DirectResponseAction) String() string { @@ -2006,7 +1986,7 @@ func (*DirectResponseAction) ProtoMessage() {} func (x *DirectResponseAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2051,11 +2031,9 @@ type Decorator struct { func (x *Decorator) Reset() { *x = Decorator{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Decorator) String() string { @@ -2066,7 +2044,7 @@ func (*Decorator) ProtoMessage() {} func (x *Decorator) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2119,11 +2097,9 @@ type Tracing struct { func (x *Tracing) Reset() { *x = Tracing{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Tracing) String() string { @@ -2134,7 +2110,7 @@ func (*Tracing) ProtoMessage() {} func (x *Tracing) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2212,11 +2188,9 @@ type VirtualCluster struct { func (x *VirtualCluster) Reset() { *x = VirtualCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualCluster) String() string { @@ -2227,7 +2201,7 @@ func (*VirtualCluster) ProtoMessage() {} func (x *VirtualCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2274,7 +2248,7 @@ type RateLimit struct { // 0. // // The filter supports a range of 0 - 10 inclusively for stage numbers. - Stage *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"` + Stage *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"` // The key to be set in runtime to disable this rate limit configuration. DisableKey string `protobuf:"bytes,2,opt,name=disable_key,json=disableKey,proto3" json:"disable_key,omitempty"` // A list of actions that are to be applied for this rate limit configuration. @@ -2288,11 +2262,9 @@ type RateLimit struct { func (x *RateLimit) Reset() { *x = RateLimit{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit) String() string { @@ -2303,7 +2275,7 @@ func (*RateLimit) ProtoMessage() {} func (x *RateLimit) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2318,7 +2290,7 @@ func (*RateLimit) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_rawDescGZIP(), []int{13} } -func (x *RateLimit) GetStage() *wrappers.UInt32Value { +func (x *RateLimit) GetStage() *wrapperspb.UInt32Value { if x != nil { return x.Stage } @@ -2387,11 +2359,9 @@ type HeaderMatcher struct { func (x *HeaderMatcher) Reset() { *x = HeaderMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderMatcher) String() string { @@ -2402,7 +2372,7 @@ func (*HeaderMatcher) ProtoMessage() {} func (x *HeaderMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2574,16 +2544,14 @@ type QueryParameterMatcher struct { // Defaults to false. The entire query parameter value (i.e., the part to // the right of the equals sign in "key=value") must match the regex. // E.g., the regex "\d+$" will match "123" but not "a123" or "123a". - Regex *wrappers.BoolValue `protobuf:"bytes,4,opt,name=regex,proto3" json:"regex,omitempty"` + Regex *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=regex,proto3" json:"regex,omitempty"` } func (x *QueryParameterMatcher) Reset() { *x = QueryParameterMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *QueryParameterMatcher) String() string { @@ -2594,7 +2562,7 @@ func (*QueryParameterMatcher) ProtoMessage() {} func (x *QueryParameterMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2623,7 +2591,7 @@ func (x *QueryParameterMatcher) GetValue() string { return "" } -func (x *QueryParameterMatcher) GetRegex() *wrappers.BoolValue { +func (x *QueryParameterMatcher) GetRegex() *wrapperspb.BoolValue { if x != nil { return x.Regex } @@ -2642,7 +2610,7 @@ type WeightedCluster_ClusterWeight struct { // (envoy_api_field_route.WeightedCluster.total_weight)`. When a request matches the route, // the choice of an upstream cluster is determined by its weight. The sum of weights across all // entries in the clusters array must add up to the total_weight, which defaults to 100. - Weight *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` + Weight *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` // Optional endpoint metadata match criteria used by the subset load balancer. Only endpoints in // the upstream cluster with metadata matching what is set in this field will be considered for // load balancing. Note that this will be merged with what's provided in @@ -2676,22 +2644,20 @@ type WeightedCluster_ClusterWeight struct { // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the `HTTP filter documentation (config_http_filters)` // for if and how it is utilized. - PerFilterConfig map[string]*_struct.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + PerFilterConfig map[string]*structpb.Struct `protobuf:"bytes,8,rep,name=per_filter_config,json=perFilterConfig,proto3" json:"per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // The per_filter_config field can be used to provide weighted cluster-specific // configurations for filters. The key should match the filter name, such as // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the `HTTP filter documentation (config_http_filters)` // for if and how it is utilized. - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,10,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,10,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *WeightedCluster_ClusterWeight) Reset() { *x = WeightedCluster_ClusterWeight{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *WeightedCluster_ClusterWeight) String() string { @@ -2702,7 +2668,7 @@ func (*WeightedCluster_ClusterWeight) ProtoMessage() {} func (x *WeightedCluster_ClusterWeight) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2724,7 +2690,7 @@ func (x *WeightedCluster_ClusterWeight) GetName() string { return "" } -func (x *WeightedCluster_ClusterWeight) GetWeight() *wrappers.UInt32Value { +func (x *WeightedCluster_ClusterWeight) GetWeight() *wrapperspb.UInt32Value { if x != nil { return x.Weight } @@ -2766,14 +2732,14 @@ func (x *WeightedCluster_ClusterWeight) GetResponseHeadersToRemove() []string { return nil } -func (x *WeightedCluster_ClusterWeight) GetPerFilterConfig() map[string]*_struct.Struct { +func (x *WeightedCluster_ClusterWeight) GetPerFilterConfig() map[string]*structpb.Struct { if x != nil { return x.PerFilterConfig } return nil } -func (x *WeightedCluster_ClusterWeight) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *WeightedCluster_ClusterWeight) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -2788,11 +2754,9 @@ type RouteMatch_ConnectMatcher struct { func (x *RouteMatch_ConnectMatcher) Reset() { *x = RouteMatch_ConnectMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteMatch_ConnectMatcher) String() string { @@ -2803,7 +2767,7 @@ func (*RouteMatch_ConnectMatcher) ProtoMessage() {} func (x *RouteMatch_ConnectMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2826,11 +2790,9 @@ type RouteMatch_GrpcRouteMatchOptions struct { func (x *RouteMatch_GrpcRouteMatchOptions) Reset() { *x = RouteMatch_GrpcRouteMatchOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteMatch_GrpcRouteMatchOptions) String() string { @@ -2841,7 +2803,7 @@ func (*RouteMatch_GrpcRouteMatchOptions) ProtoMessage() {} func (x *RouteMatch_GrpcRouteMatchOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2907,11 +2869,9 @@ type RouteAction_RequestMirrorPolicy struct { func (x *RouteAction_RequestMirrorPolicy) Reset() { *x = RouteAction_RequestMirrorPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_RequestMirrorPolicy) String() string { @@ -2922,7 +2882,7 @@ func (*RouteAction_RequestMirrorPolicy) ProtoMessage() {} func (x *RouteAction_RequestMirrorPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2996,11 +2956,9 @@ type RouteAction_HashPolicy struct { func (x *RouteAction_HashPolicy) Reset() { *x = RouteAction_HashPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy) String() string { @@ -3011,7 +2969,7 @@ func (*RouteAction_HashPolicy) ProtoMessage() {} func (x *RouteAction_HashPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3102,16 +3060,14 @@ type RouteAction_UpgradeConfig struct { // Upgrade: [upgrade_type] will be proxied upstream. UpgradeType string `protobuf:"bytes,1,opt,name=upgrade_type,json=upgradeType,proto3" json:"upgrade_type,omitempty"` // Determines if upgrades are available on this route. Defaults to true. - Enabled *wrappers.BoolValue `protobuf:"bytes,2,opt,name=enabled,proto3" json:"enabled,omitempty"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=enabled,proto3" json:"enabled,omitempty"` } func (x *RouteAction_UpgradeConfig) Reset() { *x = RouteAction_UpgradeConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_UpgradeConfig) String() string { @@ -3122,7 +3078,7 @@ func (*RouteAction_UpgradeConfig) ProtoMessage() {} func (x *RouteAction_UpgradeConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3144,7 +3100,7 @@ func (x *RouteAction_UpgradeConfig) GetUpgradeType() string { return "" } -func (x *RouteAction_UpgradeConfig) GetEnabled() *wrappers.BoolValue { +func (x *RouteAction_UpgradeConfig) GetEnabled() *wrapperspb.BoolValue { if x != nil { return x.Enabled } @@ -3163,11 +3119,9 @@ type RouteAction_HashPolicy_Header struct { func (x *RouteAction_HashPolicy_Header) Reset() { *x = RouteAction_HashPolicy_Header{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy_Header) String() string { @@ -3178,7 +3132,7 @@ func (*RouteAction_HashPolicy_Header) ProtoMessage() {} func (x *RouteAction_HashPolicy_Header) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3226,7 +3180,7 @@ type RouteAction_HashPolicy_Cookie struct { // If specified, a cookie with the TTL will be generated if the cookie is // not present. If the TTL is present and zero, the generated cookie will // be a session cookie. - Ttl *duration.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *durationpb.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` // The name of the path for the cookie. If no path is specified here, no path // will be set for the cookie. Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` @@ -3234,11 +3188,9 @@ type RouteAction_HashPolicy_Cookie struct { func (x *RouteAction_HashPolicy_Cookie) Reset() { *x = RouteAction_HashPolicy_Cookie{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[29] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[29] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy_Cookie) String() string { @@ -3249,7 +3201,7 @@ func (*RouteAction_HashPolicy_Cookie) ProtoMessage() {} func (x *RouteAction_HashPolicy_Cookie) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[29] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3271,7 +3223,7 @@ func (x *RouteAction_HashPolicy_Cookie) GetName() string { return "" } -func (x *RouteAction_HashPolicy_Cookie) GetTtl() *duration.Duration { +func (x *RouteAction_HashPolicy_Cookie) GetTtl() *durationpb.Duration { if x != nil { return x.Ttl } @@ -3296,11 +3248,9 @@ type RouteAction_HashPolicy_ConnectionProperties struct { func (x *RouteAction_HashPolicy_ConnectionProperties) Reset() { *x = RouteAction_HashPolicy_ConnectionProperties{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[30] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[30] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy_ConnectionProperties) String() string { @@ -3311,7 +3261,7 @@ func (*RouteAction_HashPolicy_ConnectionProperties) ProtoMessage() {} func (x *RouteAction_HashPolicy_ConnectionProperties) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[30] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3348,11 +3298,9 @@ type RetryPolicy_RetryPriority struct { func (x *RetryPolicy_RetryPriority) Reset() { *x = RetryPolicy_RetryPriority{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[31] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[31] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy_RetryPriority) String() string { @@ -3363,7 +3311,7 @@ func (*RetryPolicy_RetryPriority) ProtoMessage() {} func (x *RetryPolicy_RetryPriority) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[31] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3392,14 +3340,14 @@ func (m *RetryPolicy_RetryPriority) GetConfigType() isRetryPolicy_RetryPriority_ return nil } -func (x *RetryPolicy_RetryPriority) GetConfig() *_struct.Struct { +func (x *RetryPolicy_RetryPriority) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*RetryPolicy_RetryPriority_Config); ok { return x.Config } return nil } -func (x *RetryPolicy_RetryPriority) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryPriority) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryPriority_TypedConfig); ok { return x.TypedConfig } @@ -3411,11 +3359,11 @@ type isRetryPolicy_RetryPriority_ConfigType interface { } type RetryPolicy_RetryPriority_Config struct { - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type RetryPolicy_RetryPriority_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryPriority_Config) isRetryPolicy_RetryPriority_ConfigType() {} @@ -3437,11 +3385,9 @@ type RetryPolicy_RetryHostPredicate struct { func (x *RetryPolicy_RetryHostPredicate) Reset() { *x = RetryPolicy_RetryHostPredicate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[32] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[32] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy_RetryHostPredicate) String() string { @@ -3452,7 +3398,7 @@ func (*RetryPolicy_RetryHostPredicate) ProtoMessage() {} func (x *RetryPolicy_RetryHostPredicate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[32] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3481,14 +3427,14 @@ func (m *RetryPolicy_RetryHostPredicate) GetConfigType() isRetryPolicy_RetryHost return nil } -func (x *RetryPolicy_RetryHostPredicate) GetConfig() *_struct.Struct { +func (x *RetryPolicy_RetryHostPredicate) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*RetryPolicy_RetryHostPredicate_Config); ok { return x.Config } return nil } -func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryHostPredicate_TypedConfig); ok { return x.TypedConfig } @@ -3500,11 +3446,11 @@ type isRetryPolicy_RetryHostPredicate_ConfigType interface { } type RetryPolicy_RetryHostPredicate_Config struct { - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type RetryPolicy_RetryHostPredicate_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryHostPredicate_Config) isRetryPolicy_RetryHostPredicate_ConfigType() {} @@ -3520,21 +3466,19 @@ type RetryPolicy_RetryBackOff struct { // than zero. Values less than 1 ms are rounded up to 1 ms. // See `config_http_filters_router_x-envoy-max-retries` for a discussion of Envoy's // back-off algorithm. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between retries. This parameter is optional, but must be // greater than or equal to the `base_interval` if set. The default is 10 times the // `base_interval`. See `config_http_filters_router_x-envoy-max-retries` for a discussion // of Envoy's back-off algorithm. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *RetryPolicy_RetryBackOff) Reset() { *x = RetryPolicy_RetryBackOff{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[33] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[33] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy_RetryBackOff) String() string { @@ -3545,7 +3489,7 @@ func (*RetryPolicy_RetryBackOff) ProtoMessage() {} func (x *RetryPolicy_RetryBackOff) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[33] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3560,14 +3504,14 @@ func (*RetryPolicy_RetryBackOff) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_rawDescGZIP(), []int{6, 2} } -func (x *RetryPolicy_RetryBackOff) GetBaseInterval() *duration.Duration { +func (x *RetryPolicy_RetryBackOff) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *RetryPolicy_RetryBackOff) GetMaxInterval() *duration.Duration { +func (x *RetryPolicy_RetryBackOff) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -3592,11 +3536,9 @@ type RateLimit_Action struct { func (x *RateLimit_Action) Reset() { *x = RateLimit_Action{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[34] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action) String() string { @@ -3607,7 +3549,7 @@ func (*RateLimit_Action) ProtoMessage() {} func (x *RateLimit_Action) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[34] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3734,11 +3676,9 @@ type RateLimit_Action_SourceCluster struct { func (x *RateLimit_Action_SourceCluster) Reset() { *x = RateLimit_Action_SourceCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[35] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[35] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_SourceCluster) String() string { @@ -3749,7 +3689,7 @@ func (*RateLimit_Action_SourceCluster) ProtoMessage() {} func (x *RateLimit_Action_SourceCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[35] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3790,11 +3730,9 @@ type RateLimit_Action_DestinationCluster struct { func (x *RateLimit_Action_DestinationCluster) Reset() { *x = RateLimit_Action_DestinationCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[36] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[36] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_DestinationCluster) String() string { @@ -3805,7 +3743,7 @@ func (*RateLimit_Action_DestinationCluster) ProtoMessage() {} func (x *RateLimit_Action_DestinationCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[36] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3843,11 +3781,9 @@ type RateLimit_Action_RequestHeaders struct { func (x *RateLimit_Action_RequestHeaders) Reset() { *x = RateLimit_Action_RequestHeaders{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[37] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[37] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_RequestHeaders) String() string { @@ -3858,7 +3794,7 @@ func (*RateLimit_Action_RequestHeaders) ProtoMessage() {} func (x *RateLimit_Action_RequestHeaders) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[37] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3903,11 +3839,9 @@ type RateLimit_Action_RemoteAddress struct { func (x *RateLimit_Action_RemoteAddress) Reset() { *x = RateLimit_Action_RemoteAddress{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[38] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[38] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_RemoteAddress) String() string { @@ -3918,7 +3852,7 @@ func (*RateLimit_Action_RemoteAddress) ProtoMessage() {} func (x *RateLimit_Action_RemoteAddress) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[38] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3951,11 +3885,9 @@ type RateLimit_Action_GenericKey struct { func (x *RateLimit_Action_GenericKey) Reset() { *x = RateLimit_Action_GenericKey{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[39] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[39] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_GenericKey) String() string { @@ -3966,7 +3898,7 @@ func (*RateLimit_Action_GenericKey) ProtoMessage() {} func (x *RateLimit_Action_GenericKey) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[39] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4006,7 +3938,7 @@ type RateLimit_Action_HeaderValueMatch struct { // request matches the headers. If set to false, the action will append a // descriptor entry when the request does not match the headers. The // default value is true. - ExpectMatch *wrappers.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` + ExpectMatch *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` // Specifies a set of headers that the rate limit action should match // on. The action will check the request’s headers against all the // specified headers in the config. A match will happen if all the @@ -4017,11 +3949,9 @@ type RateLimit_Action_HeaderValueMatch struct { func (x *RateLimit_Action_HeaderValueMatch) Reset() { *x = RateLimit_Action_HeaderValueMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[40] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[40] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_HeaderValueMatch) String() string { @@ -4032,7 +3962,7 @@ func (*RateLimit_Action_HeaderValueMatch) ProtoMessage() {} func (x *RateLimit_Action_HeaderValueMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[40] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4054,7 +3984,7 @@ func (x *RateLimit_Action_HeaderValueMatch) GetDescriptorValue() string { return "" } -func (x *RateLimit_Action_HeaderValueMatch) GetExpectMatch() *wrappers.BoolValue { +func (x *RateLimit_Action_HeaderValueMatch) GetExpectMatch() *wrapperspb.BoolValue { if x != nil { return x.ExpectMatch } @@ -4908,7 +4838,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_enumTypes = make([]protoimpl.EnumInfo, 4) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes = make([]protoimpl.MessageInfo, 41) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_goTypes = []any{ (VirtualHost_TlsRequirementType)(0), // 0: solo.io.envoy.api.v2.route.VirtualHost.TlsRequirementType (RouteAction_ClusterNotFoundResponseCode)(0), // 1: solo.io.envoy.api.v2.route.RouteAction.ClusterNotFoundResponseCode (RouteAction_InternalRedirectAction)(0), // 2: solo.io.envoy.api.v2.route.RouteAction.InternalRedirectAction @@ -4956,17 +4886,17 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_ (*RateLimit_Action_HeaderValueMatch)(nil), // 44: solo.io.envoy.api.v2.route.RateLimit.Action.HeaderValueMatch (*core.HeaderValueOption)(nil), // 45: solo.io.envoy.api.v2.core.HeaderValueOption (*core.Metadata)(nil), // 46: solo.io.envoy.api.v2.core.Metadata - (*wrappers.UInt32Value)(nil), // 47: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 48: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 47: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 48: google.protobuf.BoolValue (*core.RuntimeFractionalPercent)(nil), // 49: solo.io.envoy.api.v2.core.RuntimeFractionalPercent - (*duration.Duration)(nil), // 50: google.protobuf.Duration + (*durationpb.Duration)(nil), // 50: google.protobuf.Duration (core.RoutingPriority)(0), // 51: solo.io.envoy.api.v2.core.RoutingPriority (*_type.FractionalPercent)(nil), // 52: solo.io.envoy.type.FractionalPercent (*core.DataSource)(nil), // 53: solo.io.envoy.api.v2.core.DataSource (core.RequestMethod)(0), // 54: solo.io.envoy.api.v2.core.RequestMethod (*_type1.Int64Range)(nil), // 55: solo.io.envoy.type.Int64Range - (*_struct.Struct)(nil), // 56: google.protobuf.Struct - (*any1.Any)(nil), // 57: google.protobuf.Any + (*structpb.Struct)(nil), // 56: google.protobuf.Struct + (*anypb.Any)(nil), // 57: google.protobuf.Any } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_depIdxs = []int32{ 5, // 0: solo.io.envoy.api.v2.route.VirtualHost.routes:type_name -> solo.io.envoy.api.v2.route.Route @@ -5084,444 +5014,22 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualHost); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Route); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WeightedCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CorsPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HedgePolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RedirectAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DirectResponseAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Decorator); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Tracing); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QueryParameterMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WeightedCluster_ClusterWeight); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteMatch_ConnectMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteMatch_GrpcRouteMatchOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_RequestMirrorPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_UpgradeConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy_Header); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy_Cookie); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy_ConnectionProperties); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy_RetryPriority); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy_RetryHostPredicate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy_RetryBackOff); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_SourceCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_DestinationCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_RequestHeaders); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_RemoteAddress); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_GenericKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_HeaderValueMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[1].OneofWrappers = []any{ (*Route_Route)(nil), (*Route_Redirect)(nil), (*Route_DirectResponse)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[3].OneofWrappers = []any{ (*RouteMatch_Prefix)(nil), (*RouteMatch_Path)(nil), (*RouteMatch_Regex)(nil), (*RouteMatch_ConnectMatcher_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[4].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[4].OneofWrappers = []any{ (*CorsPolicy_Enabled)(nil), (*CorsPolicy_FilterEnabled)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[5].OneofWrappers = []any{ (*RouteAction_Cluster)(nil), (*RouteAction_ClusterHeader)(nil), (*RouteAction_WeightedClusters)(nil), @@ -5529,13 +5037,13 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route (*RouteAction_AutoHostRewrite)(nil), (*RouteAction_AutoHostRewriteHeader)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[8].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[8].OneofWrappers = []any{ (*RedirectAction_HttpsRedirect)(nil), (*RedirectAction_SchemeRedirect)(nil), (*RedirectAction_PathRedirect)(nil), (*RedirectAction_PrefixRewrite)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[14].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[14].OneofWrappers = []any{ (*HeaderMatcher_ExactMatch)(nil), (*HeaderMatcher_RegexMatch)(nil), (*HeaderMatcher_RangeMatch)(nil), @@ -5543,20 +5051,20 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route (*HeaderMatcher_PrefixMatch)(nil), (*HeaderMatcher_SuffixMatch)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[26].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[26].OneofWrappers = []any{ (*RouteAction_HashPolicy_Header_)(nil), (*RouteAction_HashPolicy_Cookie_)(nil), (*RouteAction_HashPolicy_ConnectionProperties_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[31].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[31].OneofWrappers = []any{ (*RetryPolicy_RetryPriority_Config)(nil), (*RetryPolicy_RetryPriority_TypedConfig)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[32].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[32].OneofWrappers = []any{ (*RetryPolicy_RetryHostPredicate_Config)(nil), (*RetryPolicy_RetryHostPredicate_TypedConfig)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[34].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_api_v2_route_route_proto_msgTypes[34].OneofWrappers = []any{ (*RateLimit_Action_SourceCluster_)(nil), (*RateLimit_Action_DestinationCluster_)(nil), (*RateLimit_Action_RequestHeaders_)(nil), diff --git a/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3/mutation_rules.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3/mutation_rules.pb.clone.go index b7024467f..61a62b098 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3/mutation_rules.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3/mutation_rules.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_matcher_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -40,27 +40,27 @@ func (m *HeaderMutationRules) Clone() proto.Message { target = &HeaderMutationRules{} if h, ok := interface{}(m.GetAllowAllRouting()).(clone.Cloner); ok { - target.AllowAllRouting = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowAllRouting = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowAllRouting = proto.Clone(m.GetAllowAllRouting()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowAllRouting = proto.Clone(m.GetAllowAllRouting()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetAllowEnvoy()).(clone.Cloner); ok { - target.AllowEnvoy = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowEnvoy = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowEnvoy = proto.Clone(m.GetAllowEnvoy()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowEnvoy = proto.Clone(m.GetAllowEnvoy()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetDisallowSystem()).(clone.Cloner); ok { - target.DisallowSystem = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisallowSystem = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisallowSystem = proto.Clone(m.GetDisallowSystem()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisallowSystem = proto.Clone(m.GetDisallowSystem()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetDisallowAll()).(clone.Cloner); ok { - target.DisallowAll = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisallowAll = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisallowAll = proto.Clone(m.GetDisallowAll()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisallowAll = proto.Clone(m.GetDisallowAll()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetAllowExpression()).(clone.Cloner); ok { @@ -76,9 +76,9 @@ func (m *HeaderMutationRules) Clone() proto.Message { } if h, ok := interface{}(m.GetDisallowIsError()).(clone.Cloner); ok { - target.DisallowIsError = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisallowIsError = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisallowIsError = proto.Clone(m.GetDisallowIsError()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisallowIsError = proto.Clone(m.GetDisallowIsError()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3/mutation_rules.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3/mutation_rules.pb.go index 998f80c01..8e6f987e0 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3/mutation_rules.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3/mutation_rules.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/common/mutation_rules/v3/mutation_rules.proto @@ -15,13 +15,13 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v31 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -66,22 +66,22 @@ type HeaderMutationRules struct { // filters or request routing cannot be modified. These headers are // `host`, `:authority`, `:scheme`, and `:method`. Setting this parameter // to true allows these headers to be modified as well. - AllowAllRouting *wrappers.BoolValue `protobuf:"bytes,1,opt,name=allow_all_routing,json=allowAllRouting,proto3" json:"allow_all_routing,omitempty"` + AllowAllRouting *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=allow_all_routing,json=allowAllRouting,proto3" json:"allow_all_routing,omitempty"` // If true, allow modification of envoy internal headers. By default, these // start with `x-envoy` but this may be overridden in the `Bootstrap` // configuration using the // :ref:`header_prefix ` // field. Default is false. - AllowEnvoy *wrappers.BoolValue `protobuf:"bytes,2,opt,name=allow_envoy,json=allowEnvoy,proto3" json:"allow_envoy,omitempty"` + AllowEnvoy *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=allow_envoy,json=allowEnvoy,proto3" json:"allow_envoy,omitempty"` // If true, prevent modification of any system header, defined as a header // that starts with a `:` character, regardless of any other settings. // A processing server may still override the `:status` of an HTTP response // using an `ImmediateResponse` message. Default is false. - DisallowSystem *wrappers.BoolValue `protobuf:"bytes,3,opt,name=disallow_system,json=disallowSystem,proto3" json:"disallow_system,omitempty"` + DisallowSystem *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=disallow_system,json=disallowSystem,proto3" json:"disallow_system,omitempty"` // If true, prevent modifications of all header values, regardless of any // other settings. A processing server may still override the `:status` // of an HTTP response using an `ImmediateResponse` message. Default is false. - DisallowAll *wrappers.BoolValue `protobuf:"bytes,4,opt,name=disallow_all,json=disallowAll,proto3" json:"disallow_all,omitempty"` + DisallowAll *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=disallow_all,json=disallowAll,proto3" json:"disallow_all,omitempty"` // If set, specifically allow any header that matches this regular // expression. This overrides all other settings except for // `disallow_expression`. @@ -95,16 +95,14 @@ type HeaderMutationRules struct { // parameter, any attempt to set, add, or modify a disallowed header will // cause the `rejected_header_mutations` counter to be incremented. // Default is false. - DisallowIsError *wrappers.BoolValue `protobuf:"bytes,7,opt,name=disallow_is_error,json=disallowIsError,proto3" json:"disallow_is_error,omitempty"` + DisallowIsError *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=disallow_is_error,json=disallowIsError,proto3" json:"disallow_is_error,omitempty"` } func (x *HeaderMutationRules) Reset() { *x = HeaderMutationRules{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderMutationRules) String() string { @@ -115,7 +113,7 @@ func (*HeaderMutationRules) ProtoMessage() {} func (x *HeaderMutationRules) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -130,28 +128,28 @@ func (*HeaderMutationRules) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_rawDescGZIP(), []int{0} } -func (x *HeaderMutationRules) GetAllowAllRouting() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetAllowAllRouting() *wrapperspb.BoolValue { if x != nil { return x.AllowAllRouting } return nil } -func (x *HeaderMutationRules) GetAllowEnvoy() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetAllowEnvoy() *wrapperspb.BoolValue { if x != nil { return x.AllowEnvoy } return nil } -func (x *HeaderMutationRules) GetDisallowSystem() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetDisallowSystem() *wrapperspb.BoolValue { if x != nil { return x.DisallowSystem } return nil } -func (x *HeaderMutationRules) GetDisallowAll() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetDisallowAll() *wrapperspb.BoolValue { if x != nil { return x.DisallowAll } @@ -172,7 +170,7 @@ func (x *HeaderMutationRules) GetDisallowExpression() *v3.RegexMatcher { return nil } -func (x *HeaderMutationRules) GetDisallowIsError() *wrappers.BoolValue { +func (x *HeaderMutationRules) GetDisallowIsError() *wrapperspb.BoolValue { if x != nil { return x.DisallowIsError } @@ -195,11 +193,9 @@ type HeaderMutation struct { func (x *HeaderMutation) Reset() { *x = HeaderMutation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderMutation) String() string { @@ -210,7 +206,7 @@ func (*HeaderMutation) ProtoMessage() {} func (x *HeaderMutation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -366,10 +362,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_commo } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_goTypes = []any{ (*HeaderMutationRules)(nil), // 0: solo.io.envoy.config.common.mutation_rules.v3.HeaderMutationRules (*HeaderMutation)(nil), // 1: solo.io.envoy.config.common.mutation_rules.v3.HeaderMutation - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue (*v3.RegexMatcher)(nil), // 3: solo.io.envoy.type.matcher.v3.RegexMatcher (*v31.HeaderValueOption)(nil), // 4: solo.io.envoy.config.core.v3.HeaderValueOption } @@ -396,33 +392,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_commo if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderMutationRules); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderMutation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_common_mutation_rules_v3_mutation_rules_proto_msgTypes[1].OneofWrappers = []any{ (*HeaderMutation_Remove)(nil), (*HeaderMutation_Append)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/address.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/address.pb.clone.go index 6a9fedb16..1f68a93b5 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/address.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/address.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -86,21 +86,21 @@ func (m *TcpKeepalive) Clone() proto.Message { target = &TcpKeepalive{} if h, ok := interface{}(m.GetKeepaliveProbes()).(clone.Cloner); ok { - target.KeepaliveProbes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveProbes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.KeepaliveProbes = proto.Clone(m.GetKeepaliveProbes()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveProbes = proto.Clone(m.GetKeepaliveProbes()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetKeepaliveTime()).(clone.Cloner); ok { - target.KeepaliveTime = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveTime = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.KeepaliveTime = proto.Clone(m.GetKeepaliveTime()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveTime = proto.Clone(m.GetKeepaliveTime()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetKeepaliveInterval()).(clone.Cloner); ok { - target.KeepaliveInterval = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveInterval = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.KeepaliveInterval = proto.Clone(m.GetKeepaliveInterval()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveInterval = proto.Clone(m.GetKeepaliveInterval()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target @@ -121,9 +121,9 @@ func (m *BindConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetFreebind()).(clone.Cloner); ok { - target.Freebind = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Freebind = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Freebind = proto.Clone(m.GetFreebind()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Freebind = proto.Clone(m.GetFreebind()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetSocketOptions() != nil { @@ -192,9 +192,9 @@ func (m *CidrRange) Clone() proto.Message { target.AddressPrefix = m.GetAddressPrefix() if h, ok := interface{}(m.GetPrefixLen()).(clone.Cloner); ok { - target.PrefixLen = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PrefixLen = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.PrefixLen = proto.Clone(m.GetPrefixLen()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PrefixLen = proto.Clone(m.GetPrefixLen()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/address.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/address.pb.go index 4fc2c1ef9..fa632aafe 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/address.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/address.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/address.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -87,11 +87,9 @@ type Pipe struct { func (x *Pipe) Reset() { *x = Pipe{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Pipe) String() string { @@ -102,7 +100,7 @@ func (*Pipe) ProtoMessage() {} func (x *Pipe) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -169,11 +167,9 @@ type SocketAddress struct { func (x *SocketAddress) Reset() { *x = SocketAddress{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SocketAddress) String() string { @@ -184,7 +180,7 @@ func (*SocketAddress) ProtoMessage() {} func (x *SocketAddress) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -275,23 +271,21 @@ type TcpKeepalive struct { // Maximum number of keepalive probes to send without response before deciding // the connection is dead. Default is to use the OS level configuration (unless // overridden, Linux defaults to 9.) - KeepaliveProbes *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=keepalive_probes,json=keepaliveProbes,proto3" json:"keepalive_probes,omitempty"` + KeepaliveProbes *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=keepalive_probes,json=keepaliveProbes,proto3" json:"keepalive_probes,omitempty"` // The number of seconds a connection needs to be idle before keep-alive probes // start being sent. Default is to use the OS level configuration (unless // overridden, Linux defaults to 7200s (i.e., 2 hours.) - KeepaliveTime *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` + KeepaliveTime *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` // The number of seconds between keep-alive probes. Default is to use the OS // level configuration (unless overridden, Linux defaults to 75s.) - KeepaliveInterval *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` + KeepaliveInterval *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` } func (x *TcpKeepalive) Reset() { *x = TcpKeepalive{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TcpKeepalive) String() string { @@ -302,7 +296,7 @@ func (*TcpKeepalive) ProtoMessage() {} func (x *TcpKeepalive) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -317,21 +311,21 @@ func (*TcpKeepalive) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_rawDescGZIP(), []int{2} } -func (x *TcpKeepalive) GetKeepaliveProbes() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveProbes() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveProbes } return nil } -func (x *TcpKeepalive) GetKeepaliveTime() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveTime() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveTime } return nil } -func (x *TcpKeepalive) GetKeepaliveInterval() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveInterval() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveInterval } @@ -352,7 +346,7 @@ type BindConfig struct { // to false, the option *IP_FREEBIND* is disabled on the socket. When this // flag is not set (default), the socket is not modified, i.e. the option is // neither enabled nor disabled. - Freebind *wrappers.BoolValue `protobuf:"bytes,2,opt,name=freebind,proto3" json:"freebind,omitempty"` + Freebind *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=freebind,proto3" json:"freebind,omitempty"` // Additional socket options that may not be present in Envoy source code or // precompiled binaries. SocketOptions []*SocketOption `protobuf:"bytes,3,rep,name=socket_options,json=socketOptions,proto3" json:"socket_options,omitempty"` @@ -360,11 +354,9 @@ type BindConfig struct { func (x *BindConfig) Reset() { *x = BindConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BindConfig) String() string { @@ -375,7 +367,7 @@ func (*BindConfig) ProtoMessage() {} func (x *BindConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -397,7 +389,7 @@ func (x *BindConfig) GetSourceAddress() *SocketAddress { return nil } -func (x *BindConfig) GetFreebind() *wrappers.BoolValue { +func (x *BindConfig) GetFreebind() *wrapperspb.BoolValue { if x != nil { return x.Freebind } @@ -428,11 +420,9 @@ type Address struct { func (x *Address) Reset() { *x = Address{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Address) String() string { @@ -443,7 +433,7 @@ func (*Address) ProtoMessage() {} func (x *Address) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -505,16 +495,14 @@ type CidrRange struct { // IPv4 or IPv6 address, e.g. `192.0.0.0` or `2001:db8::`. AddressPrefix string `protobuf:"bytes,1,opt,name=address_prefix,json=addressPrefix,proto3" json:"address_prefix,omitempty"` // Length of prefix, e.g. 0, 32. - PrefixLen *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` + PrefixLen *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` } func (x *CidrRange) Reset() { *x = CidrRange{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CidrRange) String() string { @@ -525,7 +513,7 @@ func (*CidrRange) ProtoMessage() {} func (x *CidrRange) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -547,7 +535,7 @@ func (x *CidrRange) GetAddressPrefix() string { return "" } -func (x *CidrRange) GetPrefixLen() *wrappers.UInt32Value { +func (x *CidrRange) GetPrefixLen() *wrapperspb.UInt32Value { if x != nil { return x.PrefixLen } @@ -698,17 +686,17 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_goTypes = []interface{}{ - (SocketAddress_Protocol)(0), // 0: solo.io.envoy.config.core.v3.SocketAddress.Protocol - (*Pipe)(nil), // 1: solo.io.envoy.config.core.v3.Pipe - (*SocketAddress)(nil), // 2: solo.io.envoy.config.core.v3.SocketAddress - (*TcpKeepalive)(nil), // 3: solo.io.envoy.config.core.v3.TcpKeepalive - (*BindConfig)(nil), // 4: solo.io.envoy.config.core.v3.BindConfig - (*Address)(nil), // 5: solo.io.envoy.config.core.v3.Address - (*CidrRange)(nil), // 6: solo.io.envoy.config.core.v3.CidrRange - (*wrappers.UInt32Value)(nil), // 7: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 8: google.protobuf.BoolValue - (*SocketOption)(nil), // 9: solo.io.envoy.config.core.v3.SocketOption +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_goTypes = []any{ + (SocketAddress_Protocol)(0), // 0: solo.io.envoy.config.core.v3.SocketAddress.Protocol + (*Pipe)(nil), // 1: solo.io.envoy.config.core.v3.Pipe + (*SocketAddress)(nil), // 2: solo.io.envoy.config.core.v3.SocketAddress + (*TcpKeepalive)(nil), // 3: solo.io.envoy.config.core.v3.TcpKeepalive + (*BindConfig)(nil), // 4: solo.io.envoy.config.core.v3.BindConfig + (*Address)(nil), // 5: solo.io.envoy.config.core.v3.Address + (*CidrRange)(nil), // 6: solo.io.envoy.config.core.v3.CidrRange + (*wrapperspb.UInt32Value)(nil), // 7: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 8: google.protobuf.BoolValue + (*SocketOption)(nil), // 9: solo.io.envoy.config.core.v3.SocketOption } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_depIdxs = []int32{ 0, // 0: solo.io.envoy.config.core.v3.SocketAddress.protocol:type_name -> solo.io.envoy.config.core.v3.SocketAddress.Protocol @@ -736,85 +724,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ return } file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Pipe); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SocketAddress); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TcpKeepalive); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BindConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Address); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CidrRange); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[1].OneofWrappers = []any{ (*SocketAddress_PortValue)(nil), (*SocketAddress_NamedPort)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[4].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_msgTypes[4].OneofWrappers = []any{ (*Address_SocketAddress)(nil), (*Address_Pipe)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/backoff.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/backoff.pb.clone.go index ae7d1a0d9..688c9eb86 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/backoff.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/backoff.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" ) // ensure the imports are used @@ -36,15 +36,15 @@ func (m *BackoffStrategy) Clone() proto.Message { target = &BackoffStrategy{} if h, ok := interface{}(m.GetBaseInterval()).(clone.Cloner); ok { - target.BaseInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxInterval()).(clone.Cloner); ok { - target.MaxInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/backoff.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/backoff.pb.go index 30e7c4594..5e54e1f62 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/backoff.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/backoff.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/backoff.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" ) const ( @@ -34,22 +34,20 @@ type BackoffStrategy struct { // The base interval to be used for the next back off computation. It should // be greater than zero and less than or equal to :ref:`max_interval // `. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between retries. This parameter is optional, // but must be greater than or equal to the :ref:`base_interval // ` if set. The default // is 10 times the :ref:`base_interval // `. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *BackoffStrategy) Reset() { *x = BackoffStrategy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BackoffStrategy) String() string { @@ -60,7 +58,7 @@ func (*BackoffStrategy) ProtoMessage() {} func (x *BackoffStrategy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -75,14 +73,14 @@ func (*BackoffStrategy) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_rawDescGZIP(), []int{0} } -func (x *BackoffStrategy) GetBaseInterval() *duration.Duration { +func (x *BackoffStrategy) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *BackoffStrategy) GetMaxInterval() *duration.Duration { +func (x *BackoffStrategy) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -149,9 +147,9 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_goTypes = []interface{}{ - (*BackoffStrategy)(nil), // 0: solo.io.envoy.config.core.v3.BackoffStrategy - (*duration.Duration)(nil), // 1: google.protobuf.Duration +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_goTypes = []any{ + (*BackoffStrategy)(nil), // 0: solo.io.envoy.config.core.v3.BackoffStrategy + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_depIdxs = []int32{ 1, // 0: solo.io.envoy.config.core.v3.BackoffStrategy.base_interval:type_name -> google.protobuf.Duration @@ -170,20 +168,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BackoffStrategy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/base.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/base.pb.clone.go index fcd8e9b7c..74bc5885d 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/base.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/base.pb.clone.go @@ -13,13 +13,13 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" + github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/v3" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/v3" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -65,9 +65,9 @@ func (m *BuildVersion) Clone() proto.Message { } if h, ok := interface{}(m.GetMetadata()).(clone.Cloner); ok { - target.Metadata = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Metadata = proto.Clone(m.GetMetadata()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata = proto.Clone(m.GetMetadata()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -111,9 +111,9 @@ func (m *Node) Clone() proto.Message { target.Cluster = m.GetCluster() if h, ok := interface{}(m.GetMetadata()).(clone.Cloner); ok { - target.Metadata = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Metadata = proto.Clone(m.GetMetadata()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata = proto.Clone(m.GetMetadata()).(*google_golang_org_protobuf_types_known_structpb.Struct) } if h, ok := interface{}(m.GetLocality()).(clone.Cloner); ok { @@ -193,13 +193,13 @@ func (m *Metadata) Clone() proto.Message { target = &Metadata{} if m.GetFilterMetadata() != nil { - target.FilterMetadata = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetFilterMetadata())) + target.FilterMetadata = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetFilterMetadata())) for k, v := range m.GetFilterMetadata() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.FilterMetadata[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.FilterMetadata[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.FilterMetadata[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.FilterMetadata[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } @@ -247,9 +247,9 @@ func (m *RuntimeFeatureFlag) Clone() proto.Message { target = &RuntimeFeatureFlag{} if h, ok := interface{}(m.GetDefaultValue()).(clone.Cloner); ok { - target.DefaultValue = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DefaultValue = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DefaultValue = proto.Clone(m.GetDefaultValue()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DefaultValue = proto.Clone(m.GetDefaultValue()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } target.RuntimeKey = m.GetRuntimeKey() @@ -287,9 +287,9 @@ func (m *HeaderValueOption) Clone() proto.Message { } if h, ok := interface{}(m.GetAppend()).(clone.Cloner); ok { - target.Append = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Append = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Append = proto.Clone(m.GetAppend()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Append = proto.Clone(m.GetAppend()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -375,9 +375,9 @@ func (m *RetryPolicy) Clone() proto.Message { } if h, ok := interface{}(m.GetNumRetries()).(clone.Cloner); ok { - target.NumRetries = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.NumRetries = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.NumRetries = proto.Clone(m.GetNumRetries()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.NumRetries = proto.Clone(m.GetNumRetries()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target @@ -463,11 +463,11 @@ func (m *TransportSocket) Clone() proto.Message { if h, ok := interface{}(m.GetTypedConfig()).(clone.Cloner); ok { target.ConfigType = &TransportSocket_TypedConfig{ - TypedConfig: h.Clone().(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any), } } else { target.ConfigType = &TransportSocket_TypedConfig{ - TypedConfig: proto.Clone(m.GetTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: proto.Clone(m.GetTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any), } } diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/base.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/base.pb.go index a6d82f5a8..ab6ce1234 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/base.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/base.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/base.proto @@ -11,15 +11,15 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - _ "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/v3" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + _ "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -230,11 +230,9 @@ type Locality struct { func (x *Locality) Reset() { *x = Locality{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Locality) String() string { @@ -245,7 +243,7 @@ func (*Locality) ProtoMessage() {} func (x *Locality) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -292,16 +290,14 @@ type BuildVersion struct { Version *v3.SemanticVersion `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` // Free-form build information. // Envoy defines several well known keys in the source/common/common/version.h file - Metadata *_struct.Struct `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` } func (x *BuildVersion) Reset() { *x = BuildVersion{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BuildVersion) String() string { @@ -312,7 +308,7 @@ func (*BuildVersion) ProtoMessage() {} func (x *BuildVersion) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -334,7 +330,7 @@ func (x *BuildVersion) GetVersion() *v3.SemanticVersion { return nil } -func (x *BuildVersion) GetMetadata() *_struct.Struct { +func (x *BuildVersion) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -371,11 +367,9 @@ type Extension struct { func (x *Extension) Reset() { *x = Extension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Extension) String() string { @@ -386,7 +380,7 @@ func (*Extension) ProtoMessage() {} func (x *Extension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -467,7 +461,7 @@ type Node struct { Cluster string `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"` // Opaque metadata extending the node identifier. Envoy will pass this // directly to the management server. - Metadata *_struct.Struct `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` // Locality specifying where the Envoy instance is running. Locality *Locality `protobuf:"bytes,4,opt,name=locality,proto3" json:"locality,omitempty"` // Free-form string that identifies the entity requesting config. @@ -495,11 +489,9 @@ type Node struct { func (x *Node) Reset() { *x = Node{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Node) String() string { @@ -510,7 +502,7 @@ func (*Node) ProtoMessage() {} func (x *Node) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -539,7 +531,7 @@ func (x *Node) GetCluster() string { return "" } -func (x *Node) GetMetadata() *_struct.Struct { +func (x *Node) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -651,16 +643,14 @@ type Metadata struct { // Key is the reverse DNS filter name, e.g. com.acme.widget. The envoy.* // namespace is reserved for Envoy's built-in filters. - FilterMetadata map[string]*_struct.Struct `protobuf:"bytes,1,rep,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + FilterMetadata map[string]*structpb.Struct `protobuf:"bytes,1,rep,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *Metadata) Reset() { *x = Metadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Metadata) String() string { @@ -671,7 +661,7 @@ func (*Metadata) ProtoMessage() {} func (x *Metadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -686,7 +676,7 @@ func (*Metadata) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_rawDescGZIP(), []int{4} } -func (x *Metadata) GetFilterMetadata() map[string]*_struct.Struct { +func (x *Metadata) GetFilterMetadata() map[string]*structpb.Struct { if x != nil { return x.FilterMetadata } @@ -707,11 +697,9 @@ type RuntimeUInt32 struct { func (x *RuntimeUInt32) Reset() { *x = RuntimeUInt32{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RuntimeUInt32) String() string { @@ -722,7 +710,7 @@ func (*RuntimeUInt32) ProtoMessage() {} func (x *RuntimeUInt32) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -765,11 +753,9 @@ type RuntimeDouble struct { func (x *RuntimeDouble) Reset() { *x = RuntimeDouble{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RuntimeDouble) String() string { @@ -780,7 +766,7 @@ func (*RuntimeDouble) ProtoMessage() {} func (x *RuntimeDouble) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -816,7 +802,7 @@ type RuntimeFeatureFlag struct { unknownFields protoimpl.UnknownFields // Default value if runtime value is not available. - DefaultValue *wrappers.BoolValue `protobuf:"bytes,1,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` + DefaultValue *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` // Runtime key to get value for comparison. This value is used if defined. The boolean value must // be represented via its // [canonical JSON encoding](https://developers.google.com/protocol-buffers/docs/proto3#json). @@ -825,11 +811,9 @@ type RuntimeFeatureFlag struct { func (x *RuntimeFeatureFlag) Reset() { *x = RuntimeFeatureFlag{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RuntimeFeatureFlag) String() string { @@ -840,7 +824,7 @@ func (*RuntimeFeatureFlag) ProtoMessage() {} func (x *RuntimeFeatureFlag) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -855,7 +839,7 @@ func (*RuntimeFeatureFlag) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_rawDescGZIP(), []int{7} } -func (x *RuntimeFeatureFlag) GetDefaultValue() *wrappers.BoolValue { +func (x *RuntimeFeatureFlag) GetDefaultValue() *wrapperspb.BoolValue { if x != nil { return x.DefaultValue } @@ -887,11 +871,9 @@ type HeaderValue struct { func (x *HeaderValue) Reset() { *x = HeaderValue{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderValue) String() string { @@ -902,7 +884,7 @@ func (*HeaderValue) ProtoMessage() {} func (x *HeaderValue) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -941,16 +923,14 @@ type HeaderValueOption struct { Header *HeaderValue `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` // Should the value be appended? If true (default), the value is appended to // existing values. - Append *wrappers.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` + Append *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` } func (x *HeaderValueOption) Reset() { *x = HeaderValueOption{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderValueOption) String() string { @@ -961,7 +941,7 @@ func (*HeaderValueOption) ProtoMessage() {} func (x *HeaderValueOption) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -983,7 +963,7 @@ func (x *HeaderValueOption) GetHeader() *HeaderValue { return nil } -func (x *HeaderValueOption) GetAppend() *wrappers.BoolValue { +func (x *HeaderValueOption) GetAppend() *wrapperspb.BoolValue { if x != nil { return x.Append } @@ -1001,11 +981,9 @@ type HeaderMap struct { func (x *HeaderMap) Reset() { *x = HeaderMap{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderMap) String() string { @@ -1016,7 +994,7 @@ func (*HeaderMap) ProtoMessage() {} func (x *HeaderMap) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1054,11 +1032,9 @@ type DataSource struct { func (x *DataSource) Reset() { *x = DataSource{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DataSource) String() string { @@ -1069,7 +1045,7 @@ func (*DataSource) ProtoMessage() {} func (x *DataSource) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1149,16 +1125,14 @@ type RetryPolicy struct { RetryBackOff *BackoffStrategy `protobuf:"bytes,1,opt,name=retry_back_off,json=retryBackOff,proto3" json:"retry_back_off,omitempty"` // Specifies the allowed number of retries. This parameter is optional and // defaults to 1. - NumRetries *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` + NumRetries *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` } func (x *RetryPolicy) Reset() { *x = RetryPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy) String() string { @@ -1169,7 +1143,7 @@ func (*RetryPolicy) ProtoMessage() {} func (x *RetryPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1191,7 +1165,7 @@ func (x *RetryPolicy) GetRetryBackOff() *BackoffStrategy { return nil } -func (x *RetryPolicy) GetNumRetries() *wrappers.UInt32Value { +func (x *RetryPolicy) GetNumRetries() *wrapperspb.UInt32Value { if x != nil { return x.NumRetries } @@ -1214,11 +1188,9 @@ type RemoteDataSource struct { func (x *RemoteDataSource) Reset() { *x = RemoteDataSource{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RemoteDataSource) String() string { @@ -1229,7 +1201,7 @@ func (*RemoteDataSource) ProtoMessage() {} func (x *RemoteDataSource) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1280,11 +1252,9 @@ type AsyncDataSource struct { func (x *AsyncDataSource) Reset() { *x = AsyncDataSource{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AsyncDataSource) String() string { @@ -1295,7 +1265,7 @@ func (*AsyncDataSource) ProtoMessage() {} func (x *AsyncDataSource) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1372,11 +1342,9 @@ type TransportSocket struct { func (x *TransportSocket) Reset() { *x = TransportSocket{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransportSocket) String() string { @@ -1387,7 +1355,7 @@ func (*TransportSocket) ProtoMessage() {} func (x *TransportSocket) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1416,7 +1384,7 @@ func (m *TransportSocket) GetConfigType() isTransportSocket_ConfigType { return nil } -func (x *TransportSocket) GetTypedConfig() *any1.Any { +func (x *TransportSocket) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*TransportSocket_TypedConfig); ok { return x.TypedConfig } @@ -1428,7 +1396,7 @@ type isTransportSocket_ConfigType interface { } type TransportSocket_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*TransportSocket_TypedConfig) isTransportSocket_ConfigType() {} @@ -1456,11 +1424,9 @@ type RuntimeFractionalPercent struct { func (x *RuntimeFractionalPercent) Reset() { *x = RuntimeFractionalPercent{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RuntimeFractionalPercent) String() string { @@ -1471,7 +1437,7 @@ func (*RuntimeFractionalPercent) ProtoMessage() {} func (x *RuntimeFractionalPercent) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1514,11 +1480,9 @@ type ControlPlane struct { func (x *ControlPlane) Reset() { *x = ControlPlane{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ControlPlane) String() string { @@ -1529,7 +1493,7 @@ func (*ControlPlane) ProtoMessage() {} func (x *ControlPlane) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1889,7 +1853,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes = make([]protoimpl.MessageInfo, 19) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_goTypes = []any{ (RoutingPriority)(0), // 0: solo.io.envoy.config.core.v3.RoutingPriority (RequestMethod)(0), // 1: solo.io.envoy.config.core.v3.RequestMethod (TrafficDirection)(0), // 2: solo.io.envoy.config.core.v3.TrafficDirection @@ -1913,13 +1877,13 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v (*ControlPlane)(nil), // 20: solo.io.envoy.config.core.v3.ControlPlane nil, // 21: solo.io.envoy.config.core.v3.Metadata.FilterMetadataEntry (*v3.SemanticVersion)(nil), // 22: solo.io.envoy.type.v3.SemanticVersion - (*_struct.Struct)(nil), // 23: google.protobuf.Struct + (*structpb.Struct)(nil), // 23: google.protobuf.Struct (*Address)(nil), // 24: solo.io.envoy.config.core.v3.Address - (*wrappers.BoolValue)(nil), // 25: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 25: google.protobuf.BoolValue (*BackoffStrategy)(nil), // 26: solo.io.envoy.config.core.v3.BackoffStrategy - (*wrappers.UInt32Value)(nil), // 27: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 27: google.protobuf.UInt32Value (*HttpUri)(nil), // 28: solo.io.envoy.config.core.v3.HttpUri - (*any1.Any)(nil), // 29: google.protobuf.Any + (*anypb.Any)(nil), // 29: google.protobuf.Any (*v3.FractionalPercent)(nil), // 30: solo.io.envoy.type.v3.FractionalPercent } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_depIdxs = []int32{ @@ -1962,238 +1926,20 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_address_proto_init() file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_backoff_proto_init() file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Locality); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BuildVersion); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Extension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Node); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Metadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RuntimeUInt32); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RuntimeDouble); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RuntimeFeatureFlag); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderValueOption); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderMap); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DataSource); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoteDataSource); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AsyncDataSource); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransportSocket); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RuntimeFractionalPercent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ControlPlane); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[3].OneofWrappers = []any{ (*Node_UserAgentVersion)(nil), (*Node_UserAgentBuildVersion)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[11].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[11].OneofWrappers = []any{ (*DataSource_Filename)(nil), (*DataSource_InlineBytes)(nil), (*DataSource_InlineString)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[14].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[14].OneofWrappers = []any{ (*AsyncDataSource_Local)(nil), (*AsyncDataSource_Remote)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[15].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_msgTypes[15].OneofWrappers = []any{ (*TransportSocket_TypedConfig)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/event_service_config.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/event_service_config.pb.go index ac365b39d..1798c5fe7 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/event_service_config.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/event_service_config.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/event_service_config.proto @@ -39,11 +39,9 @@ type EventServiceConfig struct { func (x *EventServiceConfig) Reset() { *x = EventServiceConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EventServiceConfig) String() string { @@ -54,7 +52,7 @@ func (*EventServiceConfig) ProtoMessage() {} func (x *EventServiceConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -157,7 +155,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_goTypes = []any{ (*EventServiceConfig)(nil), // 0: solo.io.envoy.config.core.v3.EventServiceConfig (*GrpcService)(nil), // 1: solo.io.envoy.config.core.v3.GrpcService } @@ -178,21 +176,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ return } file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EventServiceConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_msgTypes[0].OneofWrappers = []any{ (*EventServiceConfig_GrpcService)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/extension.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/extension.pb.clone.go index a75e82b2d..0b8fb78ac 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/extension.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/extension.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" ) // ensure the imports are used @@ -38,9 +38,9 @@ func (m *TypedExtensionConfig) Clone() proto.Message { target.Name = m.GetName() if h, ok := interface{}(m.GetTypedConfig()).(clone.Cloner); ok { - target.TypedConfig = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedConfig = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.TypedConfig = proto.Clone(m.GetTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedConfig = proto.Clone(m.GetTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any) } return target diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/extension.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/extension.pb.go index 7855e26d4..659ee4278 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/extension.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/extension.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/extension.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" ) const ( @@ -40,16 +40,14 @@ type TypedExtensionConfig struct { // the inner type URL of *TypedStruct* will be utilized. See the // :ref:`extension configuration overview // ` for further details. - TypedConfig *any1.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` + TypedConfig *anypb.Any `protobuf:"bytes,2,opt,name=typed_config,json=typedConfig,proto3" json:"typed_config,omitempty"` } func (x *TypedExtensionConfig) Reset() { *x = TypedExtensionConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_extension_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_extension_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TypedExtensionConfig) String() string { @@ -60,7 +58,7 @@ func (*TypedExtensionConfig) ProtoMessage() {} func (x *TypedExtensionConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_extension_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -82,7 +80,7 @@ func (x *TypedExtensionConfig) GetName() string { return "" } -func (x *TypedExtensionConfig) GetTypedConfig() *any1.Any { +func (x *TypedExtensionConfig) GetTypedConfig() *anypb.Any { if x != nil { return x.TypedConfig } @@ -140,9 +138,9 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_extension_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_extension_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_extension_proto_goTypes = []any{ (*TypedExtensionConfig)(nil), // 0: solo.io.envoy.config.core.v3.TypedExtensionConfig - (*any1.Any)(nil), // 1: google.protobuf.Any + (*anypb.Any)(nil), // 1: google.protobuf.Any } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_extension_proto_depIdxs = []int32{ 1, // 0: solo.io.envoy.config.core.v3.TypedExtensionConfig.typed_config:type_name -> google.protobuf.Any @@ -160,20 +158,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_extension_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_extension_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TypedExtensionConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/grpc_service.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/grpc_service.pb.clone.go index 0b2beb4db..8d04f365b 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/grpc_service.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/grpc_service.pb.clone.go @@ -13,15 +13,15 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_empty "github.com/golang/protobuf/ptypes/empty" + google_golang_org_protobuf_types_known_emptypb "google.golang.org/protobuf/types/known/emptypb" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -44,9 +44,9 @@ func (m *GrpcService) Clone() proto.Message { target = &GrpcService{} if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if m.GetInitialMetadata() != nil { @@ -148,15 +148,15 @@ func (m *GrpcService_GoogleGrpc) Clone() proto.Message { target.CredentialsFactoryName = m.GetCredentialsFactoryName() if h, ok := interface{}(m.GetConfig()).(clone.Cloner); ok { - target.Config = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Config = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Config = proto.Clone(m.GetConfig()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Config = proto.Clone(m.GetConfig()).(*google_golang_org_protobuf_types_known_structpb.Struct) } if h, ok := interface{}(m.GetPerStreamBufferLimitBytes()).(clone.Cloner); ok { - target.PerStreamBufferLimitBytes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerStreamBufferLimitBytes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.PerStreamBufferLimitBytes = proto.Clone(m.GetPerStreamBufferLimitBytes()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerStreamBufferLimitBytes = proto.Clone(m.GetPerStreamBufferLimitBytes()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetChannelArgs()).(clone.Cloner); ok { @@ -234,11 +234,11 @@ func (m *GrpcService_GoogleGrpc_ChannelCredentials) Clone() proto.Message { if h, ok := interface{}(m.GetGoogleDefault()).(clone.Cloner); ok { target.CredentialSpecifier = &GrpcService_GoogleGrpc_ChannelCredentials_GoogleDefault{ - GoogleDefault: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + GoogleDefault: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.CredentialSpecifier = &GrpcService_GoogleGrpc_ChannelCredentials_GoogleDefault{ - GoogleDefault: proto.Clone(m.GetGoogleDefault()).(*github_com_golang_protobuf_ptypes_empty.Empty), + GoogleDefault: proto.Clone(m.GetGoogleDefault()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } @@ -279,11 +279,11 @@ func (m *GrpcService_GoogleGrpc_CallCredentials) Clone() proto.Message { if h, ok := interface{}(m.GetGoogleComputeEngine()).(clone.Cloner); ok { target.CredentialSpecifier = &GrpcService_GoogleGrpc_CallCredentials_GoogleComputeEngine{ - GoogleComputeEngine: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + GoogleComputeEngine: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.CredentialSpecifier = &GrpcService_GoogleGrpc_CallCredentials_GoogleComputeEngine{ - GoogleComputeEngine: proto.Clone(m.GetGoogleComputeEngine()).(*github_com_golang_protobuf_ptypes_empty.Empty), + GoogleComputeEngine: proto.Clone(m.GetGoogleComputeEngine()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } @@ -416,11 +416,11 @@ func (m *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) C if h, ok := interface{}(m.GetTypedConfig()).(clone.Cloner); ok { target.ConfigType = &GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig{ - TypedConfig: h.Clone().(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any), } } else { target.ConfigType = &GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig{ - TypedConfig: proto.Clone(m.GetTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: proto.Clone(m.GetTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any), } } diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/grpc_service.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/grpc_service.pb.go index 68e403dd8..2a3f1760d 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/grpc_service.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/grpc_service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/grpc_service.proto @@ -11,15 +11,15 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - empty "github.com/golang/protobuf/ptypes/empty" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -44,7 +44,7 @@ type GrpcService struct { TargetSpecifier isGrpcService_TargetSpecifier `protobuf_oneof:"target_specifier"` // The timeout for the gRPC request. This is the timeout for a specific // request. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` // Additional metadata to include in streams initiated to the GrpcService. // This can be used for scenarios in which additional ad hoc authorization // headers (e.g. `x-foo-bar: baz-key`) are to be injected. @@ -53,11 +53,9 @@ type GrpcService struct { func (x *GrpcService) Reset() { *x = GrpcService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService) String() string { @@ -68,7 +66,7 @@ func (*GrpcService) ProtoMessage() {} func (x *GrpcService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -104,7 +102,7 @@ func (x *GrpcService) GetGoogleGrpc() *GrpcService_GoogleGrpc { return nil } -func (x *GrpcService) GetTimeout() *duration.Duration { +func (x *GrpcService) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -161,11 +159,9 @@ type GrpcService_EnvoyGrpc struct { func (x *GrpcService_EnvoyGrpc) Reset() { *x = GrpcService_EnvoyGrpc{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_EnvoyGrpc) String() string { @@ -176,7 +172,7 @@ func (*GrpcService_EnvoyGrpc) ProtoMessage() {} func (x *GrpcService_EnvoyGrpc) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -241,21 +237,19 @@ type GrpcService_GoogleGrpc struct { CredentialsFactoryName string `protobuf:"bytes,5,opt,name=credentials_factory_name,json=credentialsFactoryName,proto3" json:"credentials_factory_name,omitempty"` // Additional configuration for site-specific customizations of the Google // gRPC library. - Config *_struct.Struct `protobuf:"bytes,6,opt,name=config,proto3" json:"config,omitempty"` + Config *structpb.Struct `protobuf:"bytes,6,opt,name=config,proto3" json:"config,omitempty"` // How many bytes each stream can buffer internally. // If not set an implementation defined default is applied (1MiB). - PerStreamBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=per_stream_buffer_limit_bytes,json=perStreamBufferLimitBytes,proto3" json:"per_stream_buffer_limit_bytes,omitempty"` + PerStreamBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=per_stream_buffer_limit_bytes,json=perStreamBufferLimitBytes,proto3" json:"per_stream_buffer_limit_bytes,omitempty"` // Custom channels args. ChannelArgs *GrpcService_GoogleGrpc_ChannelArgs `protobuf:"bytes,8,opt,name=channel_args,json=channelArgs,proto3" json:"channel_args,omitempty"` } func (x *GrpcService_GoogleGrpc) Reset() { *x = GrpcService_GoogleGrpc{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc) String() string { @@ -266,7 +260,7 @@ func (*GrpcService_GoogleGrpc) ProtoMessage() {} func (x *GrpcService_GoogleGrpc) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -316,14 +310,14 @@ func (x *GrpcService_GoogleGrpc) GetCredentialsFactoryName() string { return "" } -func (x *GrpcService_GoogleGrpc) GetConfig() *_struct.Struct { +func (x *GrpcService_GoogleGrpc) GetConfig() *structpb.Struct { if x != nil { return x.Config } return nil } -func (x *GrpcService_GoogleGrpc) GetPerStreamBufferLimitBytes() *wrappers.UInt32Value { +func (x *GrpcService_GoogleGrpc) GetPerStreamBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerStreamBufferLimitBytes } @@ -353,11 +347,9 @@ type GrpcService_GoogleGrpc_SslCredentials struct { func (x *GrpcService_GoogleGrpc_SslCredentials) Reset() { *x = GrpcService_GoogleGrpc_SslCredentials{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_SslCredentials) String() string { @@ -368,7 +360,7 @@ func (*GrpcService_GoogleGrpc_SslCredentials) ProtoMessage() {} func (x *GrpcService_GoogleGrpc_SslCredentials) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -414,11 +406,9 @@ type GrpcService_GoogleGrpc_GoogleLocalCredentials struct { func (x *GrpcService_GoogleGrpc_GoogleLocalCredentials) Reset() { *x = GrpcService_GoogleGrpc_GoogleLocalCredentials{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_GoogleLocalCredentials) String() string { @@ -429,7 +419,7 @@ func (*GrpcService_GoogleGrpc_GoogleLocalCredentials) ProtoMessage() {} func (x *GrpcService_GoogleGrpc_GoogleLocalCredentials) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -461,11 +451,9 @@ type GrpcService_GoogleGrpc_ChannelCredentials struct { func (x *GrpcService_GoogleGrpc_ChannelCredentials) Reset() { *x = GrpcService_GoogleGrpc_ChannelCredentials{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_ChannelCredentials) String() string { @@ -476,7 +464,7 @@ func (*GrpcService_GoogleGrpc_ChannelCredentials) ProtoMessage() {} func (x *GrpcService_GoogleGrpc_ChannelCredentials) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -505,7 +493,7 @@ func (x *GrpcService_GoogleGrpc_ChannelCredentials) GetSslCredentials() *GrpcSer return nil } -func (x *GrpcService_GoogleGrpc_ChannelCredentials) GetGoogleDefault() *empty.Empty { +func (x *GrpcService_GoogleGrpc_ChannelCredentials) GetGoogleDefault() *emptypb.Empty { if x, ok := x.GetCredentialSpecifier().(*GrpcService_GoogleGrpc_ChannelCredentials_GoogleDefault); ok { return x.GoogleDefault } @@ -529,7 +517,7 @@ type GrpcService_GoogleGrpc_ChannelCredentials_SslCredentials struct { type GrpcService_GoogleGrpc_ChannelCredentials_GoogleDefault struct { // https://grpc.io/grpc/cpp/namespacegrpc.html#a6beb3ac70ff94bd2ebbd89b8f21d1f61 - GoogleDefault *empty.Empty `protobuf:"bytes,2,opt,name=google_default,json=googleDefault,proto3,oneof"` + GoogleDefault *emptypb.Empty `protobuf:"bytes,2,opt,name=google_default,json=googleDefault,proto3,oneof"` } type GrpcService_GoogleGrpc_ChannelCredentials_LocalCredentials struct { @@ -565,11 +553,9 @@ type GrpcService_GoogleGrpc_CallCredentials struct { func (x *GrpcService_GoogleGrpc_CallCredentials) Reset() { *x = GrpcService_GoogleGrpc_CallCredentials{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_CallCredentials) String() string { @@ -580,7 +566,7 @@ func (*GrpcService_GoogleGrpc_CallCredentials) ProtoMessage() {} func (x *GrpcService_GoogleGrpc_CallCredentials) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -609,7 +595,7 @@ func (x *GrpcService_GoogleGrpc_CallCredentials) GetAccessToken() string { return "" } -func (x *GrpcService_GoogleGrpc_CallCredentials) GetGoogleComputeEngine() *empty.Empty { +func (x *GrpcService_GoogleGrpc_CallCredentials) GetGoogleComputeEngine() *emptypb.Empty { if x, ok := x.GetCredentialSpecifier().(*GrpcService_GoogleGrpc_CallCredentials_GoogleComputeEngine); ok { return x.GoogleComputeEngine } @@ -664,7 +650,7 @@ type GrpcService_GoogleGrpc_CallCredentials_AccessToken struct { type GrpcService_GoogleGrpc_CallCredentials_GoogleComputeEngine struct { // Google Compute Engine credentials. // https://grpc.io/grpc/cpp/namespacegrpc.html#a6beb3ac70ff94bd2ebbd89b8f21d1f61 - GoogleComputeEngine *empty.Empty `protobuf:"bytes,2,opt,name=google_compute_engine,json=googleComputeEngine,proto3,oneof"` + GoogleComputeEngine *emptypb.Empty `protobuf:"bytes,2,opt,name=google_compute_engine,json=googleComputeEngine,proto3,oneof"` } type GrpcService_GoogleGrpc_CallCredentials_GoogleRefreshToken struct { @@ -732,11 +718,9 @@ type GrpcService_GoogleGrpc_ChannelArgs struct { func (x *GrpcService_GoogleGrpc_ChannelArgs) Reset() { *x = GrpcService_GoogleGrpc_ChannelArgs{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_ChannelArgs) String() string { @@ -747,7 +731,7 @@ func (*GrpcService_GoogleGrpc_ChannelArgs) ProtoMessage() {} func (x *GrpcService_GoogleGrpc_ChannelArgs) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -780,11 +764,9 @@ type GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials s func (x *GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials) Reset() { *x = GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials) String() string { @@ -795,7 +777,7 @@ func (*GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials func (x *GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -835,11 +817,9 @@ type GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials struct { func (x *GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials) Reset() { *x = GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials) String() string { @@ -850,7 +830,7 @@ func (*GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials) ProtoMessage func (x *GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -893,11 +873,9 @@ type GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin struct func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) Reset() { *x = GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) String() string { @@ -908,7 +886,7 @@ func (*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) Pro func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -937,7 +915,7 @@ func (m *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) G return nil } -func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) GetTypedConfig() *any1.Any { +func (x *GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig); ok { return x.TypedConfig } @@ -949,7 +927,7 @@ type isGrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_Conf } type GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig) isGrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_ConfigType() { @@ -995,11 +973,9 @@ type GrpcService_GoogleGrpc_CallCredentials_StsService struct { func (x *GrpcService_GoogleGrpc_CallCredentials_StsService) Reset() { *x = GrpcService_GoogleGrpc_CallCredentials_StsService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_CallCredentials_StsService) String() string { @@ -1010,7 +986,7 @@ func (*GrpcService_GoogleGrpc_CallCredentials_StsService) ProtoMessage() {} func (x *GrpcService_GoogleGrpc_CallCredentials_StsService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1105,11 +1081,9 @@ type GrpcService_GoogleGrpc_ChannelArgs_Value struct { func (x *GrpcService_GoogleGrpc_ChannelArgs_Value) Reset() { *x = GrpcService_GoogleGrpc_ChannelArgs_Value{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService_GoogleGrpc_ChannelArgs_Value) String() string { @@ -1120,7 +1094,7 @@ func (*GrpcService_GoogleGrpc_ChannelArgs_Value) ProtoMessage() {} func (x *GrpcService_GoogleGrpc_ChannelArgs_Value) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1520,7 +1494,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes = make([]protoimpl.MessageInfo, 14) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_goTypes = []any{ (*GrpcService)(nil), // 0: solo.io.envoy.config.core.v3.GrpcService (*GrpcService_EnvoyGrpc)(nil), // 1: solo.io.envoy.config.core.v3.GrpcService.EnvoyGrpc (*GrpcService_GoogleGrpc)(nil), // 2: solo.io.envoy.config.core.v3.GrpcService.GoogleGrpc @@ -1534,15 +1508,15 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v (*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin)(nil), // 10: solo.io.envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.MetadataCredentialsFromPlugin (*GrpcService_GoogleGrpc_CallCredentials_StsService)(nil), // 11: solo.io.envoy.config.core.v3.GrpcService.GoogleGrpc.CallCredentials.StsService (*GrpcService_GoogleGrpc_ChannelArgs_Value)(nil), // 12: solo.io.envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.Value - nil, // 13: solo.io.envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.ArgsEntry - (*duration.Duration)(nil), // 14: google.protobuf.Duration - (*HeaderValue)(nil), // 15: solo.io.envoy.config.core.v3.HeaderValue - (*RetryPolicy)(nil), // 16: solo.io.envoy.config.core.v3.RetryPolicy - (*_struct.Struct)(nil), // 17: google.protobuf.Struct - (*wrappers.UInt32Value)(nil), // 18: google.protobuf.UInt32Value - (*DataSource)(nil), // 19: solo.io.envoy.config.core.v3.DataSource - (*empty.Empty)(nil), // 20: google.protobuf.Empty - (*any1.Any)(nil), // 21: google.protobuf.Any + nil, // 13: solo.io.envoy.config.core.v3.GrpcService.GoogleGrpc.ChannelArgs.ArgsEntry + (*durationpb.Duration)(nil), // 14: google.protobuf.Duration + (*HeaderValue)(nil), // 15: solo.io.envoy.config.core.v3.HeaderValue + (*RetryPolicy)(nil), // 16: solo.io.envoy.config.core.v3.RetryPolicy + (*structpb.Struct)(nil), // 17: google.protobuf.Struct + (*wrapperspb.UInt32Value)(nil), // 18: google.protobuf.UInt32Value + (*DataSource)(nil), // 19: solo.io.envoy.config.core.v3.DataSource + (*emptypb.Empty)(nil), // 20: google.protobuf.Empty + (*anypb.Any)(nil), // 21: google.protobuf.Any } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_depIdxs = []int32{ 1, // 0: solo.io.envoy.config.core.v3.GrpcService.envoy_grpc:type_name -> solo.io.envoy.config.core.v3.GrpcService.EnvoyGrpc @@ -1584,174 +1558,16 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ return } file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_EnvoyGrpc); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_SslCredentials); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_GoogleLocalCredentials); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_ChannelCredentials); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_CallCredentials); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_ChannelArgs); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_CallCredentials_ServiceAccountJWTAccessCredentials); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_CallCredentials_GoogleIAMCredentials); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_CallCredentials_StsService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService_GoogleGrpc_ChannelArgs_Value); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[0].OneofWrappers = []any{ (*GrpcService_EnvoyGrpc_)(nil), (*GrpcService_GoogleGrpc_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[5].OneofWrappers = []any{ (*GrpcService_GoogleGrpc_ChannelCredentials_SslCredentials)(nil), (*GrpcService_GoogleGrpc_ChannelCredentials_GoogleDefault)(nil), (*GrpcService_GoogleGrpc_ChannelCredentials_LocalCredentials)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[6].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[6].OneofWrappers = []any{ (*GrpcService_GoogleGrpc_CallCredentials_AccessToken)(nil), (*GrpcService_GoogleGrpc_CallCredentials_GoogleComputeEngine)(nil), (*GrpcService_GoogleGrpc_CallCredentials_GoogleRefreshToken)(nil), @@ -1760,10 +1576,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ (*GrpcService_GoogleGrpc_CallCredentials_FromPlugin)(nil), (*GrpcService_GoogleGrpc_CallCredentials_StsService_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[10].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[10].OneofWrappers = []any{ (*GrpcService_GoogleGrpc_CallCredentials_MetadataCredentialsFromPlugin_TypedConfig)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[12].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_grpc_service_proto_msgTypes[12].OneofWrappers = []any{ (*GrpcService_GoogleGrpc_ChannelArgs_Value_StringValue)(nil), (*GrpcService_GoogleGrpc_ChannelArgs_Value_IntValue)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/health_check.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/health_check.pb.clone.go index 7749cc6fb..356e92e9e 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/health_check.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/health_check.pb.clone.go @@ -13,19 +13,19 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" + github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_matcher_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/v3" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_advanced_http "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/advanced_http" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_matcher_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/v3" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_advanced_http "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/advanced_http" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -48,77 +48,77 @@ func (m *HealthCheck) Clone() proto.Message { target = &HealthCheck{} if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetInterval()).(clone.Cloner); ok { - target.Interval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Interval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Interval = proto.Clone(m.GetInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Interval = proto.Clone(m.GetInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetInitialJitter()).(clone.Cloner); ok { - target.InitialJitter = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.InitialJitter = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.InitialJitter = proto.Clone(m.GetInitialJitter()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.InitialJitter = proto.Clone(m.GetInitialJitter()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetIntervalJitter()).(clone.Cloner); ok { - target.IntervalJitter = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IntervalJitter = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.IntervalJitter = proto.Clone(m.GetIntervalJitter()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IntervalJitter = proto.Clone(m.GetIntervalJitter()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.IntervalJitterPercent = m.GetIntervalJitterPercent() if h, ok := interface{}(m.GetUnhealthyThreshold()).(clone.Cloner); ok { - target.UnhealthyThreshold = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.UnhealthyThreshold = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.UnhealthyThreshold = proto.Clone(m.GetUnhealthyThreshold()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.UnhealthyThreshold = proto.Clone(m.GetUnhealthyThreshold()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetHealthyThreshold()).(clone.Cloner); ok { - target.HealthyThreshold = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.HealthyThreshold = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.HealthyThreshold = proto.Clone(m.GetHealthyThreshold()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.HealthyThreshold = proto.Clone(m.GetHealthyThreshold()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetAltPort()).(clone.Cloner); ok { - target.AltPort = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.AltPort = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.AltPort = proto.Clone(m.GetAltPort()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.AltPort = proto.Clone(m.GetAltPort()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetReuseConnection()).(clone.Cloner); ok { - target.ReuseConnection = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ReuseConnection = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.ReuseConnection = proto.Clone(m.GetReuseConnection()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ReuseConnection = proto.Clone(m.GetReuseConnection()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetNoTrafficInterval()).(clone.Cloner); ok { - target.NoTrafficInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.NoTrafficInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.NoTrafficInterval = proto.Clone(m.GetNoTrafficInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.NoTrafficInterval = proto.Clone(m.GetNoTrafficInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetUnhealthyInterval()).(clone.Cloner); ok { - target.UnhealthyInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.UnhealthyInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.UnhealthyInterval = proto.Clone(m.GetUnhealthyInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.UnhealthyInterval = proto.Clone(m.GetUnhealthyInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetUnhealthyEdgeInterval()).(clone.Cloner); ok { - target.UnhealthyEdgeInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.UnhealthyEdgeInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.UnhealthyEdgeInterval = proto.Clone(m.GetUnhealthyEdgeInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.UnhealthyEdgeInterval = proto.Clone(m.GetUnhealthyEdgeInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetHealthyEdgeInterval()).(clone.Cloner); ok { - target.HealthyEdgeInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.HealthyEdgeInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.HealthyEdgeInterval = proto.Clone(m.GetHealthyEdgeInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.HealthyEdgeInterval = proto.Clone(m.GetHealthyEdgeInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.EventLogPath = m.GetEventLogPath() @@ -138,9 +138,9 @@ func (m *HealthCheck) Clone() proto.Message { } if h, ok := interface{}(m.GetTransportSocketMatchCriteria()).(clone.Cloner); ok { - target.TransportSocketMatchCriteria = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.TransportSocketMatchCriteria = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.TransportSocketMatchCriteria = proto.Clone(m.GetTransportSocketMatchCriteria()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.TransportSocketMatchCriteria = proto.Clone(m.GetTransportSocketMatchCriteria()).(*google_golang_org_protobuf_types_known_structpb.Struct) } switch m.HealthChecker.(type) { @@ -383,11 +383,11 @@ func (m *HealthCheck_CustomHealthCheck) Clone() proto.Message { if h, ok := interface{}(m.GetTypedConfig()).(clone.Cloner); ok { target.ConfigType = &HealthCheck_CustomHealthCheck_TypedConfig{ - TypedConfig: h.Clone().(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any), } } else { target.ConfigType = &HealthCheck_CustomHealthCheck_TypedConfig{ - TypedConfig: proto.Clone(m.GetTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: proto.Clone(m.GetTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any), } } diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/health_check.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/health_check.pb.go index d4bd170d8..fedd819c0 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/health_check.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/health_check.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/health_check.proto @@ -11,10 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v31 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/v3" @@ -22,6 +18,10 @@ import ( advanced_http "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/advanced_http" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -109,16 +109,16 @@ type HealthCheck struct { // The time to wait for a health check response. If the timeout is reached the // health check attempt will be considered a failure. - Timeout *duration.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,1,opt,name=timeout,proto3" json:"timeout,omitempty"` // The interval between health checks. - Interval *duration.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` + Interval *durationpb.Duration `protobuf:"bytes,2,opt,name=interval,proto3" json:"interval,omitempty"` // An optional jitter amount in milliseconds. If specified, Envoy will start health // checking after for a random time in ms between 0 and initial_jitter. This only // applies to the first health check. - InitialJitter *duration.Duration `protobuf:"bytes,20,opt,name=initial_jitter,json=initialJitter,proto3" json:"initial_jitter,omitempty"` + InitialJitter *durationpb.Duration `protobuf:"bytes,20,opt,name=initial_jitter,json=initialJitter,proto3" json:"initial_jitter,omitempty"` // An optional jitter amount in milliseconds. If specified, during every // interval Envoy will add interval_jitter to the wait time. - IntervalJitter *duration.Duration `protobuf:"bytes,3,opt,name=interval_jitter,json=intervalJitter,proto3" json:"interval_jitter,omitempty"` + IntervalJitter *durationpb.Duration `protobuf:"bytes,3,opt,name=interval_jitter,json=intervalJitter,proto3" json:"interval_jitter,omitempty"` // An optional jitter amount as a percentage of interval_ms. If specified, // during every interval Envoy will add interval_ms * // interval_jitter_percent / 100 to the wait time. @@ -129,15 +129,15 @@ type HealthCheck struct { // The number of unhealthy health checks required before a host is marked // unhealthy. Note that for *http* health checking if a host responds with 503 // this threshold is ignored and the host is considered unhealthy immediately. - UnhealthyThreshold *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=unhealthy_threshold,json=unhealthyThreshold,proto3" json:"unhealthy_threshold,omitempty"` + UnhealthyThreshold *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=unhealthy_threshold,json=unhealthyThreshold,proto3" json:"unhealthy_threshold,omitempty"` // The number of healthy health checks required before a host is marked // healthy. Note that during startup, only a single successful health check is // required to mark a host healthy. - HealthyThreshold *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=healthy_threshold,json=healthyThreshold,proto3" json:"healthy_threshold,omitempty"` + HealthyThreshold *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=healthy_threshold,json=healthyThreshold,proto3" json:"healthy_threshold,omitempty"` // [#not-implemented-hide:] Non-serving port for health checking. - AltPort *wrappers.UInt32Value `protobuf:"bytes,6,opt,name=alt_port,json=altPort,proto3" json:"alt_port,omitempty"` + AltPort *wrapperspb.UInt32Value `protobuf:"bytes,6,opt,name=alt_port,json=altPort,proto3" json:"alt_port,omitempty"` // Reuse health check connection between health checks. Default is true. - ReuseConnection *wrappers.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"` + ReuseConnection *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=reuse_connection,json=reuseConnection,proto3" json:"reuse_connection,omitempty"` // Types that are assignable to HealthChecker: // // *HealthCheck_HttpHealthCheck_ @@ -153,26 +153,26 @@ type HealthCheck struct { // any other. // // The default value for "no traffic interval" is 60 seconds. - NoTrafficInterval *duration.Duration `protobuf:"bytes,12,opt,name=no_traffic_interval,json=noTrafficInterval,proto3" json:"no_traffic_interval,omitempty"` + NoTrafficInterval *durationpb.Duration `protobuf:"bytes,12,opt,name=no_traffic_interval,json=noTrafficInterval,proto3" json:"no_traffic_interval,omitempty"` // The "unhealthy interval" is a health check interval that is used for hosts that are marked as // unhealthy. As soon as the host is marked as healthy, Envoy will shift back to using the // standard health check interval that is defined. // // The default value for "unhealthy interval" is the same as "interval". - UnhealthyInterval *duration.Duration `protobuf:"bytes,14,opt,name=unhealthy_interval,json=unhealthyInterval,proto3" json:"unhealthy_interval,omitempty"` + UnhealthyInterval *durationpb.Duration `protobuf:"bytes,14,opt,name=unhealthy_interval,json=unhealthyInterval,proto3" json:"unhealthy_interval,omitempty"` // The "unhealthy edge interval" is a special health check interval that is used for the first // health check right after a host is marked as unhealthy. For subsequent health checks // Envoy will shift back to using either "unhealthy interval" if present or the standard health // check interval that is defined. // // The default value for "unhealthy edge interval" is the same as "unhealthy interval". - UnhealthyEdgeInterval *duration.Duration `protobuf:"bytes,15,opt,name=unhealthy_edge_interval,json=unhealthyEdgeInterval,proto3" json:"unhealthy_edge_interval,omitempty"` + UnhealthyEdgeInterval *durationpb.Duration `protobuf:"bytes,15,opt,name=unhealthy_edge_interval,json=unhealthyEdgeInterval,proto3" json:"unhealthy_edge_interval,omitempty"` // The "healthy edge interval" is a special health check interval that is used for the first // health check right after a host is marked as healthy. For subsequent health checks // Envoy will shift back to using the standard health check interval that is defined. // // The default value for "healthy edge interval" is the same as the default interval. - HealthyEdgeInterval *duration.Duration `protobuf:"bytes,16,opt,name=healthy_edge_interval,json=healthyEdgeInterval,proto3" json:"healthy_edge_interval,omitempty"` + HealthyEdgeInterval *durationpb.Duration `protobuf:"bytes,16,opt,name=healthy_edge_interval,json=healthyEdgeInterval,proto3" json:"healthy_edge_interval,omitempty"` // Specifies the path to the health check event log. // If empty, no event log will be written. EventLogPath string `protobuf:"bytes,17,opt,name=event_log_path,json=eventLogPath,proto3" json:"event_log_path,omitempty"` @@ -216,16 +216,14 @@ type HealthCheck struct { // transport socket matches, // the cluster's :ref:`transport socket ` // will be used for health check socket configuration. - TransportSocketMatchCriteria *_struct.Struct `protobuf:"bytes,23,opt,name=transport_socket_match_criteria,json=transportSocketMatchCriteria,proto3" json:"transport_socket_match_criteria,omitempty"` + TransportSocketMatchCriteria *structpb.Struct `protobuf:"bytes,23,opt,name=transport_socket_match_criteria,json=transportSocketMatchCriteria,proto3" json:"transport_socket_match_criteria,omitempty"` } func (x *HealthCheck) Reset() { *x = HealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck) String() string { @@ -236,7 +234,7 @@ func (*HealthCheck) ProtoMessage() {} func (x *HealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -251,28 +249,28 @@ func (*HealthCheck) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_rawDescGZIP(), []int{0} } -func (x *HealthCheck) GetTimeout() *duration.Duration { +func (x *HealthCheck) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *HealthCheck) GetInterval() *duration.Duration { +func (x *HealthCheck) GetInterval() *durationpb.Duration { if x != nil { return x.Interval } return nil } -func (x *HealthCheck) GetInitialJitter() *duration.Duration { +func (x *HealthCheck) GetInitialJitter() *durationpb.Duration { if x != nil { return x.InitialJitter } return nil } -func (x *HealthCheck) GetIntervalJitter() *duration.Duration { +func (x *HealthCheck) GetIntervalJitter() *durationpb.Duration { if x != nil { return x.IntervalJitter } @@ -286,28 +284,28 @@ func (x *HealthCheck) GetIntervalJitterPercent() uint32 { return 0 } -func (x *HealthCheck) GetUnhealthyThreshold() *wrappers.UInt32Value { +func (x *HealthCheck) GetUnhealthyThreshold() *wrapperspb.UInt32Value { if x != nil { return x.UnhealthyThreshold } return nil } -func (x *HealthCheck) GetHealthyThreshold() *wrappers.UInt32Value { +func (x *HealthCheck) GetHealthyThreshold() *wrapperspb.UInt32Value { if x != nil { return x.HealthyThreshold } return nil } -func (x *HealthCheck) GetAltPort() *wrappers.UInt32Value { +func (x *HealthCheck) GetAltPort() *wrapperspb.UInt32Value { if x != nil { return x.AltPort } return nil } -func (x *HealthCheck) GetReuseConnection() *wrappers.BoolValue { +func (x *HealthCheck) GetReuseConnection() *wrapperspb.BoolValue { if x != nil { return x.ReuseConnection } @@ -349,28 +347,28 @@ func (x *HealthCheck) GetCustomHealthCheck() *HealthCheck_CustomHealthCheck { return nil } -func (x *HealthCheck) GetNoTrafficInterval() *duration.Duration { +func (x *HealthCheck) GetNoTrafficInterval() *durationpb.Duration { if x != nil { return x.NoTrafficInterval } return nil } -func (x *HealthCheck) GetUnhealthyInterval() *duration.Duration { +func (x *HealthCheck) GetUnhealthyInterval() *durationpb.Duration { if x != nil { return x.UnhealthyInterval } return nil } -func (x *HealthCheck) GetUnhealthyEdgeInterval() *duration.Duration { +func (x *HealthCheck) GetUnhealthyEdgeInterval() *durationpb.Duration { if x != nil { return x.UnhealthyEdgeInterval } return nil } -func (x *HealthCheck) GetHealthyEdgeInterval() *duration.Duration { +func (x *HealthCheck) GetHealthyEdgeInterval() *durationpb.Duration { if x != nil { return x.HealthyEdgeInterval } @@ -405,7 +403,7 @@ func (x *HealthCheck) GetTlsOptions() *HealthCheck_TlsOptions { return nil } -func (x *HealthCheck) GetTransportSocketMatchCriteria() *_struct.Struct { +func (x *HealthCheck) GetTransportSocketMatchCriteria() *structpb.Struct { if x != nil { return x.TransportSocketMatchCriteria } @@ -459,11 +457,9 @@ type HealthCheck_Payload struct { func (x *HealthCheck_Payload) Reset() { *x = HealthCheck_Payload{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_Payload) String() string { @@ -474,7 +470,7 @@ func (*HealthCheck_Payload) ProtoMessage() {} func (x *HealthCheck_Payload) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -573,11 +569,9 @@ type HealthCheck_HttpHealthCheck struct { func (x *HealthCheck_HttpHealthCheck) Reset() { *x = HealthCheck_HttpHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_HttpHealthCheck) String() string { @@ -588,7 +582,7 @@ func (*HealthCheck_HttpHealthCheck) ProtoMessage() {} func (x *HealthCheck_HttpHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -688,11 +682,9 @@ type HealthCheck_TcpHealthCheck struct { func (x *HealthCheck_TcpHealthCheck) Reset() { *x = HealthCheck_TcpHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_TcpHealthCheck) String() string { @@ -703,7 +695,7 @@ func (*HealthCheck_TcpHealthCheck) ProtoMessage() {} func (x *HealthCheck_TcpHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -746,11 +738,9 @@ type HealthCheck_RedisHealthCheck struct { func (x *HealthCheck_RedisHealthCheck) Reset() { *x = HealthCheck_RedisHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_RedisHealthCheck) String() string { @@ -761,7 +751,7 @@ func (*HealthCheck_RedisHealthCheck) ProtoMessage() {} func (x *HealthCheck_RedisHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -804,11 +794,9 @@ type HealthCheck_GrpcHealthCheck struct { func (x *HealthCheck_GrpcHealthCheck) Reset() { *x = HealthCheck_GrpcHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_GrpcHealthCheck) String() string { @@ -819,7 +807,7 @@ func (*HealthCheck_GrpcHealthCheck) ProtoMessage() {} func (x *HealthCheck_GrpcHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -867,11 +855,9 @@ type HealthCheck_CustomHealthCheck struct { func (x *HealthCheck_CustomHealthCheck) Reset() { *x = HealthCheck_CustomHealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_CustomHealthCheck) String() string { @@ -882,7 +868,7 @@ func (*HealthCheck_CustomHealthCheck) ProtoMessage() {} func (x *HealthCheck_CustomHealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -911,7 +897,7 @@ func (m *HealthCheck_CustomHealthCheck) GetConfigType() isHealthCheck_CustomHeal return nil } -func (x *HealthCheck_CustomHealthCheck) GetTypedConfig() *any1.Any { +func (x *HealthCheck_CustomHealthCheck) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*HealthCheck_CustomHealthCheck_TypedConfig); ok { return x.TypedConfig } @@ -923,7 +909,7 @@ type isHealthCheck_CustomHealthCheck_ConfigType interface { } type HealthCheck_CustomHealthCheck_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*HealthCheck_CustomHealthCheck_TypedConfig) isHealthCheck_CustomHealthCheck_ConfigType() {} @@ -946,11 +932,9 @@ type HealthCheck_TlsOptions struct { func (x *HealthCheck_TlsOptions) Reset() { *x = HealthCheck_TlsOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck_TlsOptions) String() string { @@ -961,7 +945,7 @@ func (*HealthCheck_TlsOptions) ProtoMessage() {} func (x *HealthCheck_TlsOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1307,7 +1291,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_goTypes = []any{ (HealthStatus)(0), // 0: solo.io.envoy.config.core.v3.HealthStatus (*HealthCheck)(nil), // 1: solo.io.envoy.config.core.v3.HealthCheck (*HealthCheck_Payload)(nil), // 2: solo.io.envoy.config.core.v3.HealthCheck.Payload @@ -1317,17 +1301,17 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v (*HealthCheck_GrpcHealthCheck)(nil), // 6: solo.io.envoy.config.core.v3.HealthCheck.GrpcHealthCheck (*HealthCheck_CustomHealthCheck)(nil), // 7: solo.io.envoy.config.core.v3.HealthCheck.CustomHealthCheck (*HealthCheck_TlsOptions)(nil), // 8: solo.io.envoy.config.core.v3.HealthCheck.TlsOptions - (*duration.Duration)(nil), // 9: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 10: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 11: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 9: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 10: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 11: google.protobuf.BoolValue (*EventServiceConfig)(nil), // 12: solo.io.envoy.config.core.v3.EventServiceConfig - (*_struct.Struct)(nil), // 13: google.protobuf.Struct + (*structpb.Struct)(nil), // 13: google.protobuf.Struct (*HeaderValueOption)(nil), // 14: solo.io.envoy.config.core.v3.HeaderValueOption (*v3.Int64Range)(nil), // 15: solo.io.envoy.type.v3.Int64Range (v3.CodecClientType)(0), // 16: solo.io.envoy.type.v3.CodecClientType (*v31.StringMatcher)(nil), // 17: solo.io.envoy.type.matcher.v3.StringMatcher (*advanced_http.ResponseAssertions)(nil), // 18: advancedhttp.options.gloo.solo.io.ResponseAssertions - (*any1.Any)(nil), // 19: google.protobuf.Any + (*anypb.Any)(nil), // 19: google.protobuf.Any } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_depIdxs = []int32{ 9, // 0: solo.io.envoy.config.core.v3.HealthCheck.timeout:type_name -> google.protobuf.Duration @@ -1375,115 +1359,17 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ } file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_base_proto_init() file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_event_service_config_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_Payload); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_HttpHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_TcpHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_RedisHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_GrpcHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_CustomHealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck_TlsOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[0].OneofWrappers = []any{ (*HealthCheck_HttpHealthCheck_)(nil), (*HealthCheck_TcpHealthCheck_)(nil), (*HealthCheck_GrpcHealthCheck_)(nil), (*HealthCheck_CustomHealthCheck_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[1].OneofWrappers = []any{ (*HealthCheck_Payload_Text)(nil), (*HealthCheck_Payload_Binary)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[6].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_health_check_proto_msgTypes[6].OneofWrappers = []any{ (*HealthCheck_CustomHealthCheck_TypedConfig)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/http_uri.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/http_uri.pb.clone.go index e09093ab6..074dbdc01 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/http_uri.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/http_uri.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" ) // ensure the imports are used @@ -38,9 +38,9 @@ func (m *HttpUri) Clone() proto.Message { target.Uri = m.GetUri() if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } switch m.HttpUpstreamType.(type) { diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/http_uri.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/http_uri.pb.go index 5c1ad81dc..fece5d32b 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/http_uri.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/http_uri.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/http_uri.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" ) const ( @@ -48,16 +48,14 @@ type HttpUri struct { // *HttpUri_Cluster HttpUpstreamType isHttpUri_HttpUpstreamType `protobuf_oneof:"http_upstream_type"` // Sets the maximum duration in milliseconds that a response can take to arrive upon request. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *HttpUri) Reset() { *x = HttpUri{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpUri) String() string { @@ -68,7 +66,7 @@ func (*HttpUri) ProtoMessage() {} func (x *HttpUri) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -104,7 +102,7 @@ func (x *HttpUri) GetCluster() string { return "" } -func (x *HttpUri) GetTimeout() *duration.Duration { +func (x *HttpUri) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -188,9 +186,9 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_goTypes = []interface{}{ - (*HttpUri)(nil), // 0: solo.io.envoy.config.core.v3.HttpUri - (*duration.Duration)(nil), // 1: google.protobuf.Duration +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_goTypes = []any{ + (*HttpUri)(nil), // 0: solo.io.envoy.config.core.v3.HttpUri + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_depIdxs = []int32{ 1, // 0: solo.io.envoy.config.core.v3.HttpUri.timeout:type_name -> google.protobuf.Duration @@ -208,21 +206,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpUri); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_http_uri_proto_msgTypes[0].OneofWrappers = []any{ (*HttpUri_Cluster)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/proxy_protocol.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/proxy_protocol.pb.go index e887b1c8f..d9b17909c 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/proxy_protocol.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/proxy_protocol.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/proxy_protocol.proto @@ -135,11 +135,9 @@ type ProxyProtocolPassThroughTLVs struct { func (x *ProxyProtocolPassThroughTLVs) Reset() { *x = ProxyProtocolPassThroughTLVs{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxyProtocolPassThroughTLVs) String() string { @@ -150,7 +148,7 @@ func (*ProxyProtocolPassThroughTLVs) ProtoMessage() {} func (x *ProxyProtocolPassThroughTLVs) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -193,11 +191,9 @@ type ProxyProtocolConfig struct { func (x *ProxyProtocolConfig) Reset() { *x = ProxyProtocolConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxyProtocolConfig) String() string { @@ -208,7 +204,7 @@ func (*ProxyProtocolConfig) ProtoMessage() {} func (x *ProxyProtocolConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -310,7 +306,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_goTypes = []any{ (ProxyProtocolPassThroughTLVs_PassTLVsMatchType)(0), // 0: solo.io.envoy.config.core.v3.ProxyProtocolPassThroughTLVs.PassTLVsMatchType (ProxyProtocolConfig_Version)(0), // 1: solo.io.envoy.config.core.v3.ProxyProtocolConfig.Version (*ProxyProtocolPassThroughTLVs)(nil), // 2: solo.io.envoy.config.core.v3.ProxyProtocolPassThroughTLVs @@ -334,32 +330,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxyProtocolPassThroughTLVs); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_proxy_protocol_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxyProtocolConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/socket_option.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/socket_option.pb.go index 0a006e2f3..f22adb54b 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/core/v3/socket_option.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/core/v3/socket_option.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/socket_option.proto @@ -103,11 +103,9 @@ type SocketOption struct { func (x *SocketOption) Reset() { *x = SocketOption{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SocketOption) String() string { @@ -118,7 +116,7 @@ func (*SocketOption) ProtoMessage() {} func (x *SocketOption) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -269,7 +267,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_goTypes = []any{ (SocketOption_SocketState)(0), // 0: solo.io.envoy.config.core.v3.SocketOption.SocketState (*SocketOption)(nil), // 1: solo.io.envoy.config.core.v3.SocketOption } @@ -289,21 +287,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SocketOption); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_core_v3_socket_option_proto_msgTypes[0].OneofWrappers = []any{ (*SocketOption_IntValue)(nil), (*SocketOption_BufValue)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2/gzip.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2/gzip.pb.clone.go index 110117742..2343b4e27 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2/gzip.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2/gzip.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -36,15 +36,15 @@ func (m *Gzip) Clone() proto.Message { target = &Gzip{} if h, ok := interface{}(m.GetMemoryLevel()).(clone.Cloner); ok { - target.MemoryLevel = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MemoryLevel = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MemoryLevel = proto.Clone(m.GetMemoryLevel()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MemoryLevel = proto.Clone(m.GetMemoryLevel()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetContentLength()).(clone.Cloner); ok { - target.ContentLength = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.ContentLength = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.ContentLength = proto.Clone(m.GetContentLength()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.ContentLength = proto.Clone(m.GetContentLength()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.CompressionLevel = m.GetCompressionLevel() @@ -65,9 +65,9 @@ func (m *Gzip) Clone() proto.Message { target.RemoveAcceptEncodingHeader = m.GetRemoveAcceptEncodingHeader() if h, ok := interface{}(m.GetWindowBits()).(clone.Cloner); ok { - target.WindowBits = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.WindowBits = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.WindowBits = proto.Clone(m.GetWindowBits()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.WindowBits = proto.Clone(m.GetWindowBits()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2/gzip.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2/gzip.pb.go index 68232e537..6a96ee4ca 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2/gzip.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2/gzip.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/filter/http/gzip/v2/gzip.proto @@ -13,10 +13,10 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -135,9 +135,9 @@ type Gzip struct { // Value from 1 to 9 that controls the amount of internal memory used by zlib. Higher values // use more memory, but are faster and produce better compression results. The default value is 5. - MemoryLevel *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=memory_level,json=memoryLevel,proto3" json:"memory_level,omitempty"` + MemoryLevel *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=memory_level,json=memoryLevel,proto3" json:"memory_level,omitempty"` // Minimum response length, in bytes, which will trigger compression. The default value is 30. - ContentLength *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=content_length,json=contentLength,proto3" json:"content_length,omitempty"` + ContentLength *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=content_length,json=contentLength,proto3" json:"content_length,omitempty"` // A value used for selecting the zlib compression level. This setting will affect speed and // amount of compression applied to the content. "BEST" provides higher compression at the cost of // higher latency, "SPEED" provides lower compression with minimum impact on response time. @@ -166,16 +166,14 @@ type Gzip struct { // Larger window results in better compression at the expense of memory usage. The default is 12 // which will produce a 4096 bytes window. For more details about this parameter, please refer to // zlib manual > deflateInit2. - WindowBits *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` + WindowBits *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=window_bits,json=windowBits,proto3" json:"window_bits,omitempty"` } func (x *Gzip) Reset() { *x = Gzip{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Gzip) String() string { @@ -186,7 +184,7 @@ func (*Gzip) ProtoMessage() {} func (x *Gzip) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -201,14 +199,14 @@ func (*Gzip) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_rawDescGZIP(), []int{0} } -func (x *Gzip) GetMemoryLevel() *wrappers.UInt32Value { +func (x *Gzip) GetMemoryLevel() *wrapperspb.UInt32Value { if x != nil { return x.MemoryLevel } return nil } -func (x *Gzip) GetContentLength() *wrappers.UInt32Value { +func (x *Gzip) GetContentLength() *wrapperspb.UInt32Value { if x != nil { return x.ContentLength } @@ -250,7 +248,7 @@ func (x *Gzip) GetRemoveAcceptEncodingHeader() bool { return false } -func (x *Gzip) GetWindowBits() *wrappers.UInt32Value { +func (x *Gzip) GetWindowBits() *wrapperspb.UInt32Value { if x != nil { return x.WindowBits } @@ -265,11 +263,9 @@ type Gzip_CompressionLevel struct { func (x *Gzip_CompressionLevel) Reset() { *x = Gzip_CompressionLevel{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Gzip_CompressionLevel) String() string { @@ -280,7 +276,7 @@ func (*Gzip_CompressionLevel) ProtoMessage() {} func (x *Gzip_CompressionLevel) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -385,12 +381,12 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filte var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_goTypes = []any{ (Gzip_CompressionStrategy)(0), // 0: solo.io.envoy.config.filter.http.gzip.v2.Gzip.CompressionStrategy (Gzip_CompressionLevel_Enum)(0), // 1: solo.io.envoy.config.filter.http.gzip.v2.Gzip.CompressionLevel.Enum (*Gzip)(nil), // 2: solo.io.envoy.config.filter.http.gzip.v2.Gzip (*Gzip_CompressionLevel)(nil), // 3: solo.io.envoy.config.filter.http.gzip.v2.Gzip.CompressionLevel - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_depIdxs = []int32{ 4, // 0: solo.io.envoy.config.filter.http.gzip.v2.Gzip.memory_level:type_name -> google.protobuf.UInt32Value @@ -412,32 +408,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filte if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Gzip); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_http_gzip_v2_gzip_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Gzip_CompressionLevel); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/config/filter/listener/tls_cipher_inspector/v3/tls_cipher_inspector.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/filter/listener/tls_cipher_inspector/v3/tls_cipher_inspector.pb.go index a8634f825..bf36efb11 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/filter/listener/tls_cipher_inspector/v3/tls_cipher_inspector.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/filter/listener/tls_cipher_inspector/v3/tls_cipher_inspector.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/filter/listener/tls_cipher_inspector/v3/tls_cipher_inspector.proto @@ -31,11 +31,9 @@ type TlsCipherInspector struct { func (x *TlsCipherInspector) Reset() { *x = TlsCipherInspector{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_listener_tls_cipher_inspector_v3_tls_cipher_inspector_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_listener_tls_cipher_inspector_v3_tls_cipher_inspector_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TlsCipherInspector) String() string { @@ -46,7 +44,7 @@ func (*TlsCipherInspector) ProtoMessage() {} func (x *TlsCipherInspector) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_listener_tls_cipher_inspector_v3_tls_cipher_inspector_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -111,7 +109,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filte } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_listener_tls_cipher_inspector_v3_tls_cipher_inspector_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_listener_tls_cipher_inspector_v3_tls_cipher_inspector_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_listener_tls_cipher_inspector_v3_tls_cipher_inspector_proto_goTypes = []any{ (*TlsCipherInspector)(nil), // 0: envoy.config.filter.listener.tls_cipher_inspector.v3.TlsCipherInspector } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_listener_tls_cipher_inspector_v3_tls_cipher_inspector_proto_depIdxs = []int32{ @@ -129,20 +127,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filte if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_listener_tls_cipher_inspector_v3_tls_cipher_inspector_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_filter_listener_tls_cipher_inspector_v3_tls_cipher_inspector_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TlsCipherInspector); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/config/matching/custom_matchers/server_name/v3/server_name_matcher.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/matching/custom_matchers/server_name/v3/server_name_matcher.pb.go index 97960ef02..07f7380cf 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/matching/custom_matchers/server_name/v3/server_name_matcher.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/matching/custom_matchers/server_name/v3/server_name_matcher.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/matching/custom_matchers/server_name/v3/server_name_matcher.proto @@ -36,11 +36,9 @@ type ServerNameMatcher struct { func (x *ServerNameMatcher) Reset() { *x = ServerNameMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServerNameMatcher) String() string { @@ -51,7 +49,7 @@ func (*ServerNameMatcher) ProtoMessage() {} func (x *ServerNameMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -88,11 +86,9 @@ type ServerNameMatcher_ServerNameSetMatcher struct { func (x *ServerNameMatcher_ServerNameSetMatcher) Reset() { *x = ServerNameMatcher_ServerNameSetMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServerNameMatcher_ServerNameSetMatcher) String() string { @@ -103,7 +99,7 @@ func (*ServerNameMatcher_ServerNameSetMatcher) ProtoMessage() {} func (x *ServerNameMatcher_ServerNameSetMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -200,7 +196,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_match } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_goTypes = []any{ (*ServerNameMatcher)(nil), // 0: envoy.config.matching.custom_matchers.server_name.v3.ServerNameMatcher (*ServerNameMatcher_ServerNameSetMatcher)(nil), // 1: envoy.config.matching.custom_matchers.server_name.v3.ServerNameMatcher.ServerNameSetMatcher (*v3.Matcher_OnMatch)(nil), // 2: xds.type.matcher.v3.Matcher.OnMatch @@ -222,32 +218,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_match if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServerNameMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_custom_matchers_server_name_v3_server_name_matcher_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServerNameMatcher_ServerNameSetMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/config/matching/inputs/cipher_detection_input/v3/cipher_detection_input.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/matching/inputs/cipher_detection_input/v3/cipher_detection_input.pb.go index 4da1cbb76..96fefb2a8 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/matching/inputs/cipher_detection_input/v3/cipher_detection_input.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/matching/inputs/cipher_detection_input/v3/cipher_detection_input.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/matching/inputs/cipher_detection_input/v3/cipher_detection_input.proto @@ -50,11 +50,9 @@ type CipherDetectionInput struct { func (x *CipherDetectionInput) Reset() { *x = CipherDetectionInput{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_inputs_cipher_detection_input_v3_cipher_detection_input_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_inputs_cipher_detection_input_v3_cipher_detection_input_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CipherDetectionInput) String() string { @@ -65,7 +63,7 @@ func (*CipherDetectionInput) ProtoMessage() {} func (x *CipherDetectionInput) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_inputs_cipher_detection_input_v3_cipher_detection_input_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -151,7 +149,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_match } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_inputs_cipher_detection_input_v3_cipher_detection_input_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_inputs_cipher_detection_input_v3_cipher_detection_input_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_inputs_cipher_detection_input_v3_cipher_detection_input_proto_goTypes = []any{ (*CipherDetectionInput)(nil), // 0: envoy.config.matching.cipher_detection_input.v3.CipherDetectionInput } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_inputs_cipher_detection_input_v3_cipher_detection_input_proto_depIdxs = []int32{ @@ -169,20 +167,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_match if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_inputs_cipher_detection_input_v3_cipher_detection_input_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_matching_inputs_cipher_detection_input_v3_cipher_detection_input_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CipherDetectionInput); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/config/route/v3/route_components.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/route/v3/route_components.pb.clone.go index 4e42df251..9004fc6fb 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/route/v3/route_components.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/route/v3/route_components.pb.clone.go @@ -13,12 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" - - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_matcher_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" @@ -28,6 +22,12 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_tracing_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/tracing/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/v3" + + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -152,13 +152,13 @@ func (m *VirtualHost) Clone() proto.Message { } if m.GetTypedPerFilterConfig() != nil { - target.TypedPerFilterConfig = make(map[string]*github_com_golang_protobuf_ptypes_any.Any, len(m.GetTypedPerFilterConfig())) + target.TypedPerFilterConfig = make(map[string]*google_golang_org_protobuf_types_known_anypb.Any, len(m.GetTypedPerFilterConfig())) for k, v := range m.GetTypedPerFilterConfig() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.TypedPerFilterConfig[k] = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.TypedPerFilterConfig[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_anypb.Any) } } @@ -175,9 +175,9 @@ func (m *VirtualHost) Clone() proto.Message { } if h, ok := interface{}(m.GetRetryPolicyTypedConfig()).(clone.Cloner); ok { - target.RetryPolicyTypedConfig = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.RetryPolicyTypedConfig = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.RetryPolicyTypedConfig = proto.Clone(m.GetRetryPolicyTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any) + target.RetryPolicyTypedConfig = proto.Clone(m.GetRetryPolicyTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any) } if h, ok := interface{}(m.GetHedgePolicy()).(clone.Cloner); ok { @@ -187,9 +187,9 @@ func (m *VirtualHost) Clone() proto.Message { } if h, ok := interface{}(m.GetPerRequestBufferLimitBytes()).(clone.Cloner); ok { - target.PerRequestBufferLimitBytes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerRequestBufferLimitBytes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.PerRequestBufferLimitBytes = proto.Clone(m.GetPerRequestBufferLimitBytes()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerRequestBufferLimitBytes = proto.Clone(m.GetPerRequestBufferLimitBytes()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target @@ -204,9 +204,9 @@ func (m *FilterAction) Clone() proto.Message { target = &FilterAction{} if h, ok := interface{}(m.GetAction()).(clone.Cloner); ok { - target.Action = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.Action = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.Action = proto.Clone(m.GetAction()).(*github_com_golang_protobuf_ptypes_any.Any) + target.Action = proto.Clone(m.GetAction()).(*google_golang_org_protobuf_types_known_anypb.Any) } return target @@ -241,13 +241,13 @@ func (m *Route) Clone() proto.Message { } if m.GetTypedPerFilterConfig() != nil { - target.TypedPerFilterConfig = make(map[string]*github_com_golang_protobuf_ptypes_any.Any, len(m.GetTypedPerFilterConfig())) + target.TypedPerFilterConfig = make(map[string]*google_golang_org_protobuf_types_known_anypb.Any, len(m.GetTypedPerFilterConfig())) for k, v := range m.GetTypedPerFilterConfig() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.TypedPerFilterConfig[k] = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.TypedPerFilterConfig[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_anypb.Any) } } @@ -304,9 +304,9 @@ func (m *Route) Clone() proto.Message { } if h, ok := interface{}(m.GetPerRequestBufferLimitBytes()).(clone.Cloner); ok { - target.PerRequestBufferLimitBytes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerRequestBufferLimitBytes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.PerRequestBufferLimitBytes = proto.Clone(m.GetPerRequestBufferLimitBytes()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerRequestBufferLimitBytes = proto.Clone(m.GetPerRequestBufferLimitBytes()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } switch m.Action.(type) { @@ -386,9 +386,9 @@ func (m *WeightedCluster) Clone() proto.Message { } if h, ok := interface{}(m.GetTotalWeight()).(clone.Cloner); ok { - target.TotalWeight = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.TotalWeight = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.TotalWeight = proto.Clone(m.GetTotalWeight()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.TotalWeight = proto.Clone(m.GetTotalWeight()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.RuntimeKeyPrefix = m.GetRuntimeKeyPrefix() @@ -405,9 +405,9 @@ func (m *RouteMatch) Clone() proto.Message { target = &RouteMatch{} if h, ok := interface{}(m.GetCaseSensitive()).(clone.Cloner); ok { - target.CaseSensitive = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.CaseSensitive = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.CaseSensitive = proto.Clone(m.GetCaseSensitive()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.CaseSensitive = proto.Clone(m.GetCaseSensitive()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetRuntimeFraction()).(clone.Cloner); ok { @@ -527,9 +527,9 @@ func (m *CorsPolicy) Clone() proto.Message { target.MaxAge = m.GetMaxAge() if h, ok := interface{}(m.GetAllowCredentials()).(clone.Cloner); ok { - target.AllowCredentials = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowCredentials = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowCredentials = proto.Clone(m.GetAllowCredentials()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowCredentials = proto.Clone(m.GetAllowCredentials()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetShadowEnabled()).(clone.Cloner); ok { @@ -582,15 +582,15 @@ func (m *RouteAction) Clone() proto.Message { } if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetIdleTimeout()).(clone.Cloner); ok { - target.IdleTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRetryPolicy()).(clone.Cloner); ok { @@ -600,9 +600,9 @@ func (m *RouteAction) Clone() proto.Message { } if h, ok := interface{}(m.GetRetryPolicyTypedConfig()).(clone.Cloner); ok { - target.RetryPolicyTypedConfig = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.RetryPolicyTypedConfig = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.RetryPolicyTypedConfig = proto.Clone(m.GetRetryPolicyTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any) + target.RetryPolicyTypedConfig = proto.Clone(m.GetRetryPolicyTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any) } if m.GetRequestMirrorPolicies() != nil { @@ -634,9 +634,9 @@ func (m *RouteAction) Clone() proto.Message { } if h, ok := interface{}(m.GetIncludeVhRateLimits()).(clone.Cloner); ok { - target.IncludeVhRateLimits = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IncludeVhRateLimits = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.IncludeVhRateLimits = proto.Clone(m.GetIncludeVhRateLimits()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IncludeVhRateLimits = proto.Clone(m.GetIncludeVhRateLimits()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetHashPolicy() != nil { @@ -659,15 +659,15 @@ func (m *RouteAction) Clone() proto.Message { } if h, ok := interface{}(m.GetMaxGrpcTimeout()).(clone.Cloner); ok { - target.MaxGrpcTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxGrpcTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxGrpcTimeout = proto.Clone(m.GetMaxGrpcTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxGrpcTimeout = proto.Clone(m.GetMaxGrpcTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetGrpcTimeoutOffset()).(clone.Cloner); ok { - target.GrpcTimeoutOffset = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.GrpcTimeoutOffset = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.GrpcTimeoutOffset = proto.Clone(m.GetGrpcTimeoutOffset()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.GrpcTimeoutOffset = proto.Clone(m.GetGrpcTimeoutOffset()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if m.GetUpgradeConfigs() != nil { @@ -692,9 +692,9 @@ func (m *RouteAction) Clone() proto.Message { target.InternalRedirectAction = m.GetInternalRedirectAction() if h, ok := interface{}(m.GetMaxInternalRedirects()).(clone.Cloner); ok { - target.MaxInternalRedirects = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxInternalRedirects = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxInternalRedirects = proto.Clone(m.GetMaxInternalRedirects()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxInternalRedirects = proto.Clone(m.GetMaxInternalRedirects()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetHedgePolicy()).(clone.Cloner); ok { @@ -743,11 +743,11 @@ func (m *RouteAction) Clone() proto.Message { if h, ok := interface{}(m.GetAutoHostRewrite()).(clone.Cloner); ok { target.HostRewriteSpecifier = &RouteAction_AutoHostRewrite{ - AutoHostRewrite: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + AutoHostRewrite: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } else { target.HostRewriteSpecifier = &RouteAction_AutoHostRewrite{ - AutoHostRewrite: proto.Clone(m.GetAutoHostRewrite()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + AutoHostRewrite: proto.Clone(m.GetAutoHostRewrite()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } @@ -773,15 +773,15 @@ func (m *RetryPolicy) Clone() proto.Message { target.RetryOn = m.GetRetryOn() if h, ok := interface{}(m.GetNumRetries()).(clone.Cloner); ok { - target.NumRetries = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.NumRetries = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.NumRetries = proto.Clone(m.GetNumRetries()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.NumRetries = proto.Clone(m.GetNumRetries()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetPerTryTimeout()).(clone.Cloner); ok { - target.PerTryTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PerTryTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.PerTryTimeout = proto.Clone(m.GetPerTryTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PerTryTimeout = proto.Clone(m.GetPerTryTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRetryPriority()).(clone.Cloner); ok { @@ -858,9 +858,9 @@ func (m *HedgePolicy) Clone() proto.Message { target = &HedgePolicy{} if h, ok := interface{}(m.GetInitialRequests()).(clone.Cloner); ok { - target.InitialRequests = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialRequests = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.InitialRequests = proto.Clone(m.GetInitialRequests()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialRequests = proto.Clone(m.GetInitialRequests()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetAdditionalRequestChance()).(clone.Cloner); ok { @@ -955,9 +955,9 @@ func (m *Decorator) Clone() proto.Message { target.Operation = m.GetOperation() if h, ok := interface{}(m.GetPropagate()).(clone.Cloner); ok { - target.Propagate = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Propagate = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Propagate = proto.Clone(m.GetPropagate()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Propagate = proto.Clone(m.GetPropagate()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1040,9 +1040,9 @@ func (m *RateLimit) Clone() proto.Message { target = &RateLimit{} if h, ok := interface{}(m.GetStage()).(clone.Cloner); ok { - target.Stage = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Stage = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.Stage = proto.Clone(m.GetStage()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Stage = proto.Clone(m.GetStage()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.DisableKey = m.GetDisableKey() @@ -1180,9 +1180,9 @@ func (m *InternalRedirectPolicy) Clone() proto.Message { target = &InternalRedirectPolicy{} if h, ok := interface{}(m.GetMaxInternalRedirects()).(clone.Cloner); ok { - target.MaxInternalRedirects = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxInternalRedirects = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxInternalRedirects = proto.Clone(m.GetMaxInternalRedirects()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxInternalRedirects = proto.Clone(m.GetMaxInternalRedirects()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if m.GetRedirectResponseCodes() != nil { @@ -1223,9 +1223,9 @@ func (m *WeightedCluster_ClusterWeight) Clone() proto.Message { target.Name = m.GetName() if h, ok := interface{}(m.GetWeight()).(clone.Cloner); ok { - target.Weight = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Weight = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.Weight = proto.Clone(m.GetWeight()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Weight = proto.Clone(m.GetWeight()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetMetadataMatch()).(clone.Cloner); ok { @@ -1279,13 +1279,13 @@ func (m *WeightedCluster_ClusterWeight) Clone() proto.Message { } if m.GetTypedPerFilterConfig() != nil { - target.TypedPerFilterConfig = make(map[string]*github_com_golang_protobuf_ptypes_any.Any, len(m.GetTypedPerFilterConfig())) + target.TypedPerFilterConfig = make(map[string]*google_golang_org_protobuf_types_known_anypb.Any, len(m.GetTypedPerFilterConfig())) for k, v := range m.GetTypedPerFilterConfig() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.TypedPerFilterConfig[k] = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.TypedPerFilterConfig[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_any.Any) + target.TypedPerFilterConfig[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_anypb.Any) } } @@ -1314,15 +1314,15 @@ func (m *RouteMatch_TlsContextMatchOptions) Clone() proto.Message { target = &RouteMatch_TlsContextMatchOptions{} if h, ok := interface{}(m.GetPresented()).(clone.Cloner); ok { - target.Presented = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Presented = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Presented = proto.Clone(m.GetPresented()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Presented = proto.Clone(m.GetPresented()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetValidated()).(clone.Cloner); ok { - target.Validated = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Validated = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Validated = proto.Clone(m.GetValidated()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Validated = proto.Clone(m.GetValidated()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1356,9 +1356,9 @@ func (m *RouteAction_RequestMirrorPolicy) Clone() proto.Message { } if h, ok := interface{}(m.GetTraceSampled()).(clone.Cloner); ok { - target.TraceSampled = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TraceSampled = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.TraceSampled = proto.Clone(m.GetTraceSampled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TraceSampled = proto.Clone(m.GetTraceSampled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1452,9 +1452,9 @@ func (m *RouteAction_UpgradeConfig) Clone() proto.Message { target.UpgradeType = m.GetUpgradeType() if h, ok := interface{}(m.GetEnabled()).(clone.Cloner); ok { - target.Enabled = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Enabled = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Enabled = proto.Clone(m.GetEnabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Enabled = proto.Clone(m.GetEnabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetConnectConfig()).(clone.Cloner); ok { @@ -1496,9 +1496,9 @@ func (m *RouteAction_HashPolicy_Cookie) Clone() proto.Message { target.Name = m.GetName() if h, ok := interface{}(m.GetTtl()).(clone.Cloner); ok { - target.Ttl = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Ttl = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Ttl = proto.Clone(m.GetTtl()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Ttl = proto.Clone(m.GetTtl()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.Path = m.GetPath() @@ -1578,11 +1578,11 @@ func (m *RetryPolicy_RetryPriority) Clone() proto.Message { if h, ok := interface{}(m.GetTypedConfig()).(clone.Cloner); ok { target.ConfigType = &RetryPolicy_RetryPriority_TypedConfig{ - TypedConfig: h.Clone().(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any), } } else { target.ConfigType = &RetryPolicy_RetryPriority_TypedConfig{ - TypedConfig: proto.Clone(m.GetTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: proto.Clone(m.GetTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any), } } @@ -1607,11 +1607,11 @@ func (m *RetryPolicy_RetryHostPredicate) Clone() proto.Message { if h, ok := interface{}(m.GetTypedConfig()).(clone.Cloner); ok { target.ConfigType = &RetryPolicy_RetryHostPredicate_TypedConfig{ - TypedConfig: h.Clone().(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any), } } else { target.ConfigType = &RetryPolicy_RetryHostPredicate_TypedConfig{ - TypedConfig: proto.Clone(m.GetTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: proto.Clone(m.GetTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any), } } @@ -1629,15 +1629,15 @@ func (m *RetryPolicy_RetryBackOff) Clone() proto.Message { target = &RetryPolicy_RetryBackOff{} if h, ok := interface{}(m.GetBaseInterval()).(clone.Cloner); ok { - target.BaseInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxInterval()).(clone.Cloner); ok { - target.MaxInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -1843,9 +1843,9 @@ func (m *RateLimit_Action_HeaderValueMatch) Clone() proto.Message { target.DescriptorValue = m.GetDescriptorValue() if h, ok := interface{}(m.GetExpectMatch()).(clone.Cloner); ok { - target.ExpectMatch = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ExpectMatch = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.ExpectMatch = proto.Clone(m.GetExpectMatch()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ExpectMatch = proto.Clone(m.GetExpectMatch()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetHeaders() != nil { diff --git a/pkg/api/gloo.solo.io/external/envoy/config/route/v3/route_components.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/route/v3/route_components.pb.go index bc6a18b65..c27c071be 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/route/v3/route_components.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/route/v3/route_components.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/route/v3/route_components.proto @@ -11,10 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - _ "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" v31 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" @@ -24,6 +20,10 @@ import ( _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -317,7 +317,7 @@ type VirtualHost struct { // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the :ref:`HTTP filter documentation ` // for if and how it is utilized. - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,15,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,15,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Decides whether the :ref:`x-envoy-attempt-count // ` header should be included // in the upstream request. Setting this option will cause it to override any existing header @@ -347,7 +347,7 @@ type VirtualHost struct { // will take precedence over this config and it'll be treated independently (e.g.: values are not // inherited). Retry policy should not be // set if this field is used. - RetryPolicyTypedConfig *any1.Any `protobuf:"bytes,20,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` + RetryPolicyTypedConfig *anypb.Any `protobuf:"bytes,20,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` // Indicates the hedge policy for all routes in this virtual host. Note that setting a // route level entry will take precedence over this config and it'll be treated // independently (e.g.: values are not inherited). @@ -355,16 +355,14 @@ type VirtualHost struct { // The maximum bytes which will be buffered for retries and shadowing. // If set and a route-specific limit is not set, the bytes actually buffered will be the minimum // value of this and the listener per_connection_buffer_limit_bytes. - PerRequestBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,18,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` + PerRequestBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,18,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` } func (x *VirtualHost) Reset() { *x = VirtualHost{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualHost) String() string { @@ -375,7 +373,7 @@ func (*VirtualHost) ProtoMessage() {} func (x *VirtualHost) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -467,7 +465,7 @@ func (x *VirtualHost) GetCors() *CorsPolicy { return nil } -func (x *VirtualHost) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *VirtualHost) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -495,7 +493,7 @@ func (x *VirtualHost) GetRetryPolicy() *RetryPolicy { return nil } -func (x *VirtualHost) GetRetryPolicyTypedConfig() *any1.Any { +func (x *VirtualHost) GetRetryPolicyTypedConfig() *anypb.Any { if x != nil { return x.RetryPolicyTypedConfig } @@ -509,7 +507,7 @@ func (x *VirtualHost) GetHedgePolicy() *HedgePolicy { return nil } -func (x *VirtualHost) GetPerRequestBufferLimitBytes() *wrappers.UInt32Value { +func (x *VirtualHost) GetPerRequestBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerRequestBufferLimitBytes } @@ -522,16 +520,14 @@ type FilterAction struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Action *any1.Any `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` + Action *anypb.Any `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"` } func (x *FilterAction) Reset() { *x = FilterAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FilterAction) String() string { @@ -542,7 +538,7 @@ func (*FilterAction) ProtoMessage() {} func (x *FilterAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -557,7 +553,7 @@ func (*FilterAction) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{1} } -func (x *FilterAction) GetAction() *any1.Any { +func (x *FilterAction) GetAction() *anypb.Any { if x != nil { return x.Action } @@ -602,7 +598,7 @@ type Route struct { // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the HTTP filter documentation for // if and how it is utilized. - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,13,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,13,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Specifies a set of headers that will be added to requests matching this // route. Headers specified at this level are applied before headers from the // enclosing :ref:`envoy_api_msg_config.route.v3.VirtualHost` and @@ -629,16 +625,14 @@ type Route struct { // The maximum bytes which will be buffered for retries and shadowing. // If set, the bytes actually buffered will be the minimum value of this and the // listener per_connection_buffer_limit_bytes. - PerRequestBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,16,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` + PerRequestBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,16,opt,name=per_request_buffer_limit_bytes,json=perRequestBufferLimitBytes,proto3" json:"per_request_buffer_limit_bytes,omitempty"` } func (x *Route) Reset() { *x = Route{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Route) String() string { @@ -649,7 +643,7 @@ func (*Route) ProtoMessage() {} func (x *Route) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -727,7 +721,7 @@ func (x *Route) GetDecorator() *Decorator { return nil } -func (x *Route) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *Route) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -769,7 +763,7 @@ func (x *Route) GetTracing() *Tracing { return nil } -func (x *Route) GetPerRequestBufferLimitBytes() *wrappers.UInt32Value { +func (x *Route) GetPerRequestBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerRequestBufferLimitBytes } @@ -827,7 +821,7 @@ type WeightedCluster struct { Clusters []*WeightedCluster_ClusterWeight `protobuf:"bytes,1,rep,name=clusters,proto3" json:"clusters,omitempty"` // Specifies the total weight across all clusters. The sum of all cluster weights must equal this // value, which must be greater than 0. Defaults to 100. - TotalWeight *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=total_weight,json=totalWeight,proto3" json:"total_weight,omitempty"` + TotalWeight *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=total_weight,json=totalWeight,proto3" json:"total_weight,omitempty"` // Specifies the runtime key prefix that should be used to construct the // runtime keys associated with each cluster. When the *runtime_key_prefix* is // specified, the router will look for weights associated with each upstream @@ -841,11 +835,9 @@ type WeightedCluster struct { func (x *WeightedCluster) Reset() { *x = WeightedCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *WeightedCluster) String() string { @@ -856,7 +848,7 @@ func (*WeightedCluster) ProtoMessage() {} func (x *WeightedCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -878,7 +870,7 @@ func (x *WeightedCluster) GetClusters() []*WeightedCluster_ClusterWeight { return nil } -func (x *WeightedCluster) GetTotalWeight() *wrappers.UInt32Value { +func (x *WeightedCluster) GetTotalWeight() *wrapperspb.UInt32Value { if x != nil { return x.TotalWeight } @@ -907,7 +899,7 @@ type RouteMatch struct { PathSpecifier isRouteMatch_PathSpecifier `protobuf_oneof:"path_specifier"` // Indicates that prefix/path matching should be case insensitive. The default // is true. - CaseSensitive *wrappers.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` + CaseSensitive *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` // Indicates that the route should additionally match on a runtime key. Every time the route // is considered for a match, it must also fall under the percentage of matches indicated by // this field. For some fraction N/D, a random number in the range [0,D) is selected. If the @@ -950,11 +942,9 @@ type RouteMatch struct { func (x *RouteMatch) Reset() { *x = RouteMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteMatch) String() string { @@ -965,7 +955,7 @@ func (*RouteMatch) ProtoMessage() {} func (x *RouteMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1015,7 +1005,7 @@ func (x *RouteMatch) GetConnectMatcher() *RouteMatch_ConnectMatcher { return nil } -func (x *RouteMatch) GetCaseSensitive() *wrappers.BoolValue { +func (x *RouteMatch) GetCaseSensitive() *wrapperspb.BoolValue { if x != nil { return x.CaseSensitive } @@ -1128,7 +1118,7 @@ type CorsPolicy struct { // Specifies the content for the *access-control-max-age* header. MaxAge string `protobuf:"bytes,5,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // Specifies whether the resource allows credentials. - AllowCredentials *wrappers.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` + AllowCredentials *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=allow_credentials,json=allowCredentials,proto3" json:"allow_credentials,omitempty"` // Types that are assignable to EnabledSpecifier: // // *CorsPolicy_FilterEnabled @@ -1147,11 +1137,9 @@ type CorsPolicy struct { func (x *CorsPolicy) Reset() { *x = CorsPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CorsPolicy) String() string { @@ -1162,7 +1150,7 @@ func (*CorsPolicy) ProtoMessage() {} func (x *CorsPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1212,7 +1200,7 @@ func (x *CorsPolicy) GetMaxAge() string { return "" } -func (x *CorsPolicy) GetAllowCredentials() *wrappers.BoolValue { +func (x *CorsPolicy) GetAllowCredentials() *wrapperspb.BoolValue { if x != nil { return x.AllowCredentials } @@ -1356,7 +1344,7 @@ type RouteAction struct { // :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, // :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the // retry overview. - Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"` // Specifies the idle timeout for the route. If not specified, there is no per-route idle timeout, // although the connection manager wide :ref:`stream_idle_timeout // ` @@ -1375,7 +1363,7 @@ type RouteAction struct { // fires, the stream is terminated with a 408 Request Timeout error code if no // upstream response header has been received, otherwise a stream reset // occurs. - IdleTimeout *duration.Duration `protobuf:"bytes,24,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,24,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // Indicates that the route has a retry policy. Note that if this is set, // it'll take precedence over the virtual host level retry policy entirely // (e.g.: policies are not merged, most internal one becomes the enforced policy). @@ -1385,7 +1373,7 @@ type RouteAction struct { // precedence over the virtual host level retry policy entirely (e.g.: policies are not merged, // most internal one becomes the enforced policy). :ref:`Retry policy ` // should not be set if this field is used. - RetryPolicyTypedConfig *any1.Any `protobuf:"bytes,33,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` + RetryPolicyTypedConfig *anypb.Any `protobuf:"bytes,33,opt,name=retry_policy_typed_config,json=retryPolicyTypedConfig,proto3" json:"retry_policy_typed_config,omitempty"` // Indicates that the route has request mirroring policies. RequestMirrorPolicies []*RouteAction_RequestMirrorPolicy `protobuf:"bytes,30,rep,name=request_mirror_policies,json=requestMirrorPolicies,proto3" json:"request_mirror_policies,omitempty"` // Optionally specifies the routing priority. @@ -1397,7 +1385,7 @@ type RouteAction struct { // limits. By default, if the route configured rate limits, the virtual host // rate_limits are not applied to the // request. - IncludeVhRateLimits *wrappers.BoolValue `protobuf:"bytes,14,opt,name=include_vh_rate_limits,json=includeVhRateLimits,proto3" json:"include_vh_rate_limits,omitempty"` + IncludeVhRateLimits *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=include_vh_rate_limits,json=includeVhRateLimits,proto3" json:"include_vh_rate_limits,omitempty"` // Specifies a list of hash policies to use for ring hash load balancing. Each // hash policy is evaluated individually and the combined result is used to // route the request. The method of combination is deterministic such that @@ -1432,7 +1420,7 @@ type RouteAction struct { // :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`, // :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the // retry overview. - MaxGrpcTimeout *duration.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"` + MaxGrpcTimeout *durationpb.Duration `protobuf:"bytes,23,opt,name=max_grpc_timeout,json=maxGrpcTimeout,proto3" json:"max_grpc_timeout,omitempty"` // If present, Envoy will adjust the timeout provided by the `grpc-timeout` header by subtracting // the provided duration from the header. This is useful in allowing Envoy to set its global // timeout to be less than that of the deadline imposed by the calling client, which makes it more @@ -1440,7 +1428,7 @@ type RouteAction struct { // The offset will only be applied if the provided grpc_timeout is greater than the offset. This // ensures that the offset will only ever decrease the timeout and never set it to 0 (meaning // infinity). - GrpcTimeoutOffset *duration.Duration `protobuf:"bytes,28,opt,name=grpc_timeout_offset,json=grpcTimeoutOffset,proto3" json:"grpc_timeout_offset,omitempty"` + GrpcTimeoutOffset *durationpb.Duration `protobuf:"bytes,28,opt,name=grpc_timeout_offset,json=grpcTimeoutOffset,proto3" json:"grpc_timeout_offset,omitempty"` UpgradeConfigs []*RouteAction_UpgradeConfig `protobuf:"bytes,25,rep,name=upgrade_configs,json=upgradeConfigs,proto3" json:"upgrade_configs,omitempty"` // If present, Envoy will try to follow an upstream redirect response instead of proxying the // response back to the downstream. An upstream redirect response is defined @@ -1465,7 +1453,7 @@ type RouteAction struct { // If not specified, at most one redirect will be followed. // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/route/v3/route_components.proto. - MaxInternalRedirects *wrappers.UInt32Value `protobuf:"bytes,31,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` + MaxInternalRedirects *wrapperspb.UInt32Value `protobuf:"bytes,31,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` // Indicates that the route has a hedge policy. Note that if this is set, // it'll take precedence over the virtual host level hedge policy entirely // (e.g.: policies are not merged, most internal one becomes the enforced policy). @@ -1474,11 +1462,9 @@ type RouteAction struct { func (x *RouteAction) Reset() { *x = RouteAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction) String() string { @@ -1489,7 +1475,7 @@ func (*RouteAction) ProtoMessage() {} func (x *RouteAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1574,7 +1560,7 @@ func (x *RouteAction) GetHostRewriteLiteral() string { return "" } -func (x *RouteAction) GetAutoHostRewrite() *wrappers.BoolValue { +func (x *RouteAction) GetAutoHostRewrite() *wrapperspb.BoolValue { if x, ok := x.GetHostRewriteSpecifier().(*RouteAction_AutoHostRewrite); ok { return x.AutoHostRewrite } @@ -1588,14 +1574,14 @@ func (x *RouteAction) GetHostRewriteHeader() string { return "" } -func (x *RouteAction) GetTimeout() *duration.Duration { +func (x *RouteAction) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *RouteAction) GetIdleTimeout() *duration.Duration { +func (x *RouteAction) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -1609,7 +1595,7 @@ func (x *RouteAction) GetRetryPolicy() *RetryPolicy { return nil } -func (x *RouteAction) GetRetryPolicyTypedConfig() *any1.Any { +func (x *RouteAction) GetRetryPolicyTypedConfig() *anypb.Any { if x != nil { return x.RetryPolicyTypedConfig } @@ -1637,7 +1623,7 @@ func (x *RouteAction) GetRateLimits() []*RateLimit { return nil } -func (x *RouteAction) GetIncludeVhRateLimits() *wrappers.BoolValue { +func (x *RouteAction) GetIncludeVhRateLimits() *wrapperspb.BoolValue { if x != nil { return x.IncludeVhRateLimits } @@ -1658,14 +1644,14 @@ func (x *RouteAction) GetCors() *CorsPolicy { return nil } -func (x *RouteAction) GetMaxGrpcTimeout() *duration.Duration { +func (x *RouteAction) GetMaxGrpcTimeout() *durationpb.Duration { if x != nil { return x.MaxGrpcTimeout } return nil } -func (x *RouteAction) GetGrpcTimeoutOffset() *duration.Duration { +func (x *RouteAction) GetGrpcTimeoutOffset() *durationpb.Duration { if x != nil { return x.GrpcTimeoutOffset } @@ -1695,7 +1681,7 @@ func (x *RouteAction) GetInternalRedirectAction() RouteAction_InternalRedirectAc } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/route/v3/route_components.proto. -func (x *RouteAction) GetMaxInternalRedirects() *wrappers.UInt32Value { +func (x *RouteAction) GetMaxInternalRedirects() *wrapperspb.UInt32Value { if x != nil { return x.MaxInternalRedirects } @@ -1763,7 +1749,7 @@ type RouteAction_AutoHostRewrite struct { // option is applicable only when the destination cluster for a route is of // type *strict_dns* or *logical_dns*. Setting this to true with other cluster // types has no effect. - AutoHostRewrite *wrappers.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` + AutoHostRewrite *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` } type RouteAction_HostRewriteHeader struct { @@ -1798,7 +1784,7 @@ type RetryPolicy struct { // Specifies the allowed number of retries. This parameter is optional and // defaults to 1. These are the same conditions documented for // :ref:`config_http_filters_router_x-envoy-max-retries`. - NumRetries *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` + NumRetries *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` // Specifies a non-zero upstream timeout per retry attempt. This parameter is optional. The // same conditions documented for // :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms` apply. @@ -1810,7 +1796,7 @@ type RetryPolicy struct { // Consequently, when using a 5xx based // retry policy, a request that times out will not be retried as the total timeout budget // would have been exhausted. - PerTryTimeout *duration.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` + PerTryTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` // Specifies an implementation of a RetryPriority which is used to determine the // distribution of load across priorities used for retries. Refer to // retry plugin configuration for more details. @@ -1842,11 +1828,9 @@ type RetryPolicy struct { func (x *RetryPolicy) Reset() { *x = RetryPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy) String() string { @@ -1857,7 +1841,7 @@ func (*RetryPolicy) ProtoMessage() {} func (x *RetryPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1879,14 +1863,14 @@ func (x *RetryPolicy) GetRetryOn() string { return "" } -func (x *RetryPolicy) GetNumRetries() *wrappers.UInt32Value { +func (x *RetryPolicy) GetNumRetries() *wrapperspb.UInt32Value { if x != nil { return x.NumRetries } return nil } -func (x *RetryPolicy) GetPerTryTimeout() *duration.Duration { +func (x *RetryPolicy) GetPerTryTimeout() *durationpb.Duration { if x != nil { return x.PerTryTimeout } @@ -1952,7 +1936,7 @@ type HedgePolicy struct { // Must be at least 1. // Defaults to 1. // [#not-implemented-hide:] - InitialRequests *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=initial_requests,json=initialRequests,proto3" json:"initial_requests,omitempty"` + InitialRequests *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=initial_requests,json=initialRequests,proto3" json:"initial_requests,omitempty"` // Specifies a probability that an additional upstream request should be sent // on top of what is specified by initial_requests. // Defaults to 0. @@ -1971,11 +1955,9 @@ type HedgePolicy struct { func (x *HedgePolicy) Reset() { *x = HedgePolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HedgePolicy) String() string { @@ -1986,7 +1968,7 @@ func (*HedgePolicy) ProtoMessage() {} func (x *HedgePolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2001,7 +1983,7 @@ func (*HedgePolicy) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{8} } -func (x *HedgePolicy) GetInitialRequests() *wrappers.UInt32Value { +func (x *HedgePolicy) GetInitialRequests() *wrapperspb.UInt32Value { if x != nil { return x.InitialRequests } @@ -2058,11 +2040,9 @@ type RedirectAction struct { func (x *RedirectAction) Reset() { *x = RedirectAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RedirectAction) String() string { @@ -2073,7 +2053,7 @@ func (*RedirectAction) ProtoMessage() {} func (x *RedirectAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2236,11 +2216,9 @@ type DirectResponseAction struct { func (x *DirectResponseAction) Reset() { *x = DirectResponseAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DirectResponseAction) String() string { @@ -2251,7 +2229,7 @@ func (*DirectResponseAction) ProtoMessage() {} func (x *DirectResponseAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2295,16 +2273,14 @@ type Decorator struct { // ` header. Operation string `protobuf:"bytes,1,opt,name=operation,proto3" json:"operation,omitempty"` // Whether the decorated details should be propagated to the other party. The default is true. - Propagate *wrappers.BoolValue `protobuf:"bytes,2,opt,name=propagate,proto3" json:"propagate,omitempty"` + Propagate *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=propagate,proto3" json:"propagate,omitempty"` } func (x *Decorator) Reset() { *x = Decorator{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Decorator) String() string { @@ -2315,7 +2291,7 @@ func (*Decorator) ProtoMessage() {} func (x *Decorator) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2337,7 +2313,7 @@ func (x *Decorator) GetOperation() string { return "" } -func (x *Decorator) GetPropagate() *wrappers.BoolValue { +func (x *Decorator) GetPropagate() *wrapperspb.BoolValue { if x != nil { return x.Propagate } @@ -2382,11 +2358,9 @@ type Tracing struct { func (x *Tracing) Reset() { *x = Tracing{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Tracing) String() string { @@ -2397,7 +2371,7 @@ func (*Tracing) ProtoMessage() {} func (x *Tracing) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2474,11 +2448,9 @@ type VirtualCluster struct { func (x *VirtualCluster) Reset() { *x = VirtualCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualCluster) String() string { @@ -2489,7 +2461,7 @@ func (*VirtualCluster) ProtoMessage() {} func (x *VirtualCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2531,7 +2503,7 @@ type RateLimit struct { // **Note**: // // The filter supports a range of 0 - 10 inclusively for stage numbers. - Stage *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"` + Stage *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=stage,proto3" json:"stage,omitempty"` // The key to be set in runtime to disable this rate limit configuration. DisableKey string `protobuf:"bytes,2,opt,name=disable_key,json=disableKey,proto3" json:"disable_key,omitempty"` // A list of actions that are to be applied for this rate limit configuration. @@ -2550,11 +2522,9 @@ type RateLimit struct { func (x *RateLimit) Reset() { *x = RateLimit{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit) String() string { @@ -2565,7 +2535,7 @@ func (*RateLimit) ProtoMessage() {} func (x *RateLimit) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2580,7 +2550,7 @@ func (*RateLimit) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{14} } -func (x *RateLimit) GetStage() *wrappers.UInt32Value { +func (x *RateLimit) GetStage() *wrapperspb.UInt32Value { if x != nil { return x.Stage } @@ -2664,11 +2634,9 @@ type HeaderMatcher struct { func (x *HeaderMatcher) Reset() { *x = HeaderMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderMatcher) String() string { @@ -2679,7 +2647,7 @@ func (*HeaderMatcher) ProtoMessage() {} func (x *HeaderMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2846,11 +2814,9 @@ type QueryParameterMatcher struct { func (x *QueryParameterMatcher) Reset() { *x = QueryParameterMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *QueryParameterMatcher) String() string { @@ -2861,7 +2827,7 @@ func (*QueryParameterMatcher) ProtoMessage() {} func (x *QueryParameterMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2936,7 +2902,7 @@ type InternalRedirectPolicy struct { // will pass the redirect back to downstream. // // If not specified, at most one redirect will be followed. - MaxInternalRedirects *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` + MaxInternalRedirects *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_internal_redirects,json=maxInternalRedirects,proto3" json:"max_internal_redirects,omitempty"` // Defines what upstream response codes are allowed to trigger internal redirect. If unspecified, // only 302 will be treated as internal redirect. // Only 301, 302, 303, 307 and 308 are valid values. Any other codes will be ignored. @@ -2952,11 +2918,9 @@ type InternalRedirectPolicy struct { func (x *InternalRedirectPolicy) Reset() { *x = InternalRedirectPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *InternalRedirectPolicy) String() string { @@ -2967,7 +2931,7 @@ func (*InternalRedirectPolicy) ProtoMessage() {} func (x *InternalRedirectPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2982,7 +2946,7 @@ func (*InternalRedirectPolicy) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{17} } -func (x *InternalRedirectPolicy) GetMaxInternalRedirects() *wrappers.UInt32Value { +func (x *InternalRedirectPolicy) GetMaxInternalRedirects() *wrapperspb.UInt32Value { if x != nil { return x.MaxInternalRedirects } @@ -3023,7 +2987,7 @@ type WeightedCluster_ClusterWeight struct { // `. When a request matches the route, // the choice of an upstream cluster is determined by its weight. The sum of weights across all // entries in the clusters array must add up to the total_weight, which defaults to 100. - Weight *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` + Weight *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` // Optional endpoint metadata match criteria used by the subset load balancer. Only endpoints in // the upstream cluster with metadata matching what is set in this field will be considered for // load balancing. Note that this will be merged with what's provided in @@ -3057,16 +3021,14 @@ type WeightedCluster_ClusterWeight struct { // *envoy.filters.http.buffer* for the HTTP buffer filter. Use of this field is filter // specific; see the :ref:`HTTP filter documentation ` // for if and how it is utilized. - TypedPerFilterConfig map[string]*any1.Any `protobuf:"bytes,10,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TypedPerFilterConfig map[string]*anypb.Any `protobuf:"bytes,10,rep,name=typed_per_filter_config,json=typedPerFilterConfig,proto3" json:"typed_per_filter_config,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *WeightedCluster_ClusterWeight) Reset() { *x = WeightedCluster_ClusterWeight{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *WeightedCluster_ClusterWeight) String() string { @@ -3077,7 +3039,7 @@ func (*WeightedCluster_ClusterWeight) ProtoMessage() {} func (x *WeightedCluster_ClusterWeight) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3099,7 +3061,7 @@ func (x *WeightedCluster_ClusterWeight) GetName() string { return "" } -func (x *WeightedCluster_ClusterWeight) GetWeight() *wrappers.UInt32Value { +func (x *WeightedCluster_ClusterWeight) GetWeight() *wrapperspb.UInt32Value { if x != nil { return x.Weight } @@ -3141,7 +3103,7 @@ func (x *WeightedCluster_ClusterWeight) GetResponseHeadersToRemove() []string { return nil } -func (x *WeightedCluster_ClusterWeight) GetTypedPerFilterConfig() map[string]*any1.Any { +func (x *WeightedCluster_ClusterWeight) GetTypedPerFilterConfig() map[string]*anypb.Any { if x != nil { return x.TypedPerFilterConfig } @@ -3156,11 +3118,9 @@ type RouteMatch_GrpcRouteMatchOptions struct { func (x *RouteMatch_GrpcRouteMatchOptions) Reset() { *x = RouteMatch_GrpcRouteMatchOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteMatch_GrpcRouteMatchOptions) String() string { @@ -3171,7 +3131,7 @@ func (*RouteMatch_GrpcRouteMatchOptions) ProtoMessage() {} func (x *RouteMatch_GrpcRouteMatchOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3193,19 +3153,17 @@ type RouteMatch_TlsContextMatchOptions struct { // If specified, the route will match against whether or not a certificate is presented. // If not specified, certificate presentation status (true or false) will not be considered when route matching. - Presented *wrappers.BoolValue `protobuf:"bytes,1,opt,name=presented,proto3" json:"presented,omitempty"` + Presented *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=presented,proto3" json:"presented,omitempty"` // If specified, the route will match against whether or not a certificate is validated. // If not specified, certificate validation status (true or false) will not be considered when route matching. - Validated *wrappers.BoolValue `protobuf:"bytes,2,opt,name=validated,proto3" json:"validated,omitempty"` + Validated *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=validated,proto3" json:"validated,omitempty"` } func (x *RouteMatch_TlsContextMatchOptions) Reset() { *x = RouteMatch_TlsContextMatchOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteMatch_TlsContextMatchOptions) String() string { @@ -3216,7 +3174,7 @@ func (*RouteMatch_TlsContextMatchOptions) ProtoMessage() {} func (x *RouteMatch_TlsContextMatchOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3231,14 +3189,14 @@ func (*RouteMatch_TlsContextMatchOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{4, 1} } -func (x *RouteMatch_TlsContextMatchOptions) GetPresented() *wrappers.BoolValue { +func (x *RouteMatch_TlsContextMatchOptions) GetPresented() *wrapperspb.BoolValue { if x != nil { return x.Presented } return nil } -func (x *RouteMatch_TlsContextMatchOptions) GetValidated() *wrappers.BoolValue { +func (x *RouteMatch_TlsContextMatchOptions) GetValidated() *wrapperspb.BoolValue { if x != nil { return x.Validated } @@ -3254,11 +3212,9 @@ type RouteMatch_ConnectMatcher struct { func (x *RouteMatch_ConnectMatcher) Reset() { *x = RouteMatch_ConnectMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteMatch_ConnectMatcher) String() string { @@ -3269,7 +3225,7 @@ func (*RouteMatch_ConnectMatcher) ProtoMessage() {} func (x *RouteMatch_ConnectMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3313,16 +3269,14 @@ type RouteAction_RequestMirrorPolicy struct { // value, the request will be mirrored. RuntimeFraction *v3.RuntimeFractionalPercent `protobuf:"bytes,3,opt,name=runtime_fraction,json=runtimeFraction,proto3" json:"runtime_fraction,omitempty"` // Determines if the trace span should be sampled. Defaults to true. - TraceSampled *wrappers.BoolValue `protobuf:"bytes,4,opt,name=trace_sampled,json=traceSampled,proto3" json:"trace_sampled,omitempty"` + TraceSampled *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=trace_sampled,json=traceSampled,proto3" json:"trace_sampled,omitempty"` } func (x *RouteAction_RequestMirrorPolicy) Reset() { *x = RouteAction_RequestMirrorPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_RequestMirrorPolicy) String() string { @@ -3333,7 +3287,7 @@ func (*RouteAction_RequestMirrorPolicy) ProtoMessage() {} func (x *RouteAction_RequestMirrorPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3362,7 +3316,7 @@ func (x *RouteAction_RequestMirrorPolicy) GetRuntimeFraction() *v3.RuntimeFracti return nil } -func (x *RouteAction_RequestMirrorPolicy) GetTraceSampled() *wrappers.BoolValue { +func (x *RouteAction_RequestMirrorPolicy) GetTraceSampled() *wrapperspb.BoolValue { if x != nil { return x.TraceSampled } @@ -3409,11 +3363,9 @@ type RouteAction_HashPolicy struct { func (x *RouteAction_HashPolicy) Reset() { *x = RouteAction_HashPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy) String() string { @@ -3424,7 +3376,7 @@ func (*RouteAction_HashPolicy) ProtoMessage() {} func (x *RouteAction_HashPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3543,7 +3495,7 @@ type RouteAction_UpgradeConfig struct { // Upgrade: [upgrade_type] will be proxied upstream. UpgradeType string `protobuf:"bytes,1,opt,name=upgrade_type,json=upgradeType,proto3" json:"upgrade_type,omitempty"` // Determines if upgrades are available on this route. Defaults to true. - Enabled *wrappers.BoolValue `protobuf:"bytes,2,opt,name=enabled,proto3" json:"enabled,omitempty"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=enabled,proto3" json:"enabled,omitempty"` // Configuration for sending data upstream as a raw data payload. This is used for // CONNECT requests, when forwarding CONNECT payload as raw TCP. // Note that CONNECT support is currently considered alpha in Envoy. @@ -3553,11 +3505,9 @@ type RouteAction_UpgradeConfig struct { func (x *RouteAction_UpgradeConfig) Reset() { *x = RouteAction_UpgradeConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_UpgradeConfig) String() string { @@ -3568,7 +3518,7 @@ func (*RouteAction_UpgradeConfig) ProtoMessage() {} func (x *RouteAction_UpgradeConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3590,7 +3540,7 @@ func (x *RouteAction_UpgradeConfig) GetUpgradeType() string { return "" } -func (x *RouteAction_UpgradeConfig) GetEnabled() *wrappers.BoolValue { +func (x *RouteAction_UpgradeConfig) GetEnabled() *wrapperspb.BoolValue { if x != nil { return x.Enabled } @@ -3619,11 +3569,9 @@ type RouteAction_HashPolicy_Header struct { func (x *RouteAction_HashPolicy_Header) Reset() { *x = RouteAction_HashPolicy_Header{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy_Header) String() string { @@ -3634,7 +3582,7 @@ func (*RouteAction_HashPolicy_Header) ProtoMessage() {} func (x *RouteAction_HashPolicy_Header) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3689,7 +3637,7 @@ type RouteAction_HashPolicy_Cookie struct { // If specified, a cookie with the TTL will be generated if the cookie is // not present. If the TTL is present and zero, the generated cookie will // be a session cookie. - Ttl *duration.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *durationpb.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` // The name of the path for the cookie. If no path is specified here, no path // will be set for the cookie. Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` @@ -3697,11 +3645,9 @@ type RouteAction_HashPolicy_Cookie struct { func (x *RouteAction_HashPolicy_Cookie) Reset() { *x = RouteAction_HashPolicy_Cookie{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[29] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[29] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy_Cookie) String() string { @@ -3712,7 +3658,7 @@ func (*RouteAction_HashPolicy_Cookie) ProtoMessage() {} func (x *RouteAction_HashPolicy_Cookie) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[29] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3734,7 +3680,7 @@ func (x *RouteAction_HashPolicy_Cookie) GetName() string { return "" } -func (x *RouteAction_HashPolicy_Cookie) GetTtl() *duration.Duration { +func (x *RouteAction_HashPolicy_Cookie) GetTtl() *durationpb.Duration { if x != nil { return x.Ttl } @@ -3759,11 +3705,9 @@ type RouteAction_HashPolicy_ConnectionProperties struct { func (x *RouteAction_HashPolicy_ConnectionProperties) Reset() { *x = RouteAction_HashPolicy_ConnectionProperties{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[30] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[30] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy_ConnectionProperties) String() string { @@ -3774,7 +3718,7 @@ func (*RouteAction_HashPolicy_ConnectionProperties) ProtoMessage() {} func (x *RouteAction_HashPolicy_ConnectionProperties) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[30] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3809,11 +3753,9 @@ type RouteAction_HashPolicy_QueryParameter struct { func (x *RouteAction_HashPolicy_QueryParameter) Reset() { *x = RouteAction_HashPolicy_QueryParameter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[31] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[31] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy_QueryParameter) String() string { @@ -3824,7 +3766,7 @@ func (*RouteAction_HashPolicy_QueryParameter) ProtoMessage() {} func (x *RouteAction_HashPolicy_QueryParameter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[31] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3859,11 +3801,9 @@ type RouteAction_HashPolicy_FilterState struct { func (x *RouteAction_HashPolicy_FilterState) Reset() { *x = RouteAction_HashPolicy_FilterState{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[32] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[32] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_HashPolicy_FilterState) String() string { @@ -3874,7 +3814,7 @@ func (*RouteAction_HashPolicy_FilterState) ProtoMessage() {} func (x *RouteAction_HashPolicy_FilterState) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[32] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3909,11 +3849,9 @@ type RouteAction_UpgradeConfig_ConnectConfig struct { func (x *RouteAction_UpgradeConfig_ConnectConfig) Reset() { *x = RouteAction_UpgradeConfig_ConnectConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[33] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[33] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction_UpgradeConfig_ConnectConfig) String() string { @@ -3924,7 +3862,7 @@ func (*RouteAction_UpgradeConfig_ConnectConfig) ProtoMessage() {} func (x *RouteAction_UpgradeConfig_ConnectConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[33] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3960,11 +3898,9 @@ type RetryPolicy_RetryPriority struct { func (x *RetryPolicy_RetryPriority) Reset() { *x = RetryPolicy_RetryPriority{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[34] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy_RetryPriority) String() string { @@ -3975,7 +3911,7 @@ func (*RetryPolicy_RetryPriority) ProtoMessage() {} func (x *RetryPolicy_RetryPriority) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[34] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4004,7 +3940,7 @@ func (m *RetryPolicy_RetryPriority) GetConfigType() isRetryPolicy_RetryPriority_ return nil } -func (x *RetryPolicy_RetryPriority) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryPriority) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryPriority_TypedConfig); ok { return x.TypedConfig } @@ -4016,7 +3952,7 @@ type isRetryPolicy_RetryPriority_ConfigType interface { } type RetryPolicy_RetryPriority_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryPriority_TypedConfig) isRetryPolicy_RetryPriority_ConfigType() {} @@ -4035,11 +3971,9 @@ type RetryPolicy_RetryHostPredicate struct { func (x *RetryPolicy_RetryHostPredicate) Reset() { *x = RetryPolicy_RetryHostPredicate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[35] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[35] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy_RetryHostPredicate) String() string { @@ -4050,7 +3984,7 @@ func (*RetryPolicy_RetryHostPredicate) ProtoMessage() {} func (x *RetryPolicy_RetryHostPredicate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[35] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4079,7 +4013,7 @@ func (m *RetryPolicy_RetryHostPredicate) GetConfigType() isRetryPolicy_RetryHost return nil } -func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *any1.Any { +func (x *RetryPolicy_RetryHostPredicate) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*RetryPolicy_RetryHostPredicate_TypedConfig); ok { return x.TypedConfig } @@ -4091,7 +4025,7 @@ type isRetryPolicy_RetryHostPredicate_ConfigType interface { } type RetryPolicy_RetryHostPredicate_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*RetryPolicy_RetryHostPredicate_TypedConfig) isRetryPolicy_RetryHostPredicate_ConfigType() {} @@ -4105,21 +4039,19 @@ type RetryPolicy_RetryBackOff struct { // than zero. Values less than 1 ms are rounded up to 1 ms. // See :ref:`config_http_filters_router_x-envoy-max-retries` for a discussion of Envoy's // back-off algorithm. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between retries. This parameter is optional, but must be // greater than or equal to the `base_interval` if set. The default is 10 times the // `base_interval`. See :ref:`config_http_filters_router_x-envoy-max-retries` for a discussion // of Envoy's back-off algorithm. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *RetryPolicy_RetryBackOff) Reset() { *x = RetryPolicy_RetryBackOff{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[36] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[36] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy_RetryBackOff) String() string { @@ -4130,7 +4062,7 @@ func (*RetryPolicy_RetryBackOff) ProtoMessage() {} func (x *RetryPolicy_RetryBackOff) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[36] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4145,14 +4077,14 @@ func (*RetryPolicy_RetryBackOff) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_rawDescGZIP(), []int{7, 2} } -func (x *RetryPolicy_RetryBackOff) GetBaseInterval() *duration.Duration { +func (x *RetryPolicy_RetryBackOff) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *RetryPolicy_RetryBackOff) GetMaxInterval() *duration.Duration { +func (x *RetryPolicy_RetryBackOff) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -4179,11 +4111,9 @@ type RateLimit_Action struct { func (x *RateLimit_Action) Reset() { *x = RateLimit_Action{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[37] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[37] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action) String() string { @@ -4194,7 +4124,7 @@ func (*RateLimit_Action) ProtoMessage() {} func (x *RateLimit_Action) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[37] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4331,11 +4261,9 @@ type RateLimit_Override struct { func (x *RateLimit_Override) Reset() { *x = RateLimit_Override{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[38] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[38] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Override) String() string { @@ -4346,7 +4274,7 @@ func (*RateLimit_Override) ProtoMessage() {} func (x *RateLimit_Override) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[38] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4401,11 +4329,9 @@ type RateLimit_Action_SourceCluster struct { func (x *RateLimit_Action_SourceCluster) Reset() { *x = RateLimit_Action_SourceCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[39] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[39] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_SourceCluster) String() string { @@ -4416,7 +4342,7 @@ func (*RateLimit_Action_SourceCluster) ProtoMessage() {} func (x *RateLimit_Action_SourceCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[39] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4455,11 +4381,9 @@ type RateLimit_Action_DestinationCluster struct { func (x *RateLimit_Action_DestinationCluster) Reset() { *x = RateLimit_Action_DestinationCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[40] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[40] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_DestinationCluster) String() string { @@ -4470,7 +4394,7 @@ func (*RateLimit_Action_DestinationCluster) ProtoMessage() {} func (x *RateLimit_Action_DestinationCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[40] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4510,11 +4434,9 @@ type RateLimit_Action_RequestHeaders struct { func (x *RateLimit_Action_RequestHeaders) Reset() { *x = RateLimit_Action_RequestHeaders{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[41] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[41] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_RequestHeaders) String() string { @@ -4525,7 +4447,7 @@ func (*RateLimit_Action_RequestHeaders) ProtoMessage() {} func (x *RateLimit_Action_RequestHeaders) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[41] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4575,11 +4497,9 @@ type RateLimit_Action_RemoteAddress struct { func (x *RateLimit_Action_RemoteAddress) Reset() { *x = RateLimit_Action_RemoteAddress{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[42] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[42] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_RemoteAddress) String() string { @@ -4590,7 +4510,7 @@ func (*RateLimit_Action_RemoteAddress) ProtoMessage() {} func (x *RateLimit_Action_RemoteAddress) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[42] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4621,11 +4541,9 @@ type RateLimit_Action_GenericKey struct { func (x *RateLimit_Action_GenericKey) Reset() { *x = RateLimit_Action_GenericKey{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[43] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[43] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_GenericKey) String() string { @@ -4636,7 +4554,7 @@ func (*RateLimit_Action_GenericKey) ProtoMessage() {} func (x *RateLimit_Action_GenericKey) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[43] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4674,7 +4592,7 @@ type RateLimit_Action_HeaderValueMatch struct { // request matches the headers. If set to false, the action will append a // descriptor entry when the request does not match the headers. The // default value is true. - ExpectMatch *wrappers.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` + ExpectMatch *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` // Specifies a set of headers that the rate limit action should match // on. The action will check the request’s headers against all the // specified headers in the config. A match will happen if all the @@ -4685,11 +4603,9 @@ type RateLimit_Action_HeaderValueMatch struct { func (x *RateLimit_Action_HeaderValueMatch) Reset() { *x = RateLimit_Action_HeaderValueMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[44] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[44] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_HeaderValueMatch) String() string { @@ -4700,7 +4616,7 @@ func (*RateLimit_Action_HeaderValueMatch) ProtoMessage() {} func (x *RateLimit_Action_HeaderValueMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[44] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4722,7 +4638,7 @@ func (x *RateLimit_Action_HeaderValueMatch) GetDescriptorValue() string { return "" } -func (x *RateLimit_Action_HeaderValueMatch) GetExpectMatch() *wrappers.BoolValue { +func (x *RateLimit_Action_HeaderValueMatch) GetExpectMatch() *wrapperspb.BoolValue { if x != nil { return x.ExpectMatch } @@ -4755,11 +4671,9 @@ type RateLimit_Action_DynamicMetaData struct { func (x *RateLimit_Action_DynamicMetaData) Reset() { *x = RateLimit_Action_DynamicMetaData{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[45] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[45] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Action_DynamicMetaData) String() string { @@ -4770,7 +4684,7 @@ func (*RateLimit_Action_DynamicMetaData) ProtoMessage() {} func (x *RateLimit_Action_DynamicMetaData) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[45] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -4814,11 +4728,9 @@ type RateLimit_Override_DynamicMetadata struct { func (x *RateLimit_Override_DynamicMetadata) Reset() { *x = RateLimit_Override_DynamicMetadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[46] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[46] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit_Override_DynamicMetadata) String() string { @@ -4829,7 +4741,7 @@ func (*RateLimit_Override_DynamicMetadata) ProtoMessage() {} func (x *RateLimit_Override_DynamicMetadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[46] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -6075,7 +5987,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_enumTypes = make([]protoimpl.EnumInfo, 4) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes = make([]protoimpl.MessageInfo, 47) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_goTypes = []any{ (VirtualHost_TlsRequirementType)(0), // 0: solo.io.envoy.config.route.v3.VirtualHost.TlsRequirementType (RouteAction_ClusterNotFoundResponseCode)(0), // 1: solo.io.envoy.config.route.v3.RouteAction.ClusterNotFoundResponseCode (RouteAction_InternalRedirectAction)(0), // 2: solo.io.envoy.config.route.v3.RouteAction.InternalRedirectAction @@ -6128,15 +6040,15 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_ (*RateLimit_Action_DynamicMetaData)(nil), // 49: solo.io.envoy.config.route.v3.RateLimit.Action.DynamicMetaData (*RateLimit_Override_DynamicMetadata)(nil), // 50: solo.io.envoy.config.route.v3.RateLimit.Override.DynamicMetadata (*v3.HeaderValueOption)(nil), // 51: solo.io.envoy.config.core.v3.HeaderValueOption - (*any1.Any)(nil), // 52: google.protobuf.Any - (*wrappers.UInt32Value)(nil), // 53: google.protobuf.UInt32Value + (*anypb.Any)(nil), // 52: google.protobuf.Any + (*wrapperspb.UInt32Value)(nil), // 53: google.protobuf.UInt32Value (*v3.Metadata)(nil), // 54: solo.io.envoy.config.core.v3.Metadata (*v31.RegexMatcher)(nil), // 55: solo.io.envoy.type.matcher.v3.RegexMatcher - (*wrappers.BoolValue)(nil), // 56: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 56: google.protobuf.BoolValue (*v3.RuntimeFractionalPercent)(nil), // 57: solo.io.envoy.config.core.v3.RuntimeFractionalPercent (*v31.StringMatcher)(nil), // 58: solo.io.envoy.type.matcher.v3.StringMatcher (*v31.RegexMatchAndSubstitute)(nil), // 59: solo.io.envoy.type.matcher.v3.RegexMatchAndSubstitute - (*duration.Duration)(nil), // 60: google.protobuf.Duration + (*durationpb.Duration)(nil), // 60: google.protobuf.Duration (v3.RoutingPriority)(0), // 61: solo.io.envoy.config.core.v3.RoutingPriority (*v32.FractionalPercent)(nil), // 62: solo.io.envoy.type.v3.FractionalPercent (*v3.DataSource)(nil), // 63: solo.io.envoy.config.core.v3.DataSource @@ -6285,552 +6197,22 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualHost); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FilterAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Route); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WeightedCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CorsPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HedgePolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RedirectAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DirectResponseAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Decorator); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Tracing); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QueryParameterMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*InternalRedirectPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WeightedCluster_ClusterWeight); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteMatch_GrpcRouteMatchOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteMatch_TlsContextMatchOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteMatch_ConnectMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_RequestMirrorPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_UpgradeConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy_Header); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy_Cookie); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy_ConnectionProperties); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy_QueryParameter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_HashPolicy_FilterState); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction_UpgradeConfig_ConnectConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy_RetryPriority); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy_RetryHostPredicate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy_RetryBackOff); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Override); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_SourceCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_DestinationCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_RequestHeaders); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_RemoteAddress); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_GenericKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_HeaderValueMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Action_DynamicMetaData); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit_Override_DynamicMetadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[2].OneofWrappers = []any{ (*Route_Route)(nil), (*Route_Redirect)(nil), (*Route_DirectResponse)(nil), (*Route_FilterAction)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[4].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[4].OneofWrappers = []any{ (*RouteMatch_Prefix)(nil), (*RouteMatch_Path)(nil), (*RouteMatch_SafeRegex)(nil), (*RouteMatch_ConnectMatcher_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[5].OneofWrappers = []any{ (*CorsPolicy_FilterEnabled)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[6].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[6].OneofWrappers = []any{ (*RouteAction_Cluster)(nil), (*RouteAction_ClusterHeader)(nil), (*RouteAction_WeightedClusters)(nil), @@ -6838,13 +6220,13 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route (*RouteAction_AutoHostRewrite)(nil), (*RouteAction_HostRewriteHeader)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[9].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[9].OneofWrappers = []any{ (*RedirectAction_HttpsRedirect)(nil), (*RedirectAction_SchemeRedirect)(nil), (*RedirectAction_PathRedirect)(nil), (*RedirectAction_PrefixRewrite)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[15].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[15].OneofWrappers = []any{ (*HeaderMatcher_ExactMatch)(nil), (*HeaderMatcher_SafeRegexMatch)(nil), (*HeaderMatcher_RangeMatch)(nil), @@ -6852,24 +6234,24 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route (*HeaderMatcher_PrefixMatch)(nil), (*HeaderMatcher_SuffixMatch)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[16].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[16].OneofWrappers = []any{ (*QueryParameterMatcher_StringMatch)(nil), (*QueryParameterMatcher_PresentMatch)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[26].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[26].OneofWrappers = []any{ (*RouteAction_HashPolicy_Header_)(nil), (*RouteAction_HashPolicy_Cookie_)(nil), (*RouteAction_HashPolicy_ConnectionProperties_)(nil), (*RouteAction_HashPolicy_QueryParameter_)(nil), (*RouteAction_HashPolicy_FilterState_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[34].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[34].OneofWrappers = []any{ (*RetryPolicy_RetryPriority_TypedConfig)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[35].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[35].OneofWrappers = []any{ (*RetryPolicy_RetryHostPredicate_TypedConfig)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[37].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[37].OneofWrappers = []any{ (*RateLimit_Action_SourceCluster_)(nil), (*RateLimit_Action_DestinationCluster_)(nil), (*RateLimit_Action_RequestHeaders_)(nil), @@ -6878,7 +6260,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route (*RateLimit_Action_HeaderValueMatch_)(nil), (*RateLimit_Action_DynamicMetadata)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[38].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_route_v3_route_components_proto_msgTypes[38].OneofWrappers = []any{ (*RateLimit_Override_DynamicMetadata_)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/datadog.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/datadog.pb.clone.go index 7357eb4b7..9ad79e7d7 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/datadog.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/datadog.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -40,15 +40,15 @@ func (m *DatadogRemoteConfig) Clone() proto.Message { target = &DatadogRemoteConfig{} if h, ok := interface{}(m.GetPollingInterval()).(clone.Cloner); ok { - target.PollingInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PollingInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.PollingInterval = proto.Clone(m.GetPollingInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PollingInterval = proto.Clone(m.GetPollingInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetDisabled()).(clone.Cloner); ok { - target.Disabled = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Disabled = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Disabled = proto.Clone(m.GetDisabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Disabled = proto.Clone(m.GetDisabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -63,9 +63,9 @@ func (m *DatadogConfig) Clone() proto.Message { target = &DatadogConfig{} if h, ok := interface{}(m.GetServiceName()).(clone.Cloner); ok { - target.ServiceName = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ServiceName = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.ServiceName = proto.Clone(m.GetServiceName()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ServiceName = proto.Clone(m.GetServiceName()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } target.CollectorHostname = m.GetCollectorHostname() diff --git a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/datadog.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/datadog.pb.go index 35cccc139..e7cf719d3 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/datadog.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/datadog.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/trace/v3/datadog.proto @@ -11,13 +11,13 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -35,20 +35,18 @@ type DatadogRemoteConfig struct { // Frequency at which new configuration updates are queried. // If no value is provided, the default value is delegated to the Datadog tracing library. - PollingInterval *duration.Duration `protobuf:"bytes,1,opt,name=polling_interval,json=pollingInterval,proto3" json:"polling_interval,omitempty"` + PollingInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=polling_interval,json=pollingInterval,proto3" json:"polling_interval,omitempty"` // Disabled remote config. // This field does not exist in envoy's config but allow us to preserve the default behavior // when upgrading to envoy v1.31 - Disabled *wrappers.BoolValue `protobuf:"bytes,2,opt,name=disabled,proto3" json:"disabled,omitempty"` + Disabled *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=disabled,proto3" json:"disabled,omitempty"` } func (x *DatadogRemoteConfig) Reset() { *x = DatadogRemoteConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DatadogRemoteConfig) String() string { @@ -59,7 +57,7 @@ func (*DatadogRemoteConfig) ProtoMessage() {} func (x *DatadogRemoteConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -74,14 +72,14 @@ func (*DatadogRemoteConfig) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_rawDescGZIP(), []int{0} } -func (x *DatadogRemoteConfig) GetPollingInterval() *duration.Duration { +func (x *DatadogRemoteConfig) GetPollingInterval() *durationpb.Duration { if x != nil { return x.PollingInterval } return nil } -func (x *DatadogRemoteConfig) GetDisabled() *wrappers.BoolValue { +func (x *DatadogRemoteConfig) GetDisabled() *wrapperspb.BoolValue { if x != nil { return x.Disabled } @@ -103,7 +101,7 @@ type DatadogConfig struct { // *DatadogConfig_ClusterName CollectorCluster isDatadogConfig_CollectorCluster `protobuf_oneof:"collector_cluster"` // The name used for the service when traces are generated by envoy. - ServiceName *wrappers.StringValue `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` + ServiceName *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` // Optional hostname to use when sending spans to the collector_cluster. Useful for collectors // that require a specific hostname. Defaults to collector_cluster above. CollectorHostname string `protobuf:"bytes,4,opt,name=collector_hostname,json=collectorHostname,proto3" json:"collector_hostname,omitempty"` @@ -117,11 +115,9 @@ type DatadogConfig struct { func (x *DatadogConfig) Reset() { *x = DatadogConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DatadogConfig) String() string { @@ -132,7 +128,7 @@ func (*DatadogConfig) ProtoMessage() {} func (x *DatadogConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -168,7 +164,7 @@ func (x *DatadogConfig) GetClusterName() string { return "" } -func (x *DatadogConfig) GetServiceName() *wrappers.StringValue { +func (x *DatadogConfig) GetServiceName() *wrapperspb.StringValue { if x != nil { return x.ServiceName } @@ -300,13 +296,13 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_goTypes = []interface{}{ - (*DatadogRemoteConfig)(nil), // 0: solo.io.envoy.config.trace.v3.DatadogRemoteConfig - (*DatadogConfig)(nil), // 1: solo.io.envoy.config.trace.v3.DatadogConfig - (*duration.Duration)(nil), // 2: google.protobuf.Duration - (*wrappers.BoolValue)(nil), // 3: google.protobuf.BoolValue - (*core.ResourceRef)(nil), // 4: core.solo.io.ResourceRef - (*wrappers.StringValue)(nil), // 5: google.protobuf.StringValue +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_goTypes = []any{ + (*DatadogRemoteConfig)(nil), // 0: solo.io.envoy.config.trace.v3.DatadogRemoteConfig + (*DatadogConfig)(nil), // 1: solo.io.envoy.config.trace.v3.DatadogConfig + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 3: google.protobuf.BoolValue + (*core.ResourceRef)(nil), // 4: core.solo.io.ResourceRef + (*wrapperspb.StringValue)(nil), // 5: google.protobuf.StringValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_depIdxs = []int32{ 2, // 0: solo.io.envoy.config.trace.v3.DatadogRemoteConfig.polling_interval:type_name -> google.protobuf.Duration @@ -328,33 +324,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DatadogRemoteConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DatadogConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_datadog_proto_msgTypes[1].OneofWrappers = []any{ (*DatadogConfig_CollectorUpstreamRef)(nil), (*DatadogConfig_ClusterName)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/opencensus.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/opencensus.pb.go index e1046cba6..de56b9507 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/opencensus.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/opencensus.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/trace/v3/opencensus.proto @@ -167,11 +167,9 @@ type OpenCensusConfig struct { func (x *OpenCensusConfig) Reset() { *x = OpenCensusConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OpenCensusConfig) String() string { @@ -182,7 +180,7 @@ func (*OpenCensusConfig) ProtoMessage() {} func (x *OpenCensusConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -287,11 +285,9 @@ type TraceConfig struct { func (x *TraceConfig) Reset() { *x = TraceConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TraceConfig) String() string { @@ -302,7 +298,7 @@ func (*TraceConfig) ProtoMessage() {} func (x *TraceConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -408,11 +404,9 @@ type ProbabilitySampler struct { func (x *ProbabilitySampler) Reset() { *x = ProbabilitySampler{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProbabilitySampler) String() string { @@ -423,7 +417,7 @@ func (*ProbabilitySampler) ProtoMessage() {} func (x *ProbabilitySampler) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -456,11 +450,9 @@ type ConstantSampler struct { func (x *ConstantSampler) Reset() { *x = ConstantSampler{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ConstantSampler) String() string { @@ -471,7 +463,7 @@ func (*ConstantSampler) ProtoMessage() {} func (x *ConstantSampler) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -505,11 +497,9 @@ type RateLimitingSampler struct { func (x *RateLimitingSampler) Reset() { *x = RateLimitingSampler{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitingSampler) String() string { @@ -520,7 +510,7 @@ func (*RateLimitingSampler) ProtoMessage() {} func (x *RateLimitingSampler) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -555,11 +545,9 @@ type OpenCensusConfig_OcagentGrpcAddress struct { func (x *OpenCensusConfig_OcagentGrpcAddress) Reset() { *x = OpenCensusConfig_OcagentGrpcAddress{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OpenCensusConfig_OcagentGrpcAddress) String() string { @@ -570,7 +558,7 @@ func (*OpenCensusConfig_OcagentGrpcAddress) ProtoMessage() {} func (x *OpenCensusConfig_OcagentGrpcAddress) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -751,7 +739,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_goTypes = []any{ (OpenCensusConfig_TraceContext)(0), // 0: solo.io.envoy.config.trace.v3.OpenCensusConfig.TraceContext (ConstantSampler_ConstantDecision)(0), // 1: solo.io.envoy.config.trace.v3.ConstantSampler.ConstantDecision (*OpenCensusConfig)(nil), // 2: solo.io.envoy.config.trace.v3.OpenCensusConfig @@ -784,85 +772,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OpenCensusConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TraceConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProbabilitySampler); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConstantSampler); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitingSampler); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OpenCensusConfig_OcagentGrpcAddress); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[0].OneofWrappers = []any{ (*OpenCensusConfig_HttpAddress)(nil), (*OpenCensusConfig_GrpcAddress)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opencensus_proto_msgTypes[1].OneofWrappers = []any{ (*TraceConfig_ProbabilitySampler)(nil), (*TraceConfig_ConstantSampler)(nil), (*TraceConfig_RateLimitingSampler)(nil), diff --git a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/opentelemetry.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/opentelemetry.pb.go index 80528545b..5f6298b15 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/opentelemetry.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/opentelemetry.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/trace/v3/opentelemetry.proto @@ -54,11 +54,9 @@ type OpenTelemetryConfig struct { func (x *OpenTelemetryConfig) Reset() { *x = OpenTelemetryConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OpenTelemetryConfig) String() string { @@ -69,7 +67,7 @@ func (*OpenTelemetryConfig) ProtoMessage() {} func (x *OpenTelemetryConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -167,11 +165,9 @@ type GrpcService struct { func (x *GrpcService) Reset() { *x = GrpcService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService) String() string { @@ -182,7 +178,7 @@ func (*GrpcService) ProtoMessage() {} func (x *GrpcService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -281,7 +277,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_goTypes = []any{ (*OpenTelemetryConfig)(nil), // 0: solo.io.envoy.config.trace.v3.OpenTelemetryConfig (*GrpcService)(nil), // 1: solo.io.envoy.config.trace.v3.GrpcService (*core.ResourceRef)(nil), // 2: core.solo.io.ResourceRef @@ -303,33 +299,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OpenTelemetryConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_opentelemetry_proto_msgTypes[0].OneofWrappers = []any{ (*OpenTelemetryConfig_CollectorUpstreamRef)(nil), (*OpenTelemetryConfig_ClusterName)(nil), (*OpenTelemetryConfig_GrpcService)(nil), diff --git a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/zipkin.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/zipkin.pb.clone.go index 1a0d5a953..6f0dd793a 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/zipkin.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/zipkin.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -40,15 +40,15 @@ func (m *ZipkinConfig) Clone() proto.Message { target.CollectorEndpoint = m.GetCollectorEndpoint() if h, ok := interface{}(m.GetTraceId_128Bit()).(clone.Cloner); ok { - target.TraceId_128Bit = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TraceId_128Bit = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.TraceId_128Bit = proto.Clone(m.GetTraceId_128Bit()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TraceId_128Bit = proto.Clone(m.GetTraceId_128Bit()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetSharedSpanContext()).(clone.Cloner); ok { - target.SharedSpanContext = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.SharedSpanContext = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.SharedSpanContext = proto.Clone(m.GetSharedSpanContext()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.SharedSpanContext = proto.Clone(m.GetSharedSpanContext()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } target.CollectorEndpointVersion = m.GetCollectorEndpointVersion() diff --git a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/zipkin.pb.go b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/zipkin.pb.go index 0ed525176..58f88e58b 100644 --- a/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/zipkin.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/config/trace/v3/zipkin.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/trace/v3/zipkin.proto @@ -11,13 +11,13 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/annotations" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -109,10 +109,10 @@ type ZipkinConfig struct { CollectorEndpoint string `protobuf:"bytes,2,opt,name=collector_endpoint,json=collectorEndpoint,proto3" json:"collector_endpoint,omitempty"` // Determines whether a 128bit trace id will be used when creating a new // trace instance. The default value is false, which will result in a 64 bit trace id being used. - TraceId_128Bit *wrappers.BoolValue `protobuf:"bytes,3,opt,name=trace_id_128bit,json=traceId128bit,proto3" json:"trace_id_128bit,omitempty"` + TraceId_128Bit *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=trace_id_128bit,json=traceId128bit,proto3" json:"trace_id_128bit,omitempty"` // Determines whether client and server spans will share the same span context. // The default value is true. - SharedSpanContext *wrappers.BoolValue `protobuf:"bytes,4,opt,name=shared_span_context,json=sharedSpanContext,proto3" json:"shared_span_context,omitempty"` + SharedSpanContext *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=shared_span_context,json=sharedSpanContext,proto3" json:"shared_span_context,omitempty"` // Determines the selected collector endpoint version. By default, the `HTTP_JSON_V1` will be // used. CollectorEndpointVersion ZipkinConfig_CollectorEndpointVersion `protobuf:"varint,5,opt,name=collector_endpoint_version,json=collectorEndpointVersion,proto3,enum=solo.io.envoy.config.trace.v3.ZipkinConfig_CollectorEndpointVersion" json:"collector_endpoint_version,omitempty"` @@ -120,11 +120,9 @@ type ZipkinConfig struct { func (x *ZipkinConfig) Reset() { *x = ZipkinConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ZipkinConfig) String() string { @@ -135,7 +133,7 @@ func (*ZipkinConfig) ProtoMessage() {} func (x *ZipkinConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -178,14 +176,14 @@ func (x *ZipkinConfig) GetCollectorEndpoint() string { return "" } -func (x *ZipkinConfig) GetTraceId_128Bit() *wrappers.BoolValue { +func (x *ZipkinConfig) GetTraceId_128Bit() *wrapperspb.BoolValue { if x != nil { return x.TraceId_128Bit } return nil } -func (x *ZipkinConfig) GetSharedSpanContext() *wrappers.BoolValue { +func (x *ZipkinConfig) GetSharedSpanContext() *wrapperspb.BoolValue { if x != nil { return x.SharedSpanContext } @@ -316,11 +314,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_goTypes = []any{ (ZipkinConfig_CollectorEndpointVersion)(0), // 0: solo.io.envoy.config.trace.v3.ZipkinConfig.CollectorEndpointVersion (*ZipkinConfig)(nil), // 1: solo.io.envoy.config.trace.v3.ZipkinConfig (*core.ResourceRef)(nil), // 2: core.solo.io.ResourceRef - (*wrappers.BoolValue)(nil), // 3: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 3: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_depIdxs = []int32{ 2, // 0: solo.io.envoy.config.trace.v3.ZipkinConfig.collector_upstream_ref:type_name -> core.solo.io.ResourceRef @@ -341,21 +339,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ZipkinConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_config_trace_v3_zipkin_proto_msgTypes[0].OneofWrappers = []any{ (*ZipkinConfig_CollectorUpstreamRef)(nil), (*ZipkinConfig_ClusterName)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/advanced_http/advanced_http.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/advanced_http/advanced_http.pb.go index 9b853390b..04167b48f 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/advanced_http/advanced_http.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/advanced_http/advanced_http.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/advanced_http/advanced_http.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - empty "github.com/golang/protobuf/ptypes/empty" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -97,11 +97,9 @@ type AdvancedHttp struct { func (x *AdvancedHttp) Reset() { *x = AdvancedHttp{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AdvancedHttp) String() string { @@ -112,7 +110,7 @@ func (*AdvancedHttp) ProtoMessage() {} func (x *AdvancedHttp) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -162,11 +160,9 @@ type ResponseAssertions struct { func (x *ResponseAssertions) Reset() { *x = ResponseAssertions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseAssertions) String() string { @@ -177,7 +173,7 @@ func (*ResponseAssertions) ProtoMessage() {} func (x *ResponseAssertions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -221,11 +217,9 @@ type ResponseMatcher struct { func (x *ResponseMatcher) Reset() { *x = ResponseMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseMatcher) String() string { @@ -236,7 +230,7 @@ func (*ResponseMatcher) ProtoMessage() {} func (x *ResponseMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -292,11 +286,9 @@ type ResponseMatch struct { func (x *ResponseMatch) Reset() { *x = ResponseMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseMatch) String() string { @@ -307,7 +299,7 @@ func (*ResponseMatch) ProtoMessage() {} func (x *ResponseMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -350,7 +342,7 @@ func (x *ResponseMatch) GetHeader() string { return "" } -func (x *ResponseMatch) GetBody() *empty.Empty { +func (x *ResponseMatch) GetBody() *emptypb.Empty { if x, ok := x.GetSource().(*ResponseMatch_Body); ok { return x.Body } @@ -375,7 +367,7 @@ type ResponseMatch_Header struct { type ResponseMatch_Body struct { // Extract information from the request/response body - Body *empty.Empty `protobuf:"bytes,4,opt,name=body,proto3,oneof"` + Body *emptypb.Empty `protobuf:"bytes,4,opt,name=body,proto3,oneof"` } func (*ResponseMatch_Header) isResponseMatch_Source() {} @@ -393,11 +385,9 @@ type JsonKey struct { func (x *JsonKey) Reset() { *x = JsonKey{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JsonKey) String() string { @@ -408,7 +398,7 @@ func (*JsonKey) ProtoMessage() {} func (x *JsonKey) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -444,11 +434,9 @@ type JsonKey_PathSegment struct { func (x *JsonKey_PathSegment) Reset() { *x = JsonKey_PathSegment{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JsonKey_PathSegment) String() string { @@ -459,7 +447,7 @@ func (*JsonKey_PathSegment) ProtoMessage() {} func (x *JsonKey_PathSegment) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -625,7 +613,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_a var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_goTypes = []any{ (HealthCheckResult)(0), // 0: envoy.config.health_checker.advanced_http.v2.HealthCheckResult (*AdvancedHttp)(nil), // 1: envoy.config.health_checker.advanced_http.v2.AdvancedHttp (*ResponseAssertions)(nil), // 2: envoy.config.health_checker.advanced_http.v2.ResponseAssertions @@ -634,7 +622,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_ad (*JsonKey)(nil), // 5: envoy.config.health_checker.advanced_http.v2.JsonKey (*JsonKey_PathSegment)(nil), // 6: envoy.config.health_checker.advanced_http.v2.JsonKey.PathSegment (*v3.HealthCheck_HttpHealthCheck)(nil), // 7: solo.io.envoy.config.core.v3.HealthCheck.HttpHealthCheck - (*empty.Empty)(nil), // 8: google.protobuf.Empty + (*emptypb.Empty)(nil), // 8: google.protobuf.Empty } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_depIdxs = []int32{ 7, // 0: envoy.config.health_checker.advanced_http.v2.AdvancedHttp.http_health_check:type_name -> solo.io.envoy.config.core.v3.HealthCheck.HttpHealthCheck @@ -660,85 +648,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_a if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AdvancedHttp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseAssertions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JsonKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JsonKey_PathSegment); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[3].OneofWrappers = []any{ (*ResponseMatch_Header)(nil), (*ResponseMatch_Body)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_advanced_http_advanced_http_proto_msgTypes[5].OneofWrappers = []any{ (*JsonKey_PathSegment_Key)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/aws/filter.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/extensions/aws/filter.pb.clone.go index 6d5ac0beb..748cc5532 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/aws/filter.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/aws/filter.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -46,9 +46,9 @@ func (m *AWSLambdaPerRoute) Clone() proto.Message { target.Async = m.GetAsync() if h, ok := interface{}(m.GetEmptyBodyOverride()).(clone.Cloner); ok { - target.EmptyBodyOverride = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.EmptyBodyOverride = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.EmptyBodyOverride = proto.Clone(m.GetEmptyBodyOverride()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.EmptyBodyOverride = proto.Clone(m.GetEmptyBodyOverride()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } target.UnwrapAsAlb = m.GetUnwrapAsAlb() @@ -104,9 +104,9 @@ func (m *AWSLambdaConfig) Clone() proto.Message { target.PropagateOriginalRouting = m.GetPropagateOriginalRouting() if h, ok := interface{}(m.GetCredentialRefreshDelay()).(clone.Cloner); ok { - target.CredentialRefreshDelay = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CredentialRefreshDelay = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.CredentialRefreshDelay = proto.Clone(m.GetCredentialRefreshDelay()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CredentialRefreshDelay = proto.Clone(m.GetCredentialRefreshDelay()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } switch m.CredentialsFetcher.(type) { @@ -115,11 +115,11 @@ func (m *AWSLambdaConfig) Clone() proto.Message { if h, ok := interface{}(m.GetUseDefaultCredentials()).(clone.Cloner); ok { target.CredentialsFetcher = &AWSLambdaConfig_UseDefaultCredentials{ - UseDefaultCredentials: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + UseDefaultCredentials: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } else { target.CredentialsFetcher = &AWSLambdaConfig_UseDefaultCredentials{ - UseDefaultCredentials: proto.Clone(m.GetUseDefaultCredentials()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + UseDefaultCredentials: proto.Clone(m.GetUseDefaultCredentials()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } @@ -164,9 +164,9 @@ func (m *AWSLambdaConfig_ServiceAccountCredentials) Clone() proto.Message { target.Uri = m.GetUri() if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.Region = m.GetRegion() diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/aws/filter.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/aws/filter.pb.go index c5ef89b38..95c70764c 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/aws/filter.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/aws/filter.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/aws/filter.proto @@ -13,12 +13,12 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -43,7 +43,7 @@ type AWSLambdaPerRoute struct { Async bool `protobuf:"varint,3,opt,name=async,proto3" json:"async,omitempty"` // Optional default body if the body is empty. By default on default // body is used if the body empty, and an empty body will be sent upstream. - EmptyBodyOverride *wrappers.StringValue `protobuf:"bytes,4,opt,name=empty_body_override,json=emptyBodyOverride,proto3" json:"empty_body_override,omitempty"` + EmptyBodyOverride *wrapperspb.StringValue `protobuf:"bytes,4,opt,name=empty_body_override,json=emptyBodyOverride,proto3" json:"empty_body_override,omitempty"` // Deprecated. Use transformer_config to specify an AWS Lambda response transformer instead. // Unwrap responses as AWS ALB does. // Expects json lambda responses to construct response. @@ -65,11 +65,9 @@ type AWSLambdaPerRoute struct { func (x *AWSLambdaPerRoute) Reset() { *x = AWSLambdaPerRoute{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AWSLambdaPerRoute) String() string { @@ -80,7 +78,7 @@ func (*AWSLambdaPerRoute) ProtoMessage() {} func (x *AWSLambdaPerRoute) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -116,7 +114,7 @@ func (x *AWSLambdaPerRoute) GetAsync() bool { return false } -func (x *AWSLambdaPerRoute) GetEmptyBodyOverride() *wrappers.StringValue { +func (x *AWSLambdaPerRoute) GetEmptyBodyOverride() *wrapperspb.StringValue { if x != nil { return x.EmptyBodyOverride } @@ -168,11 +166,9 @@ type AWSLambdaProtocolExtension struct { func (x *AWSLambdaProtocolExtension) Reset() { *x = AWSLambdaProtocolExtension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AWSLambdaProtocolExtension) String() string { @@ -183,7 +179,7 @@ func (*AWSLambdaProtocolExtension) ProtoMessage() {} func (x *AWSLambdaProtocolExtension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -265,16 +261,14 @@ type AWSLambdaConfig struct { // Does nothing if Service account is not set. // Does not affect the default filewatch for service account only augments it. // Defaults to not refreshing on time period. Suggested is 15 minutes. - CredentialRefreshDelay *duration.Duration `protobuf:"bytes,4,opt,name=credential_refresh_delay,json=credentialRefreshDelay,proto3" json:"credential_refresh_delay,omitempty"` + CredentialRefreshDelay *durationpb.Duration `protobuf:"bytes,4,opt,name=credential_refresh_delay,json=credentialRefreshDelay,proto3" json:"credential_refresh_delay,omitempty"` } func (x *AWSLambdaConfig) Reset() { *x = AWSLambdaConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AWSLambdaConfig) String() string { @@ -285,7 +279,7 @@ func (*AWSLambdaConfig) ProtoMessage() {} func (x *AWSLambdaConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -307,7 +301,7 @@ func (m *AWSLambdaConfig) GetCredentialsFetcher() isAWSLambdaConfig_CredentialsF return nil } -func (x *AWSLambdaConfig) GetUseDefaultCredentials() *wrappers.BoolValue { +func (x *AWSLambdaConfig) GetUseDefaultCredentials() *wrapperspb.BoolValue { if x, ok := x.GetCredentialsFetcher().(*AWSLambdaConfig_UseDefaultCredentials); ok { return x.UseDefaultCredentials } @@ -328,7 +322,7 @@ func (x *AWSLambdaConfig) GetPropagateOriginalRouting() bool { return false } -func (x *AWSLambdaConfig) GetCredentialRefreshDelay() *duration.Duration { +func (x *AWSLambdaConfig) GetCredentialRefreshDelay() *durationpb.Duration { if x != nil { return x.CredentialRefreshDelay } @@ -347,7 +341,7 @@ type AWSLambdaConfig_UseDefaultCredentials struct { // If credentials are provided on the cluster (using the // AWSLambdaProtocolExtension), it will override these credentials. This // defaults to false, but may change in the future to true. - UseDefaultCredentials *wrappers.BoolValue `protobuf:"bytes,1,opt,name=use_default_credentials,json=useDefaultCredentials,proto3,oneof"` + UseDefaultCredentials *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=use_default_credentials,json=useDefaultCredentials,proto3,oneof"` } type AWSLambdaConfig_ServiceAccountCredentials_ struct { @@ -381,11 +375,9 @@ type ApiGatewayTransformation struct { func (x *ApiGatewayTransformation) Reset() { *x = ApiGatewayTransformation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ApiGatewayTransformation) String() string { @@ -396,7 +388,7 @@ func (*ApiGatewayTransformation) ProtoMessage() {} func (x *ApiGatewayTransformation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -424,18 +416,16 @@ type AWSLambdaConfig_ServiceAccountCredentials struct { // The full uri of the aws sts endpoint Uri string `protobuf:"bytes,2,opt,name=uri,proto3" json:"uri,omitempty"` // timeout for the request - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` // Region for the sts endpoint. Defaults to us-east-1 Region string `protobuf:"bytes,4,opt,name=region,proto3" json:"region,omitempty"` } func (x *AWSLambdaConfig_ServiceAccountCredentials) Reset() { *x = AWSLambdaConfig_ServiceAccountCredentials{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AWSLambdaConfig_ServiceAccountCredentials) String() string { @@ -446,7 +436,7 @@ func (*AWSLambdaConfig_ServiceAccountCredentials) ProtoMessage() {} func (x *AWSLambdaConfig_ServiceAccountCredentials) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -475,7 +465,7 @@ func (x *AWSLambdaConfig_ServiceAccountCredentials) GetUri() string { return "" } -func (x *AWSLambdaConfig_ServiceAccountCredentials) GetTimeout() *duration.Duration { +func (x *AWSLambdaConfig_ServiceAccountCredentials) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -622,16 +612,16 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_a } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_goTypes = []any{ (*AWSLambdaPerRoute)(nil), // 0: envoy.config.filter.http.aws_lambda.v2.AWSLambdaPerRoute (*AWSLambdaProtocolExtension)(nil), // 1: envoy.config.filter.http.aws_lambda.v2.AWSLambdaProtocolExtension (*AWSLambdaConfig)(nil), // 2: envoy.config.filter.http.aws_lambda.v2.AWSLambdaConfig (*ApiGatewayTransformation)(nil), // 3: envoy.config.filter.http.aws_lambda.v2.ApiGatewayTransformation (*AWSLambdaConfig_ServiceAccountCredentials)(nil), // 4: envoy.config.filter.http.aws_lambda.v2.AWSLambdaConfig.ServiceAccountCredentials - (*wrappers.StringValue)(nil), // 5: google.protobuf.StringValue + (*wrapperspb.StringValue)(nil), // 5: google.protobuf.StringValue (*v3.TypedExtensionConfig)(nil), // 6: solo.io.envoy.config.core.v3.TypedExtensionConfig - (*wrappers.BoolValue)(nil), // 7: google.protobuf.BoolValue - (*duration.Duration)(nil), // 8: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 7: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_depIdxs = []int32{ 5, // 0: envoy.config.filter.http.aws_lambda.v2.AWSLambdaPerRoute.empty_body_override:type_name -> google.protobuf.StringValue @@ -655,69 +645,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_a if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AWSLambdaPerRoute); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AWSLambdaProtocolExtension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AWSLambdaConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ApiGatewayTransformation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AWSLambdaConfig_ServiceAccountCredentials); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_aws_filter_proto_msgTypes[2].OneofWrappers = []any{ (*AWSLambdaConfig_UseDefaultCredentials)(nil), (*AWSLambdaConfig_ServiceAccountCredentials_)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/cache/grpc/config.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/cache/grpc/config.pb.go index dc50c1f92..66e9f62f0 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/cache/grpc/config.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/cache/grpc/config.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/cache/grpc/config.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" ) const ( @@ -34,16 +34,14 @@ type GrpcCacheConfig struct { // A GRPC service: this maps exactly to envoy GRPC service defintions Service *v3.GrpcService `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"` // Connection timeout for retrieval from cache - Timeout *duration.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *GrpcCacheConfig) Reset() { *x = GrpcCacheConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_cache_grpc_config_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_cache_grpc_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcCacheConfig) String() string { @@ -54,7 +52,7 @@ func (*GrpcCacheConfig) ProtoMessage() {} func (x *GrpcCacheConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_cache_grpc_config_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -76,7 +74,7 @@ func (x *GrpcCacheConfig) GetService() *v3.GrpcService { return nil } -func (x *GrpcCacheConfig) GetTimeout() *duration.Duration { +func (x *GrpcCacheConfig) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -147,10 +145,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_c } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_cache_grpc_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_cache_grpc_config_proto_goTypes = []interface{}{ - (*GrpcCacheConfig)(nil), // 0: envoy.extensions.cache.grpc.v2.GrpcCacheConfig - (*v3.GrpcService)(nil), // 1: solo.io.envoy.config.core.v3.GrpcService - (*duration.Duration)(nil), // 2: google.protobuf.Duration +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_cache_grpc_config_proto_goTypes = []any{ + (*GrpcCacheConfig)(nil), // 0: envoy.extensions.cache.grpc.v2.GrpcCacheConfig + (*v3.GrpcService)(nil), // 1: solo.io.envoy.config.core.v3.GrpcService + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_cache_grpc_config_proto_depIdxs = []int32{ 1, // 0: envoy.extensions.cache.grpc.v2.GrpcCacheConfig.service:type_name -> solo.io.envoy.config.core.v3.GrpcService @@ -169,20 +167,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_c if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_cache_grpc_config_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_cache_grpc_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcCacheConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/extauth/sanitize.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/extauth/sanitize.pb.go index b93e7c384..2cdc441e1 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/extauth/sanitize.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/extauth/sanitize.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/extauth/sanitize.proto @@ -34,11 +34,9 @@ type Sanitize struct { func (x *Sanitize) Reset() { *x = Sanitize{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Sanitize) String() string { @@ -49,7 +47,7 @@ func (*Sanitize) ProtoMessage() {} func (x *Sanitize) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -90,11 +88,9 @@ type SanitizePerRoute struct { func (x *SanitizePerRoute) Reset() { *x = SanitizePerRoute{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SanitizePerRoute) String() string { @@ -105,7 +101,7 @@ func (*SanitizePerRoute) ProtoMessage() {} func (x *SanitizePerRoute) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -171,7 +167,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_e } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_goTypes = []any{ (*Sanitize)(nil), // 0: envoy.config.filter.http.sanitize.v2.Sanitize (*SanitizePerRoute)(nil), // 1: envoy.config.filter.http.sanitize.v2.SanitizePerRoute } @@ -190,32 +186,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_e if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Sanitize); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_extauth_sanitize_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SanitizePerRoute); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3/buffer.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3/buffer.pb.clone.go index 925a93de2..f5d4e4364 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3/buffer.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3/buffer.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -36,9 +36,9 @@ func (m *Buffer) Clone() proto.Message { target = &Buffer{} if h, ok := interface{}(m.GetMaxRequestBytes()).(clone.Cloner); ok { - target.MaxRequestBytes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRequestBytes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxRequestBytes = proto.Clone(m.GetMaxRequestBytes()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRequestBytes = proto.Clone(m.GetMaxRequestBytes()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3/buffer.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3/buffer.pb.go index ea4180978..136b7dccc 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3/buffer.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3/buffer.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/filters/http/buffer/v3/buffer.proto @@ -13,10 +13,10 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -33,16 +33,14 @@ type Buffer struct { // The maximum request size that the filter will buffer before the connection // manager will stop buffering and return a 413 response. - MaxRequestBytes *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` + MaxRequestBytes *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_request_bytes,json=maxRequestBytes,proto3" json:"max_request_bytes,omitempty"` } func (x *Buffer) Reset() { *x = Buffer{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Buffer) String() string { @@ -53,7 +51,7 @@ func (*Buffer) ProtoMessage() {} func (x *Buffer) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -68,7 +66,7 @@ func (*Buffer) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_rawDescGZIP(), []int{0} } -func (x *Buffer) GetMaxRequestBytes() *wrappers.UInt32Value { +func (x *Buffer) GetMaxRequestBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestBytes } @@ -89,11 +87,9 @@ type BufferPerRoute struct { func (x *BufferPerRoute) Reset() { *x = BufferPerRoute{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BufferPerRoute) String() string { @@ -104,7 +100,7 @@ func (*BufferPerRoute) ProtoMessage() {} func (x *BufferPerRoute) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -222,10 +218,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_goTypes = []interface{}{ - (*Buffer)(nil), // 0: solo.io.envoy.extensions.filters.http.buffer.v3.Buffer - (*BufferPerRoute)(nil), // 1: solo.io.envoy.extensions.filters.http.buffer.v3.BufferPerRoute - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_goTypes = []any{ + (*Buffer)(nil), // 0: solo.io.envoy.extensions.filters.http.buffer.v3.Buffer + (*BufferPerRoute)(nil), // 1: solo.io.envoy.extensions.filters.http.buffer.v3.BufferPerRoute + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_depIdxs = []int32{ 2, // 0: solo.io.envoy.extensions.filters.http.buffer.v3.Buffer.max_request_bytes:type_name -> google.protobuf.UInt32Value @@ -244,33 +240,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Buffer); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BufferPerRoute); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_buffer_v3_buffer_proto_msgTypes[1].OneofWrappers = []any{ (*BufferPerRoute_Disabled)(nil), (*BufferPerRoute_Buffer)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/csrf/v3/csrf.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/csrf/v3/csrf.pb.go index 597406985..84cda6b46 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/csrf/v3/csrf.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/csrf/v3/csrf.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/filters/http/csrf/v3/csrf.proto @@ -62,11 +62,9 @@ type CsrfPolicy struct { func (x *CsrfPolicy) Reset() { *x = CsrfPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_csrf_v3_csrf_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_csrf_v3_csrf_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CsrfPolicy) String() string { @@ -77,7 +75,7 @@ func (*CsrfPolicy) ProtoMessage() {} func (x *CsrfPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_csrf_v3_csrf_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -185,7 +183,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_csrf_v3_csrf_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_csrf_v3_csrf_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_csrf_v3_csrf_proto_goTypes = []any{ (*CsrfPolicy)(nil), // 0: solo.io.envoy.extensions.filters.http.csrf.v3.CsrfPolicy (*v3.RuntimeFractionalPercent)(nil), // 1: solo.io.envoy.config.core.v3.RuntimeFractionalPercent (*v31.StringMatcher)(nil), // 2: solo.io.envoy.type.matcher.v3.StringMatcher @@ -208,20 +206,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_csrf_v3_csrf_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_csrf_v3_csrf_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CsrfPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/ext_proc/v3/processing_mode.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/ext_proc/v3/processing_mode.pb.go index 10cc384d6..9134bc94e 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/ext_proc/v3/processing_mode.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/ext_proc/v3/processing_mode.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/filters/http/ext_proc/v3/processing_mode.proto @@ -167,11 +167,9 @@ type ProcessingMode struct { func (x *ProcessingMode) Reset() { *x = ProcessingMode{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_ext_proc_v3_processing_mode_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_ext_proc_v3_processing_mode_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProcessingMode) String() string { @@ -182,7 +180,7 @@ func (*ProcessingMode) ProtoMessage() {} func (x *ProcessingMode) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_ext_proc_v3_processing_mode_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -349,7 +347,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_ext_proc_v3_processing_mode_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_ext_proc_v3_processing_mode_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_ext_proc_v3_processing_mode_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_ext_proc_v3_processing_mode_proto_goTypes = []any{ (ProcessingMode_HeaderSendMode)(0), // 0: solo.io.envoy.extensions.filters.http.ext_proc.v3.ProcessingMode.HeaderSendMode (ProcessingMode_BodySendMode)(0), // 1: solo.io.envoy.extensions.filters.http.ext_proc.v3.ProcessingMode.BodySendMode (*ProcessingMode)(nil), // 2: solo.io.envoy.extensions.filters.http.ext_proc.v3.ProcessingMode @@ -375,20 +373,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_ext_proc_v3_processing_mode_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_ext_proc_v3_processing_mode_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProcessingMode); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/graphql/v2/graphql.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/graphql/v2/graphql.pb.go index f6e114219..ed1f1ac5e 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/graphql/v2/graphql.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/graphql/v2/graphql.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/graphql/graphql.proto @@ -11,12 +11,12 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - _ "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + _ "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -158,11 +158,9 @@ type PathSegment struct { func (x *PathSegment) Reset() { *x = PathSegment{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PathSegment) String() string { @@ -173,7 +171,7 @@ func (*PathSegment) ProtoMessage() {} func (x *PathSegment) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -251,11 +249,9 @@ type Path struct { func (x *Path) Reset() { *x = Path{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Path) String() string { @@ -266,7 +262,7 @@ func (*Path) ProtoMessage() {} func (x *Path) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -307,11 +303,9 @@ type TemplatedPath struct { func (x *TemplatedPath) Reset() { *x = TemplatedPath{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TemplatedPath) String() string { @@ -322,7 +316,7 @@ func (*TemplatedPath) ProtoMessage() {} func (x *TemplatedPath) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -373,11 +367,9 @@ type ValueProvider struct { func (x *ValueProvider) Reset() { *x = ValueProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ValueProvider) String() string { @@ -388,7 +380,7 @@ func (*ValueProvider) ProtoMessage() {} func (x *ValueProvider) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -427,11 +419,9 @@ type JsonValueList struct { func (x *JsonValueList) Reset() { *x = JsonValueList{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JsonValueList) String() string { @@ -442,7 +432,7 @@ func (*JsonValueList) ProtoMessage() {} func (x *JsonValueList) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -479,11 +469,9 @@ type JsonValue struct { func (x *JsonValue) Reset() { *x = JsonValue{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JsonValue) String() string { @@ -494,7 +482,7 @@ func (*JsonValue) ProtoMessage() {} func (x *JsonValue) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -574,11 +562,9 @@ type JsonKeyValue struct { func (x *JsonKeyValue) Reset() { *x = JsonKeyValue{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JsonKeyValue) String() string { @@ -589,7 +575,7 @@ func (*JsonKeyValue) ProtoMessage() {} func (x *JsonKeyValue) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -636,11 +622,9 @@ type JsonNode struct { func (x *JsonNode) Reset() { *x = JsonNode{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JsonNode) String() string { @@ -651,7 +635,7 @@ func (*JsonNode) ProtoMessage() {} func (x *JsonNode) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -700,11 +684,9 @@ type RequestTemplate struct { func (x *RequestTemplate) Reset() { *x = RequestTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RequestTemplate) String() string { @@ -715,7 +697,7 @@ func (*RequestTemplate) ProtoMessage() {} func (x *RequestTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -807,11 +789,9 @@ type ResponseTemplate struct { func (x *ResponseTemplate) Reset() { *x = ResponseTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseTemplate) String() string { @@ -822,7 +802,7 @@ func (*ResponseTemplate) ProtoMessage() {} func (x *ResponseTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -870,11 +850,9 @@ type RESTResolver struct { func (x *RESTResolver) Reset() { *x = RESTResolver{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RESTResolver) String() string { @@ -885,7 +863,7 @@ func (*RESTResolver) ProtoMessage() {} func (x *RESTResolver) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -949,11 +927,9 @@ type GrpcRequestTemplate struct { func (x *GrpcRequestTemplate) Reset() { *x = GrpcRequestTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcRequestTemplate) String() string { @@ -964,7 +940,7 @@ func (*GrpcRequestTemplate) ProtoMessage() {} func (x *GrpcRequestTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1019,11 +995,9 @@ type GrpcDescriptorRegistry struct { func (x *GrpcDescriptorRegistry) Reset() { *x = GrpcDescriptorRegistry{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcDescriptorRegistry) String() string { @@ -1034,7 +1008,7 @@ func (*GrpcDescriptorRegistry) ProtoMessage() {} func (x *GrpcDescriptorRegistry) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1076,11 +1050,9 @@ type GrpcResolver struct { func (x *GrpcResolver) Reset() { *x = GrpcResolver{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcResolver) String() string { @@ -1091,7 +1063,7 @@ func (*GrpcResolver) ProtoMessage() {} func (x *GrpcResolver) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1143,11 +1115,9 @@ type StaticResolver struct { func (x *StaticResolver) Reset() { *x = StaticResolver{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StaticResolver) String() string { @@ -1158,7 +1128,7 @@ func (*StaticResolver) ProtoMessage() {} func (x *StaticResolver) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1236,11 +1206,9 @@ type AbstractTypeResolver struct { func (x *AbstractTypeResolver) Reset() { *x = AbstractTypeResolver{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AbstractTypeResolver) String() string { @@ -1251,7 +1219,7 @@ func (*AbstractTypeResolver) ProtoMessage() {} func (x *AbstractTypeResolver) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1279,11 +1247,9 @@ type QueryMatcher struct { func (x *QueryMatcher) Reset() { *x = QueryMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *QueryMatcher) String() string { @@ -1294,7 +1260,7 @@ func (*QueryMatcher) ProtoMessage() {} func (x *QueryMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1356,11 +1322,9 @@ type Resolution struct { func (x *Resolution) Reset() { *x = Resolution{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Resolution) String() string { @@ -1371,7 +1335,7 @@ func (*Resolution) ProtoMessage() {} func (x *Resolution) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1431,7 +1395,7 @@ type CacheControl struct { // - root fields (i.e. Query, Mutation, Subscription) default to 0s // - non-root, non-scalar fields (i.e. object, interface, or union; or a list of those types) default to 0s // - all other fields inherit the max_age from their parent. - MaxAge *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` + MaxAge *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"` // provide controls to which users can access cached content Scope CacheControl_CacheControlScope `protobuf:"varint,2,opt,name=scope,proto3,enum=envoy.config.filter.http.graphql.v2.CacheControl_CacheControlScope" json:"scope,omitempty"` // whether or not to inherit the caching configuration of any parent fields @@ -1440,11 +1404,9 @@ type CacheControl struct { func (x *CacheControl) Reset() { *x = CacheControl{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CacheControl) String() string { @@ -1455,7 +1417,7 @@ func (*CacheControl) ProtoMessage() {} func (x *CacheControl) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1470,7 +1432,7 @@ func (*CacheControl) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_rawDescGZIP(), []int{18} } -func (x *CacheControl) GetMaxAge() *wrappers.UInt32Value { +func (x *CacheControl) GetMaxAge() *wrapperspb.UInt32Value { if x != nil { return x.MaxAge } @@ -1501,11 +1463,9 @@ type GraphQLConfig struct { func (x *GraphQLConfig) Reset() { *x = GraphQLConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GraphQLConfig) String() string { @@ -1516,7 +1476,7 @@ func (*GraphQLConfig) ProtoMessage() {} func (x *GraphQLConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1551,11 +1511,9 @@ type GraphQLRouteConfig struct { func (x *GraphQLRouteConfig) Reset() { *x = GraphQLRouteConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GraphQLRouteConfig) String() string { @@ -1566,7 +1524,7 @@ func (*GraphQLRouteConfig) ProtoMessage() {} func (x *GraphQLRouteConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1621,11 +1579,9 @@ type PersistedQueryCacheConfig struct { func (x *PersistedQueryCacheConfig) Reset() { *x = PersistedQueryCacheConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PersistedQueryCacheConfig) String() string { @@ -1636,7 +1592,7 @@ func (*PersistedQueryCacheConfig) ProtoMessage() {} func (x *PersistedQueryCacheConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1668,7 +1624,7 @@ type ExecutableSchema struct { // how to execute the schema Executor *Executor `protobuf:"bytes,2,opt,name=executor,proto3" json:"executor,omitempty"` // Schema extensions - Extensions map[string]*any1.Any `protobuf:"bytes,3,rep,name=extensions,proto3" json:"extensions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Extensions map[string]*anypb.Any `protobuf:"bytes,3,rep,name=extensions,proto3" json:"extensions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Logs request / response sensitive information // By default, this is false so no request or response sensitive information is logged. LogRequestResponseInfo bool `protobuf:"varint,4,opt,name=log_request_response_info,json=logRequestResponseInfo,proto3" json:"log_request_response_info,omitempty"` @@ -1676,11 +1632,9 @@ type ExecutableSchema struct { func (x *ExecutableSchema) Reset() { *x = ExecutableSchema{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExecutableSchema) String() string { @@ -1691,7 +1645,7 @@ func (*ExecutableSchema) ProtoMessage() {} func (x *ExecutableSchema) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1720,7 +1674,7 @@ func (x *ExecutableSchema) GetExecutor() *Executor { return nil } -func (x *ExecutableSchema) GetExtensions() map[string]*any1.Any { +func (x *ExecutableSchema) GetExtensions() map[string]*anypb.Any { if x != nil { return x.Extensions } @@ -1748,11 +1702,9 @@ type Executor struct { func (x *Executor) Reset() { *x = Executor{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor) String() string { @@ -1763,7 +1715,7 @@ func (*Executor) ProtoMessage() {} func (x *Executor) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1831,11 +1783,9 @@ type ValueProvider_GraphQLArgExtraction struct { func (x *ValueProvider_GraphQLArgExtraction) Reset() { *x = ValueProvider_GraphQLArgExtraction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ValueProvider_GraphQLArgExtraction) String() string { @@ -1846,7 +1796,7 @@ func (*ValueProvider_GraphQLArgExtraction) ProtoMessage() {} func (x *ValueProvider_GraphQLArgExtraction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1891,11 +1841,9 @@ type ValueProvider_GraphQLParentExtraction struct { func (x *ValueProvider_GraphQLParentExtraction) Reset() { *x = ValueProvider_GraphQLParentExtraction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ValueProvider_GraphQLParentExtraction) String() string { @@ -1906,7 +1854,7 @@ func (*ValueProvider_GraphQLParentExtraction) ProtoMessage() {} func (x *ValueProvider_GraphQLParentExtraction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1946,11 +1894,9 @@ type ValueProvider_TypedValueProvider struct { func (x *ValueProvider_TypedValueProvider) Reset() { *x = ValueProvider_TypedValueProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ValueProvider_TypedValueProvider) String() string { @@ -1961,7 +1907,7 @@ func (*ValueProvider_TypedValueProvider) ProtoMessage() {} func (x *ValueProvider_TypedValueProvider) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2037,11 +1983,9 @@ type ValueProvider_Provider struct { func (x *ValueProvider_Provider) Reset() { *x = ValueProvider_Provider{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ValueProvider_Provider) String() string { @@ -2052,7 +1996,7 @@ func (*ValueProvider_Provider) ProtoMessage() {} func (x *ValueProvider_Provider) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2130,11 +2074,9 @@ type StaticResolver_AsyncResponse struct { func (x *StaticResolver_AsyncResponse) Reset() { *x = StaticResolver_AsyncResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[34] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StaticResolver_AsyncResponse) String() string { @@ -2145,7 +2087,7 @@ func (*StaticResolver_AsyncResponse) ProtoMessage() {} func (x *StaticResolver_AsyncResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[34] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2187,11 +2129,9 @@ type QueryMatcher_FieldMatcher struct { func (x *QueryMatcher_FieldMatcher) Reset() { *x = QueryMatcher_FieldMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[35] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[35] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *QueryMatcher_FieldMatcher) String() string { @@ -2202,7 +2142,7 @@ func (*QueryMatcher_FieldMatcher) ProtoMessage() {} func (x *QueryMatcher_FieldMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[35] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2260,11 +2200,9 @@ type Executor_Local struct { func (x *Executor_Local) Reset() { *x = Executor_Local{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[37] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[37] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor_Local) String() string { @@ -2275,7 +2213,7 @@ func (*Executor_Local) ProtoMessage() {} func (x *Executor_Local) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[37] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2325,11 +2263,9 @@ type Executor_Remote struct { func (x *Executor_Remote) Reset() { *x = Executor_Remote{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[38] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[38] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor_Remote) String() string { @@ -2340,7 +2276,7 @@ func (*Executor_Remote) ProtoMessage() {} func (x *Executor_Remote) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[38] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2391,11 +2327,9 @@ type Executor_Remote_Extraction struct { func (x *Executor_Remote_Extraction) Reset() { *x = Executor_Remote_Extraction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[39] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[39] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor_Remote_Extraction) String() string { @@ -2406,7 +2340,7 @@ func (*Executor_Remote_Extraction) ProtoMessage() {} func (x *Executor_Remote_Extraction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[39] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2488,11 +2422,9 @@ type Executor_Remote_RemoteSchemaRequest struct { func (x *Executor_Remote_RemoteSchemaRequest) Reset() { *x = Executor_Remote_RemoteSchemaRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[40] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[40] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor_Remote_RemoteSchemaRequest) String() string { @@ -2503,7 +2435,7 @@ func (*Executor_Remote_RemoteSchemaRequest) ProtoMessage() {} func (x *Executor_Remote_RemoteSchemaRequest) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[40] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2545,11 +2477,9 @@ type Executor_Remote_Extraction_DynamicMetadataExtraction struct { func (x *Executor_Remote_Extraction_DynamicMetadataExtraction) Reset() { *x = Executor_Remote_Extraction_DynamicMetadataExtraction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[41] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[41] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor_Remote_Extraction_DynamicMetadataExtraction) String() string { @@ -2560,7 +2490,7 @@ func (*Executor_Remote_Extraction_DynamicMetadataExtraction) ProtoMessage() {} func (x *Executor_Remote_Extraction_DynamicMetadataExtraction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[41] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3107,7 +3037,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_g var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes = make([]protoimpl.MessageInfo, 44) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_goTypes = []any{ (ValueProvider_TypedValueProvider_Type)(0), // 0: envoy.config.filter.http.graphql.v2.ValueProvider.TypedValueProvider.Type (CacheControl_CacheControlScope)(0), // 1: envoy.config.filter.http.graphql.v2.CacheControl.CacheControlScope (*PathSegment)(nil), // 2: envoy.config.filter.http.graphql.v2.PathSegment @@ -3157,8 +3087,8 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_gr (*v3.HttpUri)(nil), // 46: solo.io.envoy.config.core.v3.HttpUri (*v3.DataSource)(nil), // 47: solo.io.envoy.config.core.v3.DataSource (*v3.TypedExtensionConfig)(nil), // 48: solo.io.envoy.config.core.v3.TypedExtensionConfig - (*wrappers.UInt32Value)(nil), // 49: google.protobuf.UInt32Value - (*any1.Any)(nil), // 50: google.protobuf.Any + (*wrapperspb.UInt32Value)(nil), // 49: google.protobuf.UInt32Value + (*anypb.Any)(nil), // 50: google.protobuf.Any } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_depIdxs = []int32{ 2, // 0: envoy.config.filter.http.graphql.v2.Path.segments:type_name -> envoy.config.filter.http.graphql.v2.PathSegment @@ -3231,460 +3161,38 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_g if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PathSegment); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Path); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TemplatedPath); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ValueProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JsonValueList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JsonValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JsonKeyValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JsonNode); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RequestTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RESTResolver); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcRequestTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcDescriptorRegistry); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcResolver); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StaticResolver); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AbstractTypeResolver); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QueryMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Resolution); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CacheControl); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GraphQLConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GraphQLRouteConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PersistedQueryCacheConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExecutableSchema); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ValueProvider_GraphQLArgExtraction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ValueProvider_GraphQLParentExtraction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ValueProvider_TypedValueProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ValueProvider_Provider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StaticResolver_AsyncResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QueryMatcher_FieldMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor_Local); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor_Remote); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor_Remote_Extraction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor_Remote_RemoteSchemaRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor_Remote_Extraction_DynamicMetadataExtraction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[0].OneofWrappers = []any{ (*PathSegment_Key)(nil), (*PathSegment_Index)(nil), (*PathSegment_All)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[5].OneofWrappers = []any{ (*JsonValue_Node)(nil), (*JsonValue_ValueProvider)(nil), (*JsonValue_List)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[14].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[14].OneofWrappers = []any{ (*StaticResolver_SyncResponse)(nil), (*StaticResolver_AsyncResponse_)(nil), (*StaticResolver_ErrorResponse)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[16].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[16].OneofWrappers = []any{ (*QueryMatcher_FieldMatcher_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[23].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[23].OneofWrappers = []any{ (*Executor_Local_)(nil), (*Executor_Remote_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[27].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[27].OneofWrappers = []any{ (*ValueProvider_TypedValueProvider_Header)(nil), (*ValueProvider_TypedValueProvider_Value)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[28].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[28].OneofWrappers = []any{ (*ValueProvider_Provider_GraphqlArg)(nil), (*ValueProvider_Provider_TypedProvider)(nil), (*ValueProvider_Provider_GraphqlParent)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[39].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_msgTypes[39].OneofWrappers = []any{ (*Executor_Remote_Extraction_Value)(nil), (*Executor_Remote_Extraction_Header)(nil), (*Executor_Remote_Extraction_DynamicMetadata)(nil), diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/graphql/v2/stitching.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/graphql/v2/stitching.pb.go index 97926252e..ea63ecbf0 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/graphql/v2/stitching.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/graphql/v2/stitching.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/graphql/stitching.proto @@ -11,9 +11,9 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _ "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/anypb" ) const ( @@ -33,11 +33,9 @@ type FieldNode struct { func (x *FieldNode) Reset() { *x = FieldNode{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FieldNode) String() string { @@ -48,7 +46,7 @@ func (*FieldNode) ProtoMessage() {} func (x *FieldNode) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -80,11 +78,9 @@ type FieldNodeMap struct { func (x *FieldNodeMap) Reset() { *x = FieldNodeMap{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FieldNodeMap) String() string { @@ -95,7 +91,7 @@ func (*FieldNodeMap) ProtoMessage() {} func (x *FieldNodeMap) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -127,11 +123,9 @@ type FieldNodes struct { func (x *FieldNodes) Reset() { *x = FieldNodes{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FieldNodes) String() string { @@ -142,7 +136,7 @@ func (*FieldNodes) ProtoMessage() {} func (x *FieldNodes) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -175,11 +169,9 @@ type ResolverConfig struct { func (x *ResolverConfig) Reset() { *x = ResolverConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResolverConfig) String() string { @@ -190,7 +182,7 @@ func (*ResolverConfig) ProtoMessage() {} func (x *ResolverConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -229,11 +221,9 @@ type Schemas struct { func (x *Schemas) Reset() { *x = Schemas{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Schemas) String() string { @@ -244,7 +234,7 @@ func (*Schemas) ProtoMessage() {} func (x *Schemas) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -279,11 +269,9 @@ type ArgPath struct { func (x *ArgPath) Reset() { *x = ArgPath{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ArgPath) String() string { @@ -294,7 +282,7 @@ func (*ArgPath) ProtoMessage() {} func (x *ArgPath) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -334,11 +322,9 @@ type ResolverInfo struct { func (x *ResolverInfo) Reset() { *x = ResolverInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResolverInfo) String() string { @@ -349,7 +335,7 @@ func (*ResolverInfo) ProtoMessage() {} func (x *ResolverInfo) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -397,11 +383,9 @@ type MergedTypeConfig struct { func (x *MergedTypeConfig) Reset() { *x = MergedTypeConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MergedTypeConfig) String() string { @@ -412,7 +396,7 @@ func (*MergedTypeConfig) ProtoMessage() {} func (x *MergedTypeConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -483,11 +467,9 @@ type StitchingInfo struct { func (x *StitchingInfo) Reset() { *x = StitchingInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StitchingInfo) String() string { @@ -498,7 +480,7 @@ func (*StitchingInfo) ProtoMessage() {} func (x *StitchingInfo) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -554,11 +536,9 @@ type StitchingResolver struct { func (x *StitchingResolver) Reset() { *x = StitchingResolver{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StitchingResolver) String() string { @@ -569,7 +549,7 @@ func (*StitchingResolver) ProtoMessage() {} func (x *StitchingResolver) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -601,11 +581,9 @@ type StitchingInfo_SubschemaConfig struct { func (x *StitchingInfo_SubschemaConfig) Reset() { *x = StitchingInfo_SubschemaConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StitchingInfo_SubschemaConfig) String() string { @@ -616,7 +594,7 @@ func (*StitchingInfo_SubschemaConfig) ProtoMessage() {} func (x *StitchingInfo_SubschemaConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -885,7 +863,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_g } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes = make([]protoimpl.MessageInfo, 21) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_goTypes = []any{ (*FieldNode)(nil), // 0: envoy.config.resolver.stitching.v2.FieldNode (*FieldNodeMap)(nil), // 1: envoy.config.resolver.stitching.v2.FieldNodeMap (*FieldNodes)(nil), // 2: envoy.config.resolver.stitching.v2.FieldNodes @@ -946,140 +924,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_g return } file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_graphql_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FieldNode); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FieldNodeMap); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FieldNodes); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolverConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Schemas); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ArgPath); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResolverInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MergedTypeConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StitchingInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StitchingResolver); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_graphql_stitching_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StitchingInfo_SubschemaConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/jwt_authn/v3/config.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/jwt_authn/v3/config.pb.go index 5be7d9c3c..4bd77f841 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/jwt_authn/v3/config.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/jwt_authn/v3/config.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/filters/http/jwt_authn/v3/config.proto @@ -11,13 +11,13 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - empty "github.com/golang/protobuf/ptypes/empty" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" v31 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/route/v3" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -173,11 +173,9 @@ type JwtProvider struct { func (x *JwtProvider) Reset() { *x = JwtProvider{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtProvider) String() string { @@ -188,7 +186,7 @@ func (*JwtProvider) ProtoMessage() {} func (x *JwtProvider) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -343,7 +341,7 @@ type RemoteJwks struct { HttpUri *v3.HttpUri `protobuf:"bytes,1,opt,name=http_uri,json=httpUri,proto3" json:"http_uri,omitempty"` // Duration after which the cached JWKS should be expired. If not specified, default cache // duration is 5 minutes. - CacheDuration *duration.Duration `protobuf:"bytes,2,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` + CacheDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` // Fetch Jwks asynchronously in the main thread before the listener is activated. // Fetched Jwks can be used by all worker threads. // @@ -363,11 +361,9 @@ type RemoteJwks struct { func (x *RemoteJwks) Reset() { *x = RemoteJwks{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RemoteJwks) String() string { @@ -378,7 +374,7 @@ func (*RemoteJwks) ProtoMessage() {} func (x *RemoteJwks) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -400,7 +396,7 @@ func (x *RemoteJwks) GetHttpUri() *v3.HttpUri { return nil } -func (x *RemoteJwks) GetCacheDuration() *duration.Duration { +func (x *RemoteJwks) GetCacheDuration() *durationpb.Duration { if x != nil { return x.CacheDuration } @@ -432,11 +428,9 @@ type JwksAsyncFetch struct { func (x *JwksAsyncFetch) Reset() { *x = JwksAsyncFetch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwksAsyncFetch) String() string { @@ -447,7 +441,7 @@ func (*JwksAsyncFetch) ProtoMessage() {} func (x *JwksAsyncFetch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -485,11 +479,9 @@ type JwtHeader struct { func (x *JwtHeader) Reset() { *x = JwtHeader{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtHeader) String() string { @@ -500,7 +492,7 @@ func (*JwtHeader) ProtoMessage() {} func (x *JwtHeader) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -543,11 +535,9 @@ type ProviderWithAudiences struct { func (x *ProviderWithAudiences) Reset() { *x = ProviderWithAudiences{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProviderWithAudiences) String() string { @@ -558,7 +548,7 @@ func (*ProviderWithAudiences) ProtoMessage() {} func (x *ProviderWithAudiences) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -662,11 +652,9 @@ type JwtRequirement struct { func (x *JwtRequirement) Reset() { *x = JwtRequirement{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtRequirement) String() string { @@ -677,7 +665,7 @@ func (*JwtRequirement) ProtoMessage() {} func (x *JwtRequirement) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -727,14 +715,14 @@ func (x *JwtRequirement) GetRequiresAll() *JwtRequirementAndList { return nil } -func (x *JwtRequirement) GetAllowMissingOrFailed() *empty.Empty { +func (x *JwtRequirement) GetAllowMissingOrFailed() *emptypb.Empty { if x, ok := x.GetRequiresType().(*JwtRequirement_AllowMissingOrFailed); ok { return x.AllowMissingOrFailed } return nil } -func (x *JwtRequirement) GetAllowMissing() *empty.Empty { +func (x *JwtRequirement) GetAllowMissing() *emptypb.Empty { if x, ok := x.GetRequiresType().(*JwtRequirement_AllowMissing); ok { return x.AllowMissing } @@ -772,7 +760,7 @@ type JwtRequirement_AllowMissingOrFailed struct { // verification fails. A typical usage is: this filter is used to only verify // JWTs and pass the verified JWT payloads to another filter, the other filter // will make decision. In this mode, all JWT tokens will be verified. - AllowMissingOrFailed *empty.Empty `protobuf:"bytes,5,opt,name=allow_missing_or_failed,json=allowMissingOrFailed,proto3,oneof"` + AllowMissingOrFailed *emptypb.Empty `protobuf:"bytes,5,opt,name=allow_missing_or_failed,json=allowMissingOrFailed,proto3,oneof"` } type JwtRequirement_AllowMissing struct { @@ -780,7 +768,7 @@ type JwtRequirement_AllowMissing struct { // presented but invalid. Similar to allow_missing_or_failed, this is used // to only verify JWTs and pass the verified payload to another filter. The // different is this mode will reject requests with invalid tokens. - AllowMissing *empty.Empty `protobuf:"bytes,6,opt,name=allow_missing,json=allowMissing,proto3,oneof"` + AllowMissing *emptypb.Empty `protobuf:"bytes,6,opt,name=allow_missing,json=allowMissing,proto3,oneof"` } func (*JwtRequirement_ProviderName) isJwtRequirement_RequiresType() {} @@ -808,11 +796,9 @@ type JwtRequirementOrList struct { func (x *JwtRequirementOrList) Reset() { *x = JwtRequirementOrList{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtRequirementOrList) String() string { @@ -823,7 +809,7 @@ func (*JwtRequirementOrList) ProtoMessage() {} func (x *JwtRequirementOrList) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -858,11 +844,9 @@ type JwtRequirementAndList struct { func (x *JwtRequirementAndList) Reset() { *x = JwtRequirementAndList{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtRequirementAndList) String() string { @@ -873,7 +857,7 @@ func (*JwtRequirementAndList) ProtoMessage() {} func (x *JwtRequirementAndList) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -943,11 +927,9 @@ type RequirementRule struct { func (x *RequirementRule) Reset() { *x = RequirementRule{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RequirementRule) String() string { @@ -958,7 +940,7 @@ func (*RequirementRule) ProtoMessage() {} func (x *RequirementRule) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1053,11 +1035,9 @@ type FilterStateRule struct { func (x *FilterStateRule) Reset() { *x = FilterStateRule{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FilterStateRule) String() string { @@ -1068,7 +1048,7 @@ func (*FilterStateRule) ProtoMessage() {} func (x *FilterStateRule) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1210,11 +1190,9 @@ type JwtAuthentication struct { func (x *JwtAuthentication) Reset() { *x = JwtAuthentication{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtAuthentication) String() string { @@ -1225,7 +1203,7 @@ func (*JwtAuthentication) ProtoMessage() {} func (x *JwtAuthentication) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1290,11 +1268,9 @@ type PerRouteConfig struct { func (x *PerRouteConfig) Reset() { *x = PerRouteConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PerRouteConfig) String() string { @@ -1305,7 +1281,7 @@ func (*PerRouteConfig) ProtoMessage() {} func (x *PerRouteConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1686,7 +1662,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes = make([]protoimpl.MessageInfo, 15) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_goTypes = []any{ (*JwtProvider)(nil), // 0: solo.io.envoy.extensions.filters.http.jwt_authn.v3.JwtProvider (*RemoteJwks)(nil), // 1: solo.io.envoy.extensions.filters.http.jwt_authn.v3.RemoteJwks (*JwksAsyncFetch)(nil), // 2: solo.io.envoy.extensions.filters.http.jwt_authn.v3.JwksAsyncFetch @@ -1704,8 +1680,8 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_fi nil, // 14: solo.io.envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication.RequirementMapEntry (*v3.DataSource)(nil), // 15: solo.io.envoy.config.core.v3.DataSource (*v3.HttpUri)(nil), // 16: solo.io.envoy.config.core.v3.HttpUri - (*duration.Duration)(nil), // 17: google.protobuf.Duration - (*empty.Empty)(nil), // 18: google.protobuf.Empty + (*durationpb.Duration)(nil), // 17: google.protobuf.Duration + (*emptypb.Empty)(nil), // 18: google.protobuf.Empty (*v31.RouteMatch)(nil), // 19: solo.io.envoy.config.route.v3.RouteMatch } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_depIdxs = []int32{ @@ -1746,157 +1722,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtProvider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoteJwks); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwksAsyncFetch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtHeader); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProviderWithAudiences); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtRequirement); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtRequirementOrList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtRequirementAndList); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RequirementRule); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FilterStateRule); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtAuthentication); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PerRouteConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[0].OneofWrappers = []any{ (*JwtProvider_RemoteJwks)(nil), (*JwtProvider_LocalJwks)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[5].OneofWrappers = []any{ (*JwtRequirement_ProviderName)(nil), (*JwtRequirement_ProviderAndAudiences)(nil), (*JwtRequirement_RequiresAny)(nil), @@ -1904,11 +1734,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f (*JwtRequirement_AllowMissingOrFailed)(nil), (*JwtRequirement_AllowMissing)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[8].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[8].OneofWrappers = []any{ (*RequirementRule_Requires)(nil), (*RequirementRule_RequirementName)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[11].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_jwt_authn_v3_config_proto_msgTypes[11].OneofWrappers = []any{ (*PerRouteConfig_Disabled)(nil), (*PerRouteConfig_RequirementName)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/wasm/v3/wasm.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/wasm/v3/wasm.pb.go index d8fe38696..3f58f77f7 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/wasm/v3/wasm.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/wasm/v3/wasm.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/filters/http/wasm/v3/wasm.proto @@ -37,11 +37,9 @@ type Wasm struct { func (x *Wasm) Reset() { *x = Wasm{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_wasm_v3_wasm_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_wasm_v3_wasm_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Wasm) String() string { @@ -52,7 +50,7 @@ func (*Wasm) ProtoMessage() {} func (x *Wasm) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_wasm_v3_wasm_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -127,7 +125,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_wasm_v3_wasm_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_wasm_v3_wasm_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_wasm_v3_wasm_proto_goTypes = []any{ (*Wasm)(nil), // 0: solo.io.envoy.extensions.filters.http.wasm.v3.Wasm (*v3.PluginConfig)(nil), // 1: solo.io.envoy.extensions.wasm.v3.PluginConfig } @@ -147,20 +145,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_f if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_wasm_v3_wasm_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_filters_http_wasm_v3_wasm_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Wasm); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/http_path/http_path.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/http_path/http_path.pb.go index f11738b96..a5b44944e 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/http_path/http_path.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/http_path/http_path.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/http_path/http_path.proto @@ -38,11 +38,9 @@ type HttpPath struct { func (x *HttpPath) Reset() { *x = HttpPath{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_http_path_http_path_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_http_path_http_path_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpPath) String() string { @@ -53,7 +51,7 @@ func (*HttpPath) ProtoMessage() {} func (x *HttpPath) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_http_path_http_path_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -130,7 +128,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_h } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_http_path_http_path_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_http_path_http_path_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_http_path_http_path_proto_goTypes = []any{ (*HttpPath)(nil), // 0: envoy.config.health_checker.http_path.v2.HttpPath (*v3.HealthCheck_HttpHealthCheck)(nil), // 1: solo.io.envoy.config.core.v3.HealthCheck.HttpHealthCheck } @@ -150,20 +148,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_h if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_http_path_http_path_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_http_path_http_path_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpPath); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/jwt/solo_jwt_authn.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/jwt/solo_jwt_authn.pb.go index cc24cc460..3b41778b7 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/jwt/solo_jwt_authn.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/jwt/solo_jwt_authn.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/jwt/solo_jwt_authn.proto @@ -37,11 +37,9 @@ type JwtWithStage struct { func (x *JwtWithStage) Reset() { *x = JwtWithStage{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtWithStage) String() string { @@ -52,7 +50,7 @@ func (*JwtWithStage) ProtoMessage() {} func (x *JwtWithStage) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -100,11 +98,9 @@ type SoloJwtAuthnPerRoute struct { func (x *SoloJwtAuthnPerRoute) Reset() { *x = SoloJwtAuthnPerRoute{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SoloJwtAuthnPerRoute) String() string { @@ -115,7 +111,7 @@ func (*SoloJwtAuthnPerRoute) ProtoMessage() {} func (x *SoloJwtAuthnPerRoute) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -170,11 +166,9 @@ type StagedJwtAuthnPerRoute struct { func (x *StagedJwtAuthnPerRoute) Reset() { *x = StagedJwtAuthnPerRoute{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StagedJwtAuthnPerRoute) String() string { @@ -185,7 +179,7 @@ func (*StagedJwtAuthnPerRoute) ProtoMessage() {} func (x *StagedJwtAuthnPerRoute) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -221,11 +215,9 @@ type SoloJwtAuthnPerRoute_ClaimToHeader struct { func (x *SoloJwtAuthnPerRoute_ClaimToHeader) Reset() { *x = SoloJwtAuthnPerRoute_ClaimToHeader{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SoloJwtAuthnPerRoute_ClaimToHeader) String() string { @@ -236,7 +228,7 @@ func (*SoloJwtAuthnPerRoute_ClaimToHeader) ProtoMessage() {} func (x *SoloJwtAuthnPerRoute_ClaimToHeader) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -282,11 +274,9 @@ type SoloJwtAuthnPerRoute_ClaimToHeaders struct { func (x *SoloJwtAuthnPerRoute_ClaimToHeaders) Reset() { *x = SoloJwtAuthnPerRoute_ClaimToHeaders{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SoloJwtAuthnPerRoute_ClaimToHeaders) String() string { @@ -297,7 +287,7 @@ func (*SoloJwtAuthnPerRoute_ClaimToHeaders) ProtoMessage() {} func (x *SoloJwtAuthnPerRoute_ClaimToHeaders) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -433,7 +423,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_j } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_goTypes = []any{ (*JwtWithStage)(nil), // 0: envoy.config.filter.http.solo_jwt_authn.v2.JwtWithStage (*SoloJwtAuthnPerRoute)(nil), // 1: envoy.config.filter.http.solo_jwt_authn.v2.SoloJwtAuthnPerRoute (*StagedJwtAuthnPerRoute)(nil), // 2: envoy.config.filter.http.solo_jwt_authn.v2.StagedJwtAuthnPerRoute @@ -464,68 +454,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_j if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtWithStage); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SoloJwtAuthnPerRoute); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StagedJwtAuthnPerRoute); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SoloJwtAuthnPerRoute_ClaimToHeader); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_jwt_solo_jwt_authn_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SoloJwtAuthnPerRoute_ClaimToHeaders); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/proxylatency/proxylatency.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/extensions/proxylatency/proxylatency.pb.clone.go index 5959e80c0..f72af1a0c 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/proxylatency/proxylatency.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/proxylatency/proxylatency.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -42,21 +42,21 @@ func (m *ProxyLatency) Clone() proto.Message { target.Response = m.GetResponse() if h, ok := interface{}(m.GetChargeClusterStat()).(clone.Cloner); ok { - target.ChargeClusterStat = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ChargeClusterStat = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.ChargeClusterStat = proto.Clone(m.GetChargeClusterStat()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ChargeClusterStat = proto.Clone(m.GetChargeClusterStat()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetChargeListenerStat()).(clone.Cloner); ok { - target.ChargeListenerStat = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ChargeListenerStat = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.ChargeListenerStat = proto.Clone(m.GetChargeListenerStat()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ChargeListenerStat = proto.Clone(m.GetChargeListenerStat()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetEmitDynamicMetadata()).(clone.Cloner); ok { - target.EmitDynamicMetadata = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EmitDynamicMetadata = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EmitDynamicMetadata = proto.Clone(m.GetEmitDynamicMetadata()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EmitDynamicMetadata = proto.Clone(m.GetEmitDynamicMetadata()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/proxylatency/proxylatency.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/proxylatency/proxylatency.pb.go index 40bf14ff8..55fd68abc 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/proxylatency/proxylatency.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/proxylatency/proxylatency.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/proxylatency/proxylatency.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -113,21 +113,19 @@ type ProxyLatency struct { // How measure the response. Response ProxyLatency_Measurement `protobuf:"varint,2,opt,name=response,proto3,enum=envoy.config.filter.http.proxylatency.v2.ProxyLatency_Measurement" json:"response,omitempty"` // Charge a stat per upstream cluster. If not specified, defaults to true. - ChargeClusterStat *wrappers.BoolValue `protobuf:"bytes,3,opt,name=charge_cluster_stat,json=chargeClusterStat,proto3" json:"charge_cluster_stat,omitempty"` + ChargeClusterStat *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=charge_cluster_stat,json=chargeClusterStat,proto3" json:"charge_cluster_stat,omitempty"` // Charge a stat per listener. If not specified, defaults to true. - ChargeListenerStat *wrappers.BoolValue `protobuf:"bytes,4,opt,name=charge_listener_stat,json=chargeListenerStat,proto3" json:"charge_listener_stat,omitempty"` + ChargeListenerStat *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=charge_listener_stat,json=chargeListenerStat,proto3" json:"charge_listener_stat,omitempty"` // Whether request timing is emitted to dynamic metadata. // If enabled, defaults to true. - EmitDynamicMetadata *wrappers.BoolValue `protobuf:"bytes,6,opt,name=emit_dynamic_metadata,json=emitDynamicMetadata,proto3" json:"emit_dynamic_metadata,omitempty"` + EmitDynamicMetadata *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=emit_dynamic_metadata,json=emitDynamicMetadata,proto3" json:"emit_dynamic_metadata,omitempty"` } func (x *ProxyLatency) Reset() { *x = ProxyLatency{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxyLatency) String() string { @@ -138,7 +136,7 @@ func (*ProxyLatency) ProtoMessage() {} func (x *ProxyLatency) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -174,21 +172,21 @@ func (x *ProxyLatency) GetResponse() ProxyLatency_Measurement { return ProxyLatency_LAST_INCOMING_FIRST_OUTGOING } -func (x *ProxyLatency) GetChargeClusterStat() *wrappers.BoolValue { +func (x *ProxyLatency) GetChargeClusterStat() *wrapperspb.BoolValue { if x != nil { return x.ChargeClusterStat } return nil } -func (x *ProxyLatency) GetChargeListenerStat() *wrappers.BoolValue { +func (x *ProxyLatency) GetChargeListenerStat() *wrapperspb.BoolValue { if x != nil { return x.ChargeListenerStat } return nil } -func (x *ProxyLatency) GetEmitDynamicMetadata() *wrappers.BoolValue { +func (x *ProxyLatency) GetEmitDynamicMetadata() *wrapperspb.BoolValue { if x != nil { return x.EmitDynamicMetadata } @@ -275,10 +273,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_p var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto_goTypes = []any{ (ProxyLatency_Measurement)(0), // 0: envoy.config.filter.http.proxylatency.v2.ProxyLatency.Measurement (*ProxyLatency)(nil), // 1: envoy.config.filter.http.proxylatency.v2.ProxyLatency - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto_depIdxs = []int32{ 0, // 0: envoy.config.filter.http.proxylatency.v2.ProxyLatency.request:type_name -> envoy.config.filter.http.proxylatency.v2.ProxyLatency.Measurement @@ -300,20 +298,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_p if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_proxylatency_proxylatency_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxyLatency); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/transformation/transformation.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/extensions/transformation/transformation.pb.clone.go index 37d50346a..037e5fe6f 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/transformation/transformation.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/transformation/transformation.pb.clone.go @@ -13,15 +13,15 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_empty "github.com/golang/protobuf/ptypes/empty" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_route_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/route/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_matcher_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" + + google_golang_org_protobuf_types_known_emptypb "google.golang.org/protobuf/types/known/emptypb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -186,9 +186,9 @@ func (m *Transformation) Clone() proto.Message { target = &Transformation{} if h, ok := interface{}(m.GetLogRequestResponseInfo()).(clone.Cloner); ok { - target.LogRequestResponseInfo = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LogRequestResponseInfo = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.LogRequestResponseInfo = proto.Clone(m.GetLogRequestResponseInfo()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LogRequestResponseInfo = proto.Clone(m.GetLogRequestResponseInfo()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } switch m.TransformationType.(type) { @@ -247,9 +247,9 @@ func (m *Extraction) Clone() proto.Message { target.Subgroup = m.GetSubgroup() if h, ok := interface{}(m.GetReplacementText()).(clone.Cloner); ok { - target.ReplacementText = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ReplacementText = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.ReplacementText = proto.Clone(m.GetReplacementText()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ReplacementText = proto.Clone(m.GetReplacementText()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } target.Mode = m.GetMode() @@ -266,11 +266,11 @@ func (m *Extraction) Clone() proto.Message { if h, ok := interface{}(m.GetBody()).(clone.Cloner); ok { target.Source = &Extraction_Body{ - Body: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + Body: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.Source = &Extraction_Body{ - Body: proto.Clone(m.GetBody()).(*github_com_golang_protobuf_ptypes_empty.Empty), + Body: proto.Clone(m.GetBody()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/transformation/transformation.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/transformation/transformation.pb.go index 9536825c8..0c2c4889c 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/transformation/transformation.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/transformation/transformation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/transformation/transformation.proto @@ -11,14 +11,14 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - empty "github.com/golang/protobuf/ptypes/empty" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v32 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/route/v3" v31 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -159,11 +159,9 @@ type FilterTransformations struct { func (x *FilterTransformations) Reset() { *x = FilterTransformations{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FilterTransformations) String() string { @@ -174,7 +172,7 @@ func (*FilterTransformations) ProtoMessage() {} func (x *FilterTransformations) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -231,11 +229,9 @@ type TransformationRule struct { func (x *TransformationRule) Reset() { *x = TransformationRule{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationRule) String() string { @@ -246,7 +242,7 @@ func (*TransformationRule) ProtoMessage() {} func (x *TransformationRule) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -299,11 +295,9 @@ type RouteTransformations struct { func (x *RouteTransformations) Reset() { *x = RouteTransformations{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTransformations) String() string { @@ -314,7 +308,7 @@ func (*RouteTransformations) ProtoMessage() {} func (x *RouteTransformations) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -378,11 +372,9 @@ type ResponseMatcher struct { func (x *ResponseMatcher) Reset() { *x = ResponseMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseMatcher) String() string { @@ -393,7 +385,7 @@ func (*ResponseMatcher) ProtoMessage() {} func (x *ResponseMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -434,11 +426,9 @@ type ResponseTransformationRule struct { func (x *ResponseTransformationRule) Reset() { *x = ResponseTransformationRule{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseTransformationRule) String() string { @@ -449,7 +439,7 @@ func (*ResponseTransformationRule) ProtoMessage() {} func (x *ResponseTransformationRule) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -497,16 +487,14 @@ type Transformation struct { // By default, this is false so no request or response sensitive information is logged. // If set to true, the filter will log the request/response body and headers before and // after this transformation is applied. - LogRequestResponseInfo *wrappers.BoolValue `protobuf:"bytes,4,opt,name=log_request_response_info,json=logRequestResponseInfo,proto3" json:"log_request_response_info,omitempty"` + LogRequestResponseInfo *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=log_request_response_info,json=logRequestResponseInfo,proto3" json:"log_request_response_info,omitempty"` } func (x *Transformation) Reset() { *x = Transformation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Transformation) String() string { @@ -517,7 +505,7 @@ func (*Transformation) ProtoMessage() {} func (x *Transformation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -560,7 +548,7 @@ func (x *Transformation) GetTransformerConfig() *v32.TypedExtensionConfig { return nil } -func (x *Transformation) GetLogRequestResponseInfo() *wrappers.BoolValue { +func (x *Transformation) GetLogRequestResponseInfo() *wrapperspb.BoolValue { if x != nil { return x.LogRequestResponseInfo } @@ -643,7 +631,7 @@ type Extraction struct { // to `std::regex_replace` as the replacement string. // // For more informatino, see https://en.cppreference.com/w/cpp/regex/regex_replace. - ReplacementText *wrappers.StringValue `protobuf:"bytes,5,opt,name=replacement_text,json=replacementText,proto3" json:"replacement_text,omitempty"` + ReplacementText *wrapperspb.StringValue `protobuf:"bytes,5,opt,name=replacement_text,json=replacementText,proto3" json:"replacement_text,omitempty"` // The mode of operation for the extraction. // Defaults to EXTRACT. Mode Extraction_Mode `protobuf:"varint,6,opt,name=mode,proto3,enum=envoy.api.v2.filter.http.Extraction_Mode" json:"mode,omitempty"` @@ -651,11 +639,9 @@ type Extraction struct { func (x *Extraction) Reset() { *x = Extraction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Extraction) String() string { @@ -666,7 +652,7 @@ func (*Extraction) ProtoMessage() {} func (x *Extraction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -695,7 +681,7 @@ func (x *Extraction) GetHeader() string { return "" } -func (x *Extraction) GetBody() *empty.Empty { +func (x *Extraction) GetBody() *emptypb.Empty { if x, ok := x.GetSource().(*Extraction_Body); ok { return x.Body } @@ -716,7 +702,7 @@ func (x *Extraction) GetSubgroup() uint32 { return 0 } -func (x *Extraction) GetReplacementText() *wrappers.StringValue { +func (x *Extraction) GetReplacementText() *wrapperspb.StringValue { if x != nil { return x.ReplacementText } @@ -741,7 +727,7 @@ type Extraction_Header struct { type Extraction_Body struct { // Extract information from the request/response body - Body *empty.Empty `protobuf:"bytes,4,opt,name=body,proto3,oneof"` + Body *emptypb.Empty `protobuf:"bytes,4,opt,name=body,proto3,oneof"` } func (*Extraction_Header) isExtraction_Source() {} @@ -836,11 +822,9 @@ type TransformationTemplate struct { func (x *TransformationTemplate) Reset() { *x = TransformationTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationTemplate) String() string { @@ -851,7 +835,7 @@ func (*TransformationTemplate) ProtoMessage() {} func (x *TransformationTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1042,11 +1026,9 @@ type InjaTemplate struct { func (x *InjaTemplate) Reset() { *x = InjaTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *InjaTemplate) String() string { @@ -1057,7 +1039,7 @@ func (*InjaTemplate) ProtoMessage() {} func (x *InjaTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1087,11 +1069,9 @@ type Passthrough struct { func (x *Passthrough) Reset() { *x = Passthrough{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Passthrough) String() string { @@ -1102,7 +1082,7 @@ func (*Passthrough) ProtoMessage() {} func (x *Passthrough) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1125,11 +1105,9 @@ type MergeExtractorsToBody struct { func (x *MergeExtractorsToBody) Reset() { *x = MergeExtractorsToBody{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MergeExtractorsToBody) String() string { @@ -1140,7 +1118,7 @@ func (*MergeExtractorsToBody) ProtoMessage() {} func (x *MergeExtractorsToBody) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1183,11 +1161,9 @@ type MergeJsonKeys struct { func (x *MergeJsonKeys) Reset() { *x = MergeJsonKeys{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MergeJsonKeys) String() string { @@ -1198,7 +1174,7 @@ func (*MergeJsonKeys) ProtoMessage() {} func (x *MergeJsonKeys) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1233,11 +1209,9 @@ type HeaderBodyTransform struct { func (x *HeaderBodyTransform) Reset() { *x = HeaderBodyTransform{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderBodyTransform) String() string { @@ -1248,7 +1222,7 @@ func (*HeaderBodyTransform) ProtoMessage() {} func (x *HeaderBodyTransform) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1288,11 +1262,9 @@ type TransformationRule_Transformations struct { func (x *TransformationRule_Transformations) Reset() { *x = TransformationRule_Transformations{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationRule_Transformations) String() string { @@ -1303,7 +1275,7 @@ func (*TransformationRule_Transformations) ProtoMessage() {} func (x *TransformationRule_Transformations) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1363,11 +1335,9 @@ type RouteTransformations_RouteTransformation struct { func (x *RouteTransformations_RouteTransformation) Reset() { *x = RouteTransformations_RouteTransformation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTransformations_RouteTransformation) String() string { @@ -1378,7 +1348,7 @@ func (*RouteTransformations_RouteTransformation) ProtoMessage() {} func (x *RouteTransformations_RouteTransformation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1455,11 +1425,9 @@ type RouteTransformations_RouteTransformation_RequestMatch struct { func (x *RouteTransformations_RouteTransformation_RequestMatch) Reset() { *x = RouteTransformations_RouteTransformation_RequestMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTransformations_RouteTransformation_RequestMatch) String() string { @@ -1470,7 +1438,7 @@ func (*RouteTransformations_RouteTransformation_RequestMatch) ProtoMessage() {} func (x *RouteTransformations_RouteTransformation_RequestMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1525,11 +1493,9 @@ type RouteTransformations_RouteTransformation_ResponseMatch struct { func (x *RouteTransformations_RouteTransformation_ResponseMatch) Reset() { *x = RouteTransformations_RouteTransformation_ResponseMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTransformations_RouteTransformation_ResponseMatch) String() string { @@ -1540,7 +1506,7 @@ func (*RouteTransformations_RouteTransformation_ResponseMatch) ProtoMessage() {} func (x *RouteTransformations_RouteTransformation_ResponseMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1583,11 +1549,9 @@ type TransformationTemplate_HeaderToAppend struct { func (x *TransformationTemplate_HeaderToAppend) Reset() { *x = TransformationTemplate_HeaderToAppend{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationTemplate_HeaderToAppend) String() string { @@ -1598,7 +1562,7 @@ func (*TransformationTemplate_HeaderToAppend) ProtoMessage() {} func (x *TransformationTemplate_HeaderToAppend) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1648,11 +1612,9 @@ type TransformationTemplate_DynamicMetadataValue struct { func (x *TransformationTemplate_DynamicMetadataValue) Reset() { *x = TransformationTemplate_DynamicMetadataValue{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationTemplate_DynamicMetadataValue) String() string { @@ -1663,7 +1625,7 @@ func (*TransformationTemplate_DynamicMetadataValue) ProtoMessage() {} func (x *TransformationTemplate_DynamicMetadataValue) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1717,11 +1679,9 @@ type TransformationTemplate_SpanTransformer struct { func (x *TransformationTemplate_SpanTransformer) Reset() { *x = TransformationTemplate_SpanTransformer{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationTemplate_SpanTransformer) String() string { @@ -1732,7 +1692,7 @@ func (*TransformationTemplate_SpanTransformer) ProtoMessage() {} func (x *TransformationTemplate_SpanTransformer) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1767,11 +1727,9 @@ type MergeJsonKeys_OverridableTemplate struct { func (x *MergeJsonKeys_OverridableTemplate) Reset() { *x = MergeJsonKeys_OverridableTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MergeJsonKeys_OverridableTemplate) String() string { @@ -1782,7 +1740,7 @@ func (*MergeJsonKeys_OverridableTemplate) ProtoMessage() {} func (x *MergeJsonKeys_OverridableTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2214,7 +2172,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_t var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes = make([]protoimpl.MessageInfo, 24) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_goTypes = []any{ (Extraction_Mode)(0), // 0: envoy.api.v2.filter.http.Extraction.Mode (TransformationTemplate_RequestBodyParse)(0), // 1: envoy.api.v2.filter.http.TransformationTemplate.RequestBodyParse (*FilterTransformations)(nil), // 2: envoy.api.v2.filter.http.FilterTransformations @@ -2245,9 +2203,9 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_tr (*v3.HeaderMatcher)(nil), // 27: solo.io.envoy.config.route.v3.HeaderMatcher (*v31.StringMatcher)(nil), // 28: solo.io.envoy.type.matcher.v3.StringMatcher (*v32.TypedExtensionConfig)(nil), // 29: solo.io.envoy.config.core.v3.TypedExtensionConfig - (*wrappers.BoolValue)(nil), // 30: google.protobuf.BoolValue - (*empty.Empty)(nil), // 31: google.protobuf.Empty - (*wrappers.StringValue)(nil), // 32: google.protobuf.StringValue + (*wrapperspb.BoolValue)(nil), // 30: google.protobuf.BoolValue + (*emptypb.Empty)(nil), // 31: google.protobuf.Empty + (*wrapperspb.StringValue)(nil), // 32: google.protobuf.StringValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_depIdxs = []int32{ 3, // 0: envoy.api.v2.filter.http.FilterTransformations.transformations:type_name -> envoy.api.v2.filter.http.TransformationRule @@ -2309,276 +2267,22 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_t if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FilterTransformations); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationRule); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTransformations); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseTransformationRule); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Transformation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Extraction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*InjaTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Passthrough); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MergeExtractorsToBody); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MergeJsonKeys); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderBodyTransform); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationRule_Transformations); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTransformations_RouteTransformation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTransformations_RouteTransformation_RequestMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTransformations_RouteTransformation_ResponseMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationTemplate_HeaderToAppend); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationTemplate_DynamicMetadataValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationTemplate_SpanTransformer); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MergeJsonKeys_OverridableTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[5].OneofWrappers = []any{ (*Transformation_TransformationTemplate)(nil), (*Transformation_HeaderBodyTransform)(nil), (*Transformation_TransformerConfig)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[6].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[6].OneofWrappers = []any{ (*Extraction_Header)(nil), (*Extraction_Body)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[7].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[7].OneofWrappers = []any{ (*TransformationTemplate_Body)(nil), (*TransformationTemplate_Passthrough)(nil), (*TransformationTemplate_MergeExtractorsToBody)(nil), (*TransformationTemplate_MergeJsonKeys)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[14].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_transformation_proto_msgTypes[14].OneofWrappers = []any{ (*RouteTransformations_RouteTransformation_RequestMatch_)(nil), (*RouteTransformations_RouteTransformation_ResponseMatch_)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/transformation_ee/transformation.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/transformation_ee/transformation.pb.go index d923d98a8..89f206adf 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/transformation_ee/transformation.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/transformation_ee/transformation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/transformation_ee/transformation.proto @@ -37,11 +37,9 @@ type FilterTransformations struct { func (x *FilterTransformations) Reset() { *x = FilterTransformations{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FilterTransformations) String() string { @@ -52,7 +50,7 @@ func (*FilterTransformations) ProtoMessage() {} func (x *FilterTransformations) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -96,11 +94,9 @@ type TransformationRule struct { func (x *TransformationRule) Reset() { *x = TransformationRule{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationRule) String() string { @@ -111,7 +107,7 @@ func (*TransformationRule) ProtoMessage() {} func (x *TransformationRule) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -163,11 +159,9 @@ type RouteTransformations struct { func (x *RouteTransformations) Reset() { *x = RouteTransformations{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTransformations) String() string { @@ -178,7 +172,7 @@ func (*RouteTransformations) ProtoMessage() {} func (x *RouteTransformations) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -236,11 +230,9 @@ type Transformation struct { func (x *Transformation) Reset() { *x = Transformation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Transformation) String() string { @@ -251,7 +243,7 @@ func (*Transformation) ProtoMessage() {} func (x *Transformation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -307,11 +299,9 @@ type DlpTransformation struct { func (x *DlpTransformation) Reset() { *x = DlpTransformation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DlpTransformation) String() string { @@ -322,7 +312,7 @@ func (*DlpTransformation) ProtoMessage() {} func (x *DlpTransformation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -395,11 +385,9 @@ type Action struct { func (x *Action) Reset() { *x = Action{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action) String() string { @@ -410,7 +398,7 @@ func (*Action) ProtoMessage() {} func (x *Action) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -489,11 +477,9 @@ type RegexAction struct { func (x *RegexAction) Reset() { *x = RegexAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RegexAction) String() string { @@ -504,7 +490,7 @@ func (*RegexAction) ProtoMessage() {} func (x *RegexAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -546,11 +532,9 @@ type Action_RegexMatcher struct { func (x *Action_RegexMatcher) Reset() { *x = Action_RegexMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_RegexMatcher) String() string { @@ -561,7 +545,7 @@ func (*Action_RegexMatcher) ProtoMessage() {} func (x *Action_RegexMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -597,11 +581,9 @@ type Action_KeyValueMatcher struct { func (x *Action_KeyValueMatcher) Reset() { *x = Action_KeyValueMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_KeyValueMatcher) String() string { @@ -612,7 +594,7 @@ func (*Action_KeyValueMatcher) ProtoMessage() {} func (x *Action_KeyValueMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -648,11 +630,9 @@ type Action_DlpMatcher struct { func (x *Action_DlpMatcher) Reset() { *x = Action_DlpMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_DlpMatcher) String() string { @@ -663,7 +643,7 @@ func (*Action_DlpMatcher) ProtoMessage() {} func (x *Action_DlpMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -902,7 +882,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_t } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes = make([]protoimpl.MessageInfo, 10) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_goTypes = []any{ (*FilterTransformations)(nil), // 0: envoy.config.filter.http.transformation_ee.v2.FilterTransformations (*TransformationRule)(nil), // 1: envoy.config.filter.http.transformation_ee.v2.TransformationRule (*RouteTransformations)(nil), // 2: envoy.config.filter.http.transformation_ee.v2.RouteTransformations @@ -947,132 +927,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_t if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FilterTransformations); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationRule); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTransformations); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Transformation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DlpTransformation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RegexAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_RegexMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_KeyValueMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_DlpMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[3].OneofWrappers = []any{ (*Transformation_DlpTransformation)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[9].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformation_ee_transformation_proto_msgTypes[9].OneofWrappers = []any{ (*Action_DlpMatcher_RegexMatcher)(nil), (*Action_DlpMatcher_KeyValueMatcher)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/transformers/xslt/xslt_transformer.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/transformers/xslt/xslt_transformer.pb.go index 5bd5480f0..25740ade3 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/transformers/xslt/xslt_transformer.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/transformers/xslt/xslt_transformer.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/transformers/xslt/xslt_transformer.proto @@ -46,11 +46,9 @@ type XsltTransformation struct { func (x *XsltTransformation) Reset() { *x = XsltTransformation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformers_xslt_xslt_transformer_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformers_xslt_xslt_transformer_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *XsltTransformation) String() string { @@ -61,7 +59,7 @@ func (*XsltTransformation) ProtoMessage() {} func (x *XsltTransformation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformers_xslt_xslt_transformer_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -144,7 +142,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_t } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformers_xslt_xslt_transformer_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformers_xslt_xslt_transformer_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformers_xslt_xslt_transformer_proto_goTypes = []any{ (*XsltTransformation)(nil), // 0: envoy.config.transformer.xslt.v2.XsltTransformation } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformers_xslt_xslt_transformer_proto_depIdxs = []int32{ @@ -162,20 +160,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_t if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformers_xslt_xslt_transformer_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_transformers_xslt_xslt_transformer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*XsltTransformation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/upstream_wait/upstream_wait_filter.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/upstream_wait/upstream_wait_filter.pb.go index 4e7a0c022..ed233e5af 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/upstream_wait/upstream_wait_filter.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/upstream_wait/upstream_wait_filter.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/upstream_wait/upstream_wait_filter.proto @@ -29,11 +29,9 @@ type UpstreamWaitFilterConfig struct { func (x *UpstreamWaitFilterConfig) Reset() { *x = UpstreamWaitFilterConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_upstream_wait_upstream_wait_filter_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_upstream_wait_upstream_wait_filter_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamWaitFilterConfig) String() string { @@ -44,7 +42,7 @@ func (*UpstreamWaitFilterConfig) ProtoMessage() {} func (x *UpstreamWaitFilterConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_upstream_wait_upstream_wait_filter_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -100,7 +98,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_u } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_upstream_wait_upstream_wait_filter_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_upstream_wait_upstream_wait_filter_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_upstream_wait_upstream_wait_filter_proto_goTypes = []any{ (*UpstreamWaitFilterConfig)(nil), // 0: envoy.config.filter.http.upstream_wait.v2.UpstreamWaitFilterConfig } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_upstream_wait_upstream_wait_filter_proto_depIdxs = []int32{ @@ -118,20 +116,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_u if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_upstream_wait_upstream_wait_filter_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_upstream_wait_upstream_wait_filter_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamWaitFilterConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/waf/waf.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/waf/waf.pb.go index fac8fe697..d72b8530b 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/waf/waf.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/waf/waf.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/waf/waf.proto @@ -140,11 +140,9 @@ type AuditLogging struct { func (x *AuditLogging) Reset() { *x = AuditLogging{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AuditLogging) String() string { @@ -155,7 +153,7 @@ func (*AuditLogging) ProtoMessage() {} func (x *AuditLogging) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -210,11 +208,9 @@ type ModSecurity struct { func (x *ModSecurity) Reset() { *x = ModSecurity{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ModSecurity) String() string { @@ -225,7 +221,7 @@ func (*ModSecurity) ProtoMessage() {} func (x *ModSecurity) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -314,11 +310,9 @@ type RuleSet struct { func (x *RuleSet) Reset() { *x = RuleSet{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RuleSet) String() string { @@ -329,7 +323,7 @@ func (*RuleSet) ProtoMessage() {} func (x *RuleSet) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -387,11 +381,9 @@ type ModSecurityPerRoute struct { func (x *ModSecurityPerRoute) Reset() { *x = ModSecurityPerRoute{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ModSecurityPerRoute) String() string { @@ -402,7 +394,7 @@ func (*ModSecurityPerRoute) ProtoMessage() {} func (x *ModSecurityPerRoute) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -599,7 +591,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_w var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_goTypes = []any{ (AuditLogging_AuditLogAction)(0), // 0: envoy.config.filter.http.modsecurity.v2.AuditLogging.AuditLogAction (AuditLogging_AuditLogLocation)(0), // 1: envoy.config.filter.http.modsecurity.v2.AuditLogging.AuditLogLocation (*AuditLogging)(nil), // 2: envoy.config.filter.http.modsecurity.v2.AuditLogging @@ -631,56 +623,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_w if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AuditLogging); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ModSecurity); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RuleSet); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_waf_waf_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ModSecurityPerRoute); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/wasm/v3/wasm.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/extensions/wasm/v3/wasm.pb.clone.go index 58059b935..c9ba154f5 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/wasm/v3/wasm.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/wasm/v3/wasm.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" + + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" ) // ensure the imports are used @@ -48,9 +48,9 @@ func (m *VmConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetConfiguration()).(clone.Cloner); ok { - target.Configuration = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.Configuration = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.Configuration = proto.Clone(m.GetConfiguration()).(*github_com_golang_protobuf_ptypes_any.Any) + target.Configuration = proto.Clone(m.GetConfiguration()).(*google_golang_org_protobuf_types_known_anypb.Any) } target.AllowPrecompiled = m.GetAllowPrecompiled() @@ -73,9 +73,9 @@ func (m *PluginConfig) Clone() proto.Message { target.RootId = m.GetRootId() if h, ok := interface{}(m.GetConfiguration()).(clone.Cloner); ok { - target.Configuration = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.Configuration = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.Configuration = proto.Clone(m.GetConfiguration()).(*github_com_golang_protobuf_ptypes_any.Any) + target.Configuration = proto.Clone(m.GetConfiguration()).(*google_golang_org_protobuf_types_known_anypb.Any) } target.FailOpen = m.GetFailOpen() diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/wasm/v3/wasm.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/wasm/v3/wasm.pb.go index 9c3ae03e8..4d5dde530 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/wasm/v3/wasm.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/wasm/v3/wasm.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/wasm/v3/wasm.proto @@ -13,11 +13,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" ) const ( @@ -48,7 +48,7 @@ type VmConfig struct { // (proxy_on_start). `google.protobuf.Struct` is serialized as JSON before // passing it to the plugin. `google.protobuf.BytesValue` and // `google.protobuf.StringValue` are passed directly without the wrapper. - Configuration *any1.Any `protobuf:"bytes,4,opt,name=configuration,proto3" json:"configuration,omitempty"` + Configuration *anypb.Any `protobuf:"bytes,4,opt,name=configuration,proto3" json:"configuration,omitempty"` // Allow the wasm file to include pre-compiled code on VMs which support it. // Warning: this should only be enable for trusted sources as the precompiled code is not // verified. @@ -61,11 +61,9 @@ type VmConfig struct { func (x *VmConfig) Reset() { *x = VmConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VmConfig) String() string { @@ -76,7 +74,7 @@ func (*VmConfig) ProtoMessage() {} func (x *VmConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -112,7 +110,7 @@ func (x *VmConfig) GetCode() *v3.AsyncDataSource { return nil } -func (x *VmConfig) GetConfiguration() *any1.Any { +func (x *VmConfig) GetConfiguration() *anypb.Any { if x != nil { return x.Configuration } @@ -159,7 +157,7 @@ type PluginConfig struct { // `google.protobuf.Struct` is serialized as JSON before // passing it to the plugin. `google.protobuf.BytesValue` and // `google.protobuf.StringValue` are passed directly without the wrapper. - Configuration *any1.Any `protobuf:"bytes,4,opt,name=configuration,proto3" json:"configuration,omitempty"` + Configuration *anypb.Any `protobuf:"bytes,4,opt,name=configuration,proto3" json:"configuration,omitempty"` // If there is a fatal error on the VM (e.g. exception, abort(), on_start or on_configure return false), // then all plugins associated with the VM will either fail closed (by default), e.g. by returning an HTTP 503 error, // or fail open (if 'fail_open' is set to true) by bypassing the filter. Note: when on_start or on_configure return false @@ -170,11 +168,9 @@ type PluginConfig struct { func (x *PluginConfig) Reset() { *x = PluginConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PluginConfig) String() string { @@ -185,7 +181,7 @@ func (*PluginConfig) ProtoMessage() {} func (x *PluginConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -228,7 +224,7 @@ func (x *PluginConfig) GetVmConfig() *VmConfig { return nil } -func (x *PluginConfig) GetConfiguration() *any1.Any { +func (x *PluginConfig) GetConfiguration() *anypb.Any { if x != nil { return x.Configuration } @@ -268,11 +264,9 @@ type WasmService struct { func (x *WasmService) Reset() { *x = WasmService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *WasmService) String() string { @@ -283,7 +277,7 @@ func (*WasmService) ProtoMessage() {} func (x *WasmService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -398,12 +392,12 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_w } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_goTypes = []any{ (*VmConfig)(nil), // 0: solo.io.envoy.extensions.wasm.v3.VmConfig (*PluginConfig)(nil), // 1: solo.io.envoy.extensions.wasm.v3.PluginConfig (*WasmService)(nil), // 2: solo.io.envoy.extensions.wasm.v3.WasmService (*v3.AsyncDataSource)(nil), // 3: solo.io.envoy.config.core.v3.AsyncDataSource - (*any1.Any)(nil), // 4: google.protobuf.Any + (*anypb.Any)(nil), // 4: google.protobuf.Any } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_depIdxs = []int32{ 3, // 0: solo.io.envoy.extensions.wasm.v3.VmConfig.code:type_name -> solo.io.envoy.config.core.v3.AsyncDataSource @@ -425,45 +419,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_w if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VmConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PluginConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WasmService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_wasm_v3_wasm_proto_msgTypes[1].OneofWrappers = []any{ (*PluginConfig_VmConfig)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/external/envoy/extensions/xff_offset/solo_xff_offset_filter.pb.go b/pkg/api/gloo.solo.io/external/envoy/extensions/xff_offset/solo_xff_offset_filter.pb.go index f0f4bebaf..319aafa6e 100644 --- a/pkg/api/gloo.solo.io/external/envoy/extensions/xff_offset/solo_xff_offset_filter.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/extensions/xff_offset/solo_xff_offset_filter.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/xff_offset/solo_xff_offset_filter.proto @@ -34,11 +34,9 @@ type SoloXffOffset struct { func (x *SoloXffOffset) Reset() { *x = SoloXffOffset{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_xff_offset_solo_xff_offset_filter_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_xff_offset_solo_xff_offset_filter_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SoloXffOffset) String() string { @@ -49,7 +47,7 @@ func (*SoloXffOffset) ProtoMessage() {} func (x *SoloXffOffset) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_xff_offset_solo_xff_offset_filter_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -113,7 +111,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_x } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_xff_offset_solo_xff_offset_filter_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_xff_offset_solo_xff_offset_filter_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_xff_offset_solo_xff_offset_filter_proto_goTypes = []any{ (*SoloXffOffset)(nil), // 0: envoy.config.filter.http.solo_xff_offset.v2.SoloXffOffset } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_xff_offset_solo_xff_offset_filter_proto_depIdxs = []int32{ @@ -131,20 +129,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_x if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_xff_offset_solo_xff_offset_filter_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_extensions_xff_offset_solo_xff_offset_filter_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SoloXffOffset); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/service/ext_proc/v3/external_processor.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/service/ext_proc/v3/external_processor.pb.clone.go index 7a3f24ed0..a891a91e7 100644 --- a/pkg/api/gloo.solo.io/external/envoy/service/ext_proc/v3/external_processor.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/service/ext_proc/v3/external_processor.pb.clone.go @@ -13,15 +13,15 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_extensions_filters_http_ext_proc_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/ext_proc/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/v3" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" ) // ensure the imports are used @@ -50,13 +50,13 @@ func (m *ProcessingRequest) Clone() proto.Message { } if m.GetAttributes() != nil { - target.Attributes = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetAttributes())) + target.Attributes = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetAttributes())) for k, v := range m.GetAttributes() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.Attributes[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Attributes[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Attributes[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Attributes[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } @@ -152,9 +152,9 @@ func (m *ProcessingResponse) Clone() proto.Message { target = &ProcessingResponse{} if h, ok := interface{}(m.GetDynamicMetadata()).(clone.Cloner); ok { - target.DynamicMetadata = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.DynamicMetadata = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.DynamicMetadata = proto.Clone(m.GetDynamicMetadata()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.DynamicMetadata = proto.Clone(m.GetDynamicMetadata()).(*google_golang_org_protobuf_types_known_structpb.Struct) } if h, ok := interface{}(m.GetModeOverride()).(clone.Cloner); ok { @@ -164,9 +164,9 @@ func (m *ProcessingResponse) Clone() proto.Message { } if h, ok := interface{}(m.GetOverrideMessageTimeout()).(clone.Cloner); ok { - target.OverrideMessageTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.OverrideMessageTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.OverrideMessageTimeout = proto.Clone(m.GetOverrideMessageTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.OverrideMessageTimeout = proto.Clone(m.GetOverrideMessageTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } switch m.Response.(type) { @@ -275,13 +275,13 @@ func (m *HttpHeaders) Clone() proto.Message { } if m.GetAttributes() != nil { - target.Attributes = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetAttributes())) + target.Attributes = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetAttributes())) for k, v := range m.GetAttributes() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.Attributes[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Attributes[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Attributes[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Attributes[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } diff --git a/pkg/api/gloo.solo.io/external/envoy/service/ext_proc/v3/external_processor.pb.go b/pkg/api/gloo.solo.io/external/envoy/service/ext_proc/v3/external_processor.pb.go index 76a9a6d52..c9be2a2ad 100644 --- a/pkg/api/gloo.solo.io/external/envoy/service/ext_proc/v3/external_processor.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/service/ext_proc/v3/external_processor.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/service/ext_proc/v3/external_processor.proto @@ -12,8 +12,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/annotations" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" @@ -25,6 +23,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" ) const ( @@ -122,7 +122,7 @@ type ProcessingRequest struct { // or `response_attributes` list in the configuration. Each entry // in the list is populated from the standard // attributes supported across Envoy. - Attributes map[string]*_struct.Struct `protobuf:"bytes,9,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Attributes map[string]*structpb.Struct `protobuf:"bytes,9,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Specify whether the filter that sent this request is running in :ref:`observability_mode // ` // and defaults to false. @@ -138,11 +138,9 @@ type ProcessingRequest struct { func (x *ProcessingRequest) Reset() { *x = ProcessingRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProcessingRequest) String() string { @@ -153,7 +151,7 @@ func (*ProcessingRequest) ProtoMessage() {} func (x *ProcessingRequest) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -224,7 +222,7 @@ func (x *ProcessingRequest) GetMetadataContext() *v3.Metadata { return nil } -func (x *ProcessingRequest) GetAttributes() map[string]*_struct.Struct { +func (x *ProcessingRequest) GetAttributes() map[string]*structpb.Struct { if x != nil { return x.Attributes } @@ -319,7 +317,7 @@ type ProcessingResponse struct { // Optional metadata that will be emitted as dynamic metadata to be consumed by // following filters. This metadata will be placed in the namespace(s) specified by the top-level // field name(s) of the struct. - DynamicMetadata *_struct.Struct `protobuf:"bytes,8,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` + DynamicMetadata *structpb.Struct `protobuf:"bytes,8,opt,name=dynamic_metadata,json=dynamicMetadata,proto3" json:"dynamic_metadata,omitempty"` // Override how parts of the HTTP request and response are processed // for the duration of this particular request/response only. Servers // may use this to intelligently control how requests are processed @@ -344,16 +342,14 @@ type ProcessingResponse struct { // :ref:`max_message_timeout ` // Such message can be sent at most once in a particular Envoy ext_proc filter processing state. // To enable this API, one has to set `max_message_timeout` to a number >= 1ms. - OverrideMessageTimeout *duration.Duration `protobuf:"bytes,10,opt,name=override_message_timeout,json=overrideMessageTimeout,proto3" json:"override_message_timeout,omitempty"` + OverrideMessageTimeout *durationpb.Duration `protobuf:"bytes,10,opt,name=override_message_timeout,json=overrideMessageTimeout,proto3" json:"override_message_timeout,omitempty"` } func (x *ProcessingResponse) Reset() { *x = ProcessingResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProcessingResponse) String() string { @@ -364,7 +360,7 @@ func (*ProcessingResponse) ProtoMessage() {} func (x *ProcessingResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -435,7 +431,7 @@ func (x *ProcessingResponse) GetImmediateResponse() *ImmediateResponse { return nil } -func (x *ProcessingResponse) GetDynamicMetadata() *_struct.Struct { +func (x *ProcessingResponse) GetDynamicMetadata() *structpb.Struct { if x != nil { return x.DynamicMetadata } @@ -449,7 +445,7 @@ func (x *ProcessingResponse) GetModeOverride() *v31.ProcessingMode { return nil } -func (x *ProcessingResponse) GetOverrideMessageTimeout() *duration.Duration { +func (x *ProcessingResponse) GetOverrideMessageTimeout() *durationpb.Duration { if x != nil { return x.OverrideMessageTimeout } @@ -543,7 +539,7 @@ type HttpHeaders struct { // field. // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/service/ext_proc/v3/external_processor.proto. - Attributes map[string]*_struct.Struct `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Attributes map[string]*structpb.Struct `protobuf:"bytes,2,rep,name=attributes,proto3" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // If true, then there is no message body associated with this // request or response. EndOfStream bool `protobuf:"varint,3,opt,name=end_of_stream,json=endOfStream,proto3" json:"end_of_stream,omitempty"` @@ -551,11 +547,9 @@ type HttpHeaders struct { func (x *HttpHeaders) Reset() { *x = HttpHeaders{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpHeaders) String() string { @@ -566,7 +560,7 @@ func (*HttpHeaders) ProtoMessage() {} func (x *HttpHeaders) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -589,7 +583,7 @@ func (x *HttpHeaders) GetHeaders() *v3.HeaderMap { } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/service/ext_proc/v3/external_processor.proto. -func (x *HttpHeaders) GetAttributes() map[string]*_struct.Struct { +func (x *HttpHeaders) GetAttributes() map[string]*structpb.Struct { if x != nil { return x.Attributes } @@ -615,11 +609,9 @@ type HttpBody struct { func (x *HttpBody) Reset() { *x = HttpBody{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpBody) String() string { @@ -630,7 +622,7 @@ func (*HttpBody) ProtoMessage() {} func (x *HttpBody) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -676,11 +668,9 @@ type HttpTrailers struct { func (x *HttpTrailers) Reset() { *x = HttpTrailers{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpTrailers) String() string { @@ -691,7 +681,7 @@ func (*HttpTrailers) ProtoMessage() {} func (x *HttpTrailers) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -724,11 +714,9 @@ type HeadersResponse struct { func (x *HeadersResponse) Reset() { *x = HeadersResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeadersResponse) String() string { @@ -739,7 +727,7 @@ func (*HeadersResponse) ProtoMessage() {} func (x *HeadersResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -773,11 +761,9 @@ type TrailersResponse struct { func (x *TrailersResponse) Reset() { *x = TrailersResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TrailersResponse) String() string { @@ -788,7 +774,7 @@ func (*TrailersResponse) ProtoMessage() {} func (x *TrailersResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -821,11 +807,9 @@ type BodyResponse struct { func (x *BodyResponse) Reset() { *x = BodyResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BodyResponse) String() string { @@ -836,7 +820,7 @@ func (*BodyResponse) ProtoMessage() {} func (x *BodyResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -900,11 +884,9 @@ type CommonResponse struct { func (x *CommonResponse) Reset() { *x = CommonResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CommonResponse) String() string { @@ -915,7 +897,7 @@ func (*CommonResponse) ProtoMessage() {} func (x *CommonResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -994,11 +976,9 @@ type ImmediateResponse struct { func (x *ImmediateResponse) Reset() { *x = ImmediateResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ImmediateResponse) String() string { @@ -1009,7 +989,7 @@ func (*ImmediateResponse) ProtoMessage() {} func (x *ImmediateResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1071,11 +1051,9 @@ type GrpcStatus struct { func (x *GrpcStatus) Reset() { *x = GrpcStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcStatus) String() string { @@ -1086,7 +1064,7 @@ func (*GrpcStatus) ProtoMessage() {} func (x *GrpcStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1132,11 +1110,9 @@ type HeaderMutation struct { func (x *HeaderMutation) Reset() { *x = HeaderMutation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderMutation) String() string { @@ -1147,7 +1123,7 @@ func (*HeaderMutation) ProtoMessage() {} func (x *HeaderMutation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1192,11 +1168,9 @@ type BodyMutation struct { func (x *BodyMutation) Reset() { *x = BodyMutation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BodyMutation) String() string { @@ -1207,7 +1181,7 @@ func (*BodyMutation) ProtoMessage() {} func (x *BodyMutation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1569,7 +1543,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes = make([]protoimpl.MessageInfo, 15) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_goTypes = []any{ (CommonResponse_ResponseStatus)(0), // 0: solo.io.envoy.service.ext_proc.v3.CommonResponse.ResponseStatus (*ProcessingRequest)(nil), // 1: solo.io.envoy.service.ext_proc.v3.ProcessingRequest (*ProcessingResponse)(nil), // 2: solo.io.envoy.service.ext_proc.v3.ProcessingResponse @@ -1587,9 +1561,9 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_p nil, // 14: solo.io.envoy.service.ext_proc.v3.ProcessingRequest.AttributesEntry nil, // 15: solo.io.envoy.service.ext_proc.v3.HttpHeaders.AttributesEntry (*v3.Metadata)(nil), // 16: solo.io.envoy.config.core.v3.Metadata - (*_struct.Struct)(nil), // 17: google.protobuf.Struct + (*structpb.Struct)(nil), // 17: google.protobuf.Struct (*v31.ProcessingMode)(nil), // 18: solo.io.envoy.extensions.filters.http.ext_proc.v3.ProcessingMode - (*duration.Duration)(nil), // 19: google.protobuf.Duration + (*durationpb.Duration)(nil), // 19: google.protobuf.Duration (*v3.HeaderMap)(nil), // 20: solo.io.envoy.config.core.v3.HeaderMap (*v32.HttpStatus)(nil), // 21: solo.io.envoy.type.v3.HttpStatus (*v3.HeaderValueOption)(nil), // 22: solo.io.envoy.config.core.v3.HeaderValueOption @@ -1645,165 +1619,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProcessingRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProcessingResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpHeaders); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpBody); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpTrailers); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeadersResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TrailersResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BodyResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CommonResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImmediateResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderMutation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BodyMutation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[0].OneofWrappers = []any{ (*ProcessingRequest_RequestHeaders)(nil), (*ProcessingRequest_ResponseHeaders)(nil), (*ProcessingRequest_RequestBody)(nil), @@ -1811,7 +1627,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_ (*ProcessingRequest_RequestTrailers)(nil), (*ProcessingRequest_ResponseTrailers)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[1].OneofWrappers = []any{ (*ProcessingResponse_RequestHeaders)(nil), (*ProcessingResponse_ResponseHeaders)(nil), (*ProcessingResponse_RequestBody)(nil), @@ -1820,7 +1636,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_ (*ProcessingResponse_ResponseTrailers)(nil), (*ProcessingResponse_ImmediateResponse)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[12].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_service_ext_proc_v3_external_processor_proto_msgTypes[12].OneofWrappers = []any{ (*BodyMutation_Body)(nil), (*BodyMutation_ClearBody)(nil), } diff --git a/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/regex.pb.clone.go b/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/regex.pb.clone.go index 0fee62bc1..70df92fa8 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/regex.pb.clone.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/regex.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -84,9 +84,9 @@ func (m *RegexMatcher_GoogleRE2) Clone() proto.Message { target = &RegexMatcher_GoogleRE2{} if h, ok := interface{}(m.GetMaxProgramSize()).(clone.Cloner); ok { - target.MaxProgramSize = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxProgramSize = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxProgramSize = proto.Clone(m.GetMaxProgramSize()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxProgramSize = proto.Clone(m.GetMaxProgramSize()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/regex.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/regex.pb.go index 46ec06403..2e5f2f52f 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/regex.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/regex.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/matcher/v3/regex.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -41,11 +41,9 @@ type RegexMatcher struct { func (x *RegexMatcher) Reset() { *x = RegexMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RegexMatcher) String() string { @@ -56,7 +54,7 @@ func (*RegexMatcher) ProtoMessage() {} func (x *RegexMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -133,11 +131,9 @@ type RegexMatchAndSubstitute struct { func (x *RegexMatchAndSubstitute) Reset() { *x = RegexMatchAndSubstitute{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RegexMatchAndSubstitute) String() string { @@ -148,7 +144,7 @@ func (*RegexMatchAndSubstitute) ProtoMessage() {} func (x *RegexMatchAndSubstitute) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -204,16 +200,14 @@ type RegexMatcher_GoogleRE2 struct { // instead of being done by each individual client. // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/matcher/v3/regex.proto. - MaxProgramSize *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_program_size,json=maxProgramSize,proto3" json:"max_program_size,omitempty"` + MaxProgramSize *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_program_size,json=maxProgramSize,proto3" json:"max_program_size,omitempty"` } func (x *RegexMatcher_GoogleRE2) Reset() { *x = RegexMatcher_GoogleRE2{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RegexMatcher_GoogleRE2) String() string { @@ -224,7 +218,7 @@ func (*RegexMatcher_GoogleRE2) ProtoMessage() {} func (x *RegexMatcher_GoogleRE2) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -240,7 +234,7 @@ func (*RegexMatcher_GoogleRE2) Descriptor() ([]byte, []int) { } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/matcher/v3/regex.proto. -func (x *RegexMatcher_GoogleRE2) GetMaxProgramSize() *wrappers.UInt32Value { +func (x *RegexMatcher_GoogleRE2) GetMaxProgramSize() *wrapperspb.UInt32Value { if x != nil { return x.MaxProgramSize } @@ -327,11 +321,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_goTypes = []any{ (*RegexMatcher)(nil), // 0: solo.io.envoy.type.matcher.v3.RegexMatcher (*RegexMatchAndSubstitute)(nil), // 1: solo.io.envoy.type.matcher.v3.RegexMatchAndSubstitute (*RegexMatcher_GoogleRE2)(nil), // 2: solo.io.envoy.type.matcher.v3.RegexMatcher.GoogleRE2 - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_depIdxs = []int32{ 2, // 0: solo.io.envoy.type.matcher.v3.RegexMatcher.google_re2:type_name -> solo.io.envoy.type.matcher.v3.RegexMatcher.GoogleRE2 @@ -351,45 +345,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RegexMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RegexMatchAndSubstitute); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RegexMatcher_GoogleRE2); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_msgTypes[0].OneofWrappers = []any{ (*RegexMatcher_GoogleRe2)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/string.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/string.pb.go index 0cc5c7f15..4d1530552 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/string.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3/string.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/matcher/v3/string.proto @@ -47,11 +47,9 @@ type StringMatcher struct { func (x *StringMatcher) Reset() { *x = StringMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StringMatcher) String() string { @@ -62,7 +60,7 @@ func (*StringMatcher) ProtoMessage() {} func (x *StringMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -176,11 +174,9 @@ type ListStringMatcher struct { func (x *ListStringMatcher) Reset() { *x = ListStringMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListStringMatcher) String() string { @@ -191,7 +187,7 @@ func (*ListStringMatcher) ProtoMessage() {} func (x *ListStringMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -293,7 +289,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_goTypes = []any{ (*StringMatcher)(nil), // 0: solo.io.envoy.type.matcher.v3.StringMatcher (*ListStringMatcher)(nil), // 1: solo.io.envoy.type.matcher.v3.ListStringMatcher (*RegexMatcher)(nil), // 2: solo.io.envoy.type.matcher.v3.RegexMatcher @@ -316,33 +312,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher return } file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_regex_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StringMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListStringMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_matcher_v3_string_proto_msgTypes[0].OneofWrappers = []any{ (*StringMatcher_Exact)(nil), (*StringMatcher_Prefix)(nil), (*StringMatcher_Suffix)(nil), diff --git a/pkg/api/gloo.solo.io/external/envoy/type/metadata/v3/metadata.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/metadata/v3/metadata.pb.go index 6f0b9a224..5556ef5a4 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/metadata/v3/metadata.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/metadata/v3/metadata.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/metadata/v3/metadata.proto @@ -65,11 +65,9 @@ type MetadataKey struct { func (x *MetadataKey) Reset() { *x = MetadataKey{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetadataKey) String() string { @@ -80,7 +78,7 @@ func (*MetadataKey) ProtoMessage() {} func (x *MetadataKey) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -126,11 +124,9 @@ type MetadataKind struct { func (x *MetadataKind) Reset() { *x = MetadataKind{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetadataKind) String() string { @@ -141,7 +137,7 @@ func (*MetadataKind) ProtoMessage() {} func (x *MetadataKind) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -238,11 +234,9 @@ type MetadataKey_PathSegment struct { func (x *MetadataKey_PathSegment) Reset() { *x = MetadataKey_PathSegment{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetadataKey_PathSegment) String() string { @@ -253,7 +247,7 @@ func (*MetadataKey_PathSegment) ProtoMessage() {} func (x *MetadataKey_PathSegment) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -302,11 +296,9 @@ type MetadataKind_Request struct { func (x *MetadataKind_Request) Reset() { *x = MetadataKind_Request{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetadataKind_Request) String() string { @@ -317,7 +309,7 @@ func (*MetadataKind_Request) ProtoMessage() {} func (x *MetadataKind_Request) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -341,11 +333,9 @@ type MetadataKind_Route struct { func (x *MetadataKind_Route) Reset() { *x = MetadataKind_Route{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetadataKind_Route) String() string { @@ -356,7 +346,7 @@ func (*MetadataKind_Route) ProtoMessage() {} func (x *MetadataKind_Route) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -380,11 +370,9 @@ type MetadataKind_Cluster struct { func (x *MetadataKind_Cluster) Reset() { *x = MetadataKind_Cluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetadataKind_Cluster) String() string { @@ -395,7 +383,7 @@ func (*MetadataKind_Cluster) ProtoMessage() {} func (x *MetadataKind_Cluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -420,11 +408,9 @@ type MetadataKind_Host struct { func (x *MetadataKind_Host) Reset() { *x = MetadataKind_Host{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetadataKind_Host) String() string { @@ -435,7 +421,7 @@ func (*MetadataKind_Host) ProtoMessage() {} func (x *MetadataKind_Host) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -552,7 +538,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadat } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_goTypes = []any{ (*MetadataKey)(nil), // 0: solo.io.envoy.type.metadata.v3.MetadataKey (*MetadataKind)(nil), // 1: solo.io.envoy.type.metadata.v3.MetadataKind (*MetadataKey_PathSegment)(nil), // 2: solo.io.envoy.type.metadata.v3.MetadataKey.PathSegment @@ -581,99 +567,13 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadat if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetadataKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetadataKind); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetadataKey_PathSegment); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetadataKind_Request); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetadataKind_Route); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetadataKind_Cluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetadataKind_Host); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[1].OneofWrappers = []any{ (*MetadataKind_Request_)(nil), (*MetadataKind_Route_)(nil), (*MetadataKind_Cluster_)(nil), (*MetadataKind_Host_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_metadata_v3_metadata_proto_msgTypes[2].OneofWrappers = []any{ (*MetadataKey_PathSegment_Key)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/external/envoy/type/range.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/range.pb.go index 301715e56..7324cac60 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/range.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/range.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/range.proto @@ -37,11 +37,9 @@ type Int64Range struct { func (x *Int64Range) Reset() { *x = Int64Range{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Int64Range) String() string { @@ -52,7 +50,7 @@ func (*Int64Range) ProtoMessage() {} func (x *Int64Range) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -96,11 +94,9 @@ type DoubleRange struct { func (x *DoubleRange) Reset() { *x = DoubleRange{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DoubleRange) String() string { @@ -111,7 +107,7 @@ func (*DoubleRange) ProtoMessage() {} func (x *DoubleRange) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -181,7 +177,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_p } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_goTypes = []any{ (*Int64Range)(nil), // 0: solo.io.envoy.type.Int64Range (*DoubleRange)(nil), // 1: solo.io.envoy.type.DoubleRange } @@ -198,32 +194,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_p if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Int64Range); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_range_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DoubleRange); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/type/tracing/v3/custom_tag.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/tracing/v3/custom_tag.pb.go index 161a87cc1..a85253175 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/tracing/v3/custom_tag.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/tracing/v3/custom_tag.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/tracing/v3/custom_tag.proto @@ -47,11 +47,9 @@ type CustomTag struct { func (x *CustomTag) Reset() { *x = CustomTag{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CustomTag) String() string { @@ -62,7 +60,7 @@ func (*CustomTag) ProtoMessage() {} func (x *CustomTag) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -163,11 +161,9 @@ type CustomTag_Literal struct { func (x *CustomTag_Literal) Reset() { *x = CustomTag_Literal{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CustomTag_Literal) String() string { @@ -178,7 +174,7 @@ func (*CustomTag_Literal) ProtoMessage() {} func (x *CustomTag_Literal) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -216,11 +212,9 @@ type CustomTag_Environment struct { func (x *CustomTag_Environment) Reset() { *x = CustomTag_Environment{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CustomTag_Environment) String() string { @@ -231,7 +225,7 @@ func (*CustomTag_Environment) ProtoMessage() {} func (x *CustomTag_Environment) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -276,11 +270,9 @@ type CustomTag_Header struct { func (x *CustomTag_Header) Reset() { *x = CustomTag_Header{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CustomTag_Header) String() string { @@ -291,7 +283,7 @@ func (*CustomTag_Header) ProtoMessage() {} func (x *CustomTag_Header) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -342,11 +334,9 @@ type CustomTag_Metadata struct { func (x *CustomTag_Metadata) Reset() { *x = CustomTag_Metadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CustomTag_Metadata) String() string { @@ -357,7 +347,7 @@ func (*CustomTag_Metadata) ProtoMessage() {} func (x *CustomTag_Metadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -508,7 +498,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_goTypes = []any{ (*CustomTag)(nil), // 0: solo.io.envoy.type.tracing.v3.CustomTag (*CustomTag_Literal)(nil), // 1: solo.io.envoy.type.tracing.v3.CustomTag.Literal (*CustomTag_Environment)(nil), // 2: solo.io.envoy.type.tracing.v3.CustomTag.Environment @@ -538,69 +528,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CustomTag); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CustomTag_Literal); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CustomTag_Environment); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CustomTag_Header); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CustomTag_Metadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_tracing_v3_custom_tag_proto_msgTypes[0].OneofWrappers = []any{ (*CustomTag_Literal_)(nil), (*CustomTag_Environment_)(nil), (*CustomTag_RequestHeader)(nil), diff --git a/pkg/api/gloo.solo.io/external/envoy/type/v3/http.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/v3/http.pb.go index 9286301f1..682f489b0 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/v3/http.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/v3/http.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/v3/http.proto @@ -116,7 +116,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_proto_goTypes = []any{ (CodecClientType)(0), // 0: solo.io.envoy.type.v3.CodecClientType } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_proto_depIdxs = []int32{ diff --git a/pkg/api/gloo.solo.io/external/envoy/type/v3/http_status.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/v3/http_status.pb.go index 5f1c3ec81..68c95fc25 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/v3/http_status.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/v3/http_status.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/v3/http_status.proto @@ -251,11 +251,9 @@ type HttpStatus struct { func (x *HttpStatus) Reset() { *x = HttpStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_status_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_status_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpStatus) String() string { @@ -266,7 +264,7 @@ func (*HttpStatus) ProtoMessage() {} func (x *HttpStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_status_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -413,7 +411,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_status_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_status_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_status_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_status_proto_goTypes = []any{ (StatusCode)(0), // 0: solo.io.envoy.type.v3.StatusCode (*HttpStatus)(nil), // 1: solo.io.envoy.type.v3.HttpStatus } @@ -433,20 +431,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_status_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_http_status_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/type/v3/percent.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/v3/percent.pb.go index 54a6fded7..0fdc1af41 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/v3/percent.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/v3/percent.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/v3/percent.proto @@ -94,11 +94,9 @@ type Percent struct { func (x *Percent) Reset() { *x = Percent{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Percent) String() string { @@ -109,7 +107,7 @@ func (*Percent) ProtoMessage() {} func (x *Percent) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -151,11 +149,9 @@ type FractionalPercent struct { func (x *FractionalPercent) Reset() { *x = FractionalPercent{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FractionalPercent) String() string { @@ -166,7 +162,7 @@ func (*FractionalPercent) ProtoMessage() {} func (x *FractionalPercent) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -260,7 +256,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_perc var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_goTypes = []any{ (FractionalPercent_DenominatorType)(0), // 0: solo.io.envoy.type.v3.FractionalPercent.DenominatorType (*Percent)(nil), // 1: solo.io.envoy.type.v3.Percent (*FractionalPercent)(nil), // 2: solo.io.envoy.type.v3.FractionalPercent @@ -281,32 +277,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_perc if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Percent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_percent_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FractionalPercent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/type/v3/range.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/v3/range.pb.go index 02681fea5..71fd5c153 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/v3/range.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/v3/range.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/v3/range.proto @@ -38,11 +38,9 @@ type Int64Range struct { func (x *Int64Range) Reset() { *x = Int64Range{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Int64Range) String() string { @@ -53,7 +51,7 @@ func (*Int64Range) ProtoMessage() {} func (x *Int64Range) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -97,11 +95,9 @@ type Int32Range struct { func (x *Int32Range) Reset() { *x = Int32Range{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Int32Range) String() string { @@ -112,7 +108,7 @@ func (*Int32Range) ProtoMessage() {} func (x *Int32Range) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -156,11 +152,9 @@ type DoubleRange struct { func (x *DoubleRange) Reset() { *x = DoubleRange{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DoubleRange) String() string { @@ -171,7 +165,7 @@ func (*DoubleRange) ProtoMessage() {} func (x *DoubleRange) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -257,7 +251,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_rang } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_goTypes = []any{ (*Int64Range)(nil), // 0: solo.io.envoy.type.v3.Int64Range (*Int32Range)(nil), // 1: solo.io.envoy.type.v3.Int32Range (*DoubleRange)(nil), // 2: solo.io.envoy.type.v3.DoubleRange @@ -277,44 +271,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_rang if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Int64Range); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Int32Range); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_range_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DoubleRange); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/envoy/type/v3/semantic_version.pb.go b/pkg/api/gloo.solo.io/external/envoy/type/v3/semantic_version.pb.go index cf125e7d4..e62b2a282 100644 --- a/pkg/api/gloo.solo.io/external/envoy/type/v3/semantic_version.pb.go +++ b/pkg/api/gloo.solo.io/external/envoy/type/v3/semantic_version.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/v3/semantic_version.proto @@ -38,11 +38,9 @@ type SemanticVersion struct { func (x *SemanticVersion) Reset() { *x = SemanticVersion{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_semantic_version_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_semantic_version_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SemanticVersion) String() string { @@ -53,7 +51,7 @@ func (*SemanticVersion) ProtoMessage() {} func (x *SemanticVersion) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_semantic_version_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -140,7 +138,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_sema } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_semantic_version_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_semantic_version_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_semantic_version_proto_goTypes = []any{ (*SemanticVersion)(nil), // 0: solo.io.envoy.type.v3.SemanticVersion } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_semantic_version_proto_depIdxs = []int32{ @@ -158,20 +156,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_sema if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_semantic_version_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_type_v3_semantic_version_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SemanticVersion); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/udpa/annotations/migrate.pb.go b/pkg/api/gloo.solo.io/external/udpa/annotations/migrate.pb.go index 8ceebc85e..bca2e283b 100644 --- a/pkg/api/gloo.solo.io/external/udpa/annotations/migrate.pb.go +++ b/pkg/api/gloo.solo.io/external/udpa/annotations/migrate.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/migrate.proto @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" ) const ( @@ -33,11 +33,9 @@ type MigrateAnnotation struct { func (x *MigrateAnnotation) Reset() { *x = MigrateAnnotation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MigrateAnnotation) String() string { @@ -48,7 +46,7 @@ func (*MigrateAnnotation) ProtoMessage() {} func (x *MigrateAnnotation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -85,11 +83,9 @@ type FieldMigrateAnnotation struct { func (x *FieldMigrateAnnotation) Reset() { *x = FieldMigrateAnnotation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FieldMigrateAnnotation) String() string { @@ -100,7 +96,7 @@ func (*FieldMigrateAnnotation) ProtoMessage() {} func (x *FieldMigrateAnnotation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -141,11 +137,9 @@ type FileMigrateAnnotation struct { func (x *FileMigrateAnnotation) Reset() { *x = FileMigrateAnnotation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FileMigrateAnnotation) String() string { @@ -156,7 +150,7 @@ func (*FileMigrateAnnotation) ProtoMessage() {} func (x *FileMigrateAnnotation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -180,7 +174,7 @@ func (x *FileMigrateAnnotation) GetMoveToPackage() string { var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*MigrateAnnotation)(nil), Field: 146192544, Name: "solo.io.udpa.annotations.message_migrate", @@ -188,7 +182,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_mi Filename: "github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/migrate.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*FieldMigrateAnnotation)(nil), Field: 146192544, Name: "solo.io.udpa.annotations.field_migrate", @@ -196,7 +190,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_mi Filename: "github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/migrate.proto", }, { - ExtendedType: (*descriptor.EnumOptions)(nil), + ExtendedType: (*descriptorpb.EnumOptions)(nil), ExtensionType: (*MigrateAnnotation)(nil), Field: 146192544, Name: "solo.io.udpa.annotations.enum_migrate", @@ -204,7 +198,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_mi Filename: "github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/migrate.proto", }, { - ExtendedType: (*descriptor.EnumValueOptions)(nil), + ExtendedType: (*descriptorpb.EnumValueOptions)(nil), ExtensionType: (*MigrateAnnotation)(nil), Field: 146192544, Name: "solo.io.udpa.annotations.enum_value_migrate", @@ -212,7 +206,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_mi Filename: "github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/migrate.proto", }, { - ExtendedType: (*descriptor.FileOptions)(nil), + ExtendedType: (*descriptorpb.FileOptions)(nil), ExtensionType: (*FileMigrateAnnotation)(nil), Field: 146192544, Name: "solo.io.udpa.annotations.file_migrate", @@ -221,31 +215,31 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_mi }, } -// Extension fields to descriptor.MessageOptions. +// Extension fields to descriptorpb.MessageOptions. var ( // optional solo.io.udpa.annotations.MigrateAnnotation message_migrate = 146192544; E_MessageMigrate = &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_extTypes[0] ) -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // optional solo.io.udpa.annotations.FieldMigrateAnnotation field_migrate = 146192544; E_FieldMigrate = &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_extTypes[1] ) -// Extension fields to descriptor.EnumOptions. +// Extension fields to descriptorpb.EnumOptions. var ( // optional solo.io.udpa.annotations.MigrateAnnotation enum_migrate = 146192544; E_EnumMigrate = &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_extTypes[2] ) -// Extension fields to descriptor.EnumValueOptions. +// Extension fields to descriptorpb.EnumValueOptions. var ( // optional solo.io.udpa.annotations.MigrateAnnotation enum_value_migrate = 146192544; E_EnumValueMigrate = &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_extTypes[3] ) -// Extension fields to descriptor.FileOptions. +// Extension fields to descriptorpb.FileOptions. var ( // optional solo.io.udpa.annotations.FileMigrateAnnotation file_migrate = 146192544; E_FileMigrate = &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_extTypes[4] @@ -334,15 +328,15 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_m } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_goTypes = []interface{}{ - (*MigrateAnnotation)(nil), // 0: solo.io.udpa.annotations.MigrateAnnotation - (*FieldMigrateAnnotation)(nil), // 1: solo.io.udpa.annotations.FieldMigrateAnnotation - (*FileMigrateAnnotation)(nil), // 2: solo.io.udpa.annotations.FileMigrateAnnotation - (*descriptor.MessageOptions)(nil), // 3: google.protobuf.MessageOptions - (*descriptor.FieldOptions)(nil), // 4: google.protobuf.FieldOptions - (*descriptor.EnumOptions)(nil), // 5: google.protobuf.EnumOptions - (*descriptor.EnumValueOptions)(nil), // 6: google.protobuf.EnumValueOptions - (*descriptor.FileOptions)(nil), // 7: google.protobuf.FileOptions +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_goTypes = []any{ + (*MigrateAnnotation)(nil), // 0: solo.io.udpa.annotations.MigrateAnnotation + (*FieldMigrateAnnotation)(nil), // 1: solo.io.udpa.annotations.FieldMigrateAnnotation + (*FileMigrateAnnotation)(nil), // 2: solo.io.udpa.annotations.FileMigrateAnnotation + (*descriptorpb.MessageOptions)(nil), // 3: google.protobuf.MessageOptions + (*descriptorpb.FieldOptions)(nil), // 4: google.protobuf.FieldOptions + (*descriptorpb.EnumOptions)(nil), // 5: google.protobuf.EnumOptions + (*descriptorpb.EnumValueOptions)(nil), // 6: google.protobuf.EnumValueOptions + (*descriptorpb.FileOptions)(nil), // 7: google.protobuf.FileOptions } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_depIdxs = []int32{ 3, // 0: solo.io.udpa.annotations.message_migrate:extendee -> google.protobuf.MessageOptions @@ -369,44 +363,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_m if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MigrateAnnotation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FieldMigrateAnnotation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_migrate_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FileMigrateAnnotation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/udpa/annotations/sensitive.pb.go b/pkg/api/gloo.solo.io/external/udpa/annotations/sensitive.pb.go index d80977309..21ea53b0a 100644 --- a/pkg/api/gloo.solo.io/external/udpa/annotations/sensitive.pb.go +++ b/pkg/api/gloo.solo.io/external/udpa/annotations/sensitive.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/sensitive.proto @@ -9,9 +9,9 @@ package annotations import ( reflect "reflect" - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" ) const ( @@ -23,7 +23,7 @@ const ( var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_sensitive_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 168928285, Name: "solo.io.udpa.annotations.sensitive", @@ -32,7 +32,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_se }, } -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // Magic number is the 28 most significant bits in the sha256sum of "solo.io.udpa.annotations.sensitive". // When set to true, `sensitive` indicates that this field contains sensitive data, such as @@ -68,8 +68,8 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_se 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_sensitive_proto_goTypes = []interface{}{ - (*descriptor.FieldOptions)(nil), // 0: google.protobuf.FieldOptions +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_sensitive_proto_goTypes = []any{ + (*descriptorpb.FieldOptions)(nil), // 0: google.protobuf.FieldOptions } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_sensitive_proto_depIdxs = []int32{ 0, // 0: solo.io.udpa.annotations.sensitive:extendee -> google.protobuf.FieldOptions diff --git a/pkg/api/gloo.solo.io/external/udpa/annotations/status.pb.go b/pkg/api/gloo.solo.io/external/udpa/annotations/status.pb.go index 7eed10a1e..a24b02112 100644 --- a/pkg/api/gloo.solo.io/external/udpa/annotations/status.pb.go +++ b/pkg/api/gloo.solo.io/external/udpa/annotations/status.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/status.proto @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" ) const ( @@ -92,11 +92,9 @@ type StatusAnnotation struct { func (x *StatusAnnotation) Reset() { *x = StatusAnnotation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StatusAnnotation) String() string { @@ -107,7 +105,7 @@ func (*StatusAnnotation) ProtoMessage() {} func (x *StatusAnnotation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -138,7 +136,7 @@ func (x *StatusAnnotation) GetPackageVersionStatus() PackageVersionStatus { var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.FileOptions)(nil), + ExtendedType: (*descriptorpb.FileOptions)(nil), ExtensionType: (*StatusAnnotation)(nil), Field: 254737244, Name: "solo.io.udpa.annotations.file_status", @@ -147,7 +145,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_st }, } -// Extension fields to descriptor.FileOptions. +// Extension fields to descriptorpb.FileOptions. var ( // optional solo.io.udpa.annotations.StatusAnnotation file_status = 254737244; E_FileStatus = &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_extTypes[0] @@ -210,10 +208,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_s var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_goTypes = []interface{}{ - (PackageVersionStatus)(0), // 0: solo.io.udpa.annotations.PackageVersionStatus - (*StatusAnnotation)(nil), // 1: solo.io.udpa.annotations.StatusAnnotation - (*descriptor.FileOptions)(nil), // 2: google.protobuf.FileOptions +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_goTypes = []any{ + (PackageVersionStatus)(0), // 0: solo.io.udpa.annotations.PackageVersionStatus + (*StatusAnnotation)(nil), // 1: solo.io.udpa.annotations.StatusAnnotation + (*descriptorpb.FileOptions)(nil), // 2: google.protobuf.FileOptions } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_depIdxs = []int32{ 0, // 0: solo.io.udpa.annotations.StatusAnnotation.package_version_status:type_name -> solo.io.udpa.annotations.PackageVersionStatus @@ -233,20 +231,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_s if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_status_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StatusAnnotation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/external/udpa/annotations/versioning.pb.go b/pkg/api/gloo.solo.io/external/udpa/annotations/versioning.pb.go index ee80680e2..03c1f19f4 100644 --- a/pkg/api/gloo.solo.io/external/udpa/annotations/versioning.pb.go +++ b/pkg/api/gloo.solo.io/external/udpa/annotations/versioning.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/versioning.proto @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" ) const ( @@ -35,11 +35,9 @@ type VersioningAnnotation struct { func (x *VersioningAnnotation) Reset() { *x = VersioningAnnotation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VersioningAnnotation) String() string { @@ -50,7 +48,7 @@ func (*VersioningAnnotation) ProtoMessage() {} func (x *VersioningAnnotation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -74,7 +72,7 @@ func (x *VersioningAnnotation) GetPreviousMessageType() string { var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*VersioningAnnotation)(nil), Field: 138081409, Name: "solo.io.udpa.annotations.versioning", @@ -83,7 +81,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_ve }, } -// Extension fields to descriptor.MessageOptions. +// Extension fields to descriptorpb.MessageOptions. var ( // Magic number in this file derived from top 28bit of SHA256 digest of // "solo.io.udpa.annotation.versioning". @@ -137,9 +135,9 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_v } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto_goTypes = []interface{}{ - (*VersioningAnnotation)(nil), // 0: solo.io.udpa.annotations.VersioningAnnotation - (*descriptor.MessageOptions)(nil), // 1: google.protobuf.MessageOptions +var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto_goTypes = []any{ + (*VersioningAnnotation)(nil), // 0: solo.io.udpa.annotations.VersioningAnnotation + (*descriptorpb.MessageOptions)(nil), // 1: google.protobuf.MessageOptions } var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto_depIdxs = []int32{ 1, // 0: solo.io.udpa.annotations.versioning:extendee -> google.protobuf.MessageOptions @@ -158,20 +156,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_v if File_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_versioning_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VersioningAnnotation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/artifact.pb.go b/pkg/api/gloo.solo.io/v1/artifact.pb.go index 5b12c4405..fe5536d47 100644 --- a/pkg/api/gloo.solo.io/v1/artifact.pb.go +++ b/pkg/api/gloo.solo.io/v1/artifact.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/artifact.proto @@ -47,11 +47,9 @@ type Artifact struct { func (x *Artifact) Reset() { *x = Artifact{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Artifact) String() string { @@ -62,7 +60,7 @@ func (*Artifact) ProtoMessage() {} func (x *Artifact) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -139,7 +137,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto_rawDescGZ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto_goTypes = []any{ (*Artifact)(nil), // 0: gloo.solo.io.Artifact nil, // 1: gloo.solo.io.Artifact.DataEntry (*core.Metadata)(nil), // 2: core.solo.io.Metadata @@ -159,20 +157,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto_init() { if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_artifact_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Artifact); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/circuit_breaker.pb.clone.go b/pkg/api/gloo.solo.io/v1/circuit_breaker.pb.clone.go index c338b5bf1..7858ed280 100644 --- a/pkg/api/gloo.solo.io/v1/circuit_breaker.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/circuit_breaker.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -36,27 +36,27 @@ func (m *CircuitBreakerConfig) Clone() proto.Message { target = &CircuitBreakerConfig{} if h, ok := interface{}(m.GetMaxConnections()).(clone.Cloner); ok { - target.MaxConnections = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxConnections = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxConnections = proto.Clone(m.GetMaxConnections()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxConnections = proto.Clone(m.GetMaxConnections()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetMaxPendingRequests()).(clone.Cloner); ok { - target.MaxPendingRequests = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxPendingRequests = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxPendingRequests = proto.Clone(m.GetMaxPendingRequests()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxPendingRequests = proto.Clone(m.GetMaxPendingRequests()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetMaxRequests()).(clone.Cloner); ok { - target.MaxRequests = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRequests = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxRequests = proto.Clone(m.GetMaxRequests()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRequests = proto.Clone(m.GetMaxRequests()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetMaxRetries()).(clone.Cloner); ok { - target.MaxRetries = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRetries = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxRetries = proto.Clone(m.GetMaxRetries()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRetries = proto.Clone(m.GetMaxRetries()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/gloo.solo.io/v1/circuit_breaker.pb.go b/pkg/api/gloo.solo.io/v1/circuit_breaker.pb.go index db804f25e..6c3d5b97b 100644 --- a/pkg/api/gloo.solo.io/v1/circuit_breaker.pb.go +++ b/pkg/api/gloo.solo.io/v1/circuit_breaker.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/circuit_breaker.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -31,19 +31,17 @@ type CircuitBreakerConfig struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - MaxConnections *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"` - MaxPendingRequests *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` - MaxRequests *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_requests,json=maxRequests,proto3" json:"max_requests,omitempty"` - MaxRetries *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` + MaxConnections *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_connections,json=maxConnections,proto3" json:"max_connections,omitempty"` + MaxPendingRequests *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` + MaxRequests *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_requests,json=maxRequests,proto3" json:"max_requests,omitempty"` + MaxRetries *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_retries,json=maxRetries,proto3" json:"max_retries,omitempty"` } func (x *CircuitBreakerConfig) Reset() { *x = CircuitBreakerConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CircuitBreakerConfig) String() string { @@ -54,7 +52,7 @@ func (*CircuitBreakerConfig) ProtoMessage() {} func (x *CircuitBreakerConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -69,28 +67,28 @@ func (*CircuitBreakerConfig) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_rawDescGZIP(), []int{0} } -func (x *CircuitBreakerConfig) GetMaxConnections() *wrappers.UInt32Value { +func (x *CircuitBreakerConfig) GetMaxConnections() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnections } return nil } -func (x *CircuitBreakerConfig) GetMaxPendingRequests() *wrappers.UInt32Value { +func (x *CircuitBreakerConfig) GetMaxPendingRequests() *wrapperspb.UInt32Value { if x != nil { return x.MaxPendingRequests } return nil } -func (x *CircuitBreakerConfig) GetMaxRequests() *wrappers.UInt32Value { +func (x *CircuitBreakerConfig) GetMaxRequests() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequests } return nil } -func (x *CircuitBreakerConfig) GetMaxRetries() *wrappers.UInt32Value { +func (x *CircuitBreakerConfig) GetMaxRetries() *wrapperspb.UInt32Value { if x != nil { return x.MaxRetries } @@ -148,9 +146,9 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_ra } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_goTypes = []interface{}{ - (*CircuitBreakerConfig)(nil), // 0: gloo.solo.io.CircuitBreakerConfig - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_goTypes = []any{ + (*CircuitBreakerConfig)(nil), // 0: gloo.solo.io.CircuitBreakerConfig + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_depIdxs = []int32{ 1, // 0: gloo.solo.io.CircuitBreakerConfig.max_connections:type_name -> google.protobuf.UInt32Value @@ -169,20 +167,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_in if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CircuitBreakerConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/connection.pb.clone.go b/pkg/api/gloo.solo.io/v1/connection.pb.clone.go index ca278ccfc..7db4fa8e1 100644 --- a/pkg/api/gloo.solo.io/v1/connection.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/connection.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_protocol "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/protocol" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_protocol "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/protocol" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -42,9 +42,9 @@ func (m *ConnectionConfig) Clone() proto.Message { target.MaxRequestsPerConnection = m.GetMaxRequestsPerConnection() if h, ok := interface{}(m.GetConnectTimeout()).(clone.Cloner); ok { - target.ConnectTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ConnectTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.ConnectTimeout = proto.Clone(m.GetConnectTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.ConnectTimeout = proto.Clone(m.GetConnectTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetTcpKeepalive()).(clone.Cloner); ok { @@ -54,9 +54,9 @@ func (m *ConnectionConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetPerConnectionBufferLimitBytes()).(clone.Cloner); ok { - target.PerConnectionBufferLimitBytes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerConnectionBufferLimitBytes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.PerConnectionBufferLimitBytes = proto.Clone(m.GetPerConnectionBufferLimitBytes()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerConnectionBufferLimitBytes = proto.Clone(m.GetPerConnectionBufferLimitBytes()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetCommonHttpProtocolOptions()).(clone.Cloner); ok { @@ -85,15 +85,15 @@ func (m *ConnectionConfig_TcpKeepAlive) Clone() proto.Message { target.KeepaliveProbes = m.GetKeepaliveProbes() if h, ok := interface{}(m.GetKeepaliveTime()).(clone.Cloner); ok { - target.KeepaliveTime = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.KeepaliveTime = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.KeepaliveTime = proto.Clone(m.GetKeepaliveTime()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.KeepaliveTime = proto.Clone(m.GetKeepaliveTime()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetKeepaliveInterval()).(clone.Cloner); ok { - target.KeepaliveInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.KeepaliveInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.KeepaliveInterval = proto.Clone(m.GetKeepaliveInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.KeepaliveInterval = proto.Clone(m.GetKeepaliveInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target diff --git a/pkg/api/gloo.solo.io/v1/connection.pb.go b/pkg/api/gloo.solo.io/v1/connection.pb.go index 51cd541ed..2aa774048 100644 --- a/pkg/api/gloo.solo.io/v1/connection.pb.go +++ b/pkg/api/gloo.solo.io/v1/connection.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/connection.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protocol "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/protocol" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -34,12 +34,12 @@ type ConnectionConfig struct { // Maximum requests for a single upstream connection (unspecified or zero = no limit) MaxRequestsPerConnection uint32 `protobuf:"varint,1,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` // The timeout for new network connections to hosts in the cluster - ConnectTimeout *duration.Duration `protobuf:"bytes,2,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"` + ConnectTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=connect_timeout,json=connectTimeout,proto3" json:"connect_timeout,omitempty"` // Configure OS-level tcp keepalive checks TcpKeepalive *ConnectionConfig_TcpKeepAlive `protobuf:"bytes,3,opt,name=tcp_keepalive,json=tcpKeepalive,proto3" json:"tcp_keepalive,omitempty"` // Soft limit on size of the cluster’s connections read and write buffers. If unspecified, an implementation defined default is applied (1MiB). // For more info, see the [envoy docs](https://www.envoyproxy.io/docs/envoy/v1.14.1/api-v2/api/v2/cluster.proto#cluster) - PerConnectionBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` + PerConnectionBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` // Additional options when handling HTTP requests upstream. These options will be applicable to // both HTTP1 and HTTP2 requests. CommonHttpProtocolOptions *protocol.HttpProtocolOptions `protobuf:"bytes,5,opt,name=common_http_protocol_options,json=commonHttpProtocolOptions,proto3" json:"common_http_protocol_options,omitempty"` @@ -49,11 +49,9 @@ type ConnectionConfig struct { func (x *ConnectionConfig) Reset() { *x = ConnectionConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ConnectionConfig) String() string { @@ -64,7 +62,7 @@ func (*ConnectionConfig) ProtoMessage() {} func (x *ConnectionConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -86,7 +84,7 @@ func (x *ConnectionConfig) GetMaxRequestsPerConnection() uint32 { return 0 } -func (x *ConnectionConfig) GetConnectTimeout() *duration.Duration { +func (x *ConnectionConfig) GetConnectTimeout() *durationpb.Duration { if x != nil { return x.ConnectTimeout } @@ -100,7 +98,7 @@ func (x *ConnectionConfig) GetTcpKeepalive() *ConnectionConfig_TcpKeepAlive { return nil } -func (x *ConnectionConfig) GetPerConnectionBufferLimitBytes() *wrappers.UInt32Value { +func (x *ConnectionConfig) GetPerConnectionBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerConnectionBufferLimitBytes } @@ -131,18 +129,16 @@ type ConnectionConfig_TcpKeepAlive struct { // Maximum number of keepalive probes to send without response before deciding the connection is dead. KeepaliveProbes uint32 `protobuf:"varint,1,opt,name=keepalive_probes,json=keepaliveProbes,proto3" json:"keepalive_probes,omitempty"` // The number of seconds a connection needs to be idle before keep-alive probes start being sent. This is rounded up to the second. - KeepaliveTime *duration.Duration `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` + KeepaliveTime *durationpb.Duration `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` // The number of seconds between keep-alive probes. This is rounded up to the second. - KeepaliveInterval *duration.Duration `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` + KeepaliveInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` } func (x *ConnectionConfig_TcpKeepAlive) Reset() { *x = ConnectionConfig_TcpKeepAlive{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ConnectionConfig_TcpKeepAlive) String() string { @@ -153,7 +149,7 @@ func (*ConnectionConfig_TcpKeepAlive) ProtoMessage() {} func (x *ConnectionConfig_TcpKeepAlive) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -175,14 +171,14 @@ func (x *ConnectionConfig_TcpKeepAlive) GetKeepaliveProbes() uint32 { return 0 } -func (x *ConnectionConfig_TcpKeepAlive) GetKeepaliveTime() *duration.Duration { +func (x *ConnectionConfig_TcpKeepAlive) GetKeepaliveTime() *durationpb.Duration { if x != nil { return x.KeepaliveTime } return nil } -func (x *ConnectionConfig_TcpKeepAlive) GetKeepaliveInterval() *duration.Duration { +func (x *ConnectionConfig_TcpKeepAlive) GetKeepaliveInterval() *durationpb.Duration { if x != nil { return x.KeepaliveInterval } @@ -275,11 +271,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_rawDesc } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_goTypes = []any{ (*ConnectionConfig)(nil), // 0: gloo.solo.io.ConnectionConfig (*ConnectionConfig_TcpKeepAlive)(nil), // 1: gloo.solo.io.ConnectionConfig.TcpKeepAlive - (*duration.Duration)(nil), // 2: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value (*protocol.HttpProtocolOptions)(nil), // 4: protocol.options.gloo.solo.io.HttpProtocolOptions (*protocol.Http1ProtocolOptions)(nil), // 5: protocol.options.gloo.solo.io.Http1ProtocolOptions } @@ -303,32 +299,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_init() if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConnectionConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConnectionConfig_TcpKeepAlive); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/core/matchers/matchers.pb.clone.go b/pkg/api/gloo.solo.io/v1/core/matchers/matchers.pb.clone.go index eb698da6b..2932a96ba 100644 --- a/pkg/api/gloo.solo.io/v1/core/matchers/matchers.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/core/matchers/matchers.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -36,9 +36,9 @@ func (m *Matcher) Clone() proto.Message { target = &Matcher{} if h, ok := interface{}(m.GetCaseSensitive()).(clone.Cloner); ok { - target.CaseSensitive = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.CaseSensitive = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.CaseSensitive = proto.Clone(m.GetCaseSensitive()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.CaseSensitive = proto.Clone(m.GetCaseSensitive()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetHeaders() != nil { diff --git a/pkg/api/gloo.solo.io/v1/core/matchers/matchers.pb.go b/pkg/api/gloo.solo.io/v1/core/matchers/matchers.pb.go index aa6c10686..24feccb25 100644 --- a/pkg/api/gloo.solo.io/v1/core/matchers/matchers.pb.go +++ b/pkg/api/gloo.solo.io/v1/core/matchers/matchers.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/core/matchers/matchers.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -37,7 +37,7 @@ type Matcher struct { // *Matcher_ConnectMatcher_ PathSpecifier isMatcher_PathSpecifier `protobuf_oneof:"path_specifier"` // Indicates that prefix/path matching should be case sensitive. The default is true. - CaseSensitive *wrappers.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` + CaseSensitive *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=case_sensitive,json=caseSensitive,proto3" json:"case_sensitive,omitempty"` // Specifies a set of headers that the route should match on. The router will // check the request’s headers against all the specified headers in the route // config. A match will happen if all the headers in the route are present in @@ -56,11 +56,9 @@ type Matcher struct { func (x *Matcher) Reset() { *x = Matcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Matcher) String() string { @@ -71,7 +69,7 @@ func (*Matcher) ProtoMessage() {} func (x *Matcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -121,7 +119,7 @@ func (x *Matcher) GetConnectMatcher() *Matcher_ConnectMatcher { return nil } -func (x *Matcher) GetCaseSensitive() *wrappers.BoolValue { +func (x *Matcher) GetCaseSensitive() *wrapperspb.BoolValue { if x != nil { return x.CaseSensitive } @@ -229,11 +227,9 @@ type HeaderMatcher struct { func (x *HeaderMatcher) Reset() { *x = HeaderMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderMatcher) String() string { @@ -244,7 +240,7 @@ func (*HeaderMatcher) ProtoMessage() {} func (x *HeaderMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -310,11 +306,9 @@ type QueryParameterMatcher struct { func (x *QueryParameterMatcher) Reset() { *x = QueryParameterMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *QueryParameterMatcher) String() string { @@ -325,7 +319,7 @@ func (*QueryParameterMatcher) ProtoMessage() {} func (x *QueryParameterMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -369,11 +363,9 @@ type Matcher_ConnectMatcher struct { func (x *Matcher_ConnectMatcher) Reset() { *x = Matcher_ConnectMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Matcher_ConnectMatcher) String() string { @@ -384,7 +376,7 @@ func (*Matcher_ConnectMatcher) ProtoMessage() {} func (x *Matcher_ConnectMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -475,12 +467,12 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_p } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_goTypes = []any{ (*Matcher)(nil), // 0: matchers.core.gloo.solo.io.Matcher (*HeaderMatcher)(nil), // 1: matchers.core.gloo.solo.io.HeaderMatcher (*QueryParameterMatcher)(nil), // 2: matchers.core.gloo.solo.io.QueryParameterMatcher (*Matcher_ConnectMatcher)(nil), // 3: matchers.core.gloo.solo.io.Matcher.ConnectMatcher - (*wrappers.BoolValue)(nil), // 4: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 4: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_depIdxs = []int32{ 3, // 0: matchers.core.gloo.solo.io.Matcher.connect_matcher:type_name -> matchers.core.gloo.solo.io.Matcher.ConnectMatcher @@ -499,57 +491,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_p if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Matcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QueryParameterMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Matcher_ConnectMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_matchers_matchers_proto_msgTypes[0].OneofWrappers = []any{ (*Matcher_Prefix)(nil), (*Matcher_Exact)(nil), (*Matcher_Regex)(nil), diff --git a/pkg/api/gloo.solo.io/v1/core/selectors/selectors.pb.go b/pkg/api/gloo.solo.io/v1/core/selectors/selectors.pb.go index 20185f918..ed5212979 100644 --- a/pkg/api/gloo.solo.io/v1/core/selectors/selectors.pb.go +++ b/pkg/api/gloo.solo.io/v1/core/selectors/selectors.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/core/selectors/selectors.proto @@ -113,11 +113,9 @@ type Selector struct { func (x *Selector) Reset() { *x = Selector{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Selector) String() string { @@ -128,7 +126,7 @@ func (*Selector) ProtoMessage() {} func (x *Selector) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -179,11 +177,9 @@ type Selector_Expression struct { func (x *Selector_Expression) Reset() { *x = Selector_Expression{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Selector_Expression) String() string { @@ -194,7 +190,7 @@ func (*Selector_Expression) ProtoMessage() {} func (x *Selector_Expression) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -297,7 +293,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_goTypes = []any{ (Selector_Expression_Operator)(0), // 0: selectors.core.gloo.solo.io.Selector.Expression.Operator (*Selector)(nil), // 1: selectors.core.gloo.solo.io.Selector nil, // 2: selectors.core.gloo.solo.io.Selector.LabelsEntry @@ -319,32 +315,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Selector); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_core_selectors_selectors_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Selector_Expression); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/destination_spec.pb.go b/pkg/api/gloo.solo.io/v1/destination_spec.pb.go index aaeb9c3db..61df660b1 100644 --- a/pkg/api/gloo.solo.io/v1/destination_spec.pb.go +++ b/pkg/api/gloo.solo.io/v1/destination_spec.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/destination_spec.proto @@ -46,11 +46,9 @@ type DestinationSpec struct { func (x *DestinationSpec) Reset() { *x = DestinationSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestinationSpec) String() string { @@ -61,7 +59,7 @@ func (*DestinationSpec) ProtoMessage() {} func (x *DestinationSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -205,7 +203,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_r } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_goTypes = []any{ (*DestinationSpec)(nil), // 0: gloo.solo.io.DestinationSpec (*aws.DestinationSpec)(nil), // 1: aws.options.gloo.solo.io.DestinationSpec (*azure.DestinationSpec)(nil), // 2: azure.options.gloo.solo.io.DestinationSpec @@ -229,21 +227,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_i if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestinationSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_msgTypes[0].OneofWrappers = []any{ (*DestinationSpec_Aws)(nil), (*DestinationSpec_Azure)(nil), (*DestinationSpec_Rest)(nil), diff --git a/pkg/api/gloo.solo.io/v1/endpoint.pb.go b/pkg/api/gloo.solo.io/v1/endpoint.pb.go index 802ba6a85..d1a498eb3 100644 --- a/pkg/api/gloo.solo.io/v1/endpoint.pb.go +++ b/pkg/api/gloo.solo.io/v1/endpoint.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/endpoint.proto @@ -45,11 +45,9 @@ type Endpoint struct { func (x *Endpoint) Reset() { *x = Endpoint{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Endpoint) String() string { @@ -60,7 +58,7 @@ func (*Endpoint) ProtoMessage() {} func (x *Endpoint) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -128,11 +126,9 @@ type HealthCheckConfig struct { func (x *HealthCheckConfig) Reset() { *x = HealthCheckConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheckConfig) String() string { @@ -143,7 +139,7 @@ func (*HealthCheckConfig) ProtoMessage() {} func (x *HealthCheckConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -224,7 +220,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_rawDescGZ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_goTypes = []any{ (*Endpoint)(nil), // 0: gloo.solo.io.Endpoint (*HealthCheckConfig)(nil), // 1: gloo.solo.io.HealthCheckConfig (*core.ResourceRef)(nil), // 2: core.solo.io.ResourceRef @@ -246,32 +242,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_init() { if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Endpoint); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_endpoint_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheckConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/ai/ai.pb.clone.go b/pkg/api/gloo.solo.io/v1/enterprise/options/ai/ai.pb.clone.go index a064ac3f8..93de29d5d 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/ai/ai.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/ai/ai.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" ) // ensure the imports are used @@ -234,9 +234,9 @@ func (m *FieldDefault) Clone() proto.Message { target.Field = m.GetField() if h, ok := interface{}(m.GetValue()).(clone.Cloner); ok { - target.Value = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Value) + target.Value = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Value) } else { - target.Value = proto.Clone(m.GetValue()).(*github_com_golang_protobuf_ptypes_struct.Value) + target.Value = proto.Clone(m.GetValue()).(*google_golang_org_protobuf_types_known_structpb.Value) } target.Override = m.GetOverride() diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/ai/ai.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/ai/ai.pb.go index d97a2844c..e16e3e494 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/ai/ai.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/ai/ai.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/ai/ai.proto @@ -10,11 +10,11 @@ import ( reflect "reflect" sync "sync" - _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" ) const ( @@ -358,11 +358,9 @@ type SingleAuthToken struct { func (x *SingleAuthToken) Reset() { *x = SingleAuthToken{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SingleAuthToken) String() string { @@ -373,7 +371,7 @@ func (*SingleAuthToken) ProtoMessage() {} func (x *SingleAuthToken) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -485,11 +483,9 @@ type UpstreamSpec struct { func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -500,7 +496,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -662,11 +658,9 @@ type RouteSettings struct { func (x *RouteSettings) Reset() { *x = RouteSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteSettings) String() string { @@ -677,7 +671,7 @@ func (*RouteSettings) ProtoMessage() {} func (x *RouteSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -763,7 +757,7 @@ type FieldDefault struct { // The name of the field. Field string `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"` // The field default value, which can be any JSON Data Type. - Value *_struct.Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + Value *structpb.Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` // Whether to override the field's value if it already exists. // Defaults to false. Override bool `protobuf:"varint,3,opt,name=override,proto3" json:"override,omitempty"` @@ -771,11 +765,9 @@ type FieldDefault struct { func (x *FieldDefault) Reset() { *x = FieldDefault{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FieldDefault) String() string { @@ -786,7 +778,7 @@ func (*FieldDefault) ProtoMessage() {} func (x *FieldDefault) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -808,7 +800,7 @@ func (x *FieldDefault) GetField() string { return "" } -func (x *FieldDefault) GetValue() *_struct.Value { +func (x *FieldDefault) GetValue() *structpb.Value { if x != nil { return x.Value } @@ -838,11 +830,9 @@ type Postgres struct { func (x *Postgres) Reset() { *x = Postgres{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Postgres) String() string { @@ -853,7 +843,7 @@ func (*Postgres) ProtoMessage() {} func (x *Postgres) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -899,11 +889,9 @@ type Embedding struct { func (x *Embedding) Reset() { *x = Embedding{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Embedding) String() string { @@ -914,7 +902,7 @@ func (*Embedding) ProtoMessage() {} func (x *Embedding) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1012,11 +1000,9 @@ type SemanticCache struct { func (x *SemanticCache) Reset() { *x = SemanticCache{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SemanticCache) String() string { @@ -1027,7 +1013,7 @@ func (*SemanticCache) ProtoMessage() {} func (x *SemanticCache) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1123,11 +1109,9 @@ type RAG struct { func (x *RAG) Reset() { *x = RAG{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RAG) String() string { @@ -1138,7 +1122,7 @@ func (*RAG) ProtoMessage() {} func (x *RAG) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1224,11 +1208,9 @@ type AIPromptEnrichment struct { func (x *AIPromptEnrichment) Reset() { *x = AIPromptEnrichment{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptEnrichment) String() string { @@ -1239,7 +1221,7 @@ func (*AIPromptEnrichment) ProtoMessage() {} func (x *AIPromptEnrichment) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1305,11 +1287,9 @@ type AIPromptGuard struct { func (x *AIPromptGuard) Reset() { *x = AIPromptGuard{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard) String() string { @@ -1320,7 +1300,7 @@ func (*AIPromptGuard) ProtoMessage() {} func (x *AIPromptGuard) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1360,11 +1340,9 @@ type SingleAuthToken_Passthrough struct { func (x *SingleAuthToken_Passthrough) Reset() { *x = SingleAuthToken_Passthrough{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SingleAuthToken_Passthrough) String() string { @@ -1375,7 +1353,7 @@ func (*SingleAuthToken_Passthrough) ProtoMessage() {} func (x *SingleAuthToken_Passthrough) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1405,11 +1383,9 @@ type UpstreamSpec_CustomHost struct { func (x *UpstreamSpec_CustomHost) Reset() { *x = UpstreamSpec_CustomHost{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_CustomHost) String() string { @@ -1420,7 +1396,7 @@ func (*UpstreamSpec_CustomHost) ProtoMessage() {} func (x *UpstreamSpec_CustomHost) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1470,11 +1446,9 @@ type UpstreamSpec_OpenAI struct { func (x *UpstreamSpec_OpenAI) Reset() { *x = UpstreamSpec_OpenAI{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_OpenAI) String() string { @@ -1485,7 +1459,7 @@ func (*UpstreamSpec_OpenAI) ProtoMessage() {} func (x *UpstreamSpec_OpenAI) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1549,11 +1523,9 @@ type UpstreamSpec_AzureOpenAI struct { func (x *UpstreamSpec_AzureOpenAI) Reset() { *x = UpstreamSpec_AzureOpenAI{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_AzureOpenAI) String() string { @@ -1564,7 +1536,7 @@ func (*UpstreamSpec_AzureOpenAI) ProtoMessage() {} func (x *UpstreamSpec_AzureOpenAI) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1651,11 +1623,9 @@ type UpstreamSpec_Gemini struct { func (x *UpstreamSpec_Gemini) Reset() { *x = UpstreamSpec_Gemini{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_Gemini) String() string { @@ -1666,7 +1636,7 @@ func (*UpstreamSpec_Gemini) ProtoMessage() {} func (x *UpstreamSpec_Gemini) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1754,11 +1724,9 @@ type UpstreamSpec_VertexAI struct { func (x *UpstreamSpec_VertexAI) Reset() { *x = UpstreamSpec_VertexAI{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_VertexAI) String() string { @@ -1769,7 +1737,7 @@ func (*UpstreamSpec_VertexAI) ProtoMessage() {} func (x *UpstreamSpec_VertexAI) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1873,11 +1841,9 @@ type UpstreamSpec_Mistral struct { func (x *UpstreamSpec_Mistral) Reset() { *x = UpstreamSpec_Mistral{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_Mistral) String() string { @@ -1888,7 +1854,7 @@ func (*UpstreamSpec_Mistral) ProtoMessage() {} func (x *UpstreamSpec_Mistral) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1947,11 +1913,9 @@ type UpstreamSpec_Anthropic struct { func (x *UpstreamSpec_Anthropic) Reset() { *x = UpstreamSpec_Anthropic{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_Anthropic) String() string { @@ -1962,7 +1926,7 @@ func (*UpstreamSpec_Anthropic) ProtoMessage() {} func (x *UpstreamSpec_Anthropic) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2048,11 +2012,9 @@ type UpstreamSpec_MultiPool struct { func (x *UpstreamSpec_MultiPool) Reset() { *x = UpstreamSpec_MultiPool{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_MultiPool) String() string { @@ -2063,7 +2025,7 @@ func (*UpstreamSpec_MultiPool) ProtoMessage() {} func (x *UpstreamSpec_MultiPool) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2104,11 +2066,9 @@ type UpstreamSpec_MultiPool_Backend struct { func (x *UpstreamSpec_MultiPool_Backend) Reset() { *x = UpstreamSpec_MultiPool_Backend{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_MultiPool_Backend) String() string { @@ -2119,7 +2079,7 @@ func (*UpstreamSpec_MultiPool_Backend) ProtoMessage() {} func (x *UpstreamSpec_MultiPool_Backend) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2241,11 +2201,9 @@ type UpstreamSpec_MultiPool_Priority struct { func (x *UpstreamSpec_MultiPool_Priority) Reset() { *x = UpstreamSpec_MultiPool_Priority{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_MultiPool_Priority) String() string { @@ -2256,7 +2214,7 @@ func (*UpstreamSpec_MultiPool_Priority) ProtoMessage() {} func (x *UpstreamSpec_MultiPool_Priority) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2292,11 +2250,9 @@ type Embedding_OpenAI struct { func (x *Embedding_OpenAI) Reset() { *x = Embedding_OpenAI{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Embedding_OpenAI) String() string { @@ -2307,7 +2263,7 @@ func (*Embedding_OpenAI) ProtoMessage() {} func (x *Embedding_OpenAI) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2372,11 +2328,9 @@ type Embedding_AzureOpenAI struct { func (x *Embedding_AzureOpenAI) Reset() { *x = Embedding_AzureOpenAI{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Embedding_AzureOpenAI) String() string { @@ -2387,7 +2341,7 @@ func (*Embedding_AzureOpenAI) ProtoMessage() {} func (x *Embedding_AzureOpenAI) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2469,11 +2423,9 @@ type SemanticCache_Redis struct { func (x *SemanticCache_Redis) Reset() { *x = SemanticCache_Redis{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SemanticCache_Redis) String() string { @@ -2484,7 +2436,7 @@ func (*SemanticCache_Redis) ProtoMessage() {} func (x *SemanticCache_Redis) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2534,11 +2486,9 @@ type SemanticCache_Weaviate struct { func (x *SemanticCache_Weaviate) Reset() { *x = SemanticCache_Weaviate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SemanticCache_Weaviate) String() string { @@ -2549,7 +2499,7 @@ func (*SemanticCache_Weaviate) ProtoMessage() {} func (x *SemanticCache_Weaviate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2607,11 +2557,9 @@ type SemanticCache_DataStore struct { func (x *SemanticCache_DataStore) Reset() { *x = SemanticCache_DataStore{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SemanticCache_DataStore) String() string { @@ -2622,7 +2570,7 @@ func (*SemanticCache_DataStore) ProtoMessage() {} func (x *SemanticCache_DataStore) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2689,11 +2637,9 @@ type RAG_DataStore struct { func (x *RAG_DataStore) Reset() { *x = RAG_DataStore{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RAG_DataStore) String() string { @@ -2704,7 +2650,7 @@ func (*RAG_DataStore) ProtoMessage() {} func (x *RAG_DataStore) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2759,11 +2705,9 @@ type AIPromptEnrichment_Message struct { func (x *AIPromptEnrichment_Message) Reset() { *x = AIPromptEnrichment_Message{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptEnrichment_Message) String() string { @@ -2774,7 +2718,7 @@ func (*AIPromptEnrichment_Message) ProtoMessage() {} func (x *AIPromptEnrichment_Message) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2822,11 +2766,9 @@ type AIPromptGuard_Regex struct { func (x *AIPromptGuard_Regex) Reset() { *x = AIPromptGuard_Regex{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard_Regex) String() string { @@ -2837,7 +2779,7 @@ func (*AIPromptGuard_Regex) ProtoMessage() {} func (x *AIPromptGuard_Regex) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2889,11 +2831,9 @@ type AIPromptGuard_Webhook struct { func (x *AIPromptGuard_Webhook) Reset() { *x = AIPromptGuard_Webhook{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[29] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[29] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard_Webhook) String() string { @@ -2904,7 +2844,7 @@ func (*AIPromptGuard_Webhook) ProtoMessage() {} func (x *AIPromptGuard_Webhook) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[29] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2964,11 +2904,9 @@ type AIPromptGuard_Moderation struct { func (x *AIPromptGuard_Moderation) Reset() { *x = AIPromptGuard_Moderation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[30] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[30] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard_Moderation) String() string { @@ -2979,7 +2917,7 @@ func (*AIPromptGuard_Moderation) ProtoMessage() {} func (x *AIPromptGuard_Moderation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[30] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3039,11 +2977,9 @@ type AIPromptGuard_Request struct { func (x *AIPromptGuard_Request) Reset() { *x = AIPromptGuard_Request{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[31] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[31] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard_Request) String() string { @@ -3054,7 +2990,7 @@ func (*AIPromptGuard_Request) ProtoMessage() {} func (x *AIPromptGuard_Request) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[31] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3111,11 +3047,9 @@ type AIPromptGuard_Response struct { func (x *AIPromptGuard_Response) Reset() { *x = AIPromptGuard_Response{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[32] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[32] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard_Response) String() string { @@ -3126,7 +3060,7 @@ func (*AIPromptGuard_Response) ProtoMessage() {} func (x *AIPromptGuard_Response) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[32] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3169,11 +3103,9 @@ type AIPromptGuard_Regex_RegexMatch struct { func (x *AIPromptGuard_Regex_RegexMatch) Reset() { *x = AIPromptGuard_Regex_RegexMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[33] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[33] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard_Regex_RegexMatch) String() string { @@ -3184,7 +3116,7 @@ func (*AIPromptGuard_Regex_RegexMatch) ProtoMessage() {} func (x *AIPromptGuard_Regex_RegexMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[33] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3227,11 +3159,9 @@ type AIPromptGuard_Webhook_HeaderMatch struct { func (x *AIPromptGuard_Webhook_HeaderMatch) Reset() { *x = AIPromptGuard_Webhook_HeaderMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[34] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard_Webhook_HeaderMatch) String() string { @@ -3242,7 +3172,7 @@ func (*AIPromptGuard_Webhook_HeaderMatch) ProtoMessage() {} func (x *AIPromptGuard_Webhook_HeaderMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[34] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3291,11 +3221,9 @@ type AIPromptGuard_Moderation_OpenAI struct { func (x *AIPromptGuard_Moderation_OpenAI) Reset() { *x = AIPromptGuard_Moderation_OpenAI{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[35] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[35] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard_Moderation_OpenAI) String() string { @@ -3306,7 +3234,7 @@ func (*AIPromptGuard_Moderation_OpenAI) ProtoMessage() {} func (x *AIPromptGuard_Moderation_OpenAI) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[35] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3371,11 +3299,9 @@ type AIPromptGuard_Request_CustomResponse struct { func (x *AIPromptGuard_Request_CustomResponse) Reset() { *x = AIPromptGuard_Request_CustomResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[36] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[36] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AIPromptGuard_Request_CustomResponse) String() string { @@ -3386,7 +3312,7 @@ func (*AIPromptGuard_Request_CustomResponse) ProtoMessage() {} func (x *AIPromptGuard_Request_CustomResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[36] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3896,7 +3822,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_enumTypes = make([]protoimpl.EnumInfo, 6) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes = make([]protoimpl.MessageInfo, 37) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_goTypes = []any{ (UpstreamSpec_VertexAI_Publisher)(0), // 0: ai.options.gloo.solo.io.UpstreamSpec.VertexAI.Publisher (RouteSettings_RouteType)(0), // 1: ai.options.gloo.solo.io.RouteSettings.RouteType (SemanticCache_Mode)(0), // 2: ai.options.gloo.solo.io.SemanticCache.Mode @@ -3941,7 +3867,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_ (*AIPromptGuard_Moderation_OpenAI)(nil), // 41: ai.options.gloo.solo.io.AIPromptGuard.Moderation.OpenAI (*AIPromptGuard_Request_CustomResponse)(nil), // 42: ai.options.gloo.solo.io.AIPromptGuard.Request.CustomResponse (*core.ResourceRef)(nil), // 43: core.solo.io.ResourceRef - (*_struct.Value)(nil), // 44: google.protobuf.Value + (*structpb.Value)(nil), // 44: google.protobuf.Value } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_depIdxs = []int32{ 43, // 0: ai.options.gloo.solo.io.SingleAuthToken.secret_ref:type_name -> core.solo.io.ResourceRef @@ -4019,458 +3945,12 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SingleAuthToken); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FieldDefault); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Postgres); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Embedding); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SemanticCache); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RAG); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptEnrichment); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SingleAuthToken_Passthrough); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_CustomHost); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_OpenAI); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_AzureOpenAI); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_Gemini); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_VertexAI); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_Mistral); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_Anthropic); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_MultiPool); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_MultiPool_Backend); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_MultiPool_Priority); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Embedding_OpenAI); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Embedding_AzureOpenAI); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SemanticCache_Redis); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SemanticCache_Weaviate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SemanticCache_DataStore); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RAG_DataStore); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptEnrichment_Message); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard_Regex); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard_Webhook); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard_Moderation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard_Request); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard_Response); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard_Regex_RegexMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard_Webhook_HeaderMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard_Moderation_OpenAI); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AIPromptGuard_Request_CustomResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[0].OneofWrappers = []any{ (*SingleAuthToken_Inline)(nil), (*SingleAuthToken_SecretRef)(nil), (*SingleAuthToken_Passthrough_)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[1].OneofWrappers = []any{ (*UpstreamSpec_Openai)(nil), (*UpstreamSpec_Mistral_)(nil), (*UpstreamSpec_Anthropic_)(nil), @@ -4479,20 +3959,20 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai (*UpstreamSpec_Gemini_)(nil), (*UpstreamSpec_VertexAi)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[5].OneofWrappers = []any{ (*Embedding_Openai)(nil), (*Embedding_AzureOpenai)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[13].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[13].OneofWrappers = []any{ (*UpstreamSpec_AzureOpenAI_AuthToken)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[14].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[14].OneofWrappers = []any{ (*UpstreamSpec_Gemini_AuthToken)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[15].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[15].OneofWrappers = []any{ (*UpstreamSpec_VertexAI_AuthToken)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[19].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[19].OneofWrappers = []any{ (*UpstreamSpec_MultiPool_Backend_Openai)(nil), (*UpstreamSpec_MultiPool_Backend_Mistral)(nil), (*UpstreamSpec_MultiPool_Backend_Anthropic)(nil), @@ -4500,23 +3980,23 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai (*UpstreamSpec_MultiPool_Backend_Gemini)(nil), (*UpstreamSpec_MultiPool_Backend_VertexAi)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[21].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[21].OneofWrappers = []any{ (*Embedding_OpenAI_AuthToken)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[22].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[22].OneofWrappers = []any{ (*Embedding_AzureOpenAI_AuthToken)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[25].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[25].OneofWrappers = []any{ (*SemanticCache_DataStore_Redis)(nil), (*SemanticCache_DataStore_Weaviate)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[26].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[26].OneofWrappers = []any{ (*RAG_DataStore_Postgres)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[30].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[30].OneofWrappers = []any{ (*AIPromptGuard_Moderation_Openai)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[35].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ai_ai_proto_msgTypes[35].OneofWrappers = []any{ (*AIPromptGuard_Moderation_OpenAI_AuthToken)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/caching/caching.pb.clone.go b/pkg/api/gloo.solo.io/v1/enterprise/options/caching/caching.pb.clone.go index 9ff7473b9..3b9d9ed48 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/caching/caching.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/caching/caching.pb.clone.go @@ -13,13 +13,13 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_matcher_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -61,15 +61,15 @@ func (m *Settings) Clone() proto.Message { } if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxPayloadSize()).(clone.Cloner); ok { - target.MaxPayloadSize = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxPayloadSize = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxPayloadSize = proto.Clone(m.GetMaxPayloadSize()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxPayloadSize = proto.Clone(m.GetMaxPayloadSize()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/caching/caching.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/caching/caching.pb.go index 6b727176e..8cec99a8e 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/caching/caching.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/caching/caching.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/caching/caching.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -37,20 +37,18 @@ type Settings struct { // and still be cached. Per upstream envoy allowed vary headers. AllowedVaryHeaders []*v3.StringMatcher `protobuf:"bytes,2,rep,name=allowed_vary_headers,json=allowedVaryHeaders,proto3" json:"allowed_vary_headers,omitempty"` // Connection timeout for retrieval from an sync cache - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` // Max payload size to cache. If unset defaults to a reasonable value. // If explicitly set to 0 will prevent anything with a body from // being cached. - MaxPayloadSize *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=max_payload_size,json=maxPayloadSize,proto3" json:"max_payload_size,omitempty"` + MaxPayloadSize *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=max_payload_size,json=maxPayloadSize,proto3" json:"max_payload_size,omitempty"` } func (x *Settings) Reset() { *x = Settings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_caching_caching_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_caching_caching_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Settings) String() string { @@ -61,7 +59,7 @@ func (*Settings) ProtoMessage() {} func (x *Settings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_caching_caching_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -90,14 +88,14 @@ func (x *Settings) GetAllowedVaryHeaders() []*v3.StringMatcher { return nil } -func (x *Settings) GetTimeout() *duration.Duration { +func (x *Settings) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } return nil } -func (x *Settings) GetMaxPayloadSize() *wrappers.UInt32Value { +func (x *Settings) GetMaxPayloadSize() *wrapperspb.UInt32Value { if x != nil { return x.MaxPayloadSize } @@ -169,12 +167,12 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_cachi } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_caching_caching_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_caching_caching_proto_goTypes = []interface{}{ - (*Settings)(nil), // 0: caching.options.gloo.solo.io.Settings - (*core.ResourceRef)(nil), // 1: core.solo.io.ResourceRef - (*v3.StringMatcher)(nil), // 2: solo.io.envoy.type.matcher.v3.StringMatcher - (*duration.Duration)(nil), // 3: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_caching_caching_proto_goTypes = []any{ + (*Settings)(nil), // 0: caching.options.gloo.solo.io.Settings + (*core.ResourceRef)(nil), // 1: core.solo.io.ResourceRef + (*v3.StringMatcher)(nil), // 2: solo.io.envoy.type.matcher.v3.StringMatcher + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_caching_caching_proto_depIdxs = []int32{ 1, // 0: caching.options.gloo.solo.io.Settings.caching_service_ref:type_name -> core.solo.io.ResourceRef @@ -195,20 +193,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_cachi if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_caching_caching_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_caching_caching_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Settings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/dlp/dlp.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/dlp/dlp.pb.go index 74dd830ea..509f8a5fb 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/dlp/dlp.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/dlp/dlp.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/dlp/dlp.proto @@ -259,11 +259,9 @@ type FilterConfig struct { func (x *FilterConfig) Reset() { *x = FilterConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FilterConfig) String() string { @@ -274,7 +272,7 @@ func (*FilterConfig) ProtoMessage() {} func (x *FilterConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -320,11 +318,9 @@ type DlpRule struct { func (x *DlpRule) Reset() { *x = DlpRule{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DlpRule) String() string { @@ -335,7 +331,7 @@ func (*DlpRule) ProtoMessage() {} func (x *DlpRule) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -383,11 +379,9 @@ type Config struct { func (x *Config) Reset() { *x = Config{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Config) String() string { @@ -398,7 +392,7 @@ func (*Config) ProtoMessage() {} func (x *Config) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -471,11 +465,9 @@ type Action struct { func (x *Action) Reset() { *x = Action{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action) String() string { @@ -486,7 +478,7 @@ func (*Action) ProtoMessage() {} func (x *Action) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -578,11 +570,9 @@ type CustomAction struct { func (x *CustomAction) Reset() { *x = CustomAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CustomAction) String() string { @@ -593,7 +583,7 @@ func (*CustomAction) ProtoMessage() {} func (x *CustomAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -666,11 +656,9 @@ type KeyValueAction struct { func (x *KeyValueAction) Reset() { *x = KeyValueAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *KeyValueAction) String() string { @@ -681,7 +669,7 @@ func (*KeyValueAction) ProtoMessage() {} func (x *KeyValueAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -865,7 +853,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_d var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_goTypes = []any{ (FilterConfig_EnableFor)(0), // 0: dlp.options.gloo.solo.io.FilterConfig.EnableFor (Config_EnableFor)(0), // 1: dlp.options.gloo.solo.io.Config.EnableFor (Action_ActionType)(0), // 2: dlp.options.gloo.solo.io.Action.ActionType @@ -906,80 +894,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_d if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FilterConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DlpRule); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Config); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CustomAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_dlp_dlp_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*KeyValueAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/extproc/extproc.pb.clone.go b/pkg/api/gloo.solo.io/v1/enterprise/options/extproc/extproc.pb.clone.go index e406ef877..4d3a179a1 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/extproc/extproc.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/extproc/extproc.pb.clone.go @@ -13,12 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_common_mutation_rules_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" @@ -30,6 +24,12 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_filters "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/filters" github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -64,9 +64,9 @@ func (m *Settings) Clone() proto.Message { } if h, ok := interface{}(m.GetFailureModeAllow()).(clone.Cloner); ok { - target.FailureModeAllow = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.FailureModeAllow = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.FailureModeAllow = proto.Clone(m.GetFailureModeAllow()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.FailureModeAllow = proto.Clone(m.GetFailureModeAllow()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetProcessingMode()).(clone.Cloner); ok { @@ -76,9 +76,9 @@ func (m *Settings) Clone() proto.Message { } if h, ok := interface{}(m.GetAsyncMode()).(clone.Cloner); ok { - target.AsyncMode = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AsyncMode = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AsyncMode = proto.Clone(m.GetAsyncMode()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AsyncMode = proto.Clone(m.GetAsyncMode()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetRequestAttributes() != nil { @@ -100,15 +100,15 @@ func (m *Settings) Clone() proto.Message { } if h, ok := interface{}(m.GetMessageTimeout()).(clone.Cloner); ok { - target.MessageTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MessageTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MessageTimeout = proto.Clone(m.GetMessageTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MessageTimeout = proto.Clone(m.GetMessageTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetStatPrefix()).(clone.Cloner); ok { - target.StatPrefix = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.StatPrefix = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.StatPrefix = proto.Clone(m.GetStatPrefix()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.StatPrefix = proto.Clone(m.GetStatPrefix()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetMutationRules()).(clone.Cloner); ok { @@ -118,15 +118,15 @@ func (m *Settings) Clone() proto.Message { } if h, ok := interface{}(m.GetMaxMessageTimeout()).(clone.Cloner); ok { - target.MaxMessageTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxMessageTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxMessageTimeout = proto.Clone(m.GetMaxMessageTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxMessageTimeout = proto.Clone(m.GetMaxMessageTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetDisableClearRouteCache()).(clone.Cloner); ok { - target.DisableClearRouteCache = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClearRouteCache = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableClearRouteCache = proto.Clone(m.GetDisableClearRouteCache()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableClearRouteCache = proto.Clone(m.GetDisableClearRouteCache()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetForwardRules()).(clone.Cloner); ok { @@ -136,15 +136,15 @@ func (m *Settings) Clone() proto.Message { } if h, ok := interface{}(m.GetFilterMetadata()).(clone.Cloner); ok { - target.FilterMetadata = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.FilterMetadata = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.FilterMetadata = proto.Clone(m.GetFilterMetadata()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.FilterMetadata = proto.Clone(m.GetFilterMetadata()).(*google_golang_org_protobuf_types_known_structpb.Struct) } if h, ok := interface{}(m.GetAllowModeOverride()).(clone.Cloner); ok { - target.AllowModeOverride = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowModeOverride = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowModeOverride = proto.Clone(m.GetAllowModeOverride()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowModeOverride = proto.Clone(m.GetAllowModeOverride()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetMetadataContextNamespaces() != nil { @@ -182,11 +182,11 @@ func (m *RouteSettings) Clone() proto.Message { if h, ok := interface{}(m.GetDisabled()).(clone.Cloner); ok { target.Override = &RouteSettings_Disabled{ - Disabled: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + Disabled: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } else { target.Override = &RouteSettings_Disabled{ - Disabled: proto.Clone(m.GetDisabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + Disabled: proto.Clone(m.GetDisabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } @@ -222,9 +222,9 @@ func (m *GrpcService) Clone() proto.Message { } if h, ok := interface{}(m.GetAuthority()).(clone.Cloner); ok { - target.Authority = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Authority = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Authority = proto.Clone(m.GetAuthority()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Authority = proto.Clone(m.GetAuthority()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetRetryPolicy()).(clone.Cloner); ok { @@ -234,9 +234,9 @@ func (m *GrpcService) Clone() proto.Message { } if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if m.GetInitialMetadata() != nil { @@ -270,9 +270,9 @@ func (m *Overrides) Clone() proto.Message { } if h, ok := interface{}(m.GetAsyncMode()).(clone.Cloner); ok { - target.AsyncMode = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AsyncMode = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AsyncMode = proto.Clone(m.GetAsyncMode()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AsyncMode = proto.Clone(m.GetAsyncMode()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetRequestAttributes() != nil { diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/extproc/extproc.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/extproc/extproc.pb.go index b672ef352..28848975a 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/extproc/extproc.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/extproc/extproc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/extproc/extproc.proto @@ -11,9 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v31 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/common/mutation_rules/v3" v32 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" @@ -23,6 +20,9 @@ import ( core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -54,7 +54,7 @@ type Settings struct { // downstream client will be reset. // With this parameter set to true, however, then if the gRPC stream is prematurely closed // or could not be opened, processing continues without error. - FailureModeAllow *wrappers.BoolValue `protobuf:"bytes,3,opt,name=failure_mode_allow,json=failureModeAllow,proto3" json:"failure_mode_allow,omitempty"` + FailureModeAllow *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=failure_mode_allow,json=failureModeAllow,proto3" json:"failure_mode_allow,omitempty"` // Specifies default options for how HTTP headers, trailers, and bodies are // sent. ProcessingMode *v3.ProcessingMode `protobuf:"bytes,4,opt,name=processing_mode,json=processingMode,proto3" json:"processing_mode,omitempty"` @@ -64,7 +64,7 @@ type Settings struct { // filter processing. If false, which is the default, suspend filter execution after // each message is sent to the remote service and wait up to "message_timeout" // for a reply. - AsyncMode *wrappers.BoolValue `protobuf:"bytes,5,opt,name=async_mode,json=asyncMode,proto3" json:"async_mode,omitempty"` + AsyncMode *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=async_mode,json=asyncMode,proto3" json:"async_mode,omitempty"` // NOT CURRENTLY IMPLEMENTED. // Envoy provides a number of [attributes](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/attributes#arch-overview-attributes) // for expressive policies. Each attribute name provided in this field will be @@ -88,10 +88,10 @@ type Settings struct { // least 0 seconds, and less than or equal to 3600 seconds. Zero is a valid // value which means the timer will be triggered immediately. If not // configured, default is 200 milliseconds. - MessageTimeout *duration.Duration `protobuf:"bytes,8,opt,name=message_timeout,json=messageTimeout,proto3" json:"message_timeout,omitempty"` + MessageTimeout *durationpb.Duration `protobuf:"bytes,8,opt,name=message_timeout,json=messageTimeout,proto3" json:"message_timeout,omitempty"` // Optional additional prefix to use when emitting statistics. This allows distinguishing // between statistics emitted by multiple *ext_proc* filters in an HTTP filter chain. - StatPrefix *wrappers.StringValue `protobuf:"bytes,9,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"` + StatPrefix *wrapperspb.StringValue `protobuf:"bytes,9,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"` // Rules that determine what modifications an external processing server may // make to message headers. If not set, all headers may be modified except // for "host", ":authority", ":scheme", ":method", and headers that start @@ -108,23 +108,23 @@ type Settings struct { // [override_message_timeout](https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/ext_proc/v3/external_processor.proto#envoy-v3-api-field-service-ext-proc-v3-processingresponse-override-message-timeout). // If not specified, by default it is 0, which will effectively disable the `override_message_timeout` API. // Value must be greater than or equal to the `messageTimeout` and less than or equal to 3600 seconds. - MaxMessageTimeout *duration.Duration `protobuf:"bytes,11,opt,name=max_message_timeout,json=maxMessageTimeout,proto3" json:"max_message_timeout,omitempty"` + MaxMessageTimeout *durationpb.Duration `protobuf:"bytes,11,opt,name=max_message_timeout,json=maxMessageTimeout,proto3" json:"max_message_timeout,omitempty"` // Prevents clearing the route-cache when the // [clear_route_cache](https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/ext_proc/v3/external_processor.proto#envoy-v3-api-field-service-ext-proc-v3-commonresponse-clear-route-cache) // field is set in an external processor response. - DisableClearRouteCache *wrappers.BoolValue `protobuf:"bytes,12,opt,name=disable_clear_route_cache,json=disableClearRouteCache,proto3" json:"disable_clear_route_cache,omitempty"` + DisableClearRouteCache *wrapperspb.BoolValue `protobuf:"bytes,12,opt,name=disable_clear_route_cache,json=disableClearRouteCache,proto3" json:"disable_clear_route_cache,omitempty"` // Allow headers matching the `forward_rules` to be forwarded to the external processing server. // If not set, all headers are forwarded to the external processing server. ForwardRules *HeaderForwardingRules `protobuf:"bytes,13,opt,name=forward_rules,json=forwardRules,proto3" json:"forward_rules,omitempty"` // Additional metadata to be added to the filter state for logging purposes. The metadata // will be added to StreamInfo's filter state under the namespace corresponding to the // ext_proc filter name. - FilterMetadata *_struct.Struct `protobuf:"bytes,14,opt,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty"` + FilterMetadata *structpb.Struct `protobuf:"bytes,14,opt,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty"` // If `allow_mode_override` is set to true, the filter config [processing_mode](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/http/ext_proc/v3/ext_proc.proto#envoy-v3-api-field-extensions-filters-http-ext-proc-v3-externalprocessor-processing-mode) // can be overridden by the response message from the external processing server // [mode_override](https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/ext_proc/v3/external_processor.proto#envoy-v3-api-field-service-ext-proc-v3-processingresponse-mode-override). // If not set, `mode_override` API in the response message will be ignored. - AllowModeOverride *wrappers.BoolValue `protobuf:"bytes,15,opt,name=allow_mode_override,json=allowModeOverride,proto3" json:"allow_mode_override,omitempty"` + AllowModeOverride *wrapperspb.BoolValue `protobuf:"bytes,15,opt,name=allow_mode_override,json=allowModeOverride,proto3" json:"allow_mode_override,omitempty"` // Specifies a list of metadata namespaces whose values, if present, will be passed to the // ext_proc service as an opaque *protobuf::Struct*. MetadataContextNamespaces []string `protobuf:"bytes,16,rep,name=metadata_context_namespaces,json=metadataContextNamespaces,proto3" json:"metadata_context_namespaces,omitempty"` @@ -138,11 +138,9 @@ type Settings struct { func (x *Settings) Reset() { *x = Settings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Settings) String() string { @@ -153,7 +151,7 @@ func (*Settings) ProtoMessage() {} func (x *Settings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -182,7 +180,7 @@ func (x *Settings) GetFilterStage() *filters.FilterStage { return nil } -func (x *Settings) GetFailureModeAllow() *wrappers.BoolValue { +func (x *Settings) GetFailureModeAllow() *wrapperspb.BoolValue { if x != nil { return x.FailureModeAllow } @@ -196,7 +194,7 @@ func (x *Settings) GetProcessingMode() *v3.ProcessingMode { return nil } -func (x *Settings) GetAsyncMode() *wrappers.BoolValue { +func (x *Settings) GetAsyncMode() *wrapperspb.BoolValue { if x != nil { return x.AsyncMode } @@ -217,14 +215,14 @@ func (x *Settings) GetResponseAttributes() []string { return nil } -func (x *Settings) GetMessageTimeout() *duration.Duration { +func (x *Settings) GetMessageTimeout() *durationpb.Duration { if x != nil { return x.MessageTimeout } return nil } -func (x *Settings) GetStatPrefix() *wrappers.StringValue { +func (x *Settings) GetStatPrefix() *wrapperspb.StringValue { if x != nil { return x.StatPrefix } @@ -238,14 +236,14 @@ func (x *Settings) GetMutationRules() *v31.HeaderMutationRules { return nil } -func (x *Settings) GetMaxMessageTimeout() *duration.Duration { +func (x *Settings) GetMaxMessageTimeout() *durationpb.Duration { if x != nil { return x.MaxMessageTimeout } return nil } -func (x *Settings) GetDisableClearRouteCache() *wrappers.BoolValue { +func (x *Settings) GetDisableClearRouteCache() *wrapperspb.BoolValue { if x != nil { return x.DisableClearRouteCache } @@ -259,14 +257,14 @@ func (x *Settings) GetForwardRules() *HeaderForwardingRules { return nil } -func (x *Settings) GetFilterMetadata() *_struct.Struct { +func (x *Settings) GetFilterMetadata() *structpb.Struct { if x != nil { return x.FilterMetadata } return nil } -func (x *Settings) GetAllowModeOverride() *wrappers.BoolValue { +func (x *Settings) GetAllowModeOverride() *wrapperspb.BoolValue { if x != nil { return x.AllowModeOverride } @@ -302,11 +300,9 @@ type RouteSettings struct { func (x *RouteSettings) Reset() { *x = RouteSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteSettings) String() string { @@ -317,7 +313,7 @@ func (*RouteSettings) ProtoMessage() {} func (x *RouteSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -339,7 +335,7 @@ func (m *RouteSettings) GetOverride() isRouteSettings_Override { return nil } -func (x *RouteSettings) GetDisabled() *wrappers.BoolValue { +func (x *RouteSettings) GetDisabled() *wrapperspb.BoolValue { if x, ok := x.GetOverride().(*RouteSettings_Disabled); ok { return x.Disabled } @@ -360,7 +356,7 @@ type isRouteSettings_Override interface { type RouteSettings_Disabled struct { // Set to true to disable the External Processing filter for this virtual host or route. // Setting this value to false is not supported. - Disabled *wrappers.BoolValue `protobuf:"bytes,1,opt,name=disabled,proto3,oneof"` + Disabled *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=disabled,proto3,oneof"` } type RouteSettings_Overrides struct { @@ -385,14 +381,14 @@ type GrpcService struct { // The `:authority` header in the grpc request. If this field is not set, the authority header value will be the // cluster name. // Note that this authority does not override the SNI. The SNI is provided by the transport socket of the cluster. - Authority *wrappers.StringValue `protobuf:"bytes,2,opt,name=authority,proto3" json:"authority,omitempty"` + Authority *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=authority,proto3" json:"authority,omitempty"` // Indicates the retry policy for re-establishing the gRPC stream // This field is optional. If max interval is not provided, it will be set to ten times the provided base interval. // Currently only supported for xDS gRPC streams. // If not set, xDS gRPC streams default base interval:500ms, maximum interval:30s will be applied. RetryPolicy *v32.RetryPolicy `protobuf:"bytes,3,opt,name=retry_policy,json=retryPolicy,proto3" json:"retry_policy,omitempty"` // The timeout for the gRPC request. This is the timeout for a specific request. - Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` // Additional metadata to include in streams initiated to the GrpcService. This can be used for // scenarios in which additional ad hoc authorization headers (e.g. `x-foo-bar: baz-key`) are to // be injected. For more information, including details on header value syntax, see the @@ -402,11 +398,9 @@ type GrpcService struct { func (x *GrpcService) Reset() { *x = GrpcService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService) String() string { @@ -417,7 +411,7 @@ func (*GrpcService) ProtoMessage() {} func (x *GrpcService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -439,7 +433,7 @@ func (x *GrpcService) GetExtProcServerRef() *core.ResourceRef { return nil } -func (x *GrpcService) GetAuthority() *wrappers.StringValue { +func (x *GrpcService) GetAuthority() *wrapperspb.StringValue { if x != nil { return x.Authority } @@ -453,7 +447,7 @@ func (x *GrpcService) GetRetryPolicy() *v32.RetryPolicy { return nil } -func (x *GrpcService) GetTimeout() *duration.Duration { +func (x *GrpcService) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -476,7 +470,7 @@ type Overrides struct { ProcessingMode *v3.ProcessingMode `protobuf:"bytes,1,opt,name=processing_mode,json=processingMode,proto3" json:"processing_mode,omitempty"` // NOT CURRENTLY IMPLEMENTED. // Set a different asynchronous processing option than the default. - AsyncMode *wrappers.BoolValue `protobuf:"bytes,2,opt,name=async_mode,json=asyncMode,proto3" json:"async_mode,omitempty"` + AsyncMode *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=async_mode,json=asyncMode,proto3" json:"async_mode,omitempty"` // NOT FINALIZED UPSTREAM use at your own upgrade risk // Set different optional attributes than the default setting of the // `request_attributes` field. @@ -500,11 +494,9 @@ type Overrides struct { func (x *Overrides) Reset() { *x = Overrides{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Overrides) String() string { @@ -515,7 +507,7 @@ func (*Overrides) ProtoMessage() {} func (x *Overrides) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -537,7 +529,7 @@ func (x *Overrides) GetProcessingMode() *v3.ProcessingMode { return nil } -func (x *Overrides) GetAsyncMode() *wrappers.BoolValue { +func (x *Overrides) GetAsyncMode() *wrapperspb.BoolValue { if x != nil { return x.AsyncMode } @@ -599,11 +591,9 @@ type HeaderForwardingRules struct { func (x *HeaderForwardingRules) Reset() { *x = HeaderForwardingRules{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderForwardingRules) String() string { @@ -614,7 +604,7 @@ func (*HeaderForwardingRules) ProtoMessage() {} func (x *HeaderForwardingRules) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -875,19 +865,19 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extpr } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_goTypes = []any{ (*Settings)(nil), // 0: extproc.options.gloo.solo.io.Settings (*RouteSettings)(nil), // 1: extproc.options.gloo.solo.io.RouteSettings (*GrpcService)(nil), // 2: extproc.options.gloo.solo.io.GrpcService (*Overrides)(nil), // 3: extproc.options.gloo.solo.io.Overrides (*HeaderForwardingRules)(nil), // 4: extproc.options.gloo.solo.io.HeaderForwardingRules (*filters.FilterStage)(nil), // 5: filters.gloo.solo.io.FilterStage - (*wrappers.BoolValue)(nil), // 6: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 6: google.protobuf.BoolValue (*v3.ProcessingMode)(nil), // 7: solo.io.envoy.extensions.filters.http.ext_proc.v3.ProcessingMode - (*duration.Duration)(nil), // 8: google.protobuf.Duration - (*wrappers.StringValue)(nil), // 9: google.protobuf.StringValue + (*durationpb.Duration)(nil), // 8: google.protobuf.Duration + (*wrapperspb.StringValue)(nil), // 9: google.protobuf.StringValue (*v31.HeaderMutationRules)(nil), // 10: solo.io.envoy.config.common.mutation_rules.v3.HeaderMutationRules - (*_struct.Struct)(nil), // 11: google.protobuf.Struct + (*structpb.Struct)(nil), // 11: google.protobuf.Struct (*core.ResourceRef)(nil), // 12: core.solo.io.ResourceRef (*v32.RetryPolicy)(nil), // 13: solo.io.envoy.config.core.v3.RetryPolicy (*v32.HeaderValue)(nil), // 14: solo.io.envoy.config.core.v3.HeaderValue @@ -933,69 +923,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extpr if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Settings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Overrides); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderForwardingRules); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_extproc_extproc_proto_msgTypes[1].OneofWrappers = []any{ (*RouteSettings_Disabled)(nil), (*RouteSettings_Overrides)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/gcp/gcp.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/gcp/gcp.pb.go index 62c059b5e..c1517f930 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/gcp/gcp.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/gcp/gcp.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/gcp/gcp.proto @@ -37,11 +37,9 @@ type UpstreamSpec struct { func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_gcp_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_gcp_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -52,7 +50,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_gcp_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -118,7 +116,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_g } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_gcp_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_gcp_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_gcp_proto_goTypes = []any{ (*UpstreamSpec)(nil), // 0: gcp.options.gloo.solo.io.UpstreamSpec } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_gcp_proto_depIdxs = []int32{ @@ -136,20 +134,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_g if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_gcp_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_gcp_gcp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/jwt/jwt.pb.clone.go b/pkg/api/gloo.solo.io/v1/enterprise/options/jwt/jwt.pb.clone.go index 8c627e557..bcdf18c99 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/jwt/jwt.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/jwt/jwt.pb.clone.go @@ -13,13 +13,13 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_extensions_filters_http_jwt_authn_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/jwt_authn/v3" github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -190,9 +190,9 @@ func (m *Provider) Clone() proto.Message { } if h, ok := interface{}(m.GetClockSkewSeconds()).(clone.Cloner); ok { - target.ClockSkewSeconds = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.ClockSkewSeconds = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.ClockSkewSeconds = proto.Clone(m.GetClockSkewSeconds()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.ClockSkewSeconds = proto.Clone(m.GetClockSkewSeconds()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target @@ -254,9 +254,9 @@ func (m *RemoteJwks) Clone() proto.Message { } if h, ok := interface{}(m.GetCacheDuration()).(clone.Cloner); ok { - target.CacheDuration = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheDuration = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.CacheDuration = proto.Clone(m.GetCacheDuration()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CacheDuration = proto.Clone(m.GetCacheDuration()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetAsyncFetch()).(clone.Cloner); ok { diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/jwt/jwt.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/jwt/jwt.pb.go index 9ab742fc5..305a955ec 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/jwt/jwt.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/jwt/jwt.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/jwt/jwt.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/jwt_authn/v3" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -100,11 +100,9 @@ type JwtStagedVhostExtension struct { func (x *JwtStagedVhostExtension) Reset() { *x = JwtStagedVhostExtension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtStagedVhostExtension) String() string { @@ -115,7 +113,7 @@ func (*JwtStagedVhostExtension) ProtoMessage() {} func (x *JwtStagedVhostExtension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -157,11 +155,9 @@ type JwtStagedRouteProvidersExtension struct { func (x *JwtStagedRouteProvidersExtension) Reset() { *x = JwtStagedRouteProvidersExtension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtStagedRouteProvidersExtension) String() string { @@ -172,7 +168,7 @@ func (*JwtStagedRouteProvidersExtension) ProtoMessage() {} func (x *JwtStagedRouteProvidersExtension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -214,11 +210,9 @@ type JwtStagedRouteExtension struct { func (x *JwtStagedRouteExtension) Reset() { *x = JwtStagedRouteExtension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JwtStagedRouteExtension) String() string { @@ -229,7 +223,7 @@ func (*JwtStagedRouteExtension) ProtoMessage() {} func (x *JwtStagedRouteExtension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -280,11 +274,9 @@ type VhostExtension struct { func (x *VhostExtension) Reset() { *x = VhostExtension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VhostExtension) String() string { @@ -295,7 +287,7 @@ func (*VhostExtension) ProtoMessage() {} func (x *VhostExtension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -343,11 +335,9 @@ type RouteExtension struct { func (x *RouteExtension) Reset() { *x = RouteExtension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteExtension) String() string { @@ -358,7 +348,7 @@ func (*RouteExtension) ProtoMessage() {} func (x *RouteExtension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -398,16 +388,14 @@ type Provider struct { // What claims should be copied to upstream headers. ClaimsToHeaders []*ClaimToHeader `protobuf:"bytes,6,rep,name=claims_to_headers,json=claimsToHeaders,proto3" json:"claims_to_headers,omitempty"` // Optional: ClockSkewSeconds is used to verify time constraints, such as `exp` and `npf`. Default is 60s - ClockSkewSeconds *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=clock_skew_seconds,json=clockSkewSeconds,proto3" json:"clock_skew_seconds,omitempty"` + ClockSkewSeconds *wrapperspb.UInt32Value `protobuf:"bytes,8,opt,name=clock_skew_seconds,json=clockSkewSeconds,proto3" json:"clock_skew_seconds,omitempty"` } func (x *Provider) Reset() { *x = Provider{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Provider) String() string { @@ -418,7 +406,7 @@ func (*Provider) ProtoMessage() {} func (x *Provider) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -475,7 +463,7 @@ func (x *Provider) GetClaimsToHeaders() []*ClaimToHeader { return nil } -func (x *Provider) GetClockSkewSeconds() *wrappers.UInt32Value { +func (x *Provider) GetClockSkewSeconds() *wrapperspb.UInt32Value { if x != nil { return x.ClockSkewSeconds } @@ -496,11 +484,9 @@ type Jwks struct { func (x *Jwks) Reset() { *x = Jwks{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Jwks) String() string { @@ -511,7 +497,7 @@ func (*Jwks) ProtoMessage() {} func (x *Jwks) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -577,7 +563,7 @@ type RemoteJwks struct { UpstreamRef *core.ResourceRef `protobuf:"bytes,2,opt,name=upstream_ref,json=upstreamRef,proto3" json:"upstream_ref,omitempty"` // Duration after which the cached JWKS should be expired. // If not specified, default cache duration is 5 minutes. - CacheDuration *duration.Duration `protobuf:"bytes,4,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` + CacheDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=cache_duration,json=cacheDuration,proto3" json:"cache_duration,omitempty"` // Fetch Jwks asynchronously in the main thread before the listener is activated. // Fetched Jwks can be used by all worker threads. // @@ -597,11 +583,9 @@ type RemoteJwks struct { func (x *RemoteJwks) Reset() { *x = RemoteJwks{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RemoteJwks) String() string { @@ -612,7 +596,7 @@ func (*RemoteJwks) ProtoMessage() {} func (x *RemoteJwks) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -641,7 +625,7 @@ func (x *RemoteJwks) GetUpstreamRef() *core.ResourceRef { return nil } -func (x *RemoteJwks) GetCacheDuration() *duration.Duration { +func (x *RemoteJwks) GetCacheDuration() *durationpb.Duration { if x != nil { return x.CacheDuration } @@ -666,11 +650,9 @@ type LocalJwks struct { func (x *LocalJwks) Reset() { *x = LocalJwks{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LocalJwks) String() string { @@ -681,7 +663,7 @@ func (*LocalJwks) ProtoMessage() {} func (x *LocalJwks) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -717,11 +699,9 @@ type TokenSource struct { func (x *TokenSource) Reset() { *x = TokenSource{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TokenSource) String() string { @@ -732,7 +712,7 @@ func (*TokenSource) ProtoMessage() {} func (x *TokenSource) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -777,11 +757,9 @@ type ClaimToHeader struct { func (x *ClaimToHeader) Reset() { *x = ClaimToHeader{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ClaimToHeader) String() string { @@ -792,7 +770,7 @@ func (*ClaimToHeader) ProtoMessage() {} func (x *ClaimToHeader) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -842,11 +820,9 @@ type TokenSource_HeaderSource struct { func (x *TokenSource_HeaderSource) Reset() { *x = TokenSource_HeaderSource{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TokenSource_HeaderSource) String() string { @@ -857,7 +833,7 @@ func (*TokenSource_HeaderSource) ProtoMessage() {} func (x *TokenSource_HeaderSource) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1070,7 +1046,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_j var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes = make([]protoimpl.MessageInfo, 13) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_goTypes = []any{ (VhostExtension_ValidationPolicy)(0), // 0: jwt.options.gloo.solo.io.VhostExtension.ValidationPolicy (*JwtStagedVhostExtension)(nil), // 1: jwt.options.gloo.solo.io.JwtStagedVhostExtension (*JwtStagedRouteProvidersExtension)(nil), // 2: jwt.options.gloo.solo.io.JwtStagedRouteProvidersExtension @@ -1085,9 +1061,9 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jw (*ClaimToHeader)(nil), // 11: jwt.options.gloo.solo.io.ClaimToHeader nil, // 12: jwt.options.gloo.solo.io.VhostExtension.ProvidersEntry (*TokenSource_HeaderSource)(nil), // 13: jwt.options.gloo.solo.io.TokenSource.HeaderSource - (*wrappers.UInt32Value)(nil), // 14: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 14: google.protobuf.UInt32Value (*core.ResourceRef)(nil), // 15: core.solo.io.ResourceRef - (*duration.Duration)(nil), // 16: google.protobuf.Duration + (*durationpb.Duration)(nil), // 16: google.protobuf.Duration (*v3.JwksAsyncFetch)(nil), // 17: solo.io.envoy.extensions.filters.http.jwt_authn.v3.JwksAsyncFetch } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_depIdxs = []int32{ @@ -1124,153 +1100,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_j if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtStagedVhostExtension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtStagedRouteProvidersExtension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JwtStagedRouteExtension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VhostExtension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteExtension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Provider); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Jwks); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoteJwks); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LocalJwks); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TokenSource); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ClaimToHeader); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TokenSource_HeaderSource); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[6].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_jwt_jwt_proto_msgTypes[6].OneofWrappers = []any{ (*Jwks_Remote)(nil), (*Jwks_Local)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/ratelimit/ratelimit.pb.clone.go b/pkg/api/gloo.solo.io/v1/enterprise/options/ratelimit/ratelimit.pb.clone.go index 05ecbeb66..7cb89a714 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/ratelimit/ratelimit.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/ratelimit/ratelimit.pb.clone.go @@ -13,13 +13,13 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_local_ratelimit "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/local_ratelimit" github_com_solo_io_solo_apis_pkg_api_ratelimit_solo_io_v1alpha1 "github.com/solo-io/solo-apis/pkg/api/ratelimit.solo.io/v1alpha1" github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" ) // ensure the imports are used @@ -71,9 +71,9 @@ func (m *Settings) Clone() proto.Message { } if h, ok := interface{}(m.GetRequestTimeout()).(clone.Cloner); ok { - target.RequestTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.DenyOnFail = m.GetDenyOnFail() diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/ratelimit/ratelimit.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/ratelimit/ratelimit.pb.go index 96f681928..d44ecc096 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/ratelimit/ratelimit.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/ratelimit/ratelimit.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/ratelimit/ratelimit.proto @@ -10,14 +10,14 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" local_ratelimit "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/local_ratelimit" v1alpha1 "github.com/solo-io/solo-apis/pkg/api/ratelimit.solo.io/v1alpha1" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -39,11 +39,9 @@ type IngressRateLimit struct { func (x *IngressRateLimit) Reset() { *x = IngressRateLimit{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *IngressRateLimit) String() string { @@ -54,7 +52,7 @@ func (*IngressRateLimit) ProtoMessage() {} func (x *IngressRateLimit) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -88,9 +86,9 @@ type Settings struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RatelimitServerRef *core.ResourceRef `protobuf:"bytes,1,opt,name=ratelimit_server_ref,json=ratelimitServerRef,proto3" json:"ratelimit_server_ref,omitempty"` - RequestTimeout *duration.Duration `protobuf:"bytes,2,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` - DenyOnFail bool `protobuf:"varint,3,opt,name=deny_on_fail,json=denyOnFail,proto3" json:"deny_on_fail,omitempty"` + RatelimitServerRef *core.ResourceRef `protobuf:"bytes,1,opt,name=ratelimit_server_ref,json=ratelimitServerRef,proto3" json:"ratelimit_server_ref,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + DenyOnFail bool `protobuf:"varint,3,opt,name=deny_on_fail,json=denyOnFail,proto3" json:"deny_on_fail,omitempty"` // Set this to true to return Envoy's X-RateLimit headers to the downstream. // reference docs here: https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/http/ratelimit/v3/rate_limit.proto.html#envoy-v3-api-field-extensions-filters-http-ratelimit-v3-ratelimit-enable-x-ratelimit-headers EnableXRatelimitHeaders bool `protobuf:"varint,4,opt,name=enable_x_ratelimit_headers,json=enableXRatelimitHeaders,proto3" json:"enable_x_ratelimit_headers,omitempty"` @@ -105,11 +103,9 @@ type Settings struct { func (x *Settings) Reset() { *x = Settings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Settings) String() string { @@ -120,7 +116,7 @@ func (*Settings) ProtoMessage() {} func (x *Settings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -142,7 +138,7 @@ func (x *Settings) GetRatelimitServerRef() *core.ResourceRef { return nil } -func (x *Settings) GetRequestTimeout() *duration.Duration { +func (x *Settings) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } @@ -206,11 +202,9 @@ type GrpcService struct { func (x *GrpcService) Reset() { *x = GrpcService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService) String() string { @@ -221,7 +215,7 @@ func (*GrpcService) ProtoMessage() {} func (x *GrpcService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -270,11 +264,9 @@ type ServiceSettings struct { func (x *ServiceSettings) Reset() { *x = ServiceSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServiceSettings) String() string { @@ -285,7 +277,7 @@ func (*ServiceSettings) ProtoMessage() {} func (x *ServiceSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -326,11 +318,9 @@ type RateLimitConfigRefs struct { func (x *RateLimitConfigRefs) Reset() { *x = RateLimitConfigRefs{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitConfigRefs) String() string { @@ -341,7 +331,7 @@ func (*RateLimitConfigRefs) ProtoMessage() {} func (x *RateLimitConfigRefs) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -375,11 +365,9 @@ type RateLimitConfigRef struct { func (x *RateLimitConfigRef) Reset() { *x = RateLimitConfigRef{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitConfigRef) String() string { @@ -390,7 +378,7 @@ func (*RateLimitConfigRef) ProtoMessage() {} func (x *RateLimitConfigRef) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -441,11 +429,9 @@ type RateLimitVhostExtension struct { func (x *RateLimitVhostExtension) Reset() { *x = RateLimitVhostExtension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitVhostExtension) String() string { @@ -456,7 +442,7 @@ func (*RateLimitVhostExtension) ProtoMessage() {} func (x *RateLimitVhostExtension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -508,11 +494,9 @@ type RateLimitRouteExtension struct { func (x *RateLimitRouteExtension) Reset() { *x = RateLimitRouteExtension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitRouteExtension) String() string { @@ -523,7 +507,7 @@ func (*RateLimitRouteExtension) ProtoMessage() {} func (x *RateLimitRouteExtension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -698,7 +682,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratel } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_goTypes = []any{ (*IngressRateLimit)(nil), // 0: ratelimit.options.gloo.solo.io.IngressRateLimit (*Settings)(nil), // 1: ratelimit.options.gloo.solo.io.Settings (*GrpcService)(nil), // 2: ratelimit.options.gloo.solo.io.GrpcService @@ -709,7 +693,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rateli (*RateLimitRouteExtension)(nil), // 7: ratelimit.options.gloo.solo.io.RateLimitRouteExtension (*v1alpha1.RateLimit)(nil), // 8: ratelimit.api.solo.io.RateLimit (*core.ResourceRef)(nil), // 9: core.solo.io.ResourceRef - (*duration.Duration)(nil), // 10: google.protobuf.Duration + (*durationpb.Duration)(nil), // 10: google.protobuf.Duration (*v1alpha1.Descriptor)(nil), // 11: ratelimit.api.solo.io.Descriptor (*v1alpha1.SetDescriptor)(nil), // 12: ratelimit.api.solo.io.SetDescriptor (*v1alpha1.RateLimitActions)(nil), // 13: ratelimit.api.solo.io.RateLimitActions @@ -742,105 +726,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratel if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*IngressRateLimit); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Settings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitConfigRefs); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitConfigRef); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitVhostExtension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitRouteExtension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_ratelimit_ratelimit_proto_msgTypes[1].OneofWrappers = []any{ (*Settings_GrpcService)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/rbac/rbac.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/rbac/rbac.pb.go index 702c84596..b5627db46 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/rbac/rbac.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/rbac/rbac.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/rbac/rbac.proto @@ -87,11 +87,9 @@ type Settings struct { func (x *Settings) Reset() { *x = Settings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Settings) String() string { @@ -102,7 +100,7 @@ func (*Settings) ProtoMessage() {} func (x *Settings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -139,11 +137,9 @@ type ExtensionSettings struct { func (x *ExtensionSettings) Reset() { *x = ExtensionSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExtensionSettings) String() string { @@ -154,7 +150,7 @@ func (*ExtensionSettings) ProtoMessage() {} func (x *ExtensionSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -201,11 +197,9 @@ type Policy struct { func (x *Policy) Reset() { *x = Policy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Policy) String() string { @@ -216,7 +210,7 @@ func (*Policy) ProtoMessage() {} func (x *Policy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -263,11 +257,9 @@ type Principal struct { func (x *Principal) Reset() { *x = Principal{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Principal) String() string { @@ -278,7 +270,7 @@ func (*Principal) ProtoMessage() {} func (x *Principal) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -319,11 +311,9 @@ type JWTPrincipal struct { func (x *JWTPrincipal) Reset() { *x = JWTPrincipal{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JWTPrincipal) String() string { @@ -334,7 +324,7 @@ func (*JWTPrincipal) ProtoMessage() {} func (x *JWTPrincipal) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -385,11 +375,9 @@ type Permissions struct { func (x *Permissions) Reset() { *x = Permissions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Permissions) String() string { @@ -400,7 +388,7 @@ func (*Permissions) ProtoMessage() {} func (x *Permissions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -524,7 +512,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_goTypes = []any{ (JWTPrincipal_ClaimMatcher)(0), // 0: rbac.options.gloo.solo.io.JWTPrincipal.ClaimMatcher (*Settings)(nil), // 1: rbac.options.gloo.solo.io.Settings (*ExtensionSettings)(nil), // 2: rbac.options.gloo.solo.io.ExtensionSettings @@ -557,80 +545,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Settings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExtensionSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Policy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Principal); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JWTPrincipal); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_rbac_rbac_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Permissions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/stateful_session/stateful_session.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/stateful_session/stateful_session.pb.go index edf6c1bbe..0524baeff 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/stateful_session/stateful_session.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/stateful_session/stateful_session.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/stateful_session/stateful_session.proto @@ -11,9 +11,9 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" ) const ( @@ -40,11 +40,9 @@ type StatefulSession struct { func (x *StatefulSession) Reset() { *x = StatefulSession{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StatefulSession) String() string { @@ -55,7 +53,7 @@ func (*StatefulSession) ProtoMessage() {} func (x *StatefulSession) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -130,11 +128,9 @@ type CookieBasedSessionState struct { func (x *CookieBasedSessionState) Reset() { *x = CookieBasedSessionState{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CookieBasedSessionState) String() string { @@ -145,7 +141,7 @@ func (*CookieBasedSessionState) ProtoMessage() {} func (x *CookieBasedSessionState) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -179,11 +175,9 @@ type HeaderBasedSessionState struct { func (x *HeaderBasedSessionState) Reset() { *x = HeaderBasedSessionState{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderBasedSessionState) String() string { @@ -194,7 +188,7 @@ func (*HeaderBasedSessionState) ProtoMessage() {} func (x *HeaderBasedSessionState) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -226,16 +220,14 @@ type CookieBasedSessionState_Cookie struct { // Path of cookie. This will be used to set the path of a new cookie when it is generated. If no path is specified here, no path will be set for the cookie. Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` // Duration of cookie. This will be used to set the expiry time of a new cookie when it is generated. Set this to 0s to use a session cookie and disable cookie expiration. - Ttl *duration.Duration `protobuf:"bytes,3,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *durationpb.Duration `protobuf:"bytes,3,opt,name=ttl,proto3" json:"ttl,omitempty"` } func (x *CookieBasedSessionState_Cookie) Reset() { *x = CookieBasedSessionState_Cookie{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CookieBasedSessionState_Cookie) String() string { @@ -246,7 +238,7 @@ func (*CookieBasedSessionState_Cookie) ProtoMessage() {} func (x *CookieBasedSessionState_Cookie) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -275,7 +267,7 @@ func (x *CookieBasedSessionState_Cookie) GetPath() string { return "" } -func (x *CookieBasedSessionState_Cookie) GetTtl() *duration.Duration { +func (x *CookieBasedSessionState_Cookie) GetTtl() *durationpb.Duration { if x != nil { return x.Ttl } @@ -356,12 +348,12 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_state } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_goTypes = []any{ (*StatefulSession)(nil), // 0: stateful_session.options.gloo.solo.io.StatefulSession (*CookieBasedSessionState)(nil), // 1: stateful_session.options.gloo.solo.io.CookieBasedSessionState (*HeaderBasedSessionState)(nil), // 2: stateful_session.options.gloo.solo.io.HeaderBasedSessionState (*CookieBasedSessionState_Cookie)(nil), // 3: stateful_session.options.gloo.solo.io.CookieBasedSessionState.Cookie - (*duration.Duration)(nil), // 4: google.protobuf.Duration + (*durationpb.Duration)(nil), // 4: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_depIdxs = []int32{ 1, // 0: stateful_session.options.gloo.solo.io.StatefulSession.cookie_based:type_name -> stateful_session.options.gloo.solo.io.CookieBasedSessionState @@ -382,57 +374,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_state if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StatefulSession); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CookieBasedSessionState); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderBasedSessionState); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CookieBasedSessionState_Cookie); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_stateful_session_stateful_session_proto_msgTypes[0].OneofWrappers = []any{ (*StatefulSession_CookieBased)(nil), (*StatefulSession_HeaderBased)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/enterprise/options/waf/waf.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/options/waf/waf.pb.go index 8cb386e42..3ff273924 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/options/waf/waf.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/options/waf/waf.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/waf/waf.proto @@ -55,11 +55,9 @@ type Settings struct { func (x *Settings) Reset() { *x = Settings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Settings) String() string { @@ -70,7 +68,7 @@ func (*Settings) ProtoMessage() {} func (x *Settings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -157,11 +155,9 @@ type RuleSetFromConfigMap struct { func (x *RuleSetFromConfigMap) Reset() { *x = RuleSetFromConfigMap{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RuleSetFromConfigMap) String() string { @@ -172,7 +168,7 @@ func (*RuleSetFromConfigMap) ProtoMessage() {} func (x *RuleSetFromConfigMap) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -219,11 +215,9 @@ type CoreRuleSet struct { func (x *CoreRuleSet) Reset() { *x = CoreRuleSet{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CoreRuleSet) String() string { @@ -234,7 +228,7 @@ func (*CoreRuleSet) ProtoMessage() {} func (x *CoreRuleSet) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -380,7 +374,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_w } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_goTypes = []any{ (*Settings)(nil), // 0: waf.options.gloo.solo.io.Settings (*RuleSetFromConfigMap)(nil), // 1: waf.options.gloo.solo.io.RuleSetFromConfigMap (*CoreRuleSet)(nil), // 2: waf.options.gloo.solo.io.CoreRuleSet @@ -408,45 +402,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_w if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Settings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RuleSetFromConfigMap); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CoreRuleSet); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_waf_waf_proto_msgTypes[2].OneofWrappers = []any{ (*CoreRuleSet_CustomSettingsString)(nil), (*CoreRuleSet_CustomSettingsFile)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/enterprise/ratelimit.pb.go b/pkg/api/gloo.solo.io/v1/enterprise/ratelimit.pb.go index d23233c8f..fe6dc048b 100644 --- a/pkg/api/gloo.solo.io/v1/enterprise/ratelimit.pb.go +++ b/pkg/api/gloo.solo.io/v1/enterprise/ratelimit.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/ratelimit.proto @@ -44,11 +44,9 @@ type RateLimitConfig struct { func (x *RateLimitConfig) Reset() { *x = RateLimitConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitConfig) String() string { @@ -59,7 +57,7 @@ func (*RateLimitConfig) ProtoMessage() {} func (x *RateLimitConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -171,7 +169,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_pro } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_proto_goTypes = []any{ (*RateLimitConfig)(nil), // 0: glooe.solo.io.RateLimitConfig (*v1alpha1.Descriptor)(nil), // 1: ratelimit.api.solo.io.Descriptor (*v1alpha1.SetDescriptor)(nil), // 2: ratelimit.api.solo.io.SetDescriptor @@ -201,20 +199,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_pro if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_ratelimit_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/extensions.pb.clone.go b/pkg/api/gloo.solo.io/v1/extensions.pb.clone.go index fa9250156..6ce365a7e 100644 --- a/pkg/api/gloo.solo.io/v1/extensions.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/extensions.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" ) // ensure the imports are used @@ -36,13 +36,13 @@ func (m *Extensions) Clone() proto.Message { target = &Extensions{} if m.GetConfigs() != nil { - target.Configs = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetConfigs())) + target.Configs = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetConfigs())) for k, v := range m.GetConfigs() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.Configs[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Configs[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Configs[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Configs[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } @@ -60,9 +60,9 @@ func (m *Extension) Clone() proto.Message { target = &Extension{} if h, ok := interface{}(m.GetConfig()).(clone.Cloner); ok { - target.Config = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Config = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Config = proto.Clone(m.GetConfig()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Config = proto.Clone(m.GetConfig()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target diff --git a/pkg/api/gloo.solo.io/v1/extensions.pb.go b/pkg/api/gloo.solo.io/v1/extensions.pb.go index 15cb1fc3c..083c42dc2 100644 --- a/pkg/api/gloo.solo.io/v1/extensions.pb.go +++ b/pkg/api/gloo.solo.io/v1/extensions.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/extensions.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" ) const ( @@ -28,16 +28,14 @@ type Extensions struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Configs map[string]*_struct.Struct `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Configs map[string]*structpb.Struct `protobuf:"bytes,1,rep,name=configs,proto3" json:"configs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *Extensions) Reset() { *x = Extensions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Extensions) String() string { @@ -48,7 +46,7 @@ func (*Extensions) ProtoMessage() {} func (x *Extensions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -63,7 +61,7 @@ func (*Extensions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_rawDescGZIP(), []int{0} } -func (x *Extensions) GetConfigs() map[string]*_struct.Struct { +func (x *Extensions) GetConfigs() map[string]*structpb.Struct { if x != nil { return x.Configs } @@ -75,16 +73,14 @@ type Extension struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Config *_struct.Struct `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` + Config *structpb.Struct `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"` } func (x *Extension) Reset() { *x = Extension{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Extension) String() string { @@ -95,7 +91,7 @@ func (*Extension) ProtoMessage() {} func (x *Extension) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -110,7 +106,7 @@ func (*Extension) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_rawDescGZIP(), []int{1} } -func (x *Extension) GetConfig() *_struct.Struct { +func (x *Extension) GetConfig() *structpb.Struct { if x != nil { return x.Config } @@ -162,11 +158,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_rawDesc } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_goTypes = []interface{}{ - (*Extensions)(nil), // 0: gloo.solo.io.Extensions - (*Extension)(nil), // 1: gloo.solo.io.Extension - nil, // 2: gloo.solo.io.Extensions.ConfigsEntry - (*_struct.Struct)(nil), // 3: google.protobuf.Struct +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_goTypes = []any{ + (*Extensions)(nil), // 0: gloo.solo.io.Extensions + (*Extension)(nil), // 1: gloo.solo.io.Extension + nil, // 2: gloo.solo.io.Extensions.ConfigsEntry + (*structpb.Struct)(nil), // 3: google.protobuf.Struct } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_depIdxs = []int32{ 2, // 0: gloo.solo.io.Extensions.configs:type_name -> gloo.solo.io.Extensions.ConfigsEntry @@ -184,32 +180,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_init() if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Extensions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Extension); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/failover.pb.clone.go b/pkg/api/gloo.solo.io/v1/failover.pb.clone.go index 40af55f24..34064dbb4 100644 --- a/pkg/api/gloo.solo.io/v1/failover.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/failover.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -89,9 +89,9 @@ func (m *LocalityLbEndpoints) Clone() proto.Message { } if h, ok := interface{}(m.GetLoadBalancingWeight()).(clone.Cloner); ok { - target.LoadBalancingWeight = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.LoadBalancingWeight = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.LoadBalancingWeight = proto.Clone(m.GetLoadBalancingWeight()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.LoadBalancingWeight = proto.Clone(m.GetLoadBalancingWeight()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target @@ -122,19 +122,19 @@ func (m *LbEndpoint) Clone() proto.Message { } if h, ok := interface{}(m.GetLoadBalancingWeight()).(clone.Cloner); ok { - target.LoadBalancingWeight = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.LoadBalancingWeight = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.LoadBalancingWeight = proto.Clone(m.GetLoadBalancingWeight()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.LoadBalancingWeight = proto.Clone(m.GetLoadBalancingWeight()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if m.GetMetadata() != nil { - target.Metadata = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetMetadata())) + target.Metadata = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetMetadata())) for k, v := range m.GetMetadata() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.Metadata[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Metadata[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } @@ -193,9 +193,9 @@ func (m *Failover_Policy) Clone() proto.Message { target = &Failover_Policy{} if h, ok := interface{}(m.GetOverprovisioningFactor()).(clone.Cloner); ok { - target.OverprovisioningFactor = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.OverprovisioningFactor = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.OverprovisioningFactor = proto.Clone(m.GetOverprovisioningFactor()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.OverprovisioningFactor = proto.Clone(m.GetOverprovisioningFactor()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/gloo.solo.io/v1/failover.pb.go b/pkg/api/gloo.solo.io/v1/failover.pb.go index a05d0944f..d52c3f5a6 100644 --- a/pkg/api/gloo.solo.io/v1/failover.pb.go +++ b/pkg/api/gloo.solo.io/v1/failover.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/failover.proto @@ -11,12 +11,12 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -52,11 +52,9 @@ type Failover struct { func (x *Failover) Reset() { *x = Failover{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Failover) String() string { @@ -67,7 +65,7 @@ func (*Failover) ProtoMessage() {} func (x *Failover) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -116,16 +114,14 @@ type LocalityLbEndpoints struct { // localities at the same priority level to produce the effective percentage // of traffic for the locality. // To enable locality weighted load balancing, load_balancer_config.locality_weighted_lb_config must be set as well - LoadBalancingWeight *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` + LoadBalancingWeight *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` } func (x *LocalityLbEndpoints) Reset() { *x = LocalityLbEndpoints{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LocalityLbEndpoints) String() string { @@ -136,7 +132,7 @@ func (*LocalityLbEndpoints) ProtoMessage() {} func (x *LocalityLbEndpoints) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -165,7 +161,7 @@ func (x *LocalityLbEndpoints) GetLbEndpoints() []*LbEndpoint { return nil } -func (x *LocalityLbEndpoints) GetLoadBalancingWeight() *wrappers.UInt32Value { +func (x *LocalityLbEndpoints) GetLoadBalancingWeight() *wrapperspb.UInt32Value { if x != nil { return x.LoadBalancingWeight } @@ -195,22 +191,20 @@ type LbEndpoint struct { // weighted by the endpoint's locality's load balancing weight from // LocalityLbEndpoints. If unspecified, each host is presumed to have equal // weight in a locality. - LoadBalancingWeight *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` + LoadBalancingWeight *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` // Additional metadata to add to the endpoint. This metadata can be used in upstream HTTP filters // or other specific Envoy configurations. // The following keys are added by Gloo Edge and are ignored if set: // - "envoy.transport_socket_match" // - "io.solo.health_checkers.advanced_http" - Metadata map[string]*_struct.Struct `protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Metadata map[string]*structpb.Struct `protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *LbEndpoint) Reset() { *x = LbEndpoint{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LbEndpoint) String() string { @@ -221,7 +215,7 @@ func (*LbEndpoint) ProtoMessage() {} func (x *LbEndpoint) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -264,14 +258,14 @@ func (x *LbEndpoint) GetUpstreamSslConfig() *ssl.UpstreamSslConfig { return nil } -func (x *LbEndpoint) GetLoadBalancingWeight() *wrappers.UInt32Value { +func (x *LbEndpoint) GetLoadBalancingWeight() *wrapperspb.UInt32Value { if x != nil { return x.LoadBalancingWeight } return nil } -func (x *LbEndpoint) GetMetadata() map[string]*_struct.Struct { +func (x *LbEndpoint) GetMetadata() map[string]*structpb.Struct { if x != nil { return x.Metadata } @@ -299,11 +293,9 @@ type Locality struct { func (x *Locality) Reset() { *x = Locality{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Locality) String() string { @@ -314,7 +306,7 @@ func (*Locality) ProtoMessage() {} func (x *Locality) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -360,11 +352,9 @@ type Failover_PrioritizedLocality struct { func (x *Failover_PrioritizedLocality) Reset() { *x = Failover_PrioritizedLocality{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Failover_PrioritizedLocality) String() string { @@ -375,7 +365,7 @@ func (*Failover_PrioritizedLocality) ProtoMessage() {} func (x *Failover_PrioritizedLocality) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -416,16 +406,14 @@ type Failover_Policy struct { // // Read more at priority levels and // localities. - OverprovisioningFactor *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=overprovisioning_factor,json=overprovisioningFactor,proto3" json:"overprovisioning_factor,omitempty"` + OverprovisioningFactor *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=overprovisioning_factor,json=overprovisioningFactor,proto3" json:"overprovisioning_factor,omitempty"` } func (x *Failover_Policy) Reset() { *x = Failover_Policy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Failover_Policy) String() string { @@ -436,7 +424,7 @@ func (*Failover_Policy) ProtoMessage() {} func (x *Failover_Policy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -451,7 +439,7 @@ func (*Failover_Policy) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_rawDescGZIP(), []int{0, 1} } -func (x *Failover_Policy) GetOverprovisioningFactor() *wrappers.UInt32Value { +func (x *Failover_Policy) GetOverprovisioningFactor() *wrapperspb.UInt32Value { if x != nil { return x.OverprovisioningFactor } @@ -483,11 +471,9 @@ type LbEndpoint_HealthCheckConfig struct { func (x *LbEndpoint_HealthCheckConfig) Reset() { *x = LbEndpoint_HealthCheckConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LbEndpoint_HealthCheckConfig) String() string { @@ -498,7 +484,7 @@ func (*LbEndpoint_HealthCheckConfig) ProtoMessage() {} func (x *LbEndpoint_HealthCheckConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -660,7 +646,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_rawDescGZ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_goTypes = []any{ (*Failover)(nil), // 0: gloo.solo.io.Failover (*LocalityLbEndpoints)(nil), // 1: gloo.solo.io.LocalityLbEndpoints (*LbEndpoint)(nil), // 2: gloo.solo.io.LbEndpoint @@ -669,9 +655,9 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_goTypes = (*Failover_Policy)(nil), // 5: gloo.solo.io.Failover.Policy (*LbEndpoint_HealthCheckConfig)(nil), // 6: gloo.solo.io.LbEndpoint.HealthCheckConfig nil, // 7: gloo.solo.io.LbEndpoint.MetadataEntry - (*wrappers.UInt32Value)(nil), // 8: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 8: google.protobuf.UInt32Value (*ssl.UpstreamSslConfig)(nil), // 9: gloo.solo.io.UpstreamSslConfig - (*_struct.Struct)(nil), // 10: google.protobuf.Struct + (*structpb.Struct)(nil), // 10: google.protobuf.Struct } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_depIdxs = []int32{ 4, // 0: gloo.solo.io.Failover.prioritized_localities:type_name -> gloo.solo.io.Failover.PrioritizedLocality @@ -698,92 +684,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_init() { if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Failover); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LocalityLbEndpoints); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LbEndpoint); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Locality); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Failover_PrioritizedLocality); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Failover_Policy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LbEndpoint_HealthCheckConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/filters/stages.pb.go b/pkg/api/gloo.solo.io/v1/filters/stages.pb.go index d66fad99f..4520699c4 100644 --- a/pkg/api/gloo.solo.io/v1/filters/stages.pb.go +++ b/pkg/api/gloo.solo.io/v1/filters/stages.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/filters/stages.proto @@ -155,11 +155,9 @@ type FilterStage struct { func (x *FilterStage) Reset() { *x = FilterStage{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FilterStage) String() string { @@ -170,7 +168,7 @@ func (*FilterStage) ProtoMessage() {} func (x *FilterStage) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -253,7 +251,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_raw var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_goTypes = []any{ (FilterStage_Stage)(0), // 0: filters.gloo.solo.io.FilterStage.Stage (FilterStage_Predicate)(0), // 1: filters.gloo.solo.io.FilterStage.Predicate (*FilterStage)(nil), // 2: filters.gloo.solo.io.FilterStage @@ -273,20 +271,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_ini if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_filters_stages_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FilterStage); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/gloosnapshot/snap.pb.go b/pkg/api/gloo.solo.io/v1/gloosnapshot/snap.pb.go index 395bf3140..3ff687c77 100644 --- a/pkg/api/gloo.solo.io/v1/gloosnapshot/snap.pb.go +++ b/pkg/api/gloo.solo.io/v1/gloosnapshot/snap.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/gloosnapshot/snap.proto @@ -39,7 +39,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_gloosnapshot_snap_proto_r 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_gloosnapshot_snap_proto_goTypes = []interface{}{} +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_gloosnapshot_snap_proto_goTypes = []any{} var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_gloosnapshot_snap_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type diff --git a/pkg/api/gloo.solo.io/v1/http_listener_options.pb.clone.go b/pkg/api/gloo.solo.io/v1/http_listener_options.pb.clone.go index 0ab46b667..3a3c5eab7 100644 --- a/pkg/api/gloo.solo.io/v1/http_listener_options.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/http_listener_options.pb.clone.go @@ -13,8 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_enterprise_gloo_solo_io_v1 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_filter_http_gzip_v2 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2" @@ -58,6 +56,8 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_tap "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/tap" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_wasm "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/wasm" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -170,15 +170,15 @@ func (m *HttpListenerOptions) Clone() proto.Message { } if h, ok := interface{}(m.GetSanitizeClusterHeader()).(clone.Cloner); ok { - target.SanitizeClusterHeader = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.SanitizeClusterHeader = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.SanitizeClusterHeader = proto.Clone(m.GetSanitizeClusterHeader()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.SanitizeClusterHeader = proto.Clone(m.GetSanitizeClusterHeader()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetLeftmostXffAddress()).(clone.Cloner); ok { - target.LeftmostXffAddress = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LeftmostXffAddress = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.LeftmostXffAddress = proto.Clone(m.GetLeftmostXffAddress()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LeftmostXffAddress = proto.Clone(m.GetLeftmostXffAddress()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetDynamicForwardProxy()).(clone.Cloner); ok { @@ -235,11 +235,11 @@ func (m *HttpListenerOptions) Clone() proto.Message { if h, ok := interface{}(m.GetDisableExtProc()).(clone.Cloner); ok { target.ExtProcConfig = &HttpListenerOptions_DisableExtProc{ - DisableExtProc: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + DisableExtProc: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } else { target.ExtProcConfig = &HttpListenerOptions_DisableExtProc{ - DisableExtProc: proto.Clone(m.GetDisableExtProc()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + DisableExtProc: proto.Clone(m.GetDisableExtProc()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } diff --git a/pkg/api/gloo.solo.io/v1/http_listener_options.pb.go b/pkg/api/gloo.solo.io/v1/http_listener_options.pb.go index 05beda6ae..be2e0b832 100644 --- a/pkg/api/gloo.solo.io/v1/http_listener_options.pb.go +++ b/pkg/api/gloo.solo.io/v1/http_listener_options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/http_listener_options.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" v2 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/filter/http/gzip/v2" @@ -36,6 +35,7 @@ import ( wasm "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/wasm" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -112,12 +112,12 @@ type HttpListenerOptions struct { // Enterprise-only: If using the HTTP header specified by cluster_header to direct traffic to a cluster, // this option will sanitize that header from downstream traffic. // Defaults to false - SanitizeClusterHeader *wrappers.BoolValue `protobuf:"bytes,14,opt,name=sanitize_cluster_header,json=sanitizeClusterHeader,proto3" json:"sanitize_cluster_header,omitempty"` + SanitizeClusterHeader *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=sanitize_cluster_header,json=sanitizeClusterHeader,proto3" json:"sanitize_cluster_header,omitempty"` // Enterprise-only: Setting this value to true will grab the leftmost IP address from // the x-forwarded-for header and set it as the downstream address. // It is worth noting that the x-forwarded-for header can be tampered with by clients // and should therefore be sanitized by any preceding proxies / load balancers if this option is to be used. - LeftmostXffAddress *wrappers.BoolValue `protobuf:"bytes,16,opt,name=leftmost_xff_address,json=leftmostXffAddress,proto3" json:"leftmost_xff_address,omitempty"` + LeftmostXffAddress *wrapperspb.BoolValue `protobuf:"bytes,16,opt,name=leftmost_xff_address,json=leftmostXffAddress,proto3" json:"leftmost_xff_address,omitempty"` DynamicForwardProxy *dynamic_forward_proxy.FilterConfig `protobuf:"bytes,28,opt,name=dynamic_forward_proxy,json=dynamicForwardProxy,proto3" json:"dynamic_forward_proxy,omitempty"` // ConnectionLimit can be used to limit the number of active connections per gateway. Useful for resource protection as well as DoS prevention. ConnectionLimit *connection_limit.ConnectionLimit `protobuf:"bytes,29,opt,name=connection_limit,json=connectionLimit,proto3" json:"connection_limit,omitempty"` @@ -144,11 +144,9 @@ type HttpListenerOptions struct { func (x *HttpListenerOptions) Reset() { *x = HttpListenerOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpListenerOptions) String() string { @@ -159,7 +157,7 @@ func (*HttpListenerOptions) ProtoMessage() {} func (x *HttpListenerOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -251,7 +249,7 @@ func (m *HttpListenerOptions) GetExtProcConfig() isHttpListenerOptions_ExtProcCo return nil } -func (x *HttpListenerOptions) GetDisableExtProc() *wrappers.BoolValue { +func (x *HttpListenerOptions) GetDisableExtProc() *wrapperspb.BoolValue { if x, ok := x.GetExtProcConfig().(*HttpListenerOptions_DisableExtProc); ok { return x.DisableExtProc } @@ -300,14 +298,14 @@ func (x *HttpListenerOptions) GetGrpcJsonTranscoder() *grpc_json.GrpcJsonTransco return nil } -func (x *HttpListenerOptions) GetSanitizeClusterHeader() *wrappers.BoolValue { +func (x *HttpListenerOptions) GetSanitizeClusterHeader() *wrapperspb.BoolValue { if x != nil { return x.SanitizeClusterHeader } return nil } -func (x *HttpListenerOptions) GetLeftmostXffAddress() *wrappers.BoolValue { +func (x *HttpListenerOptions) GetLeftmostXffAddress() *wrapperspb.BoolValue { if x != nil { return x.LeftmostXffAddress } @@ -377,7 +375,7 @@ type isHttpListenerOptions_ExtProcConfig interface { type HttpListenerOptions_DisableExtProc struct { // Enterprise-only: Set to true to disable the External Processing filter for this listener. // This can be overridden by child VirtualHostOptions or RouteOptions. - DisableExtProc *wrappers.BoolValue `protobuf:"bytes,30,opt,name=disable_ext_proc,json=disableExtProc,proto3,oneof"` + DisableExtProc *wrapperspb.BoolValue `protobuf:"bytes,30,opt,name=disable_ext_proc,json=disableExtProc,proto3,oneof"` } type HttpListenerOptions_ExtProc struct { @@ -687,7 +685,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_pr } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_proto_goTypes = []any{ (*HttpListenerOptions)(nil), // 0: gloo.solo.io.HttpListenerOptions (*grpc_web.GrpcWeb)(nil), // 1: grpc_web.options.gloo.solo.io.GrpcWeb (*hcm.HttpConnectionManagerSettings)(nil), // 2: hcm.options.gloo.solo.io.HttpConnectionManagerSettings @@ -699,7 +697,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_pro (*v1.Settings)(nil), // 8: enterprise.gloo.solo.io.Settings (*ratelimit.Settings)(nil), // 9: ratelimit.options.gloo.solo.io.Settings (*caching.Settings)(nil), // 10: caching.options.gloo.solo.io.Settings - (*wrappers.BoolValue)(nil), // 11: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 11: google.protobuf.BoolValue (*extproc.Settings)(nil), // 12: extproc.options.gloo.solo.io.Settings (*v2.Gzip)(nil), // 13: solo.io.envoy.config.filter.http.gzip.v2.Gzip (*proxylatency.ProxyLatency)(nil), // 14: envoy.config.filter.http.proxylatency.v2.ProxyLatency @@ -756,21 +754,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_pr return } file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpListenerOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_http_listener_options_proto_msgTypes[0].OneofWrappers = []any{ (*HttpListenerOptions_DisableExtProc)(nil), (*HttpListenerOptions_ExtProc)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/listener_options.pb.clone.go b/pkg/api/gloo.solo.io/v1/listener_options.pb.clone.go index f57d67b76..cbd93df2d 100644 --- a/pkg/api/gloo.solo.io/v1/listener_options.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/listener_options.pb.clone.go @@ -13,13 +13,13 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_als "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/als" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_proxy_protocol "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/proxy_protocol" github_com_solo_io_solo_kit_pkg_api_external_envoy_api_v2_core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -54,9 +54,9 @@ func (m *ListenerOptions) Clone() proto.Message { } if h, ok := interface{}(m.GetPerConnectionBufferLimitBytes()).(clone.Cloner); ok { - target.PerConnectionBufferLimitBytes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerConnectionBufferLimitBytes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.PerConnectionBufferLimitBytes = proto.Clone(m.GetPerConnectionBufferLimitBytes()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PerConnectionBufferLimitBytes = proto.Clone(m.GetPerConnectionBufferLimitBytes()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if m.GetSocketOptions() != nil { @@ -91,9 +91,9 @@ func (m *ListenerOptions) Clone() proto.Message { } if h, ok := interface{}(m.GetTcpStats()).(clone.Cloner); ok { - target.TcpStats = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TcpStats = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.TcpStats = proto.Clone(m.GetTcpStats()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TcpStats = proto.Clone(m.GetTcpStats()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/listener_options.pb.go b/pkg/api/gloo.solo.io/v1/listener_options.pb.go index 3bda3fe32..2c00c5883 100644 --- a/pkg/api/gloo.solo.io/v1/listener_options.pb.go +++ b/pkg/api/gloo.solo.io/v1/listener_options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/listener_options.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" als "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/als" proxy_protocol "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/proxy_protocol" core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -47,7 +47,7 @@ type ListenerOptions struct { Extensions *Extensions `protobuf:"bytes,2,opt,name=extensions,proto3" json:"extensions,omitempty"` // Soft limit on size of the listener's new connection read and write buffers. If unspecified, defaults to 1MiB // For more info, check out the [Envoy docs](https://www.envoyproxy.io/docs/envoy/v1.14.1/api-v2/api/v2/listener.proto) - PerConnectionBufferLimitBytes *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` + PerConnectionBufferLimitBytes *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=per_connection_buffer_limit_bytes,json=perConnectionBufferLimitBytes,proto3" json:"per_connection_buffer_limit_bytes,omitempty"` // Additional socket options that may not be present in Envoy source code or // precompiled binaries. SocketOptions []*core.SocketOption `protobuf:"bytes,4,rep,name=socket_options,json=socketOptions,proto3" json:"socket_options,omitempty"` @@ -62,16 +62,14 @@ type ListenerOptions struct { // If true, will wrap all filter chains in the listener with a TCP stats transport socket, which is a // passthrough listener that can report low-level Linux TCP stats, useful for diagnosis // and triage. - TcpStats *wrappers.BoolValue `protobuf:"bytes,8,opt,name=tcp_stats,json=tcpStats,proto3" json:"tcp_stats,omitempty"` + TcpStats *wrapperspb.BoolValue `protobuf:"bytes,8,opt,name=tcp_stats,json=tcpStats,proto3" json:"tcp_stats,omitempty"` } func (x *ListenerOptions) Reset() { *x = ListenerOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListenerOptions) String() string { @@ -82,7 +80,7 @@ func (*ListenerOptions) ProtoMessage() {} func (x *ListenerOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -111,7 +109,7 @@ func (x *ListenerOptions) GetExtensions() *Extensions { return nil } -func (x *ListenerOptions) GetPerConnectionBufferLimitBytes() *wrappers.UInt32Value { +func (x *ListenerOptions) GetPerConnectionBufferLimitBytes() *wrapperspb.UInt32Value { if x != nil { return x.PerConnectionBufferLimitBytes } @@ -146,7 +144,7 @@ func (x *ListenerOptions) GetListenerAccessLoggingService() *als.AccessLoggingSe return nil } -func (x *ListenerOptions) GetTcpStats() *wrappers.BoolValue { +func (x *ListenerOptions) GetTcpStats() *wrapperspb.BoolValue { if x != nil { return x.TcpStats } @@ -164,11 +162,9 @@ type ConnectionBalanceConfig struct { func (x *ConnectionBalanceConfig) Reset() { *x = ConnectionBalanceConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ConnectionBalanceConfig) String() string { @@ -179,7 +175,7 @@ func (*ConnectionBalanceConfig) ProtoMessage() {} func (x *ConnectionBalanceConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -215,11 +211,9 @@ type ConnectionBalanceConfig_ExactBalance struct { func (x *ConnectionBalanceConfig_ExactBalance) Reset() { *x = ConnectionBalanceConfig_ExactBalance{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ConnectionBalanceConfig_ExactBalance) String() string { @@ -230,7 +224,7 @@ func (*ConnectionBalanceConfig_ExactBalance) ProtoMessage() {} func (x *ConnectionBalanceConfig_ExactBalance) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -350,16 +344,16 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_r } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_goTypes = []any{ (*ListenerOptions)(nil), // 0: gloo.solo.io.ListenerOptions (*ConnectionBalanceConfig)(nil), // 1: gloo.solo.io.ConnectionBalanceConfig (*ConnectionBalanceConfig_ExactBalance)(nil), // 2: gloo.solo.io.ConnectionBalanceConfig.ExactBalance (*als.AccessLoggingService)(nil), // 3: als.options.gloo.solo.io.AccessLoggingService (*Extensions)(nil), // 4: gloo.solo.io.Extensions - (*wrappers.UInt32Value)(nil), // 5: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 5: google.protobuf.UInt32Value (*core.SocketOption)(nil), // 6: solo.io.envoy.api.v2.core.SocketOption (*proxy_protocol.ProxyProtocol)(nil), // 7: proxy_protocol.options.gloo.solo.io.ProxyProtocol - (*wrappers.BoolValue)(nil), // 8: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 8: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_depIdxs = []int32{ 3, // 0: gloo.solo.io.ListenerOptions.access_logging_service:type_name -> als.options.gloo.solo.io.AccessLoggingService @@ -384,44 +378,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_i return } file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListenerOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConnectionBalanceConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_listener_options_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConnectionBalanceConfig_ExactBalance); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/load_balancer.pb.clone.go b/pkg/api/gloo.solo.io/v1/load_balancer.pb.clone.go index 917d16c19..6078437e7 100644 --- a/pkg/api/gloo.solo.io/v1/load_balancer.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/load_balancer.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_empty "github.com/golang/protobuf/ptypes/empty" + google_golang_org_protobuf_types_known_emptypb "google.golang.org/protobuf/types/known/emptypb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -40,21 +40,21 @@ func (m *LoadBalancerConfig) Clone() proto.Message { target = &LoadBalancerConfig{} if h, ok := interface{}(m.GetHealthyPanicThreshold()).(clone.Cloner); ok { - target.HealthyPanicThreshold = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.HealthyPanicThreshold = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } else { - target.HealthyPanicThreshold = proto.Clone(m.GetHealthyPanicThreshold()).(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.HealthyPanicThreshold = proto.Clone(m.GetHealthyPanicThreshold()).(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } if h, ok := interface{}(m.GetUpdateMergeWindow()).(clone.Cloner); ok { - target.UpdateMergeWindow = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.UpdateMergeWindow = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.UpdateMergeWindow = proto.Clone(m.GetUpdateMergeWindow()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.UpdateMergeWindow = proto.Clone(m.GetUpdateMergeWindow()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetUseHostnameForHashing()).(clone.Cloner); ok { - target.UseHostnameForHashing = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseHostnameForHashing = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UseHostnameForHashing = proto.Clone(m.GetUseHostnameForHashing()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseHostnameForHashing = proto.Clone(m.GetUseHostnameForHashing()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } target.CloseConnectionsOnHostSetChange = m.GetCloseConnectionsOnHostSetChange() @@ -129,11 +129,11 @@ func (m *LoadBalancerConfig) Clone() proto.Message { if h, ok := interface{}(m.GetLocalityWeightedLbConfig()).(clone.Cloner); ok { target.LocalityConfig = &LoadBalancerConfig_LocalityWeightedLbConfig{ - LocalityWeightedLbConfig: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + LocalityWeightedLbConfig: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.LocalityConfig = &LoadBalancerConfig_LocalityWeightedLbConfig{ - LocalityWeightedLbConfig: proto.Clone(m.GetLocalityWeightedLbConfig()).(*github_com_golang_protobuf_ptypes_empty.Empty), + LocalityWeightedLbConfig: proto.Clone(m.GetLocalityWeightedLbConfig()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } @@ -241,21 +241,21 @@ func (m *LoadBalancerConfig_SlowStartConfig) Clone() proto.Message { target = &LoadBalancerConfig_SlowStartConfig{} if h, ok := interface{}(m.GetSlowStartWindow()).(clone.Cloner); ok { - target.SlowStartWindow = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.SlowStartWindow = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.SlowStartWindow = proto.Clone(m.GetSlowStartWindow()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.SlowStartWindow = proto.Clone(m.GetSlowStartWindow()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetAggression()).(clone.Cloner); ok { - target.Aggression = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.Aggression = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } else { - target.Aggression = proto.Clone(m.GetAggression()).(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.Aggression = proto.Clone(m.GetAggression()).(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } if h, ok := interface{}(m.GetMinWeightPercent()).(clone.Cloner); ok { - target.MinWeightPercent = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.MinWeightPercent = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } else { - target.MinWeightPercent = proto.Clone(m.GetMinWeightPercent()).(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.MinWeightPercent = proto.Clone(m.GetMinWeightPercent()).(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/load_balancer.pb.go b/pkg/api/gloo.solo.io/v1/load_balancer.pb.go index 844afbf76..7535b620a 100644 --- a/pkg/api/gloo.solo.io/v1/load_balancer.pb.go +++ b/pkg/api/gloo.solo.io/v1/load_balancer.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/load_balancer.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - empty "github.com/golang/protobuf/ptypes/empty" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -34,11 +34,11 @@ type LoadBalancerConfig struct { // Configures envoy's panic threshold Percent between 0-100. Once the number of non health hosts // reaches this percentage, envoy disregards health information. // see more info [here](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/load_balancing/panic_threshold.html). - HealthyPanicThreshold *wrappers.DoubleValue `protobuf:"bytes,1,opt,name=healthy_panic_threshold,json=healthyPanicThreshold,proto3" json:"healthy_panic_threshold,omitempty"` + HealthyPanicThreshold *wrapperspb.DoubleValue `protobuf:"bytes,1,opt,name=healthy_panic_threshold,json=healthyPanicThreshold,proto3" json:"healthy_panic_threshold,omitempty"` // This allows batch updates of endpoints health/weight/metadata that happen during a time window. // this help lower cpu usage when endpoint change rate is high. defaults to 1 second. // Set to 0 to disable and have changes applied immediately. - UpdateMergeWindow *duration.Duration `protobuf:"bytes,2,opt,name=update_merge_window,json=updateMergeWindow,proto3" json:"update_merge_window,omitempty"` + UpdateMergeWindow *durationpb.Duration `protobuf:"bytes,2,opt,name=update_merge_window,json=updateMergeWindow,proto3" json:"update_merge_window,omitempty"` // Types that are assignable to Type: // // *LoadBalancerConfig_RoundRobin_ @@ -52,7 +52,7 @@ type LoadBalancerConfig struct { // *LoadBalancerConfig_LocalityWeightedLbConfig LocalityConfig isLoadBalancerConfig_LocalityConfig `protobuf_oneof:"locality_config"` // Default: false, If set to true, the hostname will be used for hashing when using maglev for example, useful when using multiple host in the upstreams that resolve to the same IP. - UseHostnameForHashing *wrappers.BoolValue `protobuf:"bytes,9,opt,name=use_hostname_for_hashing,json=useHostnameForHashing,proto3" json:"use_hostname_for_hashing,omitempty"` + UseHostnameForHashing *wrapperspb.BoolValue `protobuf:"bytes,9,opt,name=use_hostname_for_hashing,json=useHostnameForHashing,proto3" json:"use_hostname_for_hashing,omitempty"` // If set to true, the load balancer will drain connections when the host set changes. // // Ring Hash or Maglev can be used to ensure that clients with the same key @@ -68,11 +68,9 @@ type LoadBalancerConfig struct { func (x *LoadBalancerConfig) Reset() { *x = LoadBalancerConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LoadBalancerConfig) String() string { @@ -83,7 +81,7 @@ func (*LoadBalancerConfig) ProtoMessage() {} func (x *LoadBalancerConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -98,14 +96,14 @@ func (*LoadBalancerConfig) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_rawDescGZIP(), []int{0} } -func (x *LoadBalancerConfig) GetHealthyPanicThreshold() *wrappers.DoubleValue { +func (x *LoadBalancerConfig) GetHealthyPanicThreshold() *wrapperspb.DoubleValue { if x != nil { return x.HealthyPanicThreshold } return nil } -func (x *LoadBalancerConfig) GetUpdateMergeWindow() *duration.Duration { +func (x *LoadBalancerConfig) GetUpdateMergeWindow() *durationpb.Duration { if x != nil { return x.UpdateMergeWindow } @@ -161,14 +159,14 @@ func (m *LoadBalancerConfig) GetLocalityConfig() isLoadBalancerConfig_LocalityCo return nil } -func (x *LoadBalancerConfig) GetLocalityWeightedLbConfig() *empty.Empty { +func (x *LoadBalancerConfig) GetLocalityWeightedLbConfig() *emptypb.Empty { if x, ok := x.GetLocalityConfig().(*LoadBalancerConfig_LocalityWeightedLbConfig); ok { return x.LocalityWeightedLbConfig } return nil } -func (x *LoadBalancerConfig) GetUseHostnameForHashing() *wrappers.BoolValue { +func (x *LoadBalancerConfig) GetUseHostnameForHashing() *wrapperspb.BoolValue { if x != nil { return x.UseHostnameForHashing } @@ -230,7 +228,7 @@ type LoadBalancerConfig_LocalityWeightedLbConfig struct { // https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/load_balancing/locality_weight#locality-weighted-load-balancing // Locality weighted load balancing enables weighting assignments across different zones and geographical locations by using explicit weights. // This field is required to enable locality weighted load balancing - LocalityWeightedLbConfig *empty.Empty `protobuf:"bytes,8,opt,name=locality_weighted_lb_config,json=localityWeightedLbConfig,proto3,oneof"` + LocalityWeightedLbConfig *emptypb.Empty `protobuf:"bytes,8,opt,name=locality_weighted_lb_config,json=localityWeightedLbConfig,proto3,oneof"` } func (*LoadBalancerConfig_LocalityWeightedLbConfig) isLoadBalancerConfig_LocalityConfig() {} @@ -246,11 +244,9 @@ type LoadBalancerConfig_RoundRobin struct { func (x *LoadBalancerConfig_RoundRobin) Reset() { *x = LoadBalancerConfig_RoundRobin{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LoadBalancerConfig_RoundRobin) String() string { @@ -261,7 +257,7 @@ func (*LoadBalancerConfig_RoundRobin) ProtoMessage() {} func (x *LoadBalancerConfig_RoundRobin) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -296,11 +292,9 @@ type LoadBalancerConfig_LeastRequest struct { func (x *LoadBalancerConfig_LeastRequest) Reset() { *x = LoadBalancerConfig_LeastRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LoadBalancerConfig_LeastRequest) String() string { @@ -311,7 +305,7 @@ func (*LoadBalancerConfig_LeastRequest) ProtoMessage() {} func (x *LoadBalancerConfig_LeastRequest) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -348,11 +342,9 @@ type LoadBalancerConfig_Random struct { func (x *LoadBalancerConfig_Random) Reset() { *x = LoadBalancerConfig_Random{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LoadBalancerConfig_Random) String() string { @@ -363,7 +355,7 @@ func (*LoadBalancerConfig_Random) ProtoMessage() {} func (x *LoadBalancerConfig_Random) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -395,11 +387,9 @@ type LoadBalancerConfig_RingHashConfig struct { func (x *LoadBalancerConfig_RingHashConfig) Reset() { *x = LoadBalancerConfig_RingHashConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LoadBalancerConfig_RingHashConfig) String() string { @@ -410,7 +400,7 @@ func (*LoadBalancerConfig_RingHashConfig) ProtoMessage() {} func (x *LoadBalancerConfig_RingHashConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -450,11 +440,9 @@ type LoadBalancerConfig_RingHash struct { func (x *LoadBalancerConfig_RingHash) Reset() { *x = LoadBalancerConfig_RingHash{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LoadBalancerConfig_RingHash) String() string { @@ -465,7 +453,7 @@ func (*LoadBalancerConfig_RingHash) ProtoMessage() {} func (x *LoadBalancerConfig_RingHash) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -495,11 +483,9 @@ type LoadBalancerConfig_Maglev struct { func (x *LoadBalancerConfig_Maglev) Reset() { *x = LoadBalancerConfig_Maglev{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LoadBalancerConfig_Maglev) String() string { @@ -510,7 +496,7 @@ func (*LoadBalancerConfig_Maglev) ProtoMessage() {} func (x *LoadBalancerConfig_Maglev) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -533,7 +519,7 @@ type LoadBalancerConfig_SlowStartConfig struct { // Represents the size of slow start window. // If set, the newly created host remains in slow start mode starting from its creation time // for the duration of slow start window. - SlowStartWindow *duration.Duration `protobuf:"bytes,1,opt,name=slow_start_window,json=slowStartWindow,proto3" json:"slow_start_window,omitempty"` + SlowStartWindow *durationpb.Duration `protobuf:"bytes,1,opt,name=slow_start_window,json=slowStartWindow,proto3" json:"slow_start_window,omitempty"` // This parameter controls the speed of traffic increase over the slow start window. Defaults to 1.0, // so that endpoint would get linearly increasing amount of traffic. // When increasing the value for this parameter, the speed of traffic ramp-up increases non-linearly. @@ -546,20 +532,18 @@ type LoadBalancerConfig_SlowStartConfig struct { // // As time progresses, more and more traffic would be sent to endpoint, which is in slow start window. // Once host exits slow start, time_factor and aggression no longer affect its weight. - Aggression *wrappers.DoubleValue `protobuf:"bytes,2,opt,name=aggression,proto3" json:"aggression,omitempty"` + Aggression *wrapperspb.DoubleValue `protobuf:"bytes,2,opt,name=aggression,proto3" json:"aggression,omitempty"` // Configures the minimum percentage of origin weight that avoids too small new weight, // which may cause endpoints in slow start mode receive no traffic in slow start window. // If not specified, the default is 10%. - MinWeightPercent *wrappers.DoubleValue `protobuf:"bytes,3,opt,name=min_weight_percent,json=minWeightPercent,proto3" json:"min_weight_percent,omitempty"` + MinWeightPercent *wrapperspb.DoubleValue `protobuf:"bytes,3,opt,name=min_weight_percent,json=minWeightPercent,proto3" json:"min_weight_percent,omitempty"` } func (x *LoadBalancerConfig_SlowStartConfig) Reset() { *x = LoadBalancerConfig_SlowStartConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LoadBalancerConfig_SlowStartConfig) String() string { @@ -570,7 +554,7 @@ func (*LoadBalancerConfig_SlowStartConfig) ProtoMessage() {} func (x *LoadBalancerConfig_SlowStartConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -585,21 +569,21 @@ func (*LoadBalancerConfig_SlowStartConfig) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_rawDescGZIP(), []int{0, 6} } -func (x *LoadBalancerConfig_SlowStartConfig) GetSlowStartWindow() *duration.Duration { +func (x *LoadBalancerConfig_SlowStartConfig) GetSlowStartWindow() *durationpb.Duration { if x != nil { return x.SlowStartWindow } return nil } -func (x *LoadBalancerConfig_SlowStartConfig) GetAggression() *wrappers.DoubleValue { +func (x *LoadBalancerConfig_SlowStartConfig) GetAggression() *wrapperspb.DoubleValue { if x != nil { return x.Aggression } return nil } -func (x *LoadBalancerConfig_SlowStartConfig) GetMinWeightPercent() *wrappers.DoubleValue { +func (x *LoadBalancerConfig_SlowStartConfig) GetMinWeightPercent() *wrapperspb.DoubleValue { if x != nil { return x.MinWeightPercent } @@ -738,7 +722,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_rawD } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_goTypes = []any{ (*LoadBalancerConfig)(nil), // 0: gloo.solo.io.LoadBalancerConfig (*LoadBalancerConfig_RoundRobin)(nil), // 1: gloo.solo.io.LoadBalancerConfig.RoundRobin (*LoadBalancerConfig_LeastRequest)(nil), // 2: gloo.solo.io.LoadBalancerConfig.LeastRequest @@ -747,10 +731,10 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_goTyp (*LoadBalancerConfig_RingHash)(nil), // 5: gloo.solo.io.LoadBalancerConfig.RingHash (*LoadBalancerConfig_Maglev)(nil), // 6: gloo.solo.io.LoadBalancerConfig.Maglev (*LoadBalancerConfig_SlowStartConfig)(nil), // 7: gloo.solo.io.LoadBalancerConfig.SlowStartConfig - (*wrappers.DoubleValue)(nil), // 8: google.protobuf.DoubleValue - (*duration.Duration)(nil), // 9: google.protobuf.Duration - (*empty.Empty)(nil), // 10: google.protobuf.Empty - (*wrappers.BoolValue)(nil), // 11: google.protobuf.BoolValue + (*wrapperspb.DoubleValue)(nil), // 8: google.protobuf.DoubleValue + (*durationpb.Duration)(nil), // 9: google.protobuf.Duration + (*emptypb.Empty)(nil), // 10: google.protobuf.Empty + (*wrapperspb.BoolValue)(nil), // 11: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_depIdxs = []int32{ 8, // 0: gloo.solo.io.LoadBalancerConfig.healthy_panic_threshold:type_name -> google.protobuf.DoubleValue @@ -780,105 +764,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_init if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoadBalancerConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoadBalancerConfig_RoundRobin); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoadBalancerConfig_LeastRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoadBalancerConfig_Random); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoadBalancerConfig_RingHashConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoadBalancerConfig_RingHash); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoadBalancerConfig_Maglev); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LoadBalancerConfig_SlowStartConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_msgTypes[0].OneofWrappers = []any{ (*LoadBalancerConfig_RoundRobin_)(nil), (*LoadBalancerConfig_LeastRequest_)(nil), (*LoadBalancerConfig_Random_)(nil), diff --git a/pkg/api/gloo.solo.io/v1/options/advanced_http/advanced_http.pb.go b/pkg/api/gloo.solo.io/v1/options/advanced_http/advanced_http.pb.go index 4bd9c7228..d1418f8b9 100644 --- a/pkg/api/gloo.solo.io/v1/options/advanced_http/advanced_http.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/advanced_http/advanced_http.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/advanced_http/advanced_http.proto @@ -11,9 +11,9 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - empty "github.com/golang/protobuf/ptypes/empty" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -89,11 +89,9 @@ type ResponseAssertions struct { func (x *ResponseAssertions) Reset() { *x = ResponseAssertions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseAssertions) String() string { @@ -104,7 +102,7 @@ func (*ResponseAssertions) ProtoMessage() {} func (x *ResponseAssertions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -148,11 +146,9 @@ type ResponseMatcher struct { func (x *ResponseMatcher) Reset() { *x = ResponseMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseMatcher) String() string { @@ -163,7 +159,7 @@ func (*ResponseMatcher) ProtoMessage() {} func (x *ResponseMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -219,11 +215,9 @@ type ResponseMatch struct { func (x *ResponseMatch) Reset() { *x = ResponseMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseMatch) String() string { @@ -234,7 +228,7 @@ func (*ResponseMatch) ProtoMessage() {} func (x *ResponseMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -277,7 +271,7 @@ func (x *ResponseMatch) GetHeader() string { return "" } -func (x *ResponseMatch) GetBody() *empty.Empty { +func (x *ResponseMatch) GetBody() *emptypb.Empty { if x, ok := x.GetSource().(*ResponseMatch_Body); ok { return x.Body } @@ -302,7 +296,7 @@ type ResponseMatch_Header struct { type ResponseMatch_Body struct { // Extract information from the request/response body - Body *empty.Empty `protobuf:"bytes,4,opt,name=body,proto3,oneof"` + Body *emptypb.Empty `protobuf:"bytes,4,opt,name=body,proto3,oneof"` } func (*ResponseMatch_Header) isResponseMatch_Source() {} @@ -320,11 +314,9 @@ type JsonKey struct { func (x *JsonKey) Reset() { *x = JsonKey{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JsonKey) String() string { @@ -335,7 +327,7 @@ func (*JsonKey) ProtoMessage() {} func (x *JsonKey) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -371,11 +363,9 @@ type JsonKey_PathSegment struct { func (x *JsonKey_PathSegment) Reset() { *x = JsonKey_PathSegment{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *JsonKey_PathSegment) String() string { @@ -386,7 +376,7 @@ func (*JsonKey_PathSegment) ProtoMessage() {} func (x *JsonKey_PathSegment) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -523,14 +513,14 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_ad var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_goTypes = []any{ (HealthCheckResult)(0), // 0: advancedhttp.options.gloo.solo.io.HealthCheckResult (*ResponseAssertions)(nil), // 1: advancedhttp.options.gloo.solo.io.ResponseAssertions (*ResponseMatcher)(nil), // 2: advancedhttp.options.gloo.solo.io.ResponseMatcher (*ResponseMatch)(nil), // 3: advancedhttp.options.gloo.solo.io.ResponseMatch (*JsonKey)(nil), // 4: advancedhttp.options.gloo.solo.io.JsonKey (*JsonKey_PathSegment)(nil), // 5: advancedhttp.options.gloo.solo.io.JsonKey.PathSegment - (*empty.Empty)(nil), // 6: google.protobuf.Empty + (*emptypb.Empty)(nil), // 6: google.protobuf.Empty } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_depIdxs = []int32{ 2, // 0: advancedhttp.options.gloo.solo.io.ResponseAssertions.response_matchers:type_name -> advancedhttp.options.gloo.solo.io.ResponseMatcher @@ -554,73 +544,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_ad if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseAssertions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JsonKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*JsonKey_PathSegment); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[2].OneofWrappers = []any{ (*ResponseMatch_Header)(nil), (*ResponseMatch_Body)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[4].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_advanced_http_advanced_http_proto_msgTypes[4].OneofWrappers = []any{ (*JsonKey_PathSegment_Key)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/v1/options/als/als.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/als/als.pb.clone.go index 91c3c723a..c6c87c6af 100644 --- a/pkg/api/gloo.solo.io/v1/options/als/als.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/als/als.pb.clone.go @@ -13,13 +13,13 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_route_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/route/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/v3" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" ) // ensure the imports are used @@ -124,11 +124,11 @@ func (m *FileSink) Clone() proto.Message { if h, ok := interface{}(m.GetJsonFormat()).(clone.Cloner); ok { target.OutputFormat = &FileSink_JsonFormat{ - JsonFormat: h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct), + JsonFormat: h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct), } } else { target.OutputFormat = &FileSink_JsonFormat{ - JsonFormat: proto.Clone(m.GetJsonFormat()).(*github_com_golang_protobuf_ptypes_struct.Struct), + JsonFormat: proto.Clone(m.GetJsonFormat()).(*google_golang_org_protobuf_types_known_structpb.Struct), } } diff --git a/pkg/api/gloo.solo.io/v1/options/als/als.pb.go b/pkg/api/gloo.solo.io/v1/options/als/als.pb.go index 2b9764842..cc88a0e8e 100644 --- a/pkg/api/gloo.solo.io/v1/options/als/als.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/als/als.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/als/als.proto @@ -14,7 +14,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" v32 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/route/v3" @@ -22,6 +21,7 @@ import ( _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" ) const ( @@ -186,11 +186,9 @@ type AccessLoggingService struct { func (x *AccessLoggingService) Reset() { *x = AccessLoggingService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AccessLoggingService) String() string { @@ -201,7 +199,7 @@ func (*AccessLoggingService) ProtoMessage() {} func (x *AccessLoggingService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -240,11 +238,9 @@ type AccessLog struct { func (x *AccessLog) Reset() { *x = AccessLog{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AccessLog) String() string { @@ -255,7 +251,7 @@ func (*AccessLog) ProtoMessage() {} func (x *AccessLog) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -334,11 +330,9 @@ type FileSink struct { func (x *FileSink) Reset() { *x = FileSink{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FileSink) String() string { @@ -349,7 +343,7 @@ func (*FileSink) ProtoMessage() {} func (x *FileSink) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -385,7 +379,7 @@ func (x *FileSink) GetStringFormat() string { return "" } -func (x *FileSink) GetJsonFormat() *_struct.Struct { +func (x *FileSink) GetJsonFormat() *structpb.Struct { if x, ok := x.GetOutputFormat().(*FileSink_JsonFormat); ok { return x.JsonFormat } @@ -405,7 +399,7 @@ type FileSink_StringFormat struct { type FileSink_JsonFormat struct { // the format object by which to envoy will emit the logs in a structured way. // https://www.envoyproxy.io/docs/envoy/v1.14.1/configuration/observability/access_log#format-dictionaries - JsonFormat *_struct.Struct `protobuf:"bytes,3,opt,name=json_format,json=jsonFormat,proto3,oneof"` + JsonFormat *structpb.Struct `protobuf:"bytes,3,opt,name=json_format,json=jsonFormat,proto3,oneof"` } func (*FileSink_StringFormat) isFileSink_OutputFormat() {} @@ -432,11 +426,9 @@ type GrpcService struct { func (x *GrpcService) Reset() { *x = GrpcService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService) String() string { @@ -447,7 +439,7 @@ func (*GrpcService) ProtoMessage() {} func (x *GrpcService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -536,11 +528,9 @@ type AccessLogFilter struct { func (x *AccessLogFilter) Reset() { *x = AccessLogFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AccessLogFilter) String() string { @@ -551,7 +541,7 @@ func (*AccessLogFilter) ProtoMessage() {} func (x *AccessLogFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -735,11 +725,9 @@ type ComparisonFilter struct { func (x *ComparisonFilter) Reset() { *x = ComparisonFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ComparisonFilter) String() string { @@ -750,7 +738,7 @@ func (*ComparisonFilter) ProtoMessage() {} func (x *ComparisonFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -791,11 +779,9 @@ type StatusCodeFilter struct { func (x *StatusCodeFilter) Reset() { *x = StatusCodeFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StatusCodeFilter) String() string { @@ -806,7 +792,7 @@ func (*StatusCodeFilter) ProtoMessage() {} func (x *StatusCodeFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -840,11 +826,9 @@ type DurationFilter struct { func (x *DurationFilter) Reset() { *x = DurationFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DurationFilter) String() string { @@ -855,7 +839,7 @@ func (*DurationFilter) ProtoMessage() {} func (x *DurationFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -887,11 +871,9 @@ type NotHealthCheckFilter struct { func (x *NotHealthCheckFilter) Reset() { *x = NotHealthCheckFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *NotHealthCheckFilter) String() string { @@ -902,7 +884,7 @@ func (*NotHealthCheckFilter) ProtoMessage() {} func (x *NotHealthCheckFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -927,11 +909,9 @@ type TraceableFilter struct { func (x *TraceableFilter) Reset() { *x = TraceableFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TraceableFilter) String() string { @@ -942,7 +922,7 @@ func (*TraceableFilter) ProtoMessage() {} func (x *TraceableFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -990,11 +970,9 @@ type RuntimeFilter struct { func (x *RuntimeFilter) Reset() { *x = RuntimeFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RuntimeFilter) String() string { @@ -1005,7 +983,7 @@ func (*RuntimeFilter) ProtoMessage() {} func (x *RuntimeFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1054,11 +1032,9 @@ type AndFilter struct { func (x *AndFilter) Reset() { *x = AndFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AndFilter) String() string { @@ -1069,7 +1045,7 @@ func (*AndFilter) ProtoMessage() {} func (x *AndFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1104,11 +1080,9 @@ type OrFilter struct { func (x *OrFilter) Reset() { *x = OrFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *OrFilter) String() string { @@ -1119,7 +1093,7 @@ func (*OrFilter) ProtoMessage() {} func (x *OrFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1154,11 +1128,9 @@ type HeaderFilter struct { func (x *HeaderFilter) Reset() { *x = HeaderFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderFilter) String() string { @@ -1169,7 +1141,7 @@ func (*HeaderFilter) ProtoMessage() {} func (x *HeaderFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1208,11 +1180,9 @@ type ResponseFlagFilter struct { func (x *ResponseFlagFilter) Reset() { *x = ResponseFlagFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseFlagFilter) String() string { @@ -1223,7 +1193,7 @@ func (*ResponseFlagFilter) ProtoMessage() {} func (x *ResponseFlagFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1262,11 +1232,9 @@ type GrpcStatusFilter struct { func (x *GrpcStatusFilter) Reset() { *x = GrpcStatusFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcStatusFilter) String() string { @@ -1277,7 +1245,7 @@ func (*GrpcStatusFilter) ProtoMessage() {} func (x *GrpcStatusFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1567,7 +1535,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_ra var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes = make([]protoimpl.MessageInfo, 16) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_goTypes = []any{ (ComparisonFilter_Op)(0), // 0: als.options.gloo.solo.io.ComparisonFilter.Op (GrpcStatusFilter_Status)(0), // 1: als.options.gloo.solo.io.GrpcStatusFilter.Status (*AccessLoggingService)(nil), // 2: als.options.gloo.solo.io.AccessLoggingService @@ -1586,7 +1554,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_goT (*HeaderFilter)(nil), // 15: als.options.gloo.solo.io.HeaderFilter (*ResponseFlagFilter)(nil), // 16: als.options.gloo.solo.io.ResponseFlagFilter (*GrpcStatusFilter)(nil), // 17: als.options.gloo.solo.io.GrpcStatusFilter - (*_struct.Struct)(nil), // 18: google.protobuf.Struct + (*structpb.Struct)(nil), // 18: google.protobuf.Struct (*v3.RuntimeUInt32)(nil), // 19: solo.io.envoy.config.core.v3.RuntimeUInt32 (*v31.FractionalPercent)(nil), // 20: solo.io.envoy.type.v3.FractionalPercent (*v32.HeaderMatcher)(nil), // 21: solo.io.envoy.config.route.v3.HeaderMatcher @@ -1628,212 +1596,18 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_in if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AccessLoggingService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AccessLog); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FileSink); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AccessLogFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComparisonFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StatusCodeFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DurationFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NotHealthCheckFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TraceableFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RuntimeFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AndFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OrFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseFlagFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcStatusFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[1].OneofWrappers = []any{ (*AccessLog_FileSink)(nil), (*AccessLog_GrpcService)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[2].OneofWrappers = []any{ (*FileSink_StringFormat)(nil), (*FileSink_JsonFormat)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[3].OneofWrappers = []any{ (*GrpcService_StaticClusterName)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[4].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_als_als_proto_msgTypes[4].OneofWrappers = []any{ (*AccessLogFilter_StatusCodeFilter)(nil), (*AccessLogFilter_DurationFilter)(nil), (*AccessLogFilter_NotHealthCheckFilter)(nil), diff --git a/pkg/api/gloo.solo.io/v1/options/aws/aws.pb.go b/pkg/api/gloo.solo.io/v1/options/aws/aws.pb.go index c164dca07..f2102e499 100644 --- a/pkg/api/gloo.solo.io/v1/options/aws/aws.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/aws/aws.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/aws/aws.proto @@ -108,11 +108,9 @@ type UpstreamSpec struct { func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -123,7 +121,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -207,11 +205,9 @@ type LambdaFunctionSpec struct { func (x *LambdaFunctionSpec) Reset() { *x = LambdaFunctionSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LambdaFunctionSpec) String() string { @@ -222,7 +218,7 @@ func (*LambdaFunctionSpec) ProtoMessage() {} func (x *LambdaFunctionSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -295,11 +291,9 @@ type DestinationSpec struct { func (x *DestinationSpec) Reset() { *x = DestinationSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestinationSpec) String() string { @@ -310,7 +304,7 @@ func (*DestinationSpec) ProtoMessage() {} func (x *DestinationSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -472,7 +466,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_ra var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_goTypes = []any{ (DestinationSpec_InvocationStyle)(0), // 0: aws.options.gloo.solo.io.DestinationSpec.InvocationStyle (*UpstreamSpec)(nil), // 1: aws.options.gloo.solo.io.UpstreamSpec (*LambdaFunctionSpec)(nil), // 2: aws.options.gloo.solo.io.LambdaFunctionSpec @@ -496,44 +490,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_in if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LambdaFunctionSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_aws_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestinationSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/aws/ec2/aws_ec2.pb.go b/pkg/api/gloo.solo.io/v1/options/aws/ec2/aws_ec2.pb.go index 31d948c68..2e9a0cce8 100644 --- a/pkg/api/gloo.solo.io/v1/options/aws/ec2/aws_ec2.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/aws/ec2/aws_ec2.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/aws/ec2/aws_ec2.proto @@ -67,11 +67,9 @@ type UpstreamSpec struct { func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -82,7 +80,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -153,11 +151,9 @@ type TagFilter struct { func (x *TagFilter) Reset() { *x = TagFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TagFilter) String() string { @@ -168,7 +164,7 @@ func (*TagFilter) ProtoMessage() {} func (x *TagFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -236,11 +232,9 @@ type TagFilter_KvPair struct { func (x *TagFilter_KvPair) Reset() { *x = TagFilter_KvPair{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TagFilter_KvPair) String() string { @@ -251,7 +245,7 @@ func (*TagFilter_KvPair) ProtoMessage() {} func (x *TagFilter_KvPair) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -341,7 +335,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_goTypes = []any{ (*UpstreamSpec)(nil), // 0: aws_ec2.options.gloo.solo.io.UpstreamSpec (*TagFilter)(nil), // 1: aws_ec2.options.gloo.solo.io.TagFilter (*TagFilter_KvPair)(nil), // 2: aws_ec2.options.gloo.solo.io.TagFilter.KvPair @@ -363,45 +357,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TagFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TagFilter_KvPair); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_aws_ec2_aws_ec2_proto_msgTypes[1].OneofWrappers = []any{ (*TagFilter_Key)(nil), (*TagFilter_KvPair_)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/options/azure/azure.pb.go b/pkg/api/gloo.solo.io/v1/options/azure/azure.pb.go index 78b4f5f91..f50091f75 100644 --- a/pkg/api/gloo.solo.io/v1/options/azure/azure.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/azure/azure.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/azure/azure.proto @@ -90,11 +90,9 @@ type UpstreamSpec struct { func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -105,7 +103,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -152,11 +150,9 @@ type DestinationSpec struct { func (x *DestinationSpec) Reset() { *x = DestinationSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestinationSpec) String() string { @@ -167,7 +163,7 @@ func (*DestinationSpec) ProtoMessage() {} func (x *DestinationSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -205,11 +201,9 @@ type UpstreamSpec_FunctionSpec struct { func (x *UpstreamSpec_FunctionSpec) Reset() { *x = UpstreamSpec_FunctionSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec_FunctionSpec) String() string { @@ -220,7 +214,7 @@ func (*UpstreamSpec_FunctionSpec) ProtoMessage() {} func (x *UpstreamSpec_FunctionSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -313,7 +307,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_prot var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_goTypes = []any{ (UpstreamSpec_FunctionSpec_AuthLevel)(0), // 0: azure.options.gloo.solo.io.UpstreamSpec.FunctionSpec.AuthLevel (*UpstreamSpec)(nil), // 1: azure.options.gloo.solo.io.UpstreamSpec (*DestinationSpec)(nil), // 2: azure.options.gloo.solo.io.DestinationSpec @@ -336,44 +330,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_prot if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestinationSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_azure_azure_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec_FunctionSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/connection_limit/connection_limit.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/connection_limit/connection_limit.pb.clone.go index b2773517c..336fae83a 100644 --- a/pkg/api/gloo.solo.io/v1/options/connection_limit/connection_limit.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/connection_limit/connection_limit.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -38,15 +38,15 @@ func (m *ConnectionLimit) Clone() proto.Message { target = &ConnectionLimit{} if h, ok := interface{}(m.GetMaxActiveConnections()).(clone.Cloner); ok { - target.MaxActiveConnections = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxActiveConnections = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxActiveConnections = proto.Clone(m.GetMaxActiveConnections()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxActiveConnections = proto.Clone(m.GetMaxActiveConnections()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetDelayBeforeClose()).(clone.Cloner); ok { - target.DelayBeforeClose = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DelayBeforeClose = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.DelayBeforeClose = proto.Clone(m.GetDelayBeforeClose()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DelayBeforeClose = proto.Clone(m.GetDelayBeforeClose()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/connection_limit/connection_limit.pb.go b/pkg/api/gloo.solo.io/v1/options/connection_limit/connection_limit.pb.go index 0181dccca..4041e8b30 100644 --- a/pkg/api/gloo.solo.io/v1/options/connection_limit/connection_limit.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/connection_limit/connection_limit.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/connection_limit/connection_limit.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -35,19 +35,17 @@ type ConnectionLimit struct { // The maximum number of active connections for this gateway. When this limit is reached, any incoming connection // will be closed after delay duration. // Must be greater than or equal to one. - MaxActiveConnections *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_active_connections,json=maxActiveConnections,proto3" json:"max_active_connections,omitempty"` + MaxActiveConnections *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_active_connections,json=maxActiveConnections,proto3" json:"max_active_connections,omitempty"` // The time to wait before a connection is dropped. Useful for DoS prevention. // Defaults to zero and the connection will be closed immediately. - DelayBeforeClose *duration.Duration `protobuf:"bytes,2,opt,name=delay_before_close,json=delayBeforeClose,proto3" json:"delay_before_close,omitempty"` + DelayBeforeClose *durationpb.Duration `protobuf:"bytes,2,opt,name=delay_before_close,json=delayBeforeClose,proto3" json:"delay_before_close,omitempty"` } func (x *ConnectionLimit) Reset() { *x = ConnectionLimit{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ConnectionLimit) String() string { @@ -58,7 +56,7 @@ func (*ConnectionLimit) ProtoMessage() {} func (x *ConnectionLimit) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -73,14 +71,14 @@ func (*ConnectionLimit) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto_rawDescGZIP(), []int{0} } -func (x *ConnectionLimit) GetMaxActiveConnections() *wrappers.UInt32Value { +func (x *ConnectionLimit) GetMaxActiveConnections() *wrapperspb.UInt32Value { if x != nil { return x.MaxActiveConnections } return nil } -func (x *ConnectionLimit) GetDelayBeforeClose() *duration.Duration { +func (x *ConnectionLimit) GetDelayBeforeClose() *durationpb.Duration { if x != nil { return x.DelayBeforeClose } @@ -141,10 +139,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto_goTypes = []interface{}{ - (*ConnectionLimit)(nil), // 0: connection_limit.options.gloo.solo.io.ConnectionLimit - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 2: google.protobuf.Duration +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto_goTypes = []any{ + (*ConnectionLimit)(nil), // 0: connection_limit.options.gloo.solo.io.ConnectionLimit + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 2: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto_depIdxs = []int32{ 1, // 0: connection_limit.options.gloo.solo.io.ConnectionLimit.max_active_connections:type_name -> google.protobuf.UInt32Value @@ -163,20 +161,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_connection_limit_connection_limit_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConnectionLimit); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/consul/consul.pb.go b/pkg/api/gloo.solo.io/v1/options/consul/consul.pb.go index 2e70620b7..f281fbcdc 100644 --- a/pkg/api/gloo.solo.io/v1/options/consul/consul.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/consul/consul.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/consul/consul.proto @@ -67,11 +67,9 @@ type UpstreamSpec struct { func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_consul_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_consul_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -82,7 +80,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_consul_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -242,7 +240,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_consul_pr } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_consul_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_consul_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_consul_proto_goTypes = []any{ (*UpstreamSpec)(nil), // 0: consul.options.gloo.solo.io.UpstreamSpec (*options.ServiceSpec)(nil), // 1: options.gloo.solo.io.ServiceSpec (ConsulConsistencyModes)(0), // 2: consul.options.gloo.solo.io.ConsulConsistencyModes @@ -265,20 +263,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_consul_pr return } file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_consul_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/consul/query_options.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/consul/query_options.pb.clone.go index 3844c6e77..d2b1754cb 100644 --- a/pkg/api/gloo.solo.io/v1/options/consul/query_options.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/consul/query_options.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -36,9 +36,9 @@ func (m *QueryOptions) Clone() proto.Message { target = &QueryOptions{} if h, ok := interface{}(m.GetUseCache()).(clone.Cloner); ok { - target.UseCache = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseCache = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UseCache = proto.Clone(m.GetUseCache()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseCache = proto.Clone(m.GetUseCache()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/consul/query_options.pb.go b/pkg/api/gloo.solo.io/v1/options/consul/query_options.pb.go index 36449192d..a949eabef 100644 --- a/pkg/api/gloo.solo.io/v1/options/consul/query_options.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/consul/query_options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/consul/query_options.proto @@ -10,11 +10,11 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -124,16 +124,14 @@ type QueryOptions struct { // // Defaults to true. // opts users into background refresh caching https://www.consul.io/api-docs/features/caching#background-refresh-caching - UseCache *wrappers.BoolValue `protobuf:"bytes,1,opt,name=use_cache,json=useCache,proto3" json:"use_cache,omitempty"` + UseCache *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=use_cache,json=useCache,proto3" json:"use_cache,omitempty"` } func (x *QueryOptions) Reset() { *x = QueryOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *QueryOptions) String() string { @@ -144,7 +142,7 @@ func (*QueryOptions) ProtoMessage() {} func (x *QueryOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -159,7 +157,7 @@ func (*QueryOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_rawDescGZIP(), []int{0} } -func (x *QueryOptions) GetUseCache() *wrappers.BoolValue { +func (x *QueryOptions) GetUseCache() *wrapperspb.BoolValue { if x != nil { return x.UseCache } @@ -213,10 +211,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_opt var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_goTypes = []interface{}{ - (ConsulConsistencyModes)(0), // 0: consul.options.gloo.solo.io.ConsulConsistencyModes - (*QueryOptions)(nil), // 1: consul.options.gloo.solo.io.QueryOptions - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_goTypes = []any{ + (ConsulConsistencyModes)(0), // 0: consul.options.gloo.solo.io.ConsulConsistencyModes + (*QueryOptions)(nil), // 1: consul.options.gloo.solo.io.QueryOptions + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_depIdxs = []int32{ 2, // 0: consul.options.gloo.solo.io.QueryOptions.use_cache:type_name -> google.protobuf.BoolValue @@ -234,20 +232,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_opt if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_consul_query_options_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QueryOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/cors/cors.pb.go b/pkg/api/gloo.solo.io/v1/options/cors/cors.pb.go index 764e10525..c50947f7b 100644 --- a/pkg/api/gloo.solo.io/v1/options/cors/cors.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/cors/cors.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/cors/cors.proto @@ -103,11 +103,9 @@ type CorsPolicy struct { func (x *CorsPolicy) Reset() { *x = CorsPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CorsPolicy) String() string { @@ -118,7 +116,7 @@ func (*CorsPolicy) ProtoMessage() {} func (x *CorsPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -202,11 +200,9 @@ type CorsPolicyMergeSettings struct { func (x *CorsPolicyMergeSettings) Reset() { *x = CorsPolicyMergeSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CorsPolicyMergeSettings) String() string { @@ -217,7 +213,7 @@ func (*CorsPolicyMergeSettings) ProtoMessage() {} func (x *CorsPolicyMergeSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -302,7 +298,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_goTypes = []any{ (CorsPolicyMergeSettings_MergeStrategy)(0), // 0: cors.options.gloo.solo.io.CorsPolicyMergeSettings.MergeStrategy (*CorsPolicy)(nil), // 1: cors.options.gloo.solo.io.CorsPolicy (*CorsPolicyMergeSettings)(nil), // 2: cors.options.gloo.solo.io.CorsPolicyMergeSettings @@ -321,32 +317,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CorsPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_cors_cors_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CorsPolicyMergeSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.pb.clone.go index 1968d321b..ec8281188 100644 --- a/pkg/api/gloo.solo.io/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.pb.clone.go @@ -13,13 +13,13 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -67,9 +67,9 @@ func (m *DnsCacheCircuitBreakers) Clone() proto.Message { target = &DnsCacheCircuitBreakers{} if h, ok := interface{}(m.GetMaxPendingRequests()).(clone.Cloner); ok { - target.MaxPendingRequests = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxPendingRequests = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxPendingRequests = proto.Clone(m.GetMaxPendingRequests()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxPendingRequests = proto.Clone(m.GetMaxPendingRequests()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target @@ -86,21 +86,21 @@ func (m *DnsCacheConfig) Clone() proto.Message { target.DnsLookupFamily = m.GetDnsLookupFamily() if h, ok := interface{}(m.GetDnsRefreshRate()).(clone.Cloner); ok { - target.DnsRefreshRate = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DnsRefreshRate = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.DnsRefreshRate = proto.Clone(m.GetDnsRefreshRate()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DnsRefreshRate = proto.Clone(m.GetDnsRefreshRate()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetHostTtl()).(clone.Cloner); ok { - target.HostTtl = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.HostTtl = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.HostTtl = proto.Clone(m.GetHostTtl()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.HostTtl = proto.Clone(m.GetHostTtl()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxHosts()).(clone.Cloner); ok { - target.MaxHosts = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxHosts = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxHosts = proto.Clone(m.GetMaxHosts()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxHosts = proto.Clone(m.GetMaxHosts()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetDnsFailureRefreshRate()).(clone.Cloner); ok { @@ -129,9 +129,9 @@ func (m *DnsCacheConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetDnsQueryTimeout()).(clone.Cloner); ok { - target.DnsQueryTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DnsQueryTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.DnsQueryTimeout = proto.Clone(m.GetDnsQueryTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DnsQueryTimeout = proto.Clone(m.GetDnsQueryTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } switch m.DnsCacheType.(type) { @@ -174,15 +174,15 @@ func (m *RefreshRate) Clone() proto.Message { target = &RefreshRate{} if h, ok := interface{}(m.GetBaseInterval()).(clone.Cloner); ok { - target.BaseInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxInterval()).(clone.Cloner); ok { - target.MaxInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.pb.go b/pkg/api/gloo.solo.io/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.pb.go index c83fe87a9..c2e63e7d9 100644 --- a/pkg/api/gloo.solo.io/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.proto @@ -11,13 +11,13 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -124,11 +124,9 @@ type FilterConfig struct { func (x *FilterConfig) Reset() { *x = FilterConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FilterConfig) String() string { @@ -139,7 +137,7 @@ func (*FilterConfig) ProtoMessage() {} func (x *FilterConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -183,16 +181,14 @@ type DnsCacheCircuitBreakers struct { // The maximum number of pending requests that Envoy will allow to the // resolver. If not specified, the default is 1024. - MaxPendingRequests *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` + MaxPendingRequests *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_pending_requests,json=maxPendingRequests,proto3" json:"max_pending_requests,omitempty"` } func (x *DnsCacheCircuitBreakers) Reset() { *x = DnsCacheCircuitBreakers{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DnsCacheCircuitBreakers) String() string { @@ -203,7 +199,7 @@ func (*DnsCacheCircuitBreakers) ProtoMessage() {} func (x *DnsCacheCircuitBreakers) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -218,7 +214,7 @@ func (*DnsCacheCircuitBreakers) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_rawDescGZIP(), []int{1} } -func (x *DnsCacheCircuitBreakers) GetMaxPendingRequests() *wrappers.UInt32Value { +func (x *DnsCacheCircuitBreakers) GetMaxPendingRequests() *wrapperspb.UInt32Value { if x != nil { return x.MaxPendingRequests } @@ -248,7 +244,7 @@ type DnsCacheConfig struct { // // Once a host has been resolved, the refresh rate will be the DNS TTL, capped // at a minimum of 5s. - DnsRefreshRate *duration.Duration `protobuf:"bytes,3,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` + DnsRefreshRate *durationpb.Duration `protobuf:"bytes,3,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` // The TTL for hosts that are unused. Hosts that have not been used in the configured time // interval will be purged. If not specified defaults to 5m. // @@ -261,7 +257,7 @@ type DnsCacheConfig struct { // **Note**: // // The TTL has no relation to DNS TTL and is only used to control Envoy's resource usage. - HostTtl *duration.Duration `protobuf:"bytes,4,opt,name=host_ttl,json=hostTtl,proto3" json:"host_ttl,omitempty"` + HostTtl *durationpb.Duration `protobuf:"bytes,4,opt,name=host_ttl,json=hostTtl,proto3" json:"host_ttl,omitempty"` // The maximum number of hosts that the cache will hold. If not specified defaults to 1024. // // **Note**: @@ -269,7 +265,7 @@ type DnsCacheConfig struct { // The implementation is approximate and enforced independently on each worker thread, thus // it is possible for the maximum hosts in the cache to go slightly above the configured // value depending on timing. This is similar to how other circuit breakers work. - MaxHosts *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=max_hosts,json=maxHosts,proto3" json:"max_hosts,omitempty"` + MaxHosts *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=max_hosts,json=maxHosts,proto3" json:"max_hosts,omitempty"` // If the DNS failure refresh rate is specified, // this is used as the cache's DNS refresh rate when DNS requests are failing. If this setting is // not specified, the failure refresh rate defaults to the dns_refresh_rate. @@ -290,16 +286,14 @@ type DnsCacheConfig struct { // used by the underlying DNS implementation (e.g., c-areas and Apple DNS) which are opaque. // Setting this timeout will ensure that queries succeed or fail within the specified time frame // and are then retried using the standard refresh rates. Defaults to 5s if not set. - DnsQueryTimeout *duration.Duration `protobuf:"bytes,11,opt,name=dns_query_timeout,json=dnsQueryTimeout,proto3" json:"dns_query_timeout,omitempty"` + DnsQueryTimeout *durationpb.Duration `protobuf:"bytes,11,opt,name=dns_query_timeout,json=dnsQueryTimeout,proto3" json:"dns_query_timeout,omitempty"` } func (x *DnsCacheConfig) Reset() { *x = DnsCacheConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DnsCacheConfig) String() string { @@ -310,7 +304,7 @@ func (*DnsCacheConfig) ProtoMessage() {} func (x *DnsCacheConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -332,21 +326,21 @@ func (x *DnsCacheConfig) GetDnsLookupFamily() DnsLookupFamily { return DnsLookupFamily_V4_PREFERRED } -func (x *DnsCacheConfig) GetDnsRefreshRate() *duration.Duration { +func (x *DnsCacheConfig) GetDnsRefreshRate() *durationpb.Duration { if x != nil { return x.DnsRefreshRate } return nil } -func (x *DnsCacheConfig) GetHostTtl() *duration.Duration { +func (x *DnsCacheConfig) GetHostTtl() *durationpb.Duration { if x != nil { return x.HostTtl } return nil } -func (x *DnsCacheConfig) GetMaxHosts() *wrappers.UInt32Value { +func (x *DnsCacheConfig) GetMaxHosts() *wrapperspb.UInt32Value { if x != nil { return x.MaxHosts } @@ -395,7 +389,7 @@ func (x *DnsCacheConfig) GetPreresolveHostnames() []*v3.SocketAddress { return nil } -func (x *DnsCacheConfig) GetDnsQueryTimeout() *duration.Duration { +func (x *DnsCacheConfig) GetDnsQueryTimeout() *durationpb.Duration { if x != nil { return x.DnsQueryTimeout } @@ -426,21 +420,19 @@ type RefreshRate struct { // Specifies the base interval between refreshes. This parameter is required and must be greater // than 1ms and less than // max_interval. - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the maximum interval between refreshes. This parameter is optional, but must be // greater than or equal to the // base_interval if set. The default // is 10 times the base_interval. - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *RefreshRate) Reset() { *x = RefreshRate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RefreshRate) String() string { @@ -451,7 +443,7 @@ func (*RefreshRate) ProtoMessage() {} func (x *RefreshRate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -466,14 +458,14 @@ func (*RefreshRate) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_rawDescGZIP(), []int{3} } -func (x *RefreshRate) GetBaseInterval() *duration.Duration { +func (x *RefreshRate) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *RefreshRate) GetMaxInterval() *duration.Duration { +func (x *RefreshRate) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -495,11 +487,9 @@ type PerRouteConfig struct { func (x *PerRouteConfig) Reset() { *x = PerRouteConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PerRouteConfig) String() string { @@ -510,7 +500,7 @@ func (*PerRouteConfig) ProtoMessage() {} func (x *PerRouteConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -598,11 +588,9 @@ type DnsResolverOptions struct { func (x *DnsResolverOptions) Reset() { *x = DnsResolverOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DnsResolverOptions) String() string { @@ -613,7 +601,7 @@ func (*DnsResolverOptions) ProtoMessage() {} func (x *DnsResolverOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -659,11 +647,9 @@ type CaresDnsResolverConfig struct { func (x *CaresDnsResolverConfig) Reset() { *x = CaresDnsResolverConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CaresDnsResolverConfig) String() string { @@ -674,7 +660,7 @@ func (*CaresDnsResolverConfig) ProtoMessage() {} func (x *CaresDnsResolverConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -712,11 +698,9 @@ type AppleDnsResolverConfig struct { func (x *AppleDnsResolverConfig) Reset() { *x = AppleDnsResolverConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AppleDnsResolverConfig) String() string { @@ -727,7 +711,7 @@ func (*AppleDnsResolverConfig) ProtoMessage() {} func (x *AppleDnsResolverConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -916,7 +900,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_goTypes = []any{ (DnsLookupFamily)(0), // 0: dfp.options.gloo.solo.io.DnsLookupFamily (*FilterConfig)(nil), // 1: dfp.options.gloo.solo.io.FilterConfig (*DnsCacheCircuitBreakers)(nil), // 2: dfp.options.gloo.solo.io.DnsCacheCircuitBreakers @@ -927,8 +911,8 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_p (*CaresDnsResolverConfig)(nil), // 7: dfp.options.gloo.solo.io.CaresDnsResolverConfig (*AppleDnsResolverConfig)(nil), // 8: dfp.options.gloo.solo.io.AppleDnsResolverConfig (*ssl.UpstreamSslConfig)(nil), // 9: gloo.solo.io.UpstreamSslConfig - (*wrappers.UInt32Value)(nil), // 10: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 11: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 10: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 11: google.protobuf.Duration (*v3.SocketAddress)(nil), // 12: solo.io.envoy.config.core.v3.SocketAddress (*v3.Address)(nil), // 13: solo.io.envoy.config.core.v3.Address } @@ -964,109 +948,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FilterConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DnsCacheCircuitBreakers); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DnsCacheConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RefreshRate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PerRouteConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DnsResolverOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CaresDnsResolverConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AppleDnsResolverConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[2].OneofWrappers = []any{ (*DnsCacheConfig_CaresDns)(nil), (*DnsCacheConfig_AppleDns)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[4].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_dynamic_forward_proxy_dynamic_forward_proxy_proto_msgTypes[4].OneofWrappers = []any{ (*PerRouteConfig_HostRewrite)(nil), (*PerRouteConfig_AutoHostRewriteHeader)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/options/faultinjection/fault.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/faultinjection/fault.pb.clone.go index 59d412e81..1141de56a 100644 --- a/pkg/api/gloo.solo.io/v1/options/faultinjection/fault.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/faultinjection/fault.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" ) // ensure the imports are used @@ -53,9 +53,9 @@ func (m *RouteDelay) Clone() proto.Message { target.Percentage = m.GetPercentage() if h, ok := interface{}(m.GetFixedDelay()).(clone.Cloner); ok { - target.FixedDelay = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.FixedDelay = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.FixedDelay = proto.Clone(m.GetFixedDelay()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.FixedDelay = proto.Clone(m.GetFixedDelay()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/faultinjection/fault.pb.go b/pkg/api/gloo.solo.io/v1/options/faultinjection/fault.pb.go index d87e5f29b..cc64f2f07 100644 --- a/pkg/api/gloo.solo.io/v1/options/faultinjection/fault.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/faultinjection/fault.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/faultinjection/fault.proto @@ -11,10 +11,10 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" ) const ( @@ -38,11 +38,9 @@ type RouteAbort struct { func (x *RouteAbort) Reset() { *x = RouteAbort{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAbort) String() string { @@ -53,7 +51,7 @@ func (*RouteAbort) ProtoMessage() {} func (x *RouteAbort) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -91,16 +89,14 @@ type RouteDelay struct { // This should be a value between 0.0 and 100.0, with up to 6 significant digits. Percentage float32 `protobuf:"fixed32,1,opt,name=percentage,proto3" json:"percentage,omitempty"` // Fixed delay, defaulting to 0. Will be rejected by the control plane if the delay is specified and less than 1 second. - FixedDelay *duration.Duration `protobuf:"bytes,2,opt,name=fixed_delay,json=fixedDelay,proto3" json:"fixed_delay,omitempty"` + FixedDelay *durationpb.Duration `protobuf:"bytes,2,opt,name=fixed_delay,json=fixedDelay,proto3" json:"fixed_delay,omitempty"` } func (x *RouteDelay) Reset() { *x = RouteDelay{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteDelay) String() string { @@ -111,7 +107,7 @@ func (*RouteDelay) ProtoMessage() {} func (x *RouteDelay) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -133,7 +129,7 @@ func (x *RouteDelay) GetPercentage() float32 { return 0 } -func (x *RouteDelay) GetFixedDelay() *duration.Duration { +func (x *RouteDelay) GetFixedDelay() *durationpb.Duration { if x != nil { return x.FixedDelay } @@ -151,11 +147,9 @@ type RouteFaults struct { func (x *RouteFaults) Reset() { *x = RouteFaults{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteFaults) String() string { @@ -166,7 +160,7 @@ func (*RouteFaults) ProtoMessage() {} func (x *RouteFaults) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -253,11 +247,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_f } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_goTypes = []interface{}{ - (*RouteAbort)(nil), // 0: fault.options.gloo.solo.io.RouteAbort - (*RouteDelay)(nil), // 1: fault.options.gloo.solo.io.RouteDelay - (*RouteFaults)(nil), // 2: fault.options.gloo.solo.io.RouteFaults - (*duration.Duration)(nil), // 3: google.protobuf.Duration +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_goTypes = []any{ + (*RouteAbort)(nil), // 0: fault.options.gloo.solo.io.RouteAbort + (*RouteDelay)(nil), // 1: fault.options.gloo.solo.io.RouteDelay + (*RouteFaults)(nil), // 2: fault.options.gloo.solo.io.RouteFaults + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_depIdxs = []int32{ 3, // 0: fault.options.gloo.solo.io.RouteDelay.fixed_delay:type_name -> google.protobuf.Duration @@ -277,44 +271,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_f if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAbort); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteDelay); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_faultinjection_fault_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteFaults); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/graphql/graphql.pb.go b/pkg/api/gloo.solo.io/v1/options/graphql/graphql.pb.go index 149d2a609..2faacb3c5 100644 --- a/pkg/api/gloo.solo.io/v1/options/graphql/graphql.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/graphql/graphql.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/graphql/graphql.proto @@ -40,11 +40,9 @@ type ServiceSpec struct { func (x *ServiceSpec) Reset() { *x = ServiceSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServiceSpec) String() string { @@ -55,7 +53,7 @@ func (*ServiceSpec) ProtoMessage() {} func (x *ServiceSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -89,11 +87,9 @@ type ServiceSpec_Endpoint struct { func (x *ServiceSpec_Endpoint) Reset() { *x = ServiceSpec_Endpoint{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServiceSpec_Endpoint) String() string { @@ -104,7 +100,7 @@ func (*ServiceSpec_Endpoint) ProtoMessage() {} func (x *ServiceSpec_Endpoint) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -166,7 +162,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_goTypes = []any{ (*ServiceSpec)(nil), // 0: graphql.options.gloo.solo.io.ServiceSpec (*ServiceSpec_Endpoint)(nil), // 1: graphql.options.gloo.solo.io.ServiceSpec.Endpoint } @@ -184,32 +180,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_graphql_graphql_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceSpec_Endpoint); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/grpc/grpc.pb.go b/pkg/api/gloo.solo.io/v1/options/grpc/grpc.pb.go index 2e34e13ff..10a8cbb2f 100644 --- a/pkg/api/gloo.solo.io/v1/options/grpc/grpc.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/grpc/grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/grpc/grpc.proto @@ -43,11 +43,9 @@ type ServiceSpec struct { func (x *ServiceSpec) Reset() { *x = ServiceSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServiceSpec) String() string { @@ -58,7 +56,7 @@ func (*ServiceSpec) ProtoMessage() {} func (x *ServiceSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -106,11 +104,9 @@ type DestinationSpec struct { func (x *DestinationSpec) Reset() { *x = DestinationSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestinationSpec) String() string { @@ -121,7 +117,7 @@ func (*DestinationSpec) ProtoMessage() {} func (x *DestinationSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -180,11 +176,9 @@ type ServiceSpec_GrpcService struct { func (x *ServiceSpec_GrpcService) Reset() { *x = ServiceSpec_GrpcService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServiceSpec_GrpcService) String() string { @@ -195,7 +189,7 @@ func (*ServiceSpec_GrpcService) ProtoMessage() {} func (x *ServiceSpec_GrpcService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -296,7 +290,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_goTypes = []any{ (*ServiceSpec)(nil), // 0: grpc.options.gloo.solo.io.ServiceSpec (*DestinationSpec)(nil), // 1: grpc.options.gloo.solo.io.DestinationSpec (*ServiceSpec_GrpcService)(nil), // 2: grpc.options.gloo.solo.io.ServiceSpec.GrpcService @@ -317,44 +311,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestinationSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_grpc_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceSpec_GrpcService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/grpc_json/grpc_json.pb.go b/pkg/api/gloo.solo.io/v1/options/grpc_json/grpc_json.pb.go index 751be68b3..6aa49b367 100644 --- a/pkg/api/gloo.solo.io/v1/options/grpc_json/grpc_json.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/grpc_json/grpc_json.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/grpc_json/grpc_json.proto @@ -137,11 +137,9 @@ type GrpcJsonTranscoder struct { func (x *GrpcJsonTranscoder) Reset() { *x = GrpcJsonTranscoder{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcJsonTranscoder) String() string { @@ -152,7 +150,7 @@ func (*GrpcJsonTranscoder) ProtoMessage() {} func (x *GrpcJsonTranscoder) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -298,11 +296,9 @@ type GrpcJsonTranscoder_PrintOptions struct { func (x *GrpcJsonTranscoder_PrintOptions) Reset() { *x = GrpcJsonTranscoder_PrintOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcJsonTranscoder_PrintOptions) String() string { @@ -313,7 +309,7 @@ func (*GrpcJsonTranscoder_PrintOptions) ProtoMessage() {} func (x *GrpcJsonTranscoder_PrintOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -373,11 +369,9 @@ type GrpcJsonTranscoder_DescriptorConfigMap struct { func (x *GrpcJsonTranscoder_DescriptorConfigMap) Reset() { *x = GrpcJsonTranscoder_DescriptorConfigMap{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcJsonTranscoder_DescriptorConfigMap) String() string { @@ -388,7 +382,7 @@ func (*GrpcJsonTranscoder_DescriptorConfigMap) ProtoMessage() {} func (x *GrpcJsonTranscoder_DescriptorConfigMap) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -520,7 +514,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_j } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_goTypes = []any{ (*GrpcJsonTranscoder)(nil), // 0: grpc_json.options.gloo.solo.io.GrpcJsonTranscoder (*GrpcJsonTranscoder_PrintOptions)(nil), // 1: grpc_json.options.gloo.solo.io.GrpcJsonTranscoder.PrintOptions (*GrpcJsonTranscoder_DescriptorConfigMap)(nil), // 2: grpc_json.options.gloo.solo.io.GrpcJsonTranscoder.DescriptorConfigMap @@ -544,45 +538,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_j if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcJsonTranscoder); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcJsonTranscoder_PrintOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcJsonTranscoder_DescriptorConfigMap); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_json_grpc_json_proto_msgTypes[0].OneofWrappers = []any{ (*GrpcJsonTranscoder_ProtoDescriptor)(nil), (*GrpcJsonTranscoder_ProtoDescriptorBin)(nil), (*GrpcJsonTranscoder_ProtoDescriptorConfigMap)(nil), diff --git a/pkg/api/gloo.solo.io/v1/options/grpc_web/grpc_web.pb.go b/pkg/api/gloo.solo.io/v1/options/grpc_web/grpc_web.pb.go index 02f989cbc..e178a95ed 100644 --- a/pkg/api/gloo.solo.io/v1/options/grpc_web/grpc_web.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/grpc_web/grpc_web.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/grpc_web/grpc_web.proto @@ -34,11 +34,9 @@ type GrpcWeb struct { func (x *GrpcWeb) Reset() { *x = GrpcWeb{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_web_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_web_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcWeb) String() string { @@ -49,7 +47,7 @@ func (*GrpcWeb) ProtoMessage() {} func (x *GrpcWeb) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_web_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -106,7 +104,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_we } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_web_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_web_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_web_proto_goTypes = []any{ (*GrpcWeb)(nil), // 0: grpc_web.options.gloo.solo.io.GrpcWeb } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_web_proto_depIdxs = []int32{ @@ -124,20 +122,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_we if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_web_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_grpc_web_grpc_web_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcWeb); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.clone.go index 05bcdbf7c..5730bf19d 100644 --- a/pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.clone.go @@ -13,10 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_headers "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/headers" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_protocol "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/protocol" @@ -24,6 +20,10 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_protocol_upgrade "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/protocol_upgrade" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_tracing "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/tracing" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -46,117 +46,117 @@ func (m *HttpConnectionManagerSettings) Clone() proto.Message { target = &HttpConnectionManagerSettings{} if h, ok := interface{}(m.GetSkipXffAppend()).(clone.Cloner); ok { - target.SkipXffAppend = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.SkipXffAppend = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.SkipXffAppend = proto.Clone(m.GetSkipXffAppend()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.SkipXffAppend = proto.Clone(m.GetSkipXffAppend()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetVia()).(clone.Cloner); ok { - target.Via = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Via = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Via = proto.Clone(m.GetVia()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Via = proto.Clone(m.GetVia()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetXffNumTrustedHops()).(clone.Cloner); ok { - target.XffNumTrustedHops = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.XffNumTrustedHops = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.XffNumTrustedHops = proto.Clone(m.GetXffNumTrustedHops()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.XffNumTrustedHops = proto.Clone(m.GetXffNumTrustedHops()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetUseRemoteAddress()).(clone.Cloner); ok { - target.UseRemoteAddress = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseRemoteAddress = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UseRemoteAddress = proto.Clone(m.GetUseRemoteAddress()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseRemoteAddress = proto.Clone(m.GetUseRemoteAddress()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetGenerateRequestId()).(clone.Cloner); ok { - target.GenerateRequestId = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.GenerateRequestId = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.GenerateRequestId = proto.Clone(m.GetGenerateRequestId()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.GenerateRequestId = proto.Clone(m.GetGenerateRequestId()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetProxy_100Continue()).(clone.Cloner); ok { - target.Proxy_100Continue = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Proxy_100Continue = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Proxy_100Continue = proto.Clone(m.GetProxy_100Continue()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Proxy_100Continue = proto.Clone(m.GetProxy_100Continue()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetStreamIdleTimeout()).(clone.Cloner); ok { - target.StreamIdleTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.StreamIdleTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.StreamIdleTimeout = proto.Clone(m.GetStreamIdleTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.StreamIdleTimeout = proto.Clone(m.GetStreamIdleTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetIdleTimeout()).(clone.Cloner); ok { - target.IdleTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxRequestHeadersKb()).(clone.Cloner); ok { - target.MaxRequestHeadersKb = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRequestHeadersKb = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxRequestHeadersKb = proto.Clone(m.GetMaxRequestHeadersKb()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRequestHeadersKb = proto.Clone(m.GetMaxRequestHeadersKb()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetRequestTimeout()).(clone.Cloner); ok { - target.RequestTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestTimeout = proto.Clone(m.GetRequestTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRequestHeadersTimeout()).(clone.Cloner); ok { - target.RequestHeadersTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestHeadersTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.RequestHeadersTimeout = proto.Clone(m.GetRequestHeadersTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RequestHeadersTimeout = proto.Clone(m.GetRequestHeadersTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetDrainTimeout()).(clone.Cloner); ok { - target.DrainTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DrainTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.DrainTimeout = proto.Clone(m.GetDrainTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DrainTimeout = proto.Clone(m.GetDrainTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetDelayedCloseTimeout()).(clone.Cloner); ok { - target.DelayedCloseTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DelayedCloseTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.DelayedCloseTimeout = proto.Clone(m.GetDelayedCloseTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DelayedCloseTimeout = proto.Clone(m.GetDelayedCloseTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetServerName()).(clone.Cloner); ok { - target.ServerName = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ServerName = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.ServerName = proto.Clone(m.GetServerName()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ServerName = proto.Clone(m.GetServerName()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetStripAnyHostPort()).(clone.Cloner); ok { - target.StripAnyHostPort = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.StripAnyHostPort = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.StripAnyHostPort = proto.Clone(m.GetStripAnyHostPort()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.StripAnyHostPort = proto.Clone(m.GetStripAnyHostPort()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetAcceptHttp_10()).(clone.Cloner); ok { - target.AcceptHttp_10 = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AcceptHttp_10 = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AcceptHttp_10 = proto.Clone(m.GetAcceptHttp_10()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AcceptHttp_10 = proto.Clone(m.GetAcceptHttp_10()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetDefaultHostForHttp_10()).(clone.Cloner); ok { - target.DefaultHostForHttp_10 = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.DefaultHostForHttp_10 = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.DefaultHostForHttp_10 = proto.Clone(m.GetDefaultHostForHttp_10()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.DefaultHostForHttp_10 = proto.Clone(m.GetDefaultHostForHttp_10()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetAllowChunkedLength()).(clone.Cloner); ok { - target.AllowChunkedLength = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowChunkedLength = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowChunkedLength = proto.Clone(m.GetAllowChunkedLength()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowChunkedLength = proto.Clone(m.GetAllowChunkedLength()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetEnableTrailers()).(clone.Cloner); ok { - target.EnableTrailers = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableTrailers = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EnableTrailers = proto.Clone(m.GetEnableTrailers()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableTrailers = proto.Clone(m.GetEnableTrailers()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetTracing()).(clone.Cloner); ok { @@ -174,9 +174,9 @@ func (m *HttpConnectionManagerSettings) Clone() proto.Message { } if h, ok := interface{}(m.GetPreserveExternalRequestId()).(clone.Cloner); ok { - target.PreserveExternalRequestId = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.PreserveExternalRequestId = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.PreserveExternalRequestId = proto.Clone(m.GetPreserveExternalRequestId()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.PreserveExternalRequestId = proto.Clone(m.GetPreserveExternalRequestId()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetUpgrades() != nil { @@ -193,29 +193,29 @@ func (m *HttpConnectionManagerSettings) Clone() proto.Message { } if h, ok := interface{}(m.GetMaxConnectionDuration()).(clone.Cloner); ok { - target.MaxConnectionDuration = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxConnectionDuration = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxConnectionDuration = proto.Clone(m.GetMaxConnectionDuration()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxConnectionDuration = proto.Clone(m.GetMaxConnectionDuration()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxStreamDuration()).(clone.Cloner); ok { - target.MaxStreamDuration = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxStreamDuration = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxStreamDuration = proto.Clone(m.GetMaxStreamDuration()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxStreamDuration = proto.Clone(m.GetMaxStreamDuration()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxHeadersCount()).(clone.Cloner); ok { - target.MaxHeadersCount = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxHeadersCount = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxHeadersCount = proto.Clone(m.GetMaxHeadersCount()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxHeadersCount = proto.Clone(m.GetMaxHeadersCount()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.HeadersWithUnderscoresAction = m.GetHeadersWithUnderscoresAction() if h, ok := interface{}(m.GetMaxRequestsPerConnection()).(clone.Cloner); ok { - target.MaxRequestsPerConnection = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRequestsPerConnection = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxRequestsPerConnection = proto.Clone(m.GetMaxRequestsPerConnection()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxRequestsPerConnection = proto.Clone(m.GetMaxRequestsPerConnection()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.ServerHeaderTransformation = m.GetServerHeaderTransformation() @@ -225,15 +225,15 @@ func (m *HttpConnectionManagerSettings) Clone() proto.Message { target.CodecType = m.GetCodecType() if h, ok := interface{}(m.GetMergeSlashes()).(clone.Cloner); ok { - target.MergeSlashes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.MergeSlashes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.MergeSlashes = proto.Clone(m.GetMergeSlashes()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.MergeSlashes = proto.Clone(m.GetMergeSlashes()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetNormalizePath()).(clone.Cloner); ok { - target.NormalizePath = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.NormalizePath = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.NormalizePath = proto.Clone(m.GetNormalizePath()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.NormalizePath = proto.Clone(m.GetNormalizePath()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetUuidRequestIdConfig()).(clone.Cloner); ok { @@ -255,9 +255,9 @@ func (m *HttpConnectionManagerSettings) Clone() proto.Message { } if h, ok := interface{}(m.GetAppendXForwardedPort()).(clone.Cloner); ok { - target.AppendXForwardedPort = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AppendXForwardedPort = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AppendXForwardedPort = proto.Clone(m.GetAppendXForwardedPort()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AppendXForwardedPort = proto.Clone(m.GetAppendXForwardedPort()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetEarlyHeaderManipulation()).(clone.Cloner); ok { @@ -272,11 +272,11 @@ func (m *HttpConnectionManagerSettings) Clone() proto.Message { if h, ok := interface{}(m.GetProperCaseHeaderKeyFormat()).(clone.Cloner); ok { target.HeaderFormat = &HttpConnectionManagerSettings_ProperCaseHeaderKeyFormat{ - ProperCaseHeaderKeyFormat: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + ProperCaseHeaderKeyFormat: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } else { target.HeaderFormat = &HttpConnectionManagerSettings_ProperCaseHeaderKeyFormat{ - ProperCaseHeaderKeyFormat: proto.Clone(m.GetProperCaseHeaderKeyFormat()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + ProperCaseHeaderKeyFormat: proto.Clone(m.GetProperCaseHeaderKeyFormat()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } @@ -284,11 +284,11 @@ func (m *HttpConnectionManagerSettings) Clone() proto.Message { if h, ok := interface{}(m.GetPreserveCaseHeaderKeyFormat()).(clone.Cloner); ok { target.HeaderFormat = &HttpConnectionManagerSettings_PreserveCaseHeaderKeyFormat{ - PreserveCaseHeaderKeyFormat: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + PreserveCaseHeaderKeyFormat: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } else { target.HeaderFormat = &HttpConnectionManagerSettings_PreserveCaseHeaderKeyFormat{ - PreserveCaseHeaderKeyFormat: proto.Clone(m.GetPreserveCaseHeaderKeyFormat()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + PreserveCaseHeaderKeyFormat: proto.Clone(m.GetPreserveCaseHeaderKeyFormat()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } @@ -306,33 +306,33 @@ func (m *HttpConnectionManagerSettings_SetCurrentClientCertDetails) Clone() prot target = &HttpConnectionManagerSettings_SetCurrentClientCertDetails{} if h, ok := interface{}(m.GetSubject()).(clone.Cloner); ok { - target.Subject = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Subject = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Subject = proto.Clone(m.GetSubject()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Subject = proto.Clone(m.GetSubject()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetCert()).(clone.Cloner); ok { - target.Cert = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Cert = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Cert = proto.Clone(m.GetCert()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Cert = proto.Clone(m.GetCert()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetChain()).(clone.Cloner); ok { - target.Chain = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Chain = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Chain = proto.Clone(m.GetChain()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Chain = proto.Clone(m.GetChain()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetDns()).(clone.Cloner); ok { - target.Dns = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Dns = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Dns = proto.Clone(m.GetDns()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Dns = proto.Clone(m.GetDns()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetUri()).(clone.Cloner); ok { - target.Uri = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Uri = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Uri = proto.Clone(m.GetUri()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Uri = proto.Clone(m.GetUri()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -347,15 +347,15 @@ func (m *HttpConnectionManagerSettings_UuidRequestIdConfigSettings) Clone() prot target = &HttpConnectionManagerSettings_UuidRequestIdConfigSettings{} if h, ok := interface{}(m.GetPackTraceReason()).(clone.Cloner); ok { - target.PackTraceReason = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.PackTraceReason = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.PackTraceReason = proto.Clone(m.GetPackTraceReason()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.PackTraceReason = proto.Clone(m.GetPackTraceReason()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetUseRequestIdForTraceSampling()).(clone.Cloner); ok { - target.UseRequestIdForTraceSampling = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseRequestIdForTraceSampling = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UseRequestIdForTraceSampling = proto.Clone(m.GetUseRequestIdForTraceSampling()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseRequestIdForTraceSampling = proto.Clone(m.GetUseRequestIdForTraceSampling()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -372,9 +372,9 @@ func (m *HttpConnectionManagerSettings_CidrRange) Clone() proto.Message { target.AddressPrefix = m.GetAddressPrefix() if h, ok := interface{}(m.GetPrefixLen()).(clone.Cloner); ok { - target.PrefixLen = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PrefixLen = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.PrefixLen = proto.Clone(m.GetPrefixLen()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PrefixLen = proto.Clone(m.GetPrefixLen()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target @@ -389,9 +389,9 @@ func (m *HttpConnectionManagerSettings_InternalAddressConfig) Clone() proto.Mess target = &HttpConnectionManagerSettings_InternalAddressConfig{} if h, ok := interface{}(m.GetUnixSockets()).(clone.Cloner); ok { - target.UnixSockets = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UnixSockets = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UnixSockets = proto.Clone(m.GetUnixSockets()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UnixSockets = proto.Clone(m.GetUnixSockets()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetCidrRanges() != nil { diff --git a/pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.go b/pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.go index afb324057..25abd3e1f 100644 --- a/pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/hcm/hcm.proto @@ -10,9 +10,6 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" headers "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/headers" protocol "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/protocol" @@ -20,6 +17,9 @@ import ( tracing "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/tracing" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -333,30 +333,30 @@ type HttpConnectionManagerSettings struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - SkipXffAppend *wrappers.BoolValue `protobuf:"bytes,1,opt,name=skip_xff_append,json=skipXffAppend,proto3" json:"skip_xff_append,omitempty"` - Via *wrappers.StringValue `protobuf:"bytes,2,opt,name=via,proto3" json:"via,omitempty"` - XffNumTrustedHops *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=xff_num_trusted_hops,json=xffNumTrustedHops,proto3" json:"xff_num_trusted_hops,omitempty"` - UseRemoteAddress *wrappers.BoolValue `protobuf:"bytes,4,opt,name=use_remote_address,json=useRemoteAddress,proto3" json:"use_remote_address,omitempty"` - GenerateRequestId *wrappers.BoolValue `protobuf:"bytes,5,opt,name=generate_request_id,json=generateRequestId,proto3" json:"generate_request_id,omitempty"` - Proxy_100Continue *wrappers.BoolValue `protobuf:"bytes,6,opt,name=proxy_100_continue,json=proxy100Continue,proto3" json:"proxy_100_continue,omitempty"` - StreamIdleTimeout *duration.Duration `protobuf:"bytes,7,opt,name=stream_idle_timeout,json=streamIdleTimeout,proto3" json:"stream_idle_timeout,omitempty"` - IdleTimeout *duration.Duration `protobuf:"bytes,8,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` - MaxRequestHeadersKb *wrappers.UInt32Value `protobuf:"bytes,9,opt,name=max_request_headers_kb,json=maxRequestHeadersKb,proto3" json:"max_request_headers_kb,omitempty"` - RequestTimeout *duration.Duration `protobuf:"bytes,10,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` + SkipXffAppend *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=skip_xff_append,json=skipXffAppend,proto3" json:"skip_xff_append,omitempty"` + Via *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=via,proto3" json:"via,omitempty"` + XffNumTrustedHops *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=xff_num_trusted_hops,json=xffNumTrustedHops,proto3" json:"xff_num_trusted_hops,omitempty"` + UseRemoteAddress *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=use_remote_address,json=useRemoteAddress,proto3" json:"use_remote_address,omitempty"` + GenerateRequestId *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=generate_request_id,json=generateRequestId,proto3" json:"generate_request_id,omitempty"` + Proxy_100Continue *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=proxy_100_continue,json=proxy100Continue,proto3" json:"proxy_100_continue,omitempty"` + StreamIdleTimeout *durationpb.Duration `protobuf:"bytes,7,opt,name=stream_idle_timeout,json=streamIdleTimeout,proto3" json:"stream_idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,8,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + MaxRequestHeadersKb *wrapperspb.UInt32Value `protobuf:"bytes,9,opt,name=max_request_headers_kb,json=maxRequestHeadersKb,proto3" json:"max_request_headers_kb,omitempty"` + RequestTimeout *durationpb.Duration `protobuf:"bytes,10,opt,name=request_timeout,json=requestTimeout,proto3" json:"request_timeout,omitempty"` // The amount of time that Envoy will wait for the request headers to be received. The timer is // activated when the first byte of the headers is received, and is disarmed when the last byte of // the headers has been received. If not specified or set to 0, this timeout is disabled. - RequestHeadersTimeout *duration.Duration `protobuf:"bytes,11,opt,name=request_headers_timeout,json=requestHeadersTimeout,proto3" json:"request_headers_timeout,omitempty"` - DrainTimeout *duration.Duration `protobuf:"bytes,12,opt,name=drain_timeout,json=drainTimeout,proto3" json:"drain_timeout,omitempty"` - DelayedCloseTimeout *duration.Duration `protobuf:"bytes,13,opt,name=delayed_close_timeout,json=delayedCloseTimeout,proto3" json:"delayed_close_timeout,omitempty"` - ServerName *wrappers.StringValue `protobuf:"bytes,14,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"` - StripAnyHostPort *wrappers.BoolValue `protobuf:"bytes,36,opt,name=strip_any_host_port,json=stripAnyHostPort,proto3" json:"strip_any_host_port,omitempty"` + RequestHeadersTimeout *durationpb.Duration `protobuf:"bytes,11,opt,name=request_headers_timeout,json=requestHeadersTimeout,proto3" json:"request_headers_timeout,omitempty"` + DrainTimeout *durationpb.Duration `protobuf:"bytes,12,opt,name=drain_timeout,json=drainTimeout,proto3" json:"drain_timeout,omitempty"` + DelayedCloseTimeout *durationpb.Duration `protobuf:"bytes,13,opt,name=delayed_close_timeout,json=delayedCloseTimeout,proto3" json:"delayed_close_timeout,omitempty"` + ServerName *wrapperspb.StringValue `protobuf:"bytes,14,opt,name=server_name,json=serverName,proto3" json:"server_name,omitempty"` + StripAnyHostPort *wrapperspb.BoolValue `protobuf:"bytes,36,opt,name=strip_any_host_port,json=stripAnyHostPort,proto3" json:"strip_any_host_port,omitempty"` // For explanation of these settings see: https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/protocol.proto#envoy-api-msg-core-http1protocoloptions - AcceptHttp_10 *wrappers.BoolValue `protobuf:"bytes,15,opt,name=accept_http_10,json=acceptHttp10,proto3" json:"accept_http_10,omitempty"` - DefaultHostForHttp_10 *wrappers.StringValue `protobuf:"bytes,16,opt,name=default_host_for_http_10,json=defaultHostForHttp10,proto3" json:"default_host_for_http_10,omitempty"` + AcceptHttp_10 *wrapperspb.BoolValue `protobuf:"bytes,15,opt,name=accept_http_10,json=acceptHttp10,proto3" json:"accept_http_10,omitempty"` + DefaultHostForHttp_10 *wrapperspb.StringValue `protobuf:"bytes,16,opt,name=default_host_for_http_10,json=defaultHostForHttp10,proto3" json:"default_host_for_http_10,omitempty"` // For an explanation of these settings, see: https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/protocol.proto#config-core-v3-http1protocoloptions - AllowChunkedLength *wrappers.BoolValue `protobuf:"bytes,34,opt,name=allow_chunked_length,json=allowChunkedLength,proto3" json:"allow_chunked_length,omitempty"` - EnableTrailers *wrappers.BoolValue `protobuf:"bytes,35,opt,name=enable_trailers,json=enableTrailers,proto3" json:"enable_trailers,omitempty"` + AllowChunkedLength *wrapperspb.BoolValue `protobuf:"bytes,34,opt,name=allow_chunked_length,json=allowChunkedLength,proto3" json:"allow_chunked_length,omitempty"` + EnableTrailers *wrapperspb.BoolValue `protobuf:"bytes,35,opt,name=enable_trailers,json=enableTrailers,proto3" json:"enable_trailers,omitempty"` // Types that are assignable to HeaderFormat: // // *HttpConnectionManagerSettings_ProperCaseHeaderKeyFormat @@ -365,20 +365,20 @@ type HttpConnectionManagerSettings struct { Tracing *tracing.ListenerTracingSettings `protobuf:"bytes,17,opt,name=tracing,proto3" json:"tracing,omitempty"` ForwardClientCertDetails HttpConnectionManagerSettings_ForwardClientCertDetails `protobuf:"varint,18,opt,name=forward_client_cert_details,json=forwardClientCertDetails,proto3,enum=hcm.options.gloo.solo.io.HttpConnectionManagerSettings_ForwardClientCertDetails" json:"forward_client_cert_details,omitempty"` SetCurrentClientCertDetails *HttpConnectionManagerSettings_SetCurrentClientCertDetails `protobuf:"bytes,19,opt,name=set_current_client_cert_details,json=setCurrentClientCertDetails,proto3" json:"set_current_client_cert_details,omitempty"` - PreserveExternalRequestId *wrappers.BoolValue `protobuf:"bytes,20,opt,name=preserve_external_request_id,json=preserveExternalRequestId,proto3" json:"preserve_external_request_id,omitempty"` + PreserveExternalRequestId *wrapperspb.BoolValue `protobuf:"bytes,20,opt,name=preserve_external_request_id,json=preserveExternalRequestId,proto3" json:"preserve_external_request_id,omitempty"` // HttpConnectionManager configuration for protocol upgrade requests. // Note: WebSocket upgrades are enabled by default on the HTTP Connection Manager and must be explicitly disabled. Upgrades []*protocol_upgrade.ProtocolUpgradeConfig `protobuf:"bytes,21,rep,name=upgrades,proto3" json:"upgrades,omitempty"` // For an explanation of these settings see https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/protocol.proto#config-core-v3-httpprotocoloptions - MaxConnectionDuration *duration.Duration `protobuf:"bytes,23,opt,name=max_connection_duration,json=maxConnectionDuration,proto3" json:"max_connection_duration,omitempty"` + MaxConnectionDuration *durationpb.Duration `protobuf:"bytes,23,opt,name=max_connection_duration,json=maxConnectionDuration,proto3" json:"max_connection_duration,omitempty"` // For an explanation of these settings see https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/protocol.proto#config-core-v3-httpprotocoloptions - MaxStreamDuration *duration.Duration `protobuf:"bytes,24,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` + MaxStreamDuration *durationpb.Duration `protobuf:"bytes,24,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` // For an explanation of these settings see https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/protocol.proto#config-core-v3-httpprotocoloptions - MaxHeadersCount *wrappers.UInt32Value `protobuf:"bytes,27,opt,name=max_headers_count,json=maxHeadersCount,proto3" json:"max_headers_count,omitempty"` + MaxHeadersCount *wrapperspb.UInt32Value `protobuf:"bytes,27,opt,name=max_headers_count,json=maxHeadersCount,proto3" json:"max_headers_count,omitempty"` // For an explanation of these settings see https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/protocol.proto#config-core-v3-httpprotocoloptions HeadersWithUnderscoresAction HttpConnectionManagerSettings_HeadersWithUnderscoreAction `protobuf:"varint,32,opt,name=headers_with_underscores_action,json=headersWithUnderscoresAction,proto3,enum=hcm.options.gloo.solo.io.HttpConnectionManagerSettings_HeadersWithUnderscoreAction" json:"headers_with_underscores_action,omitempty"` // For an explanation of these settings see https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/protocol.proto#config-core-v3-httpprotocoloptions - MaxRequestsPerConnection *wrappers.UInt32Value `protobuf:"bytes,33,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` + MaxRequestsPerConnection *wrapperspb.UInt32Value `protobuf:"bytes,33,opt,name=max_requests_per_connection,json=maxRequestsPerConnection,proto3" json:"max_requests_per_connection,omitempty"` // For an explanation of the settings see: https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto.html#envoy-v3-api-enum-extensions-filters-network-http-connection-manager-v3-httpconnectionmanager-serverheadertransformation ServerHeaderTransformation HttpConnectionManagerSettings_ServerHeaderTransformation `protobuf:"varint,25,opt,name=server_header_transformation,json=serverHeaderTransformation,proto3,enum=hcm.options.gloo.solo.io.HttpConnectionManagerSettings_ServerHeaderTransformation" json:"server_header_transformation,omitempty"` // Action to take when request URL path contains escaped slash sequences (%2F, %2f, %5C and %5c). @@ -392,28 +392,26 @@ type HttpConnectionManagerSettings struct { CodecType HttpConnectionManagerSettings_CodecType `protobuf:"varint,28,opt,name=codec_type,json=codecType,proto3,enum=hcm.options.gloo.solo.io.HttpConnectionManagerSettings_CodecType" json:"codec_type,omitempty"` // Determines if adjacent slashes in the path are merged into one before any processing of requests by HTTP filters or routing. // See here for more information: https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto - MergeSlashes *wrappers.BoolValue `protobuf:"bytes,29,opt,name=merge_slashes,json=mergeSlashes,proto3" json:"merge_slashes,omitempty"` + MergeSlashes *wrapperspb.BoolValue `protobuf:"bytes,29,opt,name=merge_slashes,json=mergeSlashes,proto3" json:"merge_slashes,omitempty"` // Should paths be normalized according to RFC 3986 before any processing of requests by HTTP filters or routing? Defaults to True. // See here for more information: https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto - NormalizePath *wrappers.BoolValue `protobuf:"bytes,30,opt,name=normalize_path,json=normalizePath,proto3" json:"normalize_path,omitempty"` + NormalizePath *wrapperspb.BoolValue `protobuf:"bytes,30,opt,name=normalize_path,json=normalizePath,proto3" json:"normalize_path,omitempty"` UuidRequestIdConfig *HttpConnectionManagerSettings_UuidRequestIdConfigSettings `protobuf:"bytes,37,opt,name=uuid_request_id_config,json=uuidRequestIdConfig,proto3" json:"uuid_request_id_config,omitempty"` // Additional HTTP/2 settings that are passed directly to the HTTP/2 codec. Http2ProtocolOptions *protocol.Http2ProtocolOptions `protobuf:"bytes,39,opt,name=http2_protocol_options,json=http2ProtocolOptions,proto3" json:"http2_protocol_options,omitempty"` // Configuration of internal addresses InternalAddressConfig *HttpConnectionManagerSettings_InternalAddressConfig `protobuf:"bytes,38,opt,name=internal_address_config,json=internalAddressConfig,proto3" json:"internal_address_config,omitempty"` // If true, configure Envoy to set the x-fowarded-port header to allow services to find Envoy's listener port. - AppendXForwardedPort *wrappers.BoolValue `protobuf:"bytes,40,opt,name=append_x_forwarded_port,json=appendXForwardedPort,proto3" json:"append_x_forwarded_port,omitempty"` + AppendXForwardedPort *wrapperspb.BoolValue `protobuf:"bytes,40,opt,name=append_x_forwarded_port,json=appendXForwardedPort,proto3" json:"append_x_forwarded_port,omitempty"` // Configuration for early header manipulation EarlyHeaderManipulation *headers.EarlyHeaderManipulation `protobuf:"bytes,41,opt,name=early_header_manipulation,json=earlyHeaderManipulation,proto3" json:"early_header_manipulation,omitempty"` } func (x *HttpConnectionManagerSettings) Reset() { *x = HttpConnectionManagerSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpConnectionManagerSettings) String() string { @@ -424,7 +422,7 @@ func (*HttpConnectionManagerSettings) ProtoMessage() {} func (x *HttpConnectionManagerSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -439,133 +437,133 @@ func (*HttpConnectionManagerSettings) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_rawDescGZIP(), []int{0} } -func (x *HttpConnectionManagerSettings) GetSkipXffAppend() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetSkipXffAppend() *wrapperspb.BoolValue { if x != nil { return x.SkipXffAppend } return nil } -func (x *HttpConnectionManagerSettings) GetVia() *wrappers.StringValue { +func (x *HttpConnectionManagerSettings) GetVia() *wrapperspb.StringValue { if x != nil { return x.Via } return nil } -func (x *HttpConnectionManagerSettings) GetXffNumTrustedHops() *wrappers.UInt32Value { +func (x *HttpConnectionManagerSettings) GetXffNumTrustedHops() *wrapperspb.UInt32Value { if x != nil { return x.XffNumTrustedHops } return nil } -func (x *HttpConnectionManagerSettings) GetUseRemoteAddress() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetUseRemoteAddress() *wrapperspb.BoolValue { if x != nil { return x.UseRemoteAddress } return nil } -func (x *HttpConnectionManagerSettings) GetGenerateRequestId() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetGenerateRequestId() *wrapperspb.BoolValue { if x != nil { return x.GenerateRequestId } return nil } -func (x *HttpConnectionManagerSettings) GetProxy_100Continue() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetProxy_100Continue() *wrapperspb.BoolValue { if x != nil { return x.Proxy_100Continue } return nil } -func (x *HttpConnectionManagerSettings) GetStreamIdleTimeout() *duration.Duration { +func (x *HttpConnectionManagerSettings) GetStreamIdleTimeout() *durationpb.Duration { if x != nil { return x.StreamIdleTimeout } return nil } -func (x *HttpConnectionManagerSettings) GetIdleTimeout() *duration.Duration { +func (x *HttpConnectionManagerSettings) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } return nil } -func (x *HttpConnectionManagerSettings) GetMaxRequestHeadersKb() *wrappers.UInt32Value { +func (x *HttpConnectionManagerSettings) GetMaxRequestHeadersKb() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestHeadersKb } return nil } -func (x *HttpConnectionManagerSettings) GetRequestTimeout() *duration.Duration { +func (x *HttpConnectionManagerSettings) GetRequestTimeout() *durationpb.Duration { if x != nil { return x.RequestTimeout } return nil } -func (x *HttpConnectionManagerSettings) GetRequestHeadersTimeout() *duration.Duration { +func (x *HttpConnectionManagerSettings) GetRequestHeadersTimeout() *durationpb.Duration { if x != nil { return x.RequestHeadersTimeout } return nil } -func (x *HttpConnectionManagerSettings) GetDrainTimeout() *duration.Duration { +func (x *HttpConnectionManagerSettings) GetDrainTimeout() *durationpb.Duration { if x != nil { return x.DrainTimeout } return nil } -func (x *HttpConnectionManagerSettings) GetDelayedCloseTimeout() *duration.Duration { +func (x *HttpConnectionManagerSettings) GetDelayedCloseTimeout() *durationpb.Duration { if x != nil { return x.DelayedCloseTimeout } return nil } -func (x *HttpConnectionManagerSettings) GetServerName() *wrappers.StringValue { +func (x *HttpConnectionManagerSettings) GetServerName() *wrapperspb.StringValue { if x != nil { return x.ServerName } return nil } -func (x *HttpConnectionManagerSettings) GetStripAnyHostPort() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetStripAnyHostPort() *wrapperspb.BoolValue { if x != nil { return x.StripAnyHostPort } return nil } -func (x *HttpConnectionManagerSettings) GetAcceptHttp_10() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetAcceptHttp_10() *wrapperspb.BoolValue { if x != nil { return x.AcceptHttp_10 } return nil } -func (x *HttpConnectionManagerSettings) GetDefaultHostForHttp_10() *wrappers.StringValue { +func (x *HttpConnectionManagerSettings) GetDefaultHostForHttp_10() *wrapperspb.StringValue { if x != nil { return x.DefaultHostForHttp_10 } return nil } -func (x *HttpConnectionManagerSettings) GetAllowChunkedLength() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetAllowChunkedLength() *wrapperspb.BoolValue { if x != nil { return x.AllowChunkedLength } return nil } -func (x *HttpConnectionManagerSettings) GetEnableTrailers() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetEnableTrailers() *wrapperspb.BoolValue { if x != nil { return x.EnableTrailers } @@ -579,14 +577,14 @@ func (m *HttpConnectionManagerSettings) GetHeaderFormat() isHttpConnectionManage return nil } -func (x *HttpConnectionManagerSettings) GetProperCaseHeaderKeyFormat() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetProperCaseHeaderKeyFormat() *wrapperspb.BoolValue { if x, ok := x.GetHeaderFormat().(*HttpConnectionManagerSettings_ProperCaseHeaderKeyFormat); ok { return x.ProperCaseHeaderKeyFormat } return nil } -func (x *HttpConnectionManagerSettings) GetPreserveCaseHeaderKeyFormat() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetPreserveCaseHeaderKeyFormat() *wrapperspb.BoolValue { if x, ok := x.GetHeaderFormat().(*HttpConnectionManagerSettings_PreserveCaseHeaderKeyFormat); ok { return x.PreserveCaseHeaderKeyFormat } @@ -614,7 +612,7 @@ func (x *HttpConnectionManagerSettings) GetSetCurrentClientCertDetails() *HttpCo return nil } -func (x *HttpConnectionManagerSettings) GetPreserveExternalRequestId() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetPreserveExternalRequestId() *wrapperspb.BoolValue { if x != nil { return x.PreserveExternalRequestId } @@ -628,21 +626,21 @@ func (x *HttpConnectionManagerSettings) GetUpgrades() []*protocol_upgrade.Protoc return nil } -func (x *HttpConnectionManagerSettings) GetMaxConnectionDuration() *duration.Duration { +func (x *HttpConnectionManagerSettings) GetMaxConnectionDuration() *durationpb.Duration { if x != nil { return x.MaxConnectionDuration } return nil } -func (x *HttpConnectionManagerSettings) GetMaxStreamDuration() *duration.Duration { +func (x *HttpConnectionManagerSettings) GetMaxStreamDuration() *durationpb.Duration { if x != nil { return x.MaxStreamDuration } return nil } -func (x *HttpConnectionManagerSettings) GetMaxHeadersCount() *wrappers.UInt32Value { +func (x *HttpConnectionManagerSettings) GetMaxHeadersCount() *wrapperspb.UInt32Value { if x != nil { return x.MaxHeadersCount } @@ -656,7 +654,7 @@ func (x *HttpConnectionManagerSettings) GetHeadersWithUnderscoresAction() HttpCo return HttpConnectionManagerSettings_ALLOW } -func (x *HttpConnectionManagerSettings) GetMaxRequestsPerConnection() *wrappers.UInt32Value { +func (x *HttpConnectionManagerSettings) GetMaxRequestsPerConnection() *wrapperspb.UInt32Value { if x != nil { return x.MaxRequestsPerConnection } @@ -684,14 +682,14 @@ func (x *HttpConnectionManagerSettings) GetCodecType() HttpConnectionManagerSett return HttpConnectionManagerSettings_AUTO } -func (x *HttpConnectionManagerSettings) GetMergeSlashes() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetMergeSlashes() *wrapperspb.BoolValue { if x != nil { return x.MergeSlashes } return nil } -func (x *HttpConnectionManagerSettings) GetNormalizePath() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetNormalizePath() *wrapperspb.BoolValue { if x != nil { return x.NormalizePath } @@ -719,7 +717,7 @@ func (x *HttpConnectionManagerSettings) GetInternalAddressConfig() *HttpConnecti return nil } -func (x *HttpConnectionManagerSettings) GetAppendXForwardedPort() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings) GetAppendXForwardedPort() *wrapperspb.BoolValue { if x != nil { return x.AppendXForwardedPort } @@ -743,13 +741,13 @@ type HttpConnectionManagerSettings_ProperCaseHeaderKeyFormat struct { // "content-type" becomes "Content-Type", and "foo$b#$are" becomes "Foo$B#$Are". // Note that while this results in most headers following conventional casing, certain headers // are not covered. For example, the "TE" header will be formatted as "Te". - ProperCaseHeaderKeyFormat *wrappers.BoolValue `protobuf:"bytes,22,opt,name=proper_case_header_key_format,json=properCaseHeaderKeyFormat,proto3,oneof"` + ProperCaseHeaderKeyFormat *wrapperspb.BoolValue `protobuf:"bytes,22,opt,name=proper_case_header_key_format,json=properCaseHeaderKeyFormat,proto3,oneof"` } type HttpConnectionManagerSettings_PreserveCaseHeaderKeyFormat struct { // Generates configuration for a stateful formatter extension that allows using received headers to // affect the output of encoding headers. Specifically: preserving REQUEST HEADER case during proxying. - PreserveCaseHeaderKeyFormat *wrappers.BoolValue `protobuf:"bytes,31,opt,name=preserve_case_header_key_format,json=preserveCaseHeaderKeyFormat,proto3,oneof"` + PreserveCaseHeaderKeyFormat *wrapperspb.BoolValue `protobuf:"bytes,31,opt,name=preserve_case_header_key_format,json=preserveCaseHeaderKeyFormat,proto3,oneof"` } func (*HttpConnectionManagerSettings_ProperCaseHeaderKeyFormat) isHttpConnectionManagerSettings_HeaderFormat() { @@ -763,20 +761,18 @@ type HttpConnectionManagerSettings_SetCurrentClientCertDetails struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Subject *wrappers.BoolValue `protobuf:"bytes,1,opt,name=subject,proto3" json:"subject,omitempty"` - Cert *wrappers.BoolValue `protobuf:"bytes,2,opt,name=cert,proto3" json:"cert,omitempty"` - Chain *wrappers.BoolValue `protobuf:"bytes,3,opt,name=chain,proto3" json:"chain,omitempty"` - Dns *wrappers.BoolValue `protobuf:"bytes,4,opt,name=dns,proto3" json:"dns,omitempty"` - Uri *wrappers.BoolValue `protobuf:"bytes,5,opt,name=uri,proto3" json:"uri,omitempty"` + Subject *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=subject,proto3" json:"subject,omitempty"` + Cert *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=cert,proto3" json:"cert,omitempty"` + Chain *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=chain,proto3" json:"chain,omitempty"` + Dns *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=dns,proto3" json:"dns,omitempty"` + Uri *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=uri,proto3" json:"uri,omitempty"` } func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) Reset() { *x = HttpConnectionManagerSettings_SetCurrentClientCertDetails{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) String() string { @@ -787,7 +783,7 @@ func (*HttpConnectionManagerSettings_SetCurrentClientCertDetails) ProtoMessage() func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -802,35 +798,35 @@ func (*HttpConnectionManagerSettings_SetCurrentClientCertDetails) Descriptor() ( return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_rawDescGZIP(), []int{0, 0} } -func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetSubject() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetSubject() *wrapperspb.BoolValue { if x != nil { return x.Subject } return nil } -func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetCert() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetCert() *wrapperspb.BoolValue { if x != nil { return x.Cert } return nil } -func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetChain() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetChain() *wrapperspb.BoolValue { if x != nil { return x.Chain } return nil } -func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetDns() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetDns() *wrapperspb.BoolValue { if x != nil { return x.Dns } return nil } -func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetUri() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings_SetCurrentClientCertDetails) GetUri() *wrapperspb.BoolValue { if x != nil { return x.Uri } @@ -848,20 +844,18 @@ type HttpConnectionManagerSettings_UuidRequestIdConfigSettings struct { // modification to the UUID will be performed. It is important to note that if disabled, // stable sampling of traces, access logs, etc. will no longer work and only random sampling will // be possible. - PackTraceReason *wrappers.BoolValue `protobuf:"bytes,1,opt,name=pack_trace_reason,json=packTraceReason,proto3" json:"pack_trace_reason,omitempty"` + PackTraceReason *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=pack_trace_reason,json=packTraceReason,proto3" json:"pack_trace_reason,omitempty"` // Set whether to use :ref:`x-request-id` for sampling or not. // This defaults to true. See the :ref:`context propagation ` // overview for more information. - UseRequestIdForTraceSampling *wrappers.BoolValue `protobuf:"bytes,2,opt,name=use_request_id_for_trace_sampling,json=useRequestIdForTraceSampling,proto3" json:"use_request_id_for_trace_sampling,omitempty"` + UseRequestIdForTraceSampling *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=use_request_id_for_trace_sampling,json=useRequestIdForTraceSampling,proto3" json:"use_request_id_for_trace_sampling,omitempty"` } func (x *HttpConnectionManagerSettings_UuidRequestIdConfigSettings) Reset() { *x = HttpConnectionManagerSettings_UuidRequestIdConfigSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpConnectionManagerSettings_UuidRequestIdConfigSettings) String() string { @@ -872,7 +866,7 @@ func (*HttpConnectionManagerSettings_UuidRequestIdConfigSettings) ProtoMessage() func (x *HttpConnectionManagerSettings_UuidRequestIdConfigSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -887,14 +881,14 @@ func (*HttpConnectionManagerSettings_UuidRequestIdConfigSettings) Descriptor() ( return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_rawDescGZIP(), []int{0, 1} } -func (x *HttpConnectionManagerSettings_UuidRequestIdConfigSettings) GetPackTraceReason() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings_UuidRequestIdConfigSettings) GetPackTraceReason() *wrapperspb.BoolValue { if x != nil { return x.PackTraceReason } return nil } -func (x *HttpConnectionManagerSettings_UuidRequestIdConfigSettings) GetUseRequestIdForTraceSampling() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings_UuidRequestIdConfigSettings) GetUseRequestIdForTraceSampling() *wrapperspb.BoolValue { if x != nil { return x.UseRequestIdForTraceSampling } @@ -910,16 +904,14 @@ type HttpConnectionManagerSettings_CidrRange struct { // IPv4 or IPv6 address AddressPrefix string `protobuf:"bytes,1,opt,name=address_prefix,json=addressPrefix,proto3" json:"address_prefix,omitempty"` // Length of prefix in bits - PrefixLen *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` + PrefixLen *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` } func (x *HttpConnectionManagerSettings_CidrRange) Reset() { *x = HttpConnectionManagerSettings_CidrRange{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpConnectionManagerSettings_CidrRange) String() string { @@ -930,7 +922,7 @@ func (*HttpConnectionManagerSettings_CidrRange) ProtoMessage() {} func (x *HttpConnectionManagerSettings_CidrRange) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -952,7 +944,7 @@ func (x *HttpConnectionManagerSettings_CidrRange) GetAddressPrefix() string { return "" } -func (x *HttpConnectionManagerSettings_CidrRange) GetPrefixLen() *wrappers.UInt32Value { +func (x *HttpConnectionManagerSettings_CidrRange) GetPrefixLen() *wrapperspb.UInt32Value { if x != nil { return x.PrefixLen } @@ -966,18 +958,16 @@ type HttpConnectionManagerSettings_InternalAddressConfig struct { unknownFields protoimpl.UnknownFields // Whether unix socket addresses should be considered internal - UnixSockets *wrappers.BoolValue `protobuf:"bytes,1,opt,name=unix_sockets,json=unixSockets,proto3" json:"unix_sockets,omitempty"` + UnixSockets *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=unix_sockets,json=unixSockets,proto3" json:"unix_sockets,omitempty"` // List of CIDR ranges that are treated as internal CidrRanges []*HttpConnectionManagerSettings_CidrRange `protobuf:"bytes,2,rep,name=cidr_ranges,json=cidrRanges,proto3" json:"cidr_ranges,omitempty"` } func (x *HttpConnectionManagerSettings_InternalAddressConfig) Reset() { *x = HttpConnectionManagerSettings_InternalAddressConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpConnectionManagerSettings_InternalAddressConfig) String() string { @@ -988,7 +978,7 @@ func (*HttpConnectionManagerSettings_InternalAddressConfig) ProtoMessage() {} func (x *HttpConnectionManagerSettings_InternalAddressConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1003,7 +993,7 @@ func (*HttpConnectionManagerSettings_InternalAddressConfig) Descriptor() ([]byte return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_rawDescGZIP(), []int{0, 3} } -func (x *HttpConnectionManagerSettings_InternalAddressConfig) GetUnixSockets() *wrappers.BoolValue { +func (x *HttpConnectionManagerSettings_InternalAddressConfig) GetUnixSockets() *wrapperspb.BoolValue { if x != nil { return x.UnixSockets } @@ -1392,7 +1382,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_ra var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_enumTypes = make([]protoimpl.EnumInfo, 5) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_goTypes = []any{ (HttpConnectionManagerSettings_ForwardClientCertDetails)(0), // 0: hcm.options.gloo.solo.io.HttpConnectionManagerSettings.ForwardClientCertDetails (HttpConnectionManagerSettings_ServerHeaderTransformation)(0), // 1: hcm.options.gloo.solo.io.HttpConnectionManagerSettings.ServerHeaderTransformation (HttpConnectionManagerSettings_HeadersWithUnderscoreAction)(0), // 2: hcm.options.gloo.solo.io.HttpConnectionManagerSettings.HeadersWithUnderscoreAction @@ -1403,10 +1393,10 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_goT (*HttpConnectionManagerSettings_UuidRequestIdConfigSettings)(nil), // 7: hcm.options.gloo.solo.io.HttpConnectionManagerSettings.UuidRequestIdConfigSettings (*HttpConnectionManagerSettings_CidrRange)(nil), // 8: hcm.options.gloo.solo.io.HttpConnectionManagerSettings.CidrRange (*HttpConnectionManagerSettings_InternalAddressConfig)(nil), // 9: hcm.options.gloo.solo.io.HttpConnectionManagerSettings.InternalAddressConfig - (*wrappers.BoolValue)(nil), // 10: google.protobuf.BoolValue - (*wrappers.StringValue)(nil), // 11: google.protobuf.StringValue - (*wrappers.UInt32Value)(nil), // 12: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 13: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 10: google.protobuf.BoolValue + (*wrapperspb.StringValue)(nil), // 11: google.protobuf.StringValue + (*wrapperspb.UInt32Value)(nil), // 12: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 13: google.protobuf.Duration (*tracing.ListenerTracingSettings)(nil), // 14: tracing.options.gloo.solo.io.ListenerTracingSettings (*protocol_upgrade.ProtocolUpgradeConfig)(nil), // 15: protocol_upgrade.options.gloo.solo.io.ProtocolUpgradeConfig (*protocol.Http2ProtocolOptions)(nil), // 16: protocol.options.gloo.solo.io.Http2ProtocolOptions @@ -1476,69 +1466,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_in if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpConnectionManagerSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpConnectionManagerSettings_SetCurrentClientCertDetails); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpConnectionManagerSettings_UuidRequestIdConfigSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpConnectionManagerSettings_CidrRange); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpConnectionManagerSettings_InternalAddressConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_hcm_hcm_proto_msgTypes[0].OneofWrappers = []any{ (*HttpConnectionManagerSettings_ProperCaseHeaderKeyFormat)(nil), (*HttpConnectionManagerSettings_PreserveCaseHeaderKeyFormat)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/options/header_validation/header_validation.pb.go b/pkg/api/gloo.solo.io/v1/options/header_validation/header_validation.pb.go index 10d463bd2..3aa8e4bde 100644 --- a/pkg/api/gloo.solo.io/v1/options/header_validation/header_validation.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/header_validation/header_validation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/header_validation/header_validation.proto @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) const ( @@ -45,11 +45,9 @@ type HeaderValidationSettings struct { func (x *HeaderValidationSettings) Reset() { *x = HeaderValidationSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderValidationSettings) String() string { @@ -60,7 +58,7 @@ func (*HeaderValidationSettings) ProtoMessage() {} func (x *HeaderValidationSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -82,7 +80,7 @@ func (m *HeaderValidationSettings) GetHeaderMethodValidation() isHeaderValidatio return nil } -func (x *HeaderValidationSettings) GetDisableHttp1MethodValidation() *empty.Empty { +func (x *HeaderValidationSettings) GetDisableHttp1MethodValidation() *emptypb.Empty { if x, ok := x.GetHeaderMethodValidation().(*HeaderValidationSettings_DisableHttp1MethodValidation); ok { return x.DisableHttp1MethodValidation } @@ -96,7 +94,7 @@ type isHeaderValidationSettings_HeaderMethodValidation interface { type HeaderValidationSettings_DisableHttp1MethodValidation struct { // Disable method validation. Envoy will not perform any validation on // the method provided in the HTTP header. - DisableHttp1MethodValidation *empty.Empty `protobuf:"bytes,1,opt,name=disable_http1_method_validation,json=disableHttp1MethodValidation,proto3,oneof"` + DisableHttp1MethodValidation *emptypb.Empty `protobuf:"bytes,1,opt,name=disable_http1_method_validation,json=disableHttp1MethodValidation,proto3,oneof"` } func (*HeaderValidationSettings_DisableHttp1MethodValidation) isHeaderValidationSettings_HeaderMethodValidation() { @@ -146,9 +144,9 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validatio } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_goTypes = []any{ (*HeaderValidationSettings)(nil), // 0: header_validation.options.gloo.solo.io.HeaderValidationSettings - (*empty.Empty)(nil), // 1: google.protobuf.Empty + (*emptypb.Empty)(nil), // 1: google.protobuf.Empty } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_depIdxs = []int32{ 1, // 0: header_validation.options.gloo.solo.io.HeaderValidationSettings.disable_http1_method_validation:type_name -> google.protobuf.Empty @@ -166,21 +164,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validatio if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderValidationSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_header_validation_header_validation_proto_msgTypes[0].OneofWrappers = []any{ (*HeaderValidationSettings_DisableHttp1MethodValidation)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/v1/options/headers/headers.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/headers/headers.pb.clone.go index 1fcc41b87..b35dc6f07 100644 --- a/pkg/api/gloo.solo.io/v1/options/headers/headers.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/headers/headers.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_kit_pkg_api_external_envoy_api_v2_core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -132,9 +132,9 @@ func (m *HeaderValueOption) Clone() proto.Message { } if h, ok := interface{}(m.GetAppend()).(clone.Cloner); ok { - target.Append = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Append = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Append = proto.Clone(m.GetAppend()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Append = proto.Clone(m.GetAppend()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/headers/headers.pb.go b/pkg/api/gloo.solo.io/v1/options/headers/headers.pb.go index 1bffb924f..9c2effd52 100644 --- a/pkg/api/gloo.solo.io/v1/options/headers/headers.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/headers/headers.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/headers/headers.proto @@ -10,11 +10,11 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -52,11 +52,9 @@ type HeaderManipulation struct { func (x *HeaderManipulation) Reset() { *x = HeaderManipulation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderManipulation) String() string { @@ -67,7 +65,7 @@ func (*HeaderManipulation) ProtoMessage() {} func (x *HeaderManipulation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -132,11 +130,9 @@ type EarlyHeaderManipulation struct { func (x *EarlyHeaderManipulation) Reset() { *x = EarlyHeaderManipulation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EarlyHeaderManipulation) String() string { @@ -147,7 +143,7 @@ func (*EarlyHeaderManipulation) ProtoMessage() {} func (x *EarlyHeaderManipulation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -187,16 +183,14 @@ type HeaderValueOption struct { // Specifies if the value should be appended or overwrite an existing header. Defaults to true. // If set to true, this maps to Envoy's `append_value: APPEND_IF_EXISTS_OR_ADD`, where the value gets be appended the header's value(s) if exists, or created if it does not. // If set to false, this maps to Envoy's `append_value: OVERWRITE_IF_EXISTS_OR_ADD`, where the header's value will be overwritten if it exists, or created if it does not. - Append *wrappers.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` + Append *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` } func (x *HeaderValueOption) Reset() { *x = HeaderValueOption{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderValueOption) String() string { @@ -207,7 +201,7 @@ func (*HeaderValueOption) ProtoMessage() {} func (x *HeaderValueOption) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -229,7 +223,7 @@ func (x *HeaderValueOption) GetHeader() *HeaderValue { return nil } -func (x *HeaderValueOption) GetAppend() *wrappers.BoolValue { +func (x *HeaderValueOption) GetAppend() *wrapperspb.BoolValue { if x != nil { return x.Append } @@ -250,11 +244,9 @@ type HeaderValue struct { func (x *HeaderValue) Reset() { *x = HeaderValue{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderValue) String() string { @@ -265,7 +257,7 @@ func (*HeaderValue) ProtoMessage() {} func (x *HeaderValue) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -376,13 +368,13 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_goTypes = []any{ (*HeaderManipulation)(nil), // 0: headers.options.gloo.solo.io.HeaderManipulation (*EarlyHeaderManipulation)(nil), // 1: headers.options.gloo.solo.io.EarlyHeaderManipulation (*HeaderValueOption)(nil), // 2: headers.options.gloo.solo.io.HeaderValueOption (*HeaderValue)(nil), // 3: headers.options.gloo.solo.io.HeaderValue (*core.HeaderValueOption)(nil), // 4: solo.io.envoy.api.v2.core.HeaderValueOption - (*wrappers.BoolValue)(nil), // 5: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 5: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_depIdxs = []int32{ 4, // 0: headers.options.gloo.solo.io.HeaderManipulation.request_headers_to_add:type_name -> solo.io.envoy.api.v2.core.HeaderValueOption @@ -402,56 +394,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderManipulation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EarlyHeaderManipulation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderValueOption); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_headers_headers_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/healthcheck/healthcheck.pb.go b/pkg/api/gloo.solo.io/v1/options/healthcheck/healthcheck.pb.go index 4b1c353fd..155b163ab 100644 --- a/pkg/api/gloo.solo.io/v1/options/healthcheck/healthcheck.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/healthcheck/healthcheck.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/healthcheck/healthcheck.proto @@ -10,11 +10,11 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -36,11 +36,9 @@ type HealthCheck struct { func (x *HealthCheck) Reset() { *x = HealthCheck{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_healthcheck_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_healthcheck_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HealthCheck) String() string { @@ -51,7 +49,7 @@ func (*HealthCheck) ProtoMessage() {} func (x *HealthCheck) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_healthcheck_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -113,7 +111,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_heal } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_healthcheck_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_healthcheck_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_healthcheck_proto_goTypes = []any{ (*HealthCheck)(nil), // 0: healthcheck.options.gloo.solo.io.HealthCheck } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_healthcheck_proto_depIdxs = []int32{ @@ -131,20 +129,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_heal if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_healthcheck_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_healthcheck_healthcheck_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HealthCheck); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/kubernetes/kubernetes.pb.go b/pkg/api/gloo.solo.io/v1/options/kubernetes/kubernetes.pb.go index 72c28c8a4..49ada5305 100644 --- a/pkg/api/gloo.solo.io/v1/options/kubernetes/kubernetes.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/kubernetes/kubernetes.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/kubernetes/kubernetes.proto @@ -53,11 +53,9 @@ type UpstreamSpec struct { func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kubernetes_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kubernetes_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -68,7 +66,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kubernetes_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -193,7 +191,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kuber } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kubernetes_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kubernetes_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kubernetes_proto_goTypes = []any{ (*UpstreamSpec)(nil), // 0: kubernetes.options.gloo.solo.io.UpstreamSpec nil, // 1: kubernetes.options.gloo.solo.io.UpstreamSpec.SelectorEntry (*options.ServiceSpec)(nil), // 2: options.gloo.solo.io.ServiceSpec @@ -217,20 +215,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kuber if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kubernetes_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_kubernetes_kubernetes_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/lbhash/lbhash.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/lbhash/lbhash.pb.clone.go index a074ebc80..9724db219 100644 --- a/pkg/api/gloo.solo.io/v1/options/lbhash/lbhash.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/lbhash/lbhash.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" ) // ensure the imports are used @@ -62,9 +62,9 @@ func (m *Cookie) Clone() proto.Message { target.Name = m.GetName() if h, ok := interface{}(m.GetTtl()).(clone.Cloner); ok { - target.Ttl = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Ttl = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Ttl = proto.Clone(m.GetTtl()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Ttl = proto.Clone(m.GetTtl()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.Path = m.GetPath() diff --git a/pkg/api/gloo.solo.io/v1/options/lbhash/lbhash.pb.go b/pkg/api/gloo.solo.io/v1/options/lbhash/lbhash.pb.go index 841b646c8..4937ce31f 100644 --- a/pkg/api/gloo.solo.io/v1/options/lbhash/lbhash.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/lbhash/lbhash.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/lbhash/lbhash.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" ) const ( @@ -36,11 +36,9 @@ type RouteActionHashConfig struct { func (x *RouteActionHashConfig) Reset() { *x = RouteActionHashConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteActionHashConfig) String() string { @@ -51,7 +49,7 @@ func (*RouteActionHashConfig) ProtoMessage() {} func (x *RouteActionHashConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -86,18 +84,16 @@ type Cookie struct { // required, the name of the cookie to be used to obtain the hash key Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // If specified, a cookie with the TTL will be generated if the cookie is not present. If the TTL is present and zero, the generated cookie will be a session cookie. - Ttl *duration.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` + Ttl *durationpb.Duration `protobuf:"bytes,2,opt,name=ttl,proto3" json:"ttl,omitempty"` // The name of the path for the cookie. If no path is specified here, no path will be set for the cookie. Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` } func (x *Cookie) Reset() { *x = Cookie{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Cookie) String() string { @@ -108,7 +104,7 @@ func (*Cookie) ProtoMessage() {} func (x *Cookie) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -130,7 +126,7 @@ func (x *Cookie) GetName() string { return "" } -func (x *Cookie) GetTtl() *duration.Duration { +func (x *Cookie) GetTtl() *durationpb.Duration { if x != nil { return x.Ttl } @@ -164,11 +160,9 @@ type HashPolicy struct { func (x *HashPolicy) Reset() { *x = HashPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HashPolicy) String() string { @@ -179,7 +173,7 @@ func (*HashPolicy) ProtoMessage() {} func (x *HashPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -311,11 +305,11 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_pr } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_goTypes = []any{ (*RouteActionHashConfig)(nil), // 0: lbhash.options.gloo.solo.io.RouteActionHashConfig (*Cookie)(nil), // 1: lbhash.options.gloo.solo.io.Cookie (*HashPolicy)(nil), // 2: lbhash.options.gloo.solo.io.HashPolicy - (*duration.Duration)(nil), // 3: google.protobuf.Duration + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_depIdxs = []int32{ 2, // 0: lbhash.options.gloo.solo.io.RouteActionHashConfig.hash_policies:type_name -> lbhash.options.gloo.solo.io.HashPolicy @@ -333,45 +327,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_pr if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteActionHashConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Cookie); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HashPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_lbhash_lbhash_proto_msgTypes[2].OneofWrappers = []any{ (*HashPolicy_Header)(nil), (*HashPolicy_Cookie)(nil), (*HashPolicy_SourceIp)(nil), diff --git a/pkg/api/gloo.solo.io/v1/options/local_ratelimit/local_ratelimit.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/local_ratelimit/local_ratelimit.pb.clone.go index c080da61e..901f77c15 100644 --- a/pkg/api/gloo.solo.io/v1/options/local_ratelimit/local_ratelimit.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/local_ratelimit/local_ratelimit.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -40,15 +40,15 @@ func (m *TokenBucket) Clone() proto.Message { target.MaxTokens = m.GetMaxTokens() if h, ok := interface{}(m.GetTokensPerFill()).(clone.Cloner); ok { - target.TokensPerFill = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.TokensPerFill = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.TokensPerFill = proto.Clone(m.GetTokensPerFill()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.TokensPerFill = proto.Clone(m.GetTokensPerFill()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetFillInterval()).(clone.Cloner); ok { - target.FillInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.FillInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.FillInterval = proto.Clone(m.GetFillInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.FillInterval = proto.Clone(m.GetFillInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -69,15 +69,15 @@ func (m *Settings) Clone() proto.Message { } if h, ok := interface{}(m.GetLocalRateLimitPerDownstreamConnection()).(clone.Cloner); ok { - target.LocalRateLimitPerDownstreamConnection = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LocalRateLimitPerDownstreamConnection = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.LocalRateLimitPerDownstreamConnection = proto.Clone(m.GetLocalRateLimitPerDownstreamConnection()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LocalRateLimitPerDownstreamConnection = proto.Clone(m.GetLocalRateLimitPerDownstreamConnection()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetEnableXRatelimitHeaders()).(clone.Cloner); ok { - target.EnableXRatelimitHeaders = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableXRatelimitHeaders = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EnableXRatelimitHeaders = proto.Clone(m.GetEnableXRatelimitHeaders()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableXRatelimitHeaders = proto.Clone(m.GetEnableXRatelimitHeaders()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/local_ratelimit/local_ratelimit.pb.go b/pkg/api/gloo.solo.io/v1/options/local_ratelimit/local_ratelimit.pb.go index 5f7010633..f1bbc1ff8 100644 --- a/pkg/api/gloo.solo.io/v1/options/local_ratelimit/local_ratelimit.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/local_ratelimit/local_ratelimit.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/local_ratelimit/local_ratelimit.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -37,20 +37,18 @@ type TokenBucket struct { MaxTokens uint32 `protobuf:"varint,1,opt,name=max_tokens,json=maxTokens,proto3" json:"max_tokens,omitempty"` // The number of tokens added to the bucket during each fill interval. If not specified, defaults to a single token. // Must be greater than zero. - TokensPerFill *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=tokens_per_fill,json=tokensPerFill,proto3" json:"tokens_per_fill,omitempty"` + TokensPerFill *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=tokens_per_fill,json=tokensPerFill,proto3" json:"tokens_per_fill,omitempty"` // The fill interval that tokens are added to the bucket. During each fill interval tokens_per_fill are added to the bucket. // The bucket will never contain more than max_tokens tokens. // The fill_interval must be >= 50ms and defaults to 1 second. - FillInterval *duration.Duration `protobuf:"bytes,3,opt,name=fill_interval,json=fillInterval,proto3" json:"fill_interval,omitempty"` + FillInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=fill_interval,json=fillInterval,proto3" json:"fill_interval,omitempty"` } func (x *TokenBucket) Reset() { *x = TokenBucket{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TokenBucket) String() string { @@ -61,7 +59,7 @@ func (*TokenBucket) ProtoMessage() {} func (x *TokenBucket) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -83,14 +81,14 @@ func (x *TokenBucket) GetMaxTokens() uint32 { return 0 } -func (x *TokenBucket) GetTokensPerFill() *wrappers.UInt32Value { +func (x *TokenBucket) GetTokensPerFill() *wrapperspb.UInt32Value { if x != nil { return x.TokensPerFill } return nil } -func (x *TokenBucket) GetFillInterval() *duration.Duration { +func (x *TokenBucket) GetFillInterval() *durationpb.Duration { if x != nil { return x.FillInterval } @@ -112,21 +110,19 @@ type Settings struct { // If set to true, a token bucket is allocated for each connection, thus the rate limits are applied per connection thereby allowing one to rate limit requests on a per connection basis. // This setting applies to all token buckets in the vHost and route as well. // Defaults to false - LocalRateLimitPerDownstreamConnection *wrappers.BoolValue `protobuf:"bytes,2,opt,name=local_rate_limit_per_downstream_connection,json=localRateLimitPerDownstreamConnection,proto3" json:"local_rate_limit_per_downstream_connection,omitempty"` + LocalRateLimitPerDownstreamConnection *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=local_rate_limit_per_downstream_connection,json=localRateLimitPerDownstreamConnection,proto3" json:"local_rate_limit_per_downstream_connection,omitempty"` // Set this to true to return Envoy's X-RateLimit headers to the downstream. // reference docs here: https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/common/ratelimit/v3/ratelimit.proto#envoy-v3-api-enum-extensions-common-ratelimit-v3-xratelimitheadersrfcversion // This setting applies at the vHost and route local rate limit as well // Defaults to false - EnableXRatelimitHeaders *wrappers.BoolValue `protobuf:"bytes,3,opt,name=enable_x_ratelimit_headers,json=enableXRatelimitHeaders,proto3" json:"enable_x_ratelimit_headers,omitempty"` + EnableXRatelimitHeaders *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=enable_x_ratelimit_headers,json=enableXRatelimitHeaders,proto3" json:"enable_x_ratelimit_headers,omitempty"` } func (x *Settings) Reset() { *x = Settings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Settings) String() string { @@ -137,7 +133,7 @@ func (*Settings) ProtoMessage() {} func (x *Settings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -159,14 +155,14 @@ func (x *Settings) GetDefaultLimit() *TokenBucket { return nil } -func (x *Settings) GetLocalRateLimitPerDownstreamConnection() *wrappers.BoolValue { +func (x *Settings) GetLocalRateLimitPerDownstreamConnection() *wrapperspb.BoolValue { if x != nil { return x.LocalRateLimitPerDownstreamConnection } return nil } -func (x *Settings) GetEnableXRatelimitHeaders() *wrappers.BoolValue { +func (x *Settings) GetEnableXRatelimitHeaders() *wrapperspb.BoolValue { if x != nil { return x.EnableXRatelimitHeaders } @@ -246,12 +242,12 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_goTypes = []interface{}{ - (*TokenBucket)(nil), // 0: local_ratelimit.options.gloo.solo.io.TokenBucket - (*Settings)(nil), // 1: local_ratelimit.options.gloo.solo.io.Settings - (*wrappers.UInt32Value)(nil), // 2: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 3: google.protobuf.Duration - (*wrappers.BoolValue)(nil), // 4: google.protobuf.BoolValue +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_goTypes = []any{ + (*TokenBucket)(nil), // 0: local_ratelimit.options.gloo.solo.io.TokenBucket + (*Settings)(nil), // 1: local_ratelimit.options.gloo.solo.io.Settings + (*wrapperspb.UInt32Value)(nil), // 2: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 4: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_depIdxs = []int32{ 2, // 0: local_ratelimit.options.gloo.solo.io.TokenBucket.tokens_per_fill:type_name -> google.protobuf.UInt32Value @@ -273,32 +269,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TokenBucket); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_local_ratelimit_local_ratelimit_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Settings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/pipe/pipe.pb.go b/pkg/api/gloo.solo.io/v1/options/pipe/pipe.pb.go index a12efabdd..8f1670dc2 100644 --- a/pkg/api/gloo.solo.io/v1/options/pipe/pipe.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/pipe/pipe.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/pipe/pipe.proto @@ -40,11 +40,9 @@ type UpstreamSpec struct { func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -55,7 +53,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -127,7 +125,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto_goTypes = []any{ (*UpstreamSpec)(nil), // 0: pipe.options.gloo.solo.io.UpstreamSpec (*options.ServiceSpec)(nil), // 1: options.gloo.solo.io.ServiceSpec } @@ -145,20 +143,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_pipe_pipe_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/protocol/protocol.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/protocol/protocol.pb.clone.go index d6053331d..dd8be0c38 100644 --- a/pkg/api/gloo.solo.io/v1/options/protocol/protocol.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/protocol/protocol.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -38,17 +38,17 @@ func (m *HttpProtocolOptions) Clone() proto.Message { target = &HttpProtocolOptions{} if h, ok := interface{}(m.GetIdleTimeout()).(clone.Cloner); ok { - target.IdleTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.MaxHeadersCount = m.GetMaxHeadersCount() if h, ok := interface{}(m.GetMaxStreamDuration()).(clone.Cloner); ok { - target.MaxStreamDuration = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxStreamDuration = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxStreamDuration = proto.Clone(m.GetMaxStreamDuration()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxStreamDuration = proto.Clone(m.GetMaxStreamDuration()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.HeadersWithUnderscoresAction = m.GetHeadersWithUnderscoresAction() @@ -67,9 +67,9 @@ func (m *Http1ProtocolOptions) Clone() proto.Message { target.EnableTrailers = m.GetEnableTrailers() if h, ok := interface{}(m.GetOverrideStreamErrorOnInvalidHttpMessage()).(clone.Cloner); ok { - target.OverrideStreamErrorOnInvalidHttpMessage = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OverrideStreamErrorOnInvalidHttpMessage = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.OverrideStreamErrorOnInvalidHttpMessage = proto.Clone(m.GetOverrideStreamErrorOnInvalidHttpMessage()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OverrideStreamErrorOnInvalidHttpMessage = proto.Clone(m.GetOverrideStreamErrorOnInvalidHttpMessage()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } switch m.HeaderFormat.(type) { @@ -100,27 +100,27 @@ func (m *Http2ProtocolOptions) Clone() proto.Message { target = &Http2ProtocolOptions{} if h, ok := interface{}(m.GetMaxConcurrentStreams()).(clone.Cloner); ok { - target.MaxConcurrentStreams = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxConcurrentStreams = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxConcurrentStreams = proto.Clone(m.GetMaxConcurrentStreams()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxConcurrentStreams = proto.Clone(m.GetMaxConcurrentStreams()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetInitialStreamWindowSize()).(clone.Cloner); ok { - target.InitialStreamWindowSize = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialStreamWindowSize = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.InitialStreamWindowSize = proto.Clone(m.GetInitialStreamWindowSize()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialStreamWindowSize = proto.Clone(m.GetInitialStreamWindowSize()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetInitialConnectionWindowSize()).(clone.Cloner); ok { - target.InitialConnectionWindowSize = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialConnectionWindowSize = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.InitialConnectionWindowSize = proto.Clone(m.GetInitialConnectionWindowSize()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialConnectionWindowSize = proto.Clone(m.GetInitialConnectionWindowSize()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetOverrideStreamErrorOnInvalidHttpMessage()).(clone.Cloner); ok { - target.OverrideStreamErrorOnInvalidHttpMessage = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OverrideStreamErrorOnInvalidHttpMessage = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.OverrideStreamErrorOnInvalidHttpMessage = proto.Clone(m.GetOverrideStreamErrorOnInvalidHttpMessage()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OverrideStreamErrorOnInvalidHttpMessage = proto.Clone(m.GetOverrideStreamErrorOnInvalidHttpMessage()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/protocol/protocol.pb.go b/pkg/api/gloo.solo.io/v1/options/protocol/protocol.pb.go index 58d87b6a8..2fc1b9645 100644 --- a/pkg/api/gloo.solo.io/v1/options/protocol/protocol.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/protocol/protocol.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/protocol/protocol.proto @@ -10,11 +10,11 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -103,14 +103,14 @@ type HttpProtocolOptions struct { // // Disabling this timeout has a highly likelihood of yielding connection leaks due to lost TCP // FIN packets, etc. - IdleTimeout *duration.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // The maximum number of headers. If unconfigured, the default // maximum number of request headers allowed is 100. Requests that exceed this limit will receive // a 431 response for HTTP/1.x and cause a stream reset for HTTP/2. MaxHeadersCount uint32 `protobuf:"varint,2,opt,name=max_headers_count,json=maxHeadersCount,proto3" json:"max_headers_count,omitempty"` // Total duration to keep alive an HTTP request/response stream. If the time limit is reached the stream will be // reset independent of any other timeouts. If not specified, this value is not set. - MaxStreamDuration *duration.Duration `protobuf:"bytes,3,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` + MaxStreamDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` // Action to take when a client request with a header name containing underscore characters is received. // If this setting is not specified, the value defaults to ALLOW. // Note: upstream responses are not affected by this setting. @@ -119,11 +119,9 @@ type HttpProtocolOptions struct { func (x *HttpProtocolOptions) Reset() { *x = HttpProtocolOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpProtocolOptions) String() string { @@ -134,7 +132,7 @@ func (*HttpProtocolOptions) ProtoMessage() {} func (x *HttpProtocolOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -149,7 +147,7 @@ func (*HttpProtocolOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_rawDescGZIP(), []int{0} } -func (x *HttpProtocolOptions) GetIdleTimeout() *duration.Duration { +func (x *HttpProtocolOptions) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -163,7 +161,7 @@ func (x *HttpProtocolOptions) GetMaxHeadersCount() uint32 { return 0 } -func (x *HttpProtocolOptions) GetMaxStreamDuration() *duration.Duration { +func (x *HttpProtocolOptions) GetMaxStreamDuration() *durationpb.Duration { if x != nil { return x.MaxStreamDuration } @@ -196,16 +194,14 @@ type Http1ProtocolOptions struct { // open where possible. // If set, this overrides any HCM :ref:`stream_error_on_invalid_http_messaging // `. - OverrideStreamErrorOnInvalidHttpMessage *wrappers.BoolValue `protobuf:"bytes,2,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` + OverrideStreamErrorOnInvalidHttpMessage *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` } func (x *Http1ProtocolOptions) Reset() { *x = Http1ProtocolOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Http1ProtocolOptions) String() string { @@ -216,7 +212,7 @@ func (*Http1ProtocolOptions) ProtoMessage() {} func (x *Http1ProtocolOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -259,7 +255,7 @@ func (x *Http1ProtocolOptions) GetPreserveCaseHeaderKeyFormat() bool { return false } -func (x *Http1ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrappers.BoolValue { +func (x *Http1ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrapperspb.BoolValue { if x != nil { return x.OverrideStreamErrorOnInvalidHttpMessage } @@ -305,7 +301,7 @@ type Http2ProtocolOptions struct { // This acts as an upper bound: Envoy will lower the max concurrent streams allowed on a given // connection based on upstream settings. Config dumps will reflect the configured upper bound, // not the per-connection negotiated limits. - MaxConcurrentStreams *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` + MaxConcurrentStreams *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` // [Initial stream-level flow-control window](https://httpwg.org/specs/rfc7540.html#rfc.section.6.9.2) size. Valid values range from 65535 // (2^16 - 1, HTTP/2 default) to 2147483647 (2^31 - 1, HTTP/2 maximum) and defaults to 268435456 // (256 * 1024 * 1024). @@ -316,10 +312,10 @@ type Http2ProtocolOptions struct { // This field also acts as a soft limit on the number of bytes Envoy will buffer per-stream in the // HTTP/2 codec buffers. Once the buffer reaches this pointer, watermark callbacks will fire to // stop the flow of data to the codec buffers. - InitialStreamWindowSize *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` + InitialStreamWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` // Similar to *initial_stream_window_size*, but for connection-level flow-control // window. Currently, this has the same minimum/maximum/default as *initial_stream_window_size*. - InitialConnectionWindowSize *wrappers.UInt32Value `protobuf:"bytes,4,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` + InitialConnectionWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` // Allows invalid HTTP messaging and headers. When this option is disabled (default), then // the whole HTTP/2 connection is terminated upon receiving invalid HEADERS frame. However, // when this option is enabled, only the offending stream is terminated. @@ -328,16 +324,14 @@ type Http2ProtocolOptions struct { // ` // // See [RFC7540, sec. 8.1](https://datatracker.ietf.org/doc/html/rfc7540#section-8.1) for details. - OverrideStreamErrorOnInvalidHttpMessage *wrappers.BoolValue `protobuf:"bytes,14,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` + OverrideStreamErrorOnInvalidHttpMessage *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` } func (x *Http2ProtocolOptions) Reset() { *x = Http2ProtocolOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Http2ProtocolOptions) String() string { @@ -348,7 +342,7 @@ func (*Http2ProtocolOptions) ProtoMessage() {} func (x *Http2ProtocolOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -363,28 +357,28 @@ func (*Http2ProtocolOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_rawDescGZIP(), []int{2} } -func (x *Http2ProtocolOptions) GetMaxConcurrentStreams() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetMaxConcurrentStreams() *wrapperspb.UInt32Value { if x != nil { return x.MaxConcurrentStreams } return nil } -func (x *Http2ProtocolOptions) GetInitialStreamWindowSize() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetInitialStreamWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialStreamWindowSize } return nil } -func (x *Http2ProtocolOptions) GetInitialConnectionWindowSize() *wrappers.UInt32Value { +func (x *Http2ProtocolOptions) GetInitialConnectionWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialConnectionWindowSize } return nil } -func (x *Http2ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrappers.BoolValue { +func (x *Http2ProtocolOptions) GetOverrideStreamErrorOnInvalidHttpMessage() *wrapperspb.BoolValue { if x != nil { return x.OverrideStreamErrorOnInvalidHttpMessage } @@ -504,14 +498,14 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protoco var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_goTypes = []any{ (HttpProtocolOptions_HeadersWithUnderscoresAction)(0), // 0: protocol.options.gloo.solo.io.HttpProtocolOptions.HeadersWithUnderscoresAction (*HttpProtocolOptions)(nil), // 1: protocol.options.gloo.solo.io.HttpProtocolOptions (*Http1ProtocolOptions)(nil), // 2: protocol.options.gloo.solo.io.Http1ProtocolOptions (*Http2ProtocolOptions)(nil), // 3: protocol.options.gloo.solo.io.Http2ProtocolOptions - (*duration.Duration)(nil), // 4: google.protobuf.Duration - (*wrappers.BoolValue)(nil), // 5: google.protobuf.BoolValue - (*wrappers.UInt32Value)(nil), // 6: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 4: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 5: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 6: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_depIdxs = []int32{ 4, // 0: protocol.options.gloo.solo.io.HttpProtocolOptions.idle_timeout:type_name -> google.protobuf.Duration @@ -536,45 +530,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protoco if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpProtocolOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Http1ProtocolOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Http2ProtocolOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_protocol_proto_msgTypes[1].OneofWrappers = []any{ (*Http1ProtocolOptions_ProperCaseHeaderKeyFormat)(nil), (*Http1ProtocolOptions_PreserveCaseHeaderKeyFormat)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/options/protocol_upgrade/protocol_upgrade.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/protocol_upgrade/protocol_upgrade.pb.clone.go index 0d58eb8bd..5efe10925 100644 --- a/pkg/api/gloo.solo.io/v1/options/protocol_upgrade/protocol_upgrade.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/protocol_upgrade/protocol_upgrade.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -75,9 +75,9 @@ func (m *ProtocolUpgradeConfig_ProtocolUpgradeSpec) Clone() proto.Message { target = &ProtocolUpgradeConfig_ProtocolUpgradeSpec{} if h, ok := interface{}(m.GetEnabled()).(clone.Cloner); ok { - target.Enabled = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Enabled = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Enabled = proto.Clone(m.GetEnabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Enabled = proto.Clone(m.GetEnabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/protocol_upgrade/protocol_upgrade.pb.go b/pkg/api/gloo.solo.io/v1/options/protocol_upgrade/protocol_upgrade.pb.go index 41c094822..922876fd7 100644 --- a/pkg/api/gloo.solo.io/v1/options/protocol_upgrade/protocol_upgrade.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/protocol_upgrade/protocol_upgrade.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/protocol_upgrade/protocol_upgrade.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -37,11 +37,9 @@ type ProtocolUpgradeConfig struct { func (x *ProtocolUpgradeConfig) Reset() { *x = ProtocolUpgradeConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtocolUpgradeConfig) String() string { @@ -52,7 +50,7 @@ func (*ProtocolUpgradeConfig) ProtoMessage() {} func (x *ProtocolUpgradeConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -111,16 +109,14 @@ type ProtocolUpgradeConfig_ProtocolUpgradeSpec struct { unknownFields protoimpl.UnknownFields // Whether the upgrade should be enabled. If left unset, Envoy will enable the protocol upgrade. - Enabled *wrappers.BoolValue `protobuf:"bytes,1,opt,name=enabled,proto3" json:"enabled,omitempty"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=enabled,proto3" json:"enabled,omitempty"` } func (x *ProtocolUpgradeConfig_ProtocolUpgradeSpec) Reset() { *x = ProtocolUpgradeConfig_ProtocolUpgradeSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProtocolUpgradeConfig_ProtocolUpgradeSpec) String() string { @@ -131,7 +127,7 @@ func (*ProtocolUpgradeConfig_ProtocolUpgradeSpec) ProtoMessage() {} func (x *ProtocolUpgradeConfig_ProtocolUpgradeSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -146,7 +142,7 @@ func (*ProtocolUpgradeConfig_ProtocolUpgradeSpec) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_rawDescGZIP(), []int{0, 0} } -func (x *ProtocolUpgradeConfig_ProtocolUpgradeSpec) GetEnabled() *wrappers.BoolValue { +func (x *ProtocolUpgradeConfig_ProtocolUpgradeSpec) GetEnabled() *wrapperspb.BoolValue { if x != nil { return x.Enabled } @@ -211,10 +207,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_goTypes = []any{ (*ProtocolUpgradeConfig)(nil), // 0: protocol_upgrade.options.gloo.solo.io.ProtocolUpgradeConfig (*ProtocolUpgradeConfig_ProtocolUpgradeSpec)(nil), // 1: protocol_upgrade.options.gloo.solo.io.ProtocolUpgradeConfig.ProtocolUpgradeSpec - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_depIdxs = []int32{ 1, // 0: protocol_upgrade.options.gloo.solo.io.ProtocolUpgradeConfig.websocket:type_name -> protocol_upgrade.options.gloo.solo.io.ProtocolUpgradeConfig.ProtocolUpgradeSpec @@ -234,33 +230,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProtocolUpgradeConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProtocolUpgradeConfig_ProtocolUpgradeSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_protocol_upgrade_protocol_upgrade_proto_msgTypes[0].OneofWrappers = []any{ (*ProtocolUpgradeConfig_Websocket)(nil), (*ProtocolUpgradeConfig_Connect)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/options/proxy_protocol/proxy_protocol.pb.go b/pkg/api/gloo.solo.io/v1/options/proxy_protocol/proxy_protocol.pb.go index 4d55104ea..64f16d972 100644 --- a/pkg/api/gloo.solo.io/v1/options/proxy_protocol/proxy_protocol.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/proxy_protocol/proxy_protocol.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/proxy_protocol/proxy_protocol.proto @@ -44,11 +44,9 @@ type ProxyProtocol struct { func (x *ProxyProtocol) Reset() { *x = ProxyProtocol{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxyProtocol) String() string { @@ -59,7 +57,7 @@ func (*ProxyProtocol) ProtoMessage() {} func (x *ProxyProtocol) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -101,11 +99,9 @@ type ProxyProtocol_KeyValuePair struct { func (x *ProxyProtocol_KeyValuePair) Reset() { *x = ProxyProtocol_KeyValuePair{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxyProtocol_KeyValuePair) String() string { @@ -116,7 +112,7 @@ func (*ProxyProtocol_KeyValuePair) ProtoMessage() {} func (x *ProxyProtocol_KeyValuePair) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -160,11 +156,9 @@ type ProxyProtocol_Rule struct { func (x *ProxyProtocol_Rule) Reset() { *x = ProxyProtocol_Rule{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxyProtocol_Rule) String() string { @@ -175,7 +169,7 @@ func (*ProxyProtocol_Rule) ProtoMessage() {} func (x *ProxyProtocol_Rule) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -266,7 +260,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_p } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_goTypes = []any{ (*ProxyProtocol)(nil), // 0: proxy_protocol.options.gloo.solo.io.ProxyProtocol (*ProxyProtocol_KeyValuePair)(nil), // 1: proxy_protocol.options.gloo.solo.io.ProxyProtocol.KeyValuePair (*ProxyProtocol_Rule)(nil), // 2: proxy_protocol.options.gloo.solo.io.ProxyProtocol.Rule @@ -288,44 +282,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_p if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxyProtocol); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxyProtocol_KeyValuePair); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_proxy_protocol_proxy_protocol_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxyProtocol_Rule); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/rest/rest.pb.go b/pkg/api/gloo.solo.io/v1/options/rest/rest.pb.go index dbcb9b0aa..6849df642 100644 --- a/pkg/api/gloo.solo.io/v1/options/rest/rest.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/rest/rest.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/rest/rest.proto @@ -35,11 +35,9 @@ type ServiceSpec struct { func (x *ServiceSpec) Reset() { *x = ServiceSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServiceSpec) String() string { @@ -50,7 +48,7 @@ func (*ServiceSpec) ProtoMessage() {} func (x *ServiceSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -92,11 +90,9 @@ type DestinationSpec struct { func (x *DestinationSpec) Reset() { *x = DestinationSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DestinationSpec) String() string { @@ -107,7 +103,7 @@ func (*DestinationSpec) ProtoMessage() {} func (x *DestinationSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -157,11 +153,9 @@ type ServiceSpec_SwaggerInfo struct { func (x *ServiceSpec_SwaggerInfo) Reset() { *x = ServiceSpec_SwaggerInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServiceSpec_SwaggerInfo) String() string { @@ -172,7 +166,7 @@ func (*ServiceSpec_SwaggerInfo) ProtoMessage() {} func (x *ServiceSpec_SwaggerInfo) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -308,7 +302,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_goTypes = []any{ (*ServiceSpec)(nil), // 0: rest.options.gloo.solo.io.ServiceSpec (*DestinationSpec)(nil), // 1: rest.options.gloo.solo.io.DestinationSpec nil, // 2: rest.options.gloo.solo.io.ServiceSpec.TransformationsEntry @@ -334,45 +328,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DestinationSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceSpec_SwaggerInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_rest_rest_proto_msgTypes[3].OneofWrappers = []any{ (*ServiceSpec_SwaggerInfo_Url)(nil), (*ServiceSpec_SwaggerInfo_Inline)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/options/retries/retries.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/retries/retries.pb.clone.go index 2b2033cf9..2ae2b1f88 100644 --- a/pkg/api/gloo.solo.io/v1/options/retries/retries.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/retries/retries.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -38,15 +38,15 @@ func (m *RetryBackOff) Clone() proto.Message { target = &RetryBackOff{} if h, ok := interface{}(m.GetBaseInterval()).(clone.Cloner); ok { - target.BaseInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.BaseInterval = proto.Clone(m.GetBaseInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetMaxInterval()).(clone.Cloner); ok { - target.MaxInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxInterval = proto.Clone(m.GetMaxInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -65,9 +65,9 @@ func (m *RetryPolicy) Clone() proto.Message { target.NumRetries = m.GetNumRetries() if h, ok := interface{}(m.GetPerTryTimeout()).(clone.Cloner); ok { - target.PerTryTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PerTryTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.PerTryTimeout = proto.Clone(m.GetPerTryTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.PerTryTimeout = proto.Clone(m.GetPerTryTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRetryBackOff()).(clone.Cloner); ok { @@ -113,9 +113,9 @@ func (m *RetryPolicy_PreviousPriorities) Clone() proto.Message { target = &RetryPolicy_PreviousPriorities{} if h, ok := interface{}(m.GetUpdateFrequency()).(clone.Cloner); ok { - target.UpdateFrequency = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.UpdateFrequency = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.UpdateFrequency = proto.Clone(m.GetUpdateFrequency()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.UpdateFrequency = proto.Clone(m.GetUpdateFrequency()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/retries/retries.pb.go b/pkg/api/gloo.solo.io/v1/options/retries/retries.pb.go index 7c75c969d..5cddce59f 100644 --- a/pkg/api/gloo.solo.io/v1/options/retries/retries.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/retries/retries.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/retries/retries.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -32,18 +32,16 @@ type RetryBackOff struct { unknownFields protoimpl.UnknownFields // Specifies the base interval for a retry - BaseInterval *duration.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` + BaseInterval *durationpb.Duration `protobuf:"bytes,1,opt,name=base_interval,json=baseInterval,proto3" json:"base_interval,omitempty"` // Specifies the max interval for a retry - MaxInterval *duration.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` + MaxInterval *durationpb.Duration `protobuf:"bytes,2,opt,name=max_interval,json=maxInterval,proto3" json:"max_interval,omitempty"` } func (x *RetryBackOff) Reset() { *x = RetryBackOff{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryBackOff) String() string { @@ -54,7 +52,7 @@ func (*RetryBackOff) ProtoMessage() {} func (x *RetryBackOff) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -69,14 +67,14 @@ func (*RetryBackOff) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_rawDescGZIP(), []int{0} } -func (x *RetryBackOff) GetBaseInterval() *duration.Duration { +func (x *RetryBackOff) GetBaseInterval() *durationpb.Duration { if x != nil { return x.BaseInterval } return nil } -func (x *RetryBackOff) GetMaxInterval() *duration.Duration { +func (x *RetryBackOff) GetMaxInterval() *durationpb.Duration { if x != nil { return x.MaxInterval } @@ -96,7 +94,7 @@ type RetryPolicy struct { // defaults to 1. These are the same conditions [documented for Envoy](https://www.envoyproxy.io/docs/envoy/v1.14.1/configuration/http/http_filters/router_filter#config-http-filters-router-x-envoy-retry-on) NumRetries uint32 `protobuf:"varint,2,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"` // Specifies a non-zero upstream timeout per retry attempt. This parameter is optional. - PerTryTimeout *duration.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` + PerTryTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=per_try_timeout,json=perTryTimeout,proto3" json:"per_try_timeout,omitempty"` // Specifies the retry policy interval RetryBackOff *RetryBackOff `protobuf:"bytes,4,opt,name=retry_back_off,json=retryBackOff,proto3" json:"retry_back_off,omitempty"` // Types that are assignable to PriorityPredicate: @@ -111,11 +109,9 @@ type RetryPolicy struct { func (x *RetryPolicy) Reset() { *x = RetryPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy) String() string { @@ -126,7 +122,7 @@ func (*RetryPolicy) ProtoMessage() {} func (x *RetryPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -155,7 +151,7 @@ func (x *RetryPolicy) GetNumRetries() uint32 { return 0 } -func (x *RetryPolicy) GetPerTryTimeout() *duration.Duration { +func (x *RetryPolicy) GetPerTryTimeout() *durationpb.Duration { if x != nil { return x.PerTryTimeout } @@ -209,16 +205,14 @@ type RetryPolicy_PreviousPriorities struct { // Specify the update frequency for the previous priorities. For more information about previous priorities, see the [Envoy docs](https://www.envoyproxy.io/docs/envoy/v1.30.1/api-v3/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.proto#envoy-v3-api-file-envoy-extensions-retry-priority-previous-priorities-v3-previous-priorities-config-proto). // This option only works in combination with an Upstream failover policy that enables priorities. - UpdateFrequency *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=update_frequency,json=updateFrequency,proto3" json:"update_frequency,omitempty"` + UpdateFrequency *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=update_frequency,json=updateFrequency,proto3" json:"update_frequency,omitempty"` } func (x *RetryPolicy_PreviousPriorities) Reset() { *x = RetryPolicy_PreviousPriorities{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RetryPolicy_PreviousPriorities) String() string { @@ -229,7 +223,7 @@ func (*RetryPolicy_PreviousPriorities) ProtoMessage() {} func (x *RetryPolicy_PreviousPriorities) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -244,7 +238,7 @@ func (*RetryPolicy_PreviousPriorities) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_rawDescGZIP(), []int{1, 0} } -func (x *RetryPolicy_PreviousPriorities) GetUpdateFrequency() *wrappers.UInt32Value { +func (x *RetryPolicy_PreviousPriorities) GetUpdateFrequency() *wrapperspb.UInt32Value { if x != nil { return x.UpdateFrequency } @@ -331,12 +325,12 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_ } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_goTypes = []any{ (*RetryBackOff)(nil), // 0: retries.options.gloo.solo.io.RetryBackOff (*RetryPolicy)(nil), // 1: retries.options.gloo.solo.io.RetryPolicy (*RetryPolicy_PreviousPriorities)(nil), // 2: retries.options.gloo.solo.io.RetryPolicy.PreviousPriorities - (*duration.Duration)(nil), // 3: google.protobuf.Duration - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 3: google.protobuf.Duration + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_depIdxs = []int32{ 3, // 0: retries.options.gloo.solo.io.RetryBackOff.base_interval:type_name -> google.protobuf.Duration @@ -357,45 +351,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryBackOff); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RetryPolicy_PreviousPriorities); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_retries_retries_proto_msgTypes[1].OneofWrappers = []any{ (*RetryPolicy_PreviousPriorities_)(nil), } type x struct{} diff --git a/pkg/api/gloo.solo.io/v1/options/router/router.pb.go b/pkg/api/gloo.solo.io/v1/options/router/router.pb.go index 573722bb9..74f1a531a 100644 --- a/pkg/api/gloo.solo.io/v1/options/router/router.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/router/router.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/router/router.proto @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -30,22 +30,20 @@ type Router struct { unknownFields protoimpl.UnknownFields // Do not add any additional x-envoy- headers to requests or responses. This only affects the router filter generated x-envoy- headers, other Envoy filters and the HTTP connection manager may continue to set x-envoy- headers. - SuppressEnvoyHeaders *wrappers.BoolValue `protobuf:"bytes,1,opt,name=suppress_envoy_headers,json=suppressEnvoyHeaders,proto3" json:"suppress_envoy_headers,omitempty"` + SuppressEnvoyHeaders *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=suppress_envoy_headers,json=suppressEnvoyHeaders,proto3" json:"suppress_envoy_headers,omitempty"` // Whether dynamic stats should be enabled or disabled. If not set, or if // set to true, dynamic stats will be enabled. Otherwise, if set to false, // dynamic stats will be disabled. It is strongly recommended to leave this // in the default state in production - it should only be set to false in // very specific benchmarking or profiling scenarios. - DynamicStats *wrappers.BoolValue `protobuf:"bytes,2,opt,name=dynamic_stats,json=dynamicStats,proto3" json:"dynamic_stats,omitempty"` + DynamicStats *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=dynamic_stats,json=dynamicStats,proto3" json:"dynamic_stats,omitempty"` } func (x *Router) Reset() { *x = Router{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Router) String() string { @@ -56,7 +54,7 @@ func (*Router) ProtoMessage() {} func (x *Router) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -71,14 +69,14 @@ func (*Router) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto_rawDescGZIP(), []int{0} } -func (x *Router) GetSuppressEnvoyHeaders() *wrappers.BoolValue { +func (x *Router) GetSuppressEnvoyHeaders() *wrapperspb.BoolValue { if x != nil { return x.SuppressEnvoyHeaders } return nil } -func (x *Router) GetDynamicStats() *wrappers.BoolValue { +func (x *Router) GetDynamicStats() *wrapperspb.BoolValue { if x != nil { return x.DynamicStats } @@ -126,9 +124,9 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_pr } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto_goTypes = []interface{}{ - (*Router)(nil), // 0: gloo.solo.io.Router - (*wrappers.BoolValue)(nil), // 1: google.protobuf.BoolValue +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto_goTypes = []any{ + (*Router)(nil), // 0: gloo.solo.io.Router + (*wrapperspb.BoolValue)(nil), // 1: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto_depIdxs = []int32{ 1, // 0: gloo.solo.io.Router.suppress_envoy_headers:type_name -> google.protobuf.BoolValue @@ -145,20 +143,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_pr if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_router_router_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Router); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/service_spec.pb.go b/pkg/api/gloo.solo.io/v1/options/service_spec.pb.go index dd96a1b70..ac90446fe 100644 --- a/pkg/api/gloo.solo.io/v1/options/service_spec.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/service_spec.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/service_spec.proto @@ -50,11 +50,9 @@ type ServiceSpec struct { func (x *ServiceSpec) Reset() { *x = ServiceSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ServiceSpec) String() string { @@ -65,7 +63,7 @@ func (*ServiceSpec) ProtoMessage() {} func (x *ServiceSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -216,7 +214,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_pro } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto_goTypes = []any{ (*ServiceSpec)(nil), // 0: options.gloo.solo.io.ServiceSpec (*rest.ServiceSpec)(nil), // 1: rest.options.gloo.solo.io.ServiceSpec (*grpc.ServiceSpec)(nil), // 2: grpc.options.gloo.solo.io.ServiceSpec @@ -240,21 +238,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_pro if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ServiceSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_service_spec_proto_msgTypes[0].OneofWrappers = []any{ (*ServiceSpec_Rest)(nil), (*ServiceSpec_Grpc)(nil), (*ServiceSpec_GrpcJsonTranscoder)(nil), diff --git a/pkg/api/gloo.solo.io/v1/options/shadowing/shadowing.pb.go b/pkg/api/gloo.solo.io/v1/options/shadowing/shadowing.pb.go index bbe92bef3..4f6787af8 100644 --- a/pkg/api/gloo.solo.io/v1/options/shadowing/shadowing.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/shadowing/shadowing.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/shadowing/shadowing.proto @@ -41,11 +41,9 @@ type RouteShadowing struct { func (x *RouteShadowing) Reset() { *x = RouteShadowing{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadowing_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadowing_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteShadowing) String() string { @@ -56,7 +54,7 @@ func (*RouteShadowing) ProtoMessage() {} func (x *RouteShadowing) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadowing_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -127,7 +125,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadow } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadowing_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadowing_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadowing_proto_goTypes = []any{ (*RouteShadowing)(nil), // 0: shadowing.options.gloo.solo.io.RouteShadowing (*core.ResourceRef)(nil), // 1: core.solo.io.ResourceRef } @@ -147,20 +145,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadow if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadowing_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_shadowing_shadowing_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteShadowing); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/static/static.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/static/static.pb.clone.go index 1dcd2cd99..322d73741 100644 --- a/pkg/api/gloo.solo.io/v1/options/static/static.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/static/static.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -53,9 +53,9 @@ func (m *UpstreamSpec) Clone() proto.Message { } if h, ok := interface{}(m.GetUseTls()).(clone.Cloner); ok { - target.UseTls = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseTls = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UseTls = proto.Clone(m.GetUseTls()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseTls = proto.Clone(m.GetUseTls()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetServiceSpec()).(clone.Cloner); ok { @@ -65,9 +65,9 @@ func (m *UpstreamSpec) Clone() proto.Message { } if h, ok := interface{}(m.GetAutoSniRewrite()).(clone.Cloner); ok { - target.AutoSniRewrite = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AutoSniRewrite = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AutoSniRewrite = proto.Clone(m.GetAutoSniRewrite()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AutoSniRewrite = proto.Clone(m.GetAutoSniRewrite()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -88,9 +88,9 @@ func (m *Host) Clone() proto.Message { target.SniAddr = m.GetSniAddr() if h, ok := interface{}(m.GetLoadBalancingWeight()).(clone.Cloner); ok { - target.LoadBalancingWeight = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.LoadBalancingWeight = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.LoadBalancingWeight = proto.Clone(m.GetLoadBalancingWeight()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.LoadBalancingWeight = proto.Clone(m.GetLoadBalancingWeight()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetHealthCheckConfig()).(clone.Cloner); ok { @@ -100,13 +100,13 @@ func (m *Host) Clone() proto.Message { } if m.GetMetadata() != nil { - target.Metadata = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetMetadata())) + target.Metadata = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetMetadata())) for k, v := range m.GetMetadata() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.Metadata[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Metadata[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } diff --git a/pkg/api/gloo.solo.io/v1/options/static/static.pb.go b/pkg/api/gloo.solo.io/v1/options/static/static.pb.go index 9f7e83a73..c6abc4f09 100644 --- a/pkg/api/gloo.solo.io/v1/options/static/static.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/static/static.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/static/static.proto @@ -11,12 +11,12 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" options "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -40,22 +40,20 @@ type UpstreamSpec struct { Hosts []*Host `protobuf:"bytes,1,rep,name=hosts,proto3" json:"hosts,omitempty"` // Attempt to use outbound TLS // If not explicitly set, Gloo will automatically set this to true for port 443 - UseTls *wrappers.BoolValue `protobuf:"bytes,3,opt,name=use_tls,json=useTls,proto3" json:"use_tls,omitempty"` + UseTls *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=use_tls,json=useTls,proto3" json:"use_tls,omitempty"` // An optional Service Spec describing the service listening at this address ServiceSpec *options.ServiceSpec `protobuf:"bytes,5,opt,name=service_spec,json=serviceSpec,proto3" json:"service_spec,omitempty"` // When set, automatically set the sni address to use to the addr field. // If both this and host.sni_addr are set, host.sni_addr has priority. // defaults to "true". - AutoSniRewrite *wrappers.BoolValue `protobuf:"bytes,6,opt,name=auto_sni_rewrite,json=autoSniRewrite,proto3" json:"auto_sni_rewrite,omitempty"` + AutoSniRewrite *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=auto_sni_rewrite,json=autoSniRewrite,proto3" json:"auto_sni_rewrite,omitempty"` } func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -66,7 +64,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -88,7 +86,7 @@ func (x *UpstreamSpec) GetHosts() []*Host { return nil } -func (x *UpstreamSpec) GetUseTls() *wrappers.BoolValue { +func (x *UpstreamSpec) GetUseTls() *wrapperspb.BoolValue { if x != nil { return x.UseTls } @@ -102,7 +100,7 @@ func (x *UpstreamSpec) GetServiceSpec() *options.ServiceSpec { return nil } -func (x *UpstreamSpec) GetAutoSniRewrite() *wrappers.BoolValue { +func (x *UpstreamSpec) GetAutoSniRewrite() *wrapperspb.BoolValue { if x != nil { return x.AutoSniRewrite } @@ -129,7 +127,7 @@ type Host struct { // weighted by the endpoint's locality's load balancing weight from // LocalityLbEndpoints. If unspecified, each host is presumed to have equal // weight in a locality. - LoadBalancingWeight *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` + LoadBalancingWeight *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=load_balancing_weight,json=loadBalancingWeight,proto3" json:"load_balancing_weight,omitempty"` // (Enterprise Only): Host specific health checking configuration. HealthCheckConfig *Host_HealthCheckConfig `protobuf:"bytes,3,opt,name=health_check_config,json=healthCheckConfig,proto3" json:"health_check_config,omitempty"` // Additional metadata to add to the endpoint. This metadata can be used in upstream HTTP filters @@ -137,16 +135,14 @@ type Host struct { // The following keys are added by Gloo Edge and are ignored if set: // - "envoy.transport_socket_match" // - "io.solo.health_checkers.advanced_http" - Metadata map[string]*_struct.Struct `protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Metadata map[string]*structpb.Struct `protobuf:"bytes,6,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *Host) Reset() { *x = Host{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Host) String() string { @@ -157,7 +153,7 @@ func (*Host) ProtoMessage() {} func (x *Host) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -193,7 +189,7 @@ func (x *Host) GetSniAddr() string { return "" } -func (x *Host) GetLoadBalancingWeight() *wrappers.UInt32Value { +func (x *Host) GetLoadBalancingWeight() *wrapperspb.UInt32Value { if x != nil { return x.LoadBalancingWeight } @@ -207,7 +203,7 @@ func (x *Host) GetHealthCheckConfig() *Host_HealthCheckConfig { return nil } -func (x *Host) GetMetadata() map[string]*_struct.Struct { +func (x *Host) GetMetadata() map[string]*structpb.Struct { if x != nil { return x.Metadata } @@ -227,11 +223,9 @@ type Host_HealthCheckConfig struct { func (x *Host_HealthCheckConfig) Reset() { *x = Host_HealthCheckConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Host_HealthCheckConfig) String() string { @@ -242,7 +236,7 @@ func (*Host_HealthCheckConfig) ProtoMessage() {} func (x *Host_HealthCheckConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -361,15 +355,15 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_pr } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_goTypes = []any{ (*UpstreamSpec)(nil), // 0: static.options.gloo.solo.io.UpstreamSpec (*Host)(nil), // 1: static.options.gloo.solo.io.Host (*Host_HealthCheckConfig)(nil), // 2: static.options.gloo.solo.io.Host.HealthCheckConfig nil, // 3: static.options.gloo.solo.io.Host.MetadataEntry - (*wrappers.BoolValue)(nil), // 4: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 4: google.protobuf.BoolValue (*options.ServiceSpec)(nil), // 5: options.gloo.solo.io.ServiceSpec - (*wrappers.UInt32Value)(nil), // 6: google.protobuf.UInt32Value - (*_struct.Struct)(nil), // 7: google.protobuf.Struct + (*wrapperspb.UInt32Value)(nil), // 6: google.protobuf.UInt32Value + (*structpb.Struct)(nil), // 7: google.protobuf.Struct } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_depIdxs = []int32{ 1, // 0: static.options.gloo.solo.io.UpstreamSpec.hosts:type_name -> static.options.gloo.solo.io.Host @@ -392,44 +386,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_pr if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Host); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_static_static_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Host_HealthCheckConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/stats/stats.pb.go b/pkg/api/gloo.solo.io/v1/options/stats/stats.pb.go index aeb3c6eab..a45739395 100644 --- a/pkg/api/gloo.solo.io/v1/options/stats/stats.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/stats/stats.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/stats/stats.proto @@ -34,11 +34,9 @@ type Stats struct { func (x *Stats) Reset() { *x = Stats{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Stats) String() string { @@ -49,7 +47,7 @@ func (*Stats) ProtoMessage() {} func (x *Stats) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -103,11 +101,9 @@ type VirtualCluster struct { func (x *VirtualCluster) Reset() { *x = VirtualCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualCluster) String() string { @@ -118,7 +114,7 @@ func (*VirtualCluster) ProtoMessage() {} func (x *VirtualCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -197,7 +193,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_prot } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_goTypes = []any{ (*Stats)(nil), // 0: stats.options.gloo.solo.io.Stats (*VirtualCluster)(nil), // 1: stats.options.gloo.solo.io.VirtualCluster } @@ -215,32 +211,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_prot if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Stats); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_stats_stats_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/subset_spec.pb.go b/pkg/api/gloo.solo.io/v1/options/subset_spec.pb.go index bd4d0b6da..ea6058a57 100644 --- a/pkg/api/gloo.solo.io/v1/options/subset_spec.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/subset_spec.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/subset_spec.proto @@ -92,11 +92,9 @@ type SubsetSpec struct { func (x *SubsetSpec) Reset() { *x = SubsetSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SubsetSpec) String() string { @@ -107,7 +105,7 @@ func (*SubsetSpec) ProtoMessage() {} func (x *SubsetSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -156,11 +154,9 @@ type Selector struct { func (x *Selector) Reset() { *x = Selector{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Selector) String() string { @@ -171,7 +167,7 @@ func (*Selector) ProtoMessage() {} func (x *Selector) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -211,11 +207,9 @@ type Subset struct { func (x *Subset) Reset() { *x = Subset{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Subset) String() string { @@ -226,7 +220,7 @@ func (*Subset) ProtoMessage() {} func (x *Subset) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -312,7 +306,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_prot var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_goTypes = []any{ (FallbackPolicy)(0), // 0: options.gloo.solo.io.FallbackPolicy (*SubsetSpec)(nil), // 1: options.gloo.solo.io.SubsetSpec (*Selector)(nil), // 2: options.gloo.solo.io.Selector @@ -336,44 +330,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_prot if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SubsetSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Selector); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_subset_spec_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Subset); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/tap/tap.pb.go b/pkg/api/gloo.solo.io/v1/options/tap/tap.pb.go index f7d5eee96..429bc44d0 100644 --- a/pkg/api/gloo.solo.io/v1/options/tap/tap.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/tap/tap.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/tap/tap.proto @@ -11,11 +11,11 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -40,26 +40,24 @@ type Tap struct { // For buffered tapping, the maximum amount of received body that will be buffered // prior to truncation. If truncation occurs, the truncated field will be set. // If not specified, the default is 1KiB. - MaxBufferedRxBytes *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=max_buffered_rx_bytes,json=maxBufferedRxBytes,proto3" json:"max_buffered_rx_bytes,omitempty"` + MaxBufferedRxBytes *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=max_buffered_rx_bytes,json=maxBufferedRxBytes,proto3" json:"max_buffered_rx_bytes,omitempty"` // For buffered tapping, the maximum amount of transmitted body that will be buffered // prior to truncation. If truncation occurs, the truncated field will be set. // If not specified, the default is 1KiB. - MaxBufferedTxBytes *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=max_buffered_tx_bytes,json=maxBufferedTxBytes,proto3" json:"max_buffered_tx_bytes,omitempty"` + MaxBufferedTxBytes *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=max_buffered_tx_bytes,json=maxBufferedTxBytes,proto3" json:"max_buffered_tx_bytes,omitempty"` // Indicates whether tap filter records the time stamp for request/response headers. // Request headers time stamp is stored after receiving request headers. // Response headers time stamp is stored after receiving response headers. - RecordHeadersReceivedTime *wrappers.BoolValue `protobuf:"bytes,4,opt,name=record_headers_received_time,json=recordHeadersReceivedTime,proto3" json:"record_headers_received_time,omitempty"` + RecordHeadersReceivedTime *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=record_headers_received_time,json=recordHeadersReceivedTime,proto3" json:"record_headers_received_time,omitempty"` // Indicates whether report downstream connection info - RecordDownstreamConnection *wrappers.BoolValue `protobuf:"bytes,5,opt,name=record_downstream_connection,json=recordDownstreamConnection,proto3" json:"record_downstream_connection,omitempty"` + RecordDownstreamConnection *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=record_downstream_connection,json=recordDownstreamConnection,proto3" json:"record_downstream_connection,omitempty"` } func (x *Tap) Reset() { *x = Tap{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Tap) String() string { @@ -70,7 +68,7 @@ func (*Tap) ProtoMessage() {} func (x *Tap) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -92,28 +90,28 @@ func (x *Tap) GetSinks() []*Sink { return nil } -func (x *Tap) GetMaxBufferedRxBytes() *wrappers.UInt32Value { +func (x *Tap) GetMaxBufferedRxBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxBufferedRxBytes } return nil } -func (x *Tap) GetMaxBufferedTxBytes() *wrappers.UInt32Value { +func (x *Tap) GetMaxBufferedTxBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxBufferedTxBytes } return nil } -func (x *Tap) GetRecordHeadersReceivedTime() *wrappers.BoolValue { +func (x *Tap) GetRecordHeadersReceivedTime() *wrapperspb.BoolValue { if x != nil { return x.RecordHeadersReceivedTime } return nil } -func (x *Tap) GetRecordDownstreamConnection() *wrappers.BoolValue { +func (x *Tap) GetRecordDownstreamConnection() *wrapperspb.BoolValue { if x != nil { return x.RecordDownstreamConnection } @@ -136,11 +134,9 @@ type Sink struct { func (x *Sink) Reset() { *x = Sink{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Sink) String() string { @@ -151,7 +147,7 @@ func (*Sink) ProtoMessage() {} func (x *Sink) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -217,11 +213,9 @@ type GrpcService struct { func (x *GrpcService) Reset() { *x = GrpcService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcService) String() string { @@ -232,7 +226,7 @@ func (*GrpcService) ProtoMessage() {} func (x *GrpcService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -263,16 +257,14 @@ type HttpService struct { // Upstream reference to the tap server TapServer *core.ResourceRef `protobuf:"bytes,1,opt,name=tap_server,json=tapServer,proto3" json:"tap_server,omitempty"` // Connection timeout - Timeout *duration.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *HttpService) Reset() { *x = HttpService{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpService) String() string { @@ -283,7 +275,7 @@ func (*HttpService) ProtoMessage() {} func (x *HttpService) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -305,7 +297,7 @@ func (x *HttpService) GetTapServer() *core.ResourceRef { return nil } -func (x *HttpService) GetTimeout() *duration.Duration { +func (x *HttpService) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -402,15 +394,15 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_t } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_goTypes = []interface{}{ - (*Tap)(nil), // 0: tap.options.gloo.solo.io.Tap - (*Sink)(nil), // 1: tap.options.gloo.solo.io.Sink - (*GrpcService)(nil), // 2: tap.options.gloo.solo.io.GrpcService - (*HttpService)(nil), // 3: tap.options.gloo.solo.io.HttpService - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 5: google.protobuf.BoolValue - (*core.ResourceRef)(nil), // 6: core.solo.io.ResourceRef - (*duration.Duration)(nil), // 7: google.protobuf.Duration +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_goTypes = []any{ + (*Tap)(nil), // 0: tap.options.gloo.solo.io.Tap + (*Sink)(nil), // 1: tap.options.gloo.solo.io.Sink + (*GrpcService)(nil), // 2: tap.options.gloo.solo.io.GrpcService + (*HttpService)(nil), // 3: tap.options.gloo.solo.io.HttpService + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 5: google.protobuf.BoolValue + (*core.ResourceRef)(nil), // 6: core.solo.io.ResourceRef + (*durationpb.Duration)(nil), // 7: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_depIdxs = []int32{ 1, // 0: tap.options.gloo.solo.io.Tap.sinks:type_name -> tap.options.gloo.solo.io.Sink @@ -437,57 +429,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_t if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Tap); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Sink); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpService); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_enterprise_options_tap_tap_proto_msgTypes[1].OneofWrappers = []any{ (*Sink_GrpcService)(nil), (*Sink_HttpService)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.clone.go index ef778536a..bc1c5d149 100644 --- a/pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -38,15 +38,15 @@ func (m *TcpProxySettings) Clone() proto.Message { target = &TcpProxySettings{} if h, ok := interface{}(m.GetMaxConnectAttempts()).(clone.Cloner); ok { - target.MaxConnectAttempts = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxConnectAttempts = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxConnectAttempts = proto.Clone(m.GetMaxConnectAttempts()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxConnectAttempts = proto.Clone(m.GetMaxConnectAttempts()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetIdleTimeout()).(clone.Cloner); ok { - target.IdleTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetTunnelingConfig()).(clone.Cloner); ok { @@ -56,9 +56,9 @@ func (m *TcpProxySettings) Clone() proto.Message { } if h, ok := interface{}(m.GetAccessLogFlushInterval()).(clone.Cloner); ok { - target.AccessLogFlushInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.AccessLogFlushInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.AccessLogFlushInterval = proto.Clone(m.GetAccessLogFlushInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.AccessLogFlushInterval = proto.Clone(m.GetAccessLogFlushInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -79,9 +79,9 @@ func (m *HeaderValueOption) Clone() proto.Message { } if h, ok := interface{}(m.GetAppend()).(clone.Cloner); ok { - target.Append = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Append = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Append = proto.Clone(m.GetAppend()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Append = proto.Clone(m.GetAppend()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.go b/pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.go index 504db20c1..34b490357 100644 --- a/pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/tcp/tcp.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -32,8 +32,8 @@ type TcpProxySettings struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - MaxConnectAttempts *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` - IdleTimeout *duration.Duration `protobuf:"bytes,2,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + MaxConnectAttempts *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_connect_attempts,json=maxConnectAttempts,proto3" json:"max_connect_attempts,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // If set, this configures tunneling, e.g. configuration options to tunnel multiple TCP // payloads over a shared HTTP tunnel. If this message is absent, the payload // will be proxied upstream as per usual. @@ -41,16 +41,14 @@ type TcpProxySettings struct { // If set, Envoy will flush the access log on this time interval. Must be a // minimum of 1 ms. By default, will only write to the access log when a // connection is closed. - AccessLogFlushInterval *duration.Duration `protobuf:"bytes,15,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` + AccessLogFlushInterval *durationpb.Duration `protobuf:"bytes,15,opt,name=access_log_flush_interval,json=accessLogFlushInterval,proto3" json:"access_log_flush_interval,omitempty"` } func (x *TcpProxySettings) Reset() { *x = TcpProxySettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TcpProxySettings) String() string { @@ -61,7 +59,7 @@ func (*TcpProxySettings) ProtoMessage() {} func (x *TcpProxySettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -76,14 +74,14 @@ func (*TcpProxySettings) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_rawDescGZIP(), []int{0} } -func (x *TcpProxySettings) GetMaxConnectAttempts() *wrappers.UInt32Value { +func (x *TcpProxySettings) GetMaxConnectAttempts() *wrapperspb.UInt32Value { if x != nil { return x.MaxConnectAttempts } return nil } -func (x *TcpProxySettings) GetIdleTimeout() *duration.Duration { +func (x *TcpProxySettings) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -97,7 +95,7 @@ func (x *TcpProxySettings) GetTunnelingConfig() *TcpProxySettings_TunnelingConfi return nil } -func (x *TcpProxySettings) GetAccessLogFlushInterval() *duration.Duration { +func (x *TcpProxySettings) GetAccessLogFlushInterval() *durationpb.Duration { if x != nil { return x.AccessLogFlushInterval } @@ -113,16 +111,14 @@ type HeaderValueOption struct { // Header name/value pair that this option applies to. Header *HeaderValue `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` // If true (default), the value is appended to existing values. - Append *wrappers.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` + Append *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` } func (x *HeaderValueOption) Reset() { *x = HeaderValueOption{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderValueOption) String() string { @@ -133,7 +129,7 @@ func (*HeaderValueOption) ProtoMessage() {} func (x *HeaderValueOption) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -155,7 +151,7 @@ func (x *HeaderValueOption) GetHeader() *HeaderValue { return nil } -func (x *HeaderValueOption) GetAppend() *wrappers.BoolValue { +func (x *HeaderValueOption) GetAppend() *wrapperspb.BoolValue { if x != nil { return x.Append } @@ -176,11 +172,9 @@ type HeaderValue struct { func (x *HeaderValue) Reset() { *x = HeaderValue{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderValue) String() string { @@ -191,7 +185,7 @@ func (*HeaderValue) ProtoMessage() {} func (x *HeaderValue) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -235,11 +229,9 @@ type TcpProxySettings_TunnelingConfig struct { func (x *TcpProxySettings_TunnelingConfig) Reset() { *x = TcpProxySettings_TunnelingConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TcpProxySettings_TunnelingConfig) String() string { @@ -250,7 +242,7 @@ func (*TcpProxySettings_TunnelingConfig) ProtoMessage() {} func (x *TcpProxySettings_TunnelingConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -361,14 +353,14 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_ra } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_goTypes = []any{ (*TcpProxySettings)(nil), // 0: tcp.options.gloo.solo.io.TcpProxySettings (*HeaderValueOption)(nil), // 1: tcp.options.gloo.solo.io.HeaderValueOption (*HeaderValue)(nil), // 2: tcp.options.gloo.solo.io.HeaderValue (*TcpProxySettings_TunnelingConfig)(nil), // 3: tcp.options.gloo.solo.io.TcpProxySettings.TunnelingConfig - (*wrappers.UInt32Value)(nil), // 4: google.protobuf.UInt32Value - (*duration.Duration)(nil), // 5: google.protobuf.Duration - (*wrappers.BoolValue)(nil), // 6: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 4: google.protobuf.UInt32Value + (*durationpb.Duration)(nil), // 5: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 6: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_depIdxs = []int32{ 4, // 0: tcp.options.gloo.solo.io.TcpProxySettings.max_connect_attempts:type_name -> google.protobuf.UInt32Value @@ -390,56 +382,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_in if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TcpProxySettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderValueOption); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tcp_tcp_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TcpProxySettings_TunnelingConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/tracing/tracing.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/tracing/tracing.pb.clone.go index 3f66bd830..495d1e554 100644 --- a/pkg/api/gloo.solo.io/v1/options/tracing/tracing.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/tracing/tracing.pb.clone.go @@ -13,9 +13,9 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_trace_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/trace/v3" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -38,22 +38,22 @@ func (m *ListenerTracingSettings) Clone() proto.Message { target = &ListenerTracingSettings{} if m.GetRequestHeadersForTags() != nil { - target.RequestHeadersForTags = make([]*github_com_golang_protobuf_ptypes_wrappers.StringValue, len(m.GetRequestHeadersForTags())) + target.RequestHeadersForTags = make([]*google_golang_org_protobuf_types_known_wrapperspb.StringValue, len(m.GetRequestHeadersForTags())) for idx, v := range m.GetRequestHeadersForTags() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.RequestHeadersForTags[idx] = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.RequestHeadersForTags[idx] = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.RequestHeadersForTags[idx] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.RequestHeadersForTags[idx] = proto.Clone(v).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } } } if h, ok := interface{}(m.GetVerbose()).(clone.Cloner); ok { - target.Verbose = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Verbose = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Verbose = proto.Clone(m.GetVerbose()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Verbose = proto.Clone(m.GetVerbose()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetTracePercentages()).(clone.Cloner); ok { @@ -175,9 +175,9 @@ func (m *RouteTracingSettings) Clone() proto.Message { } if h, ok := interface{}(m.GetPropagate()).(clone.Cloner); ok { - target.Propagate = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Propagate = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Propagate = proto.Clone(m.GetPropagate()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Propagate = proto.Clone(m.GetPropagate()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -192,21 +192,21 @@ func (m *TracePercentages) Clone() proto.Message { target = &TracePercentages{} if h, ok := interface{}(m.GetClientSamplePercentage()).(clone.Cloner); ok { - target.ClientSamplePercentage = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.FloatValue) + target.ClientSamplePercentage = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.FloatValue) } else { - target.ClientSamplePercentage = proto.Clone(m.GetClientSamplePercentage()).(*github_com_golang_protobuf_ptypes_wrappers.FloatValue) + target.ClientSamplePercentage = proto.Clone(m.GetClientSamplePercentage()).(*google_golang_org_protobuf_types_known_wrapperspb.FloatValue) } if h, ok := interface{}(m.GetRandomSamplePercentage()).(clone.Cloner); ok { - target.RandomSamplePercentage = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.FloatValue) + target.RandomSamplePercentage = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.FloatValue) } else { - target.RandomSamplePercentage = proto.Clone(m.GetRandomSamplePercentage()).(*github_com_golang_protobuf_ptypes_wrappers.FloatValue) + target.RandomSamplePercentage = proto.Clone(m.GetRandomSamplePercentage()).(*google_golang_org_protobuf_types_known_wrapperspb.FloatValue) } if h, ok := interface{}(m.GetOverallSamplePercentage()).(clone.Cloner); ok { - target.OverallSamplePercentage = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.FloatValue) + target.OverallSamplePercentage = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.FloatValue) } else { - target.OverallSamplePercentage = proto.Clone(m.GetOverallSamplePercentage()).(*github_com_golang_protobuf_ptypes_wrappers.FloatValue) + target.OverallSamplePercentage = proto.Clone(m.GetOverallSamplePercentage()).(*google_golang_org_protobuf_types_known_wrapperspb.FloatValue) } return target @@ -221,21 +221,21 @@ func (m *TracingTagEnvironmentVariable) Clone() proto.Message { target = &TracingTagEnvironmentVariable{} if h, ok := interface{}(m.GetTag()).(clone.Cloner); ok { - target.Tag = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Tag = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Tag = proto.Clone(m.GetTag()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Tag = proto.Clone(m.GetTag()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetName()).(clone.Cloner); ok { - target.Name = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Name = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Name = proto.Clone(m.GetName()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Name = proto.Clone(m.GetName()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetDefaultValue()).(clone.Cloner); ok { - target.DefaultValue = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.DefaultValue = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.DefaultValue = proto.Clone(m.GetDefaultValue()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.DefaultValue = proto.Clone(m.GetDefaultValue()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } return target @@ -250,15 +250,15 @@ func (m *TracingTagLiteral) Clone() proto.Message { target = &TracingTagLiteral{} if h, ok := interface{}(m.GetTag()).(clone.Cloner); ok { - target.Tag = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Tag = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Tag = proto.Clone(m.GetTag()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Tag = proto.Clone(m.GetTag()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetValue()).(clone.Cloner); ok { - target.Value = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Value = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Value = proto.Clone(m.GetValue()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Value = proto.Clone(m.GetValue()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/tracing/tracing.pb.go b/pkg/api/gloo.solo.io/v1/options/tracing/tracing.pb.go index ea8a474e2..2da7528aa 100644 --- a/pkg/api/gloo.solo.io/v1/options/tracing/tracing.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/tracing/tracing.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/tracing/tracing.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/any" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/trace/v3" _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/anypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -83,9 +83,9 @@ type ListenerTracingSettings struct { unknownFields protoimpl.UnknownFields // Optional. If specified, Envoy will include the headers and header values for any matching request headers. - RequestHeadersForTags []*wrappers.StringValue `protobuf:"bytes,1,rep,name=request_headers_for_tags,json=requestHeadersForTags,proto3" json:"request_headers_for_tags,omitempty"` + RequestHeadersForTags []*wrapperspb.StringValue `protobuf:"bytes,1,rep,name=request_headers_for_tags,json=requestHeadersForTags,proto3" json:"request_headers_for_tags,omitempty"` // Optional. If true, Envoy will include logs for streaming events. Default: false. - Verbose *wrappers.BoolValue `protobuf:"bytes,2,opt,name=verbose,proto3" json:"verbose,omitempty"` + Verbose *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=verbose,proto3" json:"verbose,omitempty"` // Requests can produce traces by random sampling or when the `x-client-trace-id` header is provided. // TracePercentages defines the limits for random, forced, and overall tracing percentages. TracePercentages *TracePercentages `protobuf:"bytes,3,opt,name=trace_percentages,json=tracePercentages,proto3" json:"trace_percentages,omitempty"` @@ -113,11 +113,9 @@ type ListenerTracingSettings struct { func (x *ListenerTracingSettings) Reset() { *x = ListenerTracingSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ListenerTracingSettings) String() string { @@ -128,7 +126,7 @@ func (*ListenerTracingSettings) ProtoMessage() {} func (x *ListenerTracingSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -143,14 +141,14 @@ func (*ListenerTracingSettings) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_rawDescGZIP(), []int{0} } -func (x *ListenerTracingSettings) GetRequestHeadersForTags() []*wrappers.StringValue { +func (x *ListenerTracingSettings) GetRequestHeadersForTags() []*wrapperspb.StringValue { if x != nil { return x.RequestHeadersForTags } return nil } -func (x *ListenerTracingSettings) GetVerbose() *wrappers.BoolValue { +func (x *ListenerTracingSettings) GetVerbose() *wrapperspb.BoolValue { if x != nil { return x.Verbose } @@ -271,16 +269,14 @@ type RouteTracingSettings struct { // TracePercentages defines the limits for random, forced, and overall tracing percentages. TracePercentages *TracePercentages `protobuf:"bytes,2,opt,name=trace_percentages,json=tracePercentages,proto3" json:"trace_percentages,omitempty"` // Optional. Default is true, If set to false, the tracing headers will not propagate to the upstream. - Propagate *wrappers.BoolValue `protobuf:"bytes,3,opt,name=propagate,proto3" json:"propagate,omitempty"` + Propagate *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=propagate,proto3" json:"propagate,omitempty"` } func (x *RouteTracingSettings) Reset() { *x = RouteTracingSettings{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteTracingSettings) String() string { @@ -291,7 +287,7 @@ func (*RouteTracingSettings) ProtoMessage() {} func (x *RouteTracingSettings) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -320,7 +316,7 @@ func (x *RouteTracingSettings) GetTracePercentages() *TracePercentages { return nil } -func (x *RouteTracingSettings) GetPropagate() *wrappers.BoolValue { +func (x *RouteTracingSettings) GetPropagate() *wrapperspb.BoolValue { if x != nil { return x.Propagate } @@ -337,24 +333,22 @@ type TracePercentages struct { // Percentage of requests that should produce traces when the `x-client-trace-id` header is provided. // optional, defaults to 100.0 // This should be a value between 0.0 and 100.0, with up to 6 significant digits. - ClientSamplePercentage *wrappers.FloatValue `protobuf:"bytes,1,opt,name=client_sample_percentage,json=clientSamplePercentage,proto3" json:"client_sample_percentage,omitempty"` + ClientSamplePercentage *wrapperspb.FloatValue `protobuf:"bytes,1,opt,name=client_sample_percentage,json=clientSamplePercentage,proto3" json:"client_sample_percentage,omitempty"` // Percentage of requests that should produce traces by random sampling. // optional, defaults to 100.0 // This should be a value between 0.0 and 100.0, with up to 6 significant digits. - RandomSamplePercentage *wrappers.FloatValue `protobuf:"bytes,2,opt,name=random_sample_percentage,json=randomSamplePercentage,proto3" json:"random_sample_percentage,omitempty"` + RandomSamplePercentage *wrapperspb.FloatValue `protobuf:"bytes,2,opt,name=random_sample_percentage,json=randomSamplePercentage,proto3" json:"random_sample_percentage,omitempty"` // Overall percentage of requests that should produce traces. // optional, defaults to 100.0 // This should be a value between 0.0 and 100.0, with up to 6 significant digits. - OverallSamplePercentage *wrappers.FloatValue `protobuf:"bytes,3,opt,name=overall_sample_percentage,json=overallSamplePercentage,proto3" json:"overall_sample_percentage,omitempty"` + OverallSamplePercentage *wrapperspb.FloatValue `protobuf:"bytes,3,opt,name=overall_sample_percentage,json=overallSamplePercentage,proto3" json:"overall_sample_percentage,omitempty"` } func (x *TracePercentages) Reset() { *x = TracePercentages{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TracePercentages) String() string { @@ -365,7 +359,7 @@ func (*TracePercentages) ProtoMessage() {} func (x *TracePercentages) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -380,21 +374,21 @@ func (*TracePercentages) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_rawDescGZIP(), []int{2} } -func (x *TracePercentages) GetClientSamplePercentage() *wrappers.FloatValue { +func (x *TracePercentages) GetClientSamplePercentage() *wrapperspb.FloatValue { if x != nil { return x.ClientSamplePercentage } return nil } -func (x *TracePercentages) GetRandomSamplePercentage() *wrappers.FloatValue { +func (x *TracePercentages) GetRandomSamplePercentage() *wrapperspb.FloatValue { if x != nil { return x.RandomSamplePercentage } return nil } -func (x *TracePercentages) GetOverallSamplePercentage() *wrappers.FloatValue { +func (x *TracePercentages) GetOverallSamplePercentage() *wrapperspb.FloatValue { if x != nil { return x.OverallSamplePercentage } @@ -409,21 +403,19 @@ type TracingTagEnvironmentVariable struct { unknownFields protoimpl.UnknownFields // Used to populate the tag name. - Tag *wrappers.StringValue `protobuf:"bytes,1,opt,name=tag,proto3" json:"tag,omitempty"` + Tag *wrapperspb.StringValue `protobuf:"bytes,1,opt,name=tag,proto3" json:"tag,omitempty"` // Environment variable name to obtain the value to populate the tag value. - Name *wrappers.StringValue `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` // When the environment variable is not found, the tag value will be populated with this default value if specified, // otherwise no tag will be populated. - DefaultValue *wrappers.StringValue `protobuf:"bytes,3,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` + DefaultValue *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` } func (x *TracingTagEnvironmentVariable) Reset() { *x = TracingTagEnvironmentVariable{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TracingTagEnvironmentVariable) String() string { @@ -434,7 +426,7 @@ func (*TracingTagEnvironmentVariable) ProtoMessage() {} func (x *TracingTagEnvironmentVariable) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -449,21 +441,21 @@ func (*TracingTagEnvironmentVariable) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_rawDescGZIP(), []int{3} } -func (x *TracingTagEnvironmentVariable) GetTag() *wrappers.StringValue { +func (x *TracingTagEnvironmentVariable) GetTag() *wrapperspb.StringValue { if x != nil { return x.Tag } return nil } -func (x *TracingTagEnvironmentVariable) GetName() *wrappers.StringValue { +func (x *TracingTagEnvironmentVariable) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *TracingTagEnvironmentVariable) GetDefaultValue() *wrappers.StringValue { +func (x *TracingTagEnvironmentVariable) GetDefaultValue() *wrapperspb.StringValue { if x != nil { return x.DefaultValue } @@ -478,18 +470,16 @@ type TracingTagLiteral struct { unknownFields protoimpl.UnknownFields // Used to populate the tag name. - Tag *wrappers.StringValue `protobuf:"bytes,1,opt,name=tag,proto3" json:"tag,omitempty"` + Tag *wrapperspb.StringValue `protobuf:"bytes,1,opt,name=tag,proto3" json:"tag,omitempty"` // Static literal value to populate the tag value. - Value *wrappers.StringValue `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` + Value *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` } func (x *TracingTagLiteral) Reset() { *x = TracingTagLiteral{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TracingTagLiteral) String() string { @@ -500,7 +490,7 @@ func (*TracingTagLiteral) ProtoMessage() {} func (x *TracingTagLiteral) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -515,14 +505,14 @@ func (*TracingTagLiteral) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_rawDescGZIP(), []int{4} } -func (x *TracingTagLiteral) GetTag() *wrappers.StringValue { +func (x *TracingTagLiteral) GetTag() *wrapperspb.StringValue { if x != nil { return x.Tag } return nil } -func (x *TracingTagLiteral) GetValue() *wrappers.StringValue { +func (x *TracingTagLiteral) GetValue() *wrapperspb.StringValue { if x != nil { return x.Value } @@ -548,11 +538,9 @@ type TracingTagMetadata struct { func (x *TracingTagMetadata) Reset() { *x = TracingTagMetadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TracingTagMetadata) String() string { @@ -563,7 +551,7 @@ func (*TracingTagMetadata) ProtoMessage() {} func (x *TracingTagMetadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -626,11 +614,9 @@ type TracingTagMetadata_MetadataValue struct { func (x *TracingTagMetadata_MetadataValue) Reset() { *x = TracingTagMetadata_MetadataValue{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TracingTagMetadata_MetadataValue) String() string { @@ -641,7 +627,7 @@ func (*TracingTagMetadata_MetadataValue) ProtoMessage() {} func (x *TracingTagMetadata_MetadataValue) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -879,7 +865,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_goTypes = []any{ (TracingTagMetadata_Kind)(0), // 0: tracing.options.gloo.solo.io.TracingTagMetadata.Kind (*ListenerTracingSettings)(nil), // 1: tracing.options.gloo.solo.io.ListenerTracingSettings (*RouteTracingSettings)(nil), // 2: tracing.options.gloo.solo.io.RouteTracingSettings @@ -888,13 +874,13 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_p (*TracingTagLiteral)(nil), // 5: tracing.options.gloo.solo.io.TracingTagLiteral (*TracingTagMetadata)(nil), // 6: tracing.options.gloo.solo.io.TracingTagMetadata (*TracingTagMetadata_MetadataValue)(nil), // 7: tracing.options.gloo.solo.io.TracingTagMetadata.MetadataValue - (*wrappers.StringValue)(nil), // 8: google.protobuf.StringValue - (*wrappers.BoolValue)(nil), // 9: google.protobuf.BoolValue + (*wrapperspb.StringValue)(nil), // 8: google.protobuf.StringValue + (*wrapperspb.BoolValue)(nil), // 9: google.protobuf.BoolValue (*v3.ZipkinConfig)(nil), // 10: solo.io.envoy.config.trace.v3.ZipkinConfig (*v3.DatadogConfig)(nil), // 11: solo.io.envoy.config.trace.v3.DatadogConfig (*v3.OpenTelemetryConfig)(nil), // 12: solo.io.envoy.config.trace.v3.OpenTelemetryConfig (*v3.OpenCensusConfig)(nil), // 13: solo.io.envoy.config.trace.v3.OpenCensusConfig - (*wrappers.FloatValue)(nil), // 14: google.protobuf.FloatValue + (*wrapperspb.FloatValue)(nil), // 14: google.protobuf.FloatValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_depIdxs = []int32{ 8, // 0: tracing.options.gloo.solo.io.ListenerTracingSettings.request_headers_for_tags:type_name -> google.protobuf.StringValue @@ -931,93 +917,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListenerTracingSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteTracingSettings); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TracePercentages); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TracingTagEnvironmentVariable); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TracingTagLiteral); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TracingTagMetadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TracingTagMetadata_MetadataValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_tracing_tracing_proto_msgTypes[0].OneofWrappers = []any{ (*ListenerTracingSettings_ZipkinConfig)(nil), (*ListenerTracingSettings_DatadogConfig)(nil), (*ListenerTracingSettings_OpenTelemetryConfig)(nil), diff --git a/pkg/api/gloo.solo.io/v1/options/transformation/parameters.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/transformation/parameters.pb.clone.go index 4c8c59bbf..433b89db9 100644 --- a/pkg/api/gloo.solo.io/v1/options/transformation/parameters.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/transformation/parameters.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -45,9 +45,9 @@ func (m *Parameters) Clone() proto.Message { } if h, ok := interface{}(m.GetPath()).(clone.Cloner); ok { - target.Path = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Path = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.Path = proto.Clone(m.GetPath()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.Path = proto.Clone(m.GetPath()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/options/transformation/parameters.pb.go b/pkg/api/gloo.solo.io/v1/options/transformation/parameters.pb.go index 0a46728d4..07bf3d4e1 100644 --- a/pkg/api/gloo.solo.io/v1/options/transformation/parameters.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/transformation/parameters.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/transformation/parameters.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -46,16 +46,14 @@ type Parameters struct { // extensions: // parameters: // path: /users/{ userId } - Path *wrappers.StringValue `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` + Path *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` } func (x *Parameters) Reset() { *x = Parameters{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_parameters_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_parameters_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Parameters) String() string { @@ -66,7 +64,7 @@ func (*Parameters) ProtoMessage() {} func (x *Parameters) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_parameters_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -88,7 +86,7 @@ func (x *Parameters) GetHeaders() map[string]string { return nil } -func (x *Parameters) GetPath() *wrappers.StringValue { +func (x *Parameters) GetPath() *wrapperspb.StringValue { if x != nil { return x.Path } @@ -144,10 +142,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_p } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_parameters_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_parameters_proto_goTypes = []interface{}{ - (*Parameters)(nil), // 0: transformation.options.gloo.solo.io.Parameters - nil, // 1: transformation.options.gloo.solo.io.Parameters.HeadersEntry - (*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_parameters_proto_goTypes = []any{ + (*Parameters)(nil), // 0: transformation.options.gloo.solo.io.Parameters + nil, // 1: transformation.options.gloo.solo.io.Parameters.HeadersEntry + (*wrapperspb.StringValue)(nil), // 2: google.protobuf.StringValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_parameters_proto_depIdxs = []int32{ 1, // 0: transformation.options.gloo.solo.io.Parameters.headers:type_name -> transformation.options.gloo.solo.io.Parameters.HeadersEntry @@ -166,20 +164,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_p if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_parameters_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_parameters_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Parameters); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/options/transformation/transformation.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/transformation/transformation.pb.clone.go index bc50605eb..9f37b54a1 100644 --- a/pkg/api/gloo.solo.io/v1/options/transformation/transformation.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/transformation/transformation.pb.clone.go @@ -13,13 +13,13 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_empty "github.com/golang/protobuf/ptypes/empty" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_extensions_transformers_xslt "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/transformers/xslt" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_core_matchers "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/core/matchers" + + google_golang_org_protobuf_types_known_emptypb "google.golang.org/protobuf/types/known/emptypb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -187,15 +187,15 @@ func (m *TransformationStages) Clone() proto.Message { target.InheritTransformation = m.GetInheritTransformation() if h, ok := interface{}(m.GetLogRequestResponseInfo()).(clone.Cloner); ok { - target.LogRequestResponseInfo = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LogRequestResponseInfo = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.LogRequestResponseInfo = proto.Clone(m.GetLogRequestResponseInfo()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LogRequestResponseInfo = proto.Clone(m.GetLogRequestResponseInfo()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetEscapeCharacters()).(clone.Cloner); ok { - target.EscapeCharacters = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EscapeCharacters = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EscapeCharacters = proto.Clone(m.GetEscapeCharacters()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EscapeCharacters = proto.Clone(m.GetEscapeCharacters()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -267,9 +267,9 @@ func (m *Extraction) Clone() proto.Message { target.Subgroup = m.GetSubgroup() if h, ok := interface{}(m.GetReplacementText()).(clone.Cloner); ok { - target.ReplacementText = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ReplacementText = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.ReplacementText = proto.Clone(m.GetReplacementText()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ReplacementText = proto.Clone(m.GetReplacementText()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } target.Mode = m.GetMode() @@ -286,11 +286,11 @@ func (m *Extraction) Clone() proto.Message { if h, ok := interface{}(m.GetBody()).(clone.Cloner); ok { target.Source = &Extraction_Body{ - Body: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + Body: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.Source = &Extraction_Body{ - Body: proto.Clone(m.GetBody()).(*github_com_golang_protobuf_ptypes_empty.Empty), + Body: proto.Clone(m.GetBody()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } @@ -375,9 +375,9 @@ func (m *TransformationTemplate) Clone() proto.Message { } if h, ok := interface{}(m.GetEscapeCharacters()).(clone.Cloner); ok { - target.EscapeCharacters = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EscapeCharacters = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EscapeCharacters = proto.Clone(m.GetEscapeCharacters()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EscapeCharacters = proto.Clone(m.GetEscapeCharacters()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetSpanTransformer()).(clone.Cloner); ok { diff --git a/pkg/api/gloo.solo.io/v1/options/transformation/transformation.pb.go b/pkg/api/gloo.solo.io/v1/options/transformation/transformation.pb.go index 06579a7ef..35bfb86e8 100644 --- a/pkg/api/gloo.solo.io/v1/options/transformation/transformation.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/transformation/transformation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/transformation/transformation.proto @@ -10,13 +10,13 @@ import ( reflect "reflect" sync "sync" - empty "github.com/golang/protobuf/ptypes/empty" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" xslt "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/transformers/xslt" matchers "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/core/matchers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -152,11 +152,9 @@ type ResponseMatch struct { func (x *ResponseMatch) Reset() { *x = ResponseMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseMatch) String() string { @@ -167,7 +165,7 @@ func (*ResponseMatch) ProtoMessage() {} func (x *ResponseMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -220,11 +218,9 @@ type RequestMatch struct { func (x *RequestMatch) Reset() { *x = RequestMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RequestMatch) String() string { @@ -235,7 +231,7 @@ func (*RequestMatch) ProtoMessage() {} func (x *RequestMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -293,11 +289,9 @@ type Transformations struct { func (x *Transformations) Reset() { *x = Transformations{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Transformations) String() string { @@ -308,7 +302,7 @@ func (*Transformations) ProtoMessage() {} func (x *Transformations) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -360,11 +354,9 @@ type RequestResponseTransformations struct { func (x *RequestResponseTransformations) Reset() { *x = RequestResponseTransformations{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RequestResponseTransformations) String() string { @@ -375,7 +367,7 @@ func (*RequestResponseTransformations) ProtoMessage() {} func (x *RequestResponseTransformations) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -429,22 +421,20 @@ type TransformationStages struct { InheritTransformation bool `protobuf:"varint,3,opt,name=inherit_transformation,json=inheritTransformation,proto3" json:"inherit_transformation,omitempty"` // When enabled, log request/response body and headers before and after all transformations defined here are applied.\ // This overrides the log_request_response_info field in the Transformation message. - LogRequestResponseInfo *wrappers.BoolValue `protobuf:"bytes,4,opt,name=log_request_response_info,json=logRequestResponseInfo,proto3" json:"log_request_response_info,omitempty"` + LogRequestResponseInfo *wrapperspb.BoolValue `protobuf:"bytes,4,opt,name=log_request_response_info,json=logRequestResponseInfo,proto3" json:"log_request_response_info,omitempty"` // Use this field to set Inja behavior when rendering strings which contain // characters that would need to be escaped to be valid JSON. Note that this // sets the behavior for all staged transformations configured here. This setting // can be overridden per-transformation using the field `escape_characters` on // the TransformationTemplate. - EscapeCharacters *wrappers.BoolValue `protobuf:"bytes,5,opt,name=escape_characters,json=escapeCharacters,proto3" json:"escape_characters,omitempty"` + EscapeCharacters *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=escape_characters,json=escapeCharacters,proto3" json:"escape_characters,omitempty"` } func (x *TransformationStages) Reset() { *x = TransformationStages{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationStages) String() string { @@ -455,7 +445,7 @@ func (*TransformationStages) ProtoMessage() {} func (x *TransformationStages) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -498,14 +488,14 @@ func (x *TransformationStages) GetInheritTransformation() bool { return false } -func (x *TransformationStages) GetLogRequestResponseInfo() *wrappers.BoolValue { +func (x *TransformationStages) GetLogRequestResponseInfo() *wrapperspb.BoolValue { if x != nil { return x.LogRequestResponseInfo } return nil } -func (x *TransformationStages) GetEscapeCharacters() *wrappers.BoolValue { +func (x *TransformationStages) GetEscapeCharacters() *wrapperspb.BoolValue { if x != nil { return x.EscapeCharacters } @@ -532,11 +522,9 @@ type Transformation struct { func (x *Transformation) Reset() { *x = Transformation{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Transformation) String() string { @@ -547,7 +535,7 @@ func (*Transformation) ProtoMessage() {} func (x *Transformation) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -672,7 +660,7 @@ type Extraction struct { // to `std::regex_replace` as the replacement string. // // For more informatino, see https://en.cppreference.com/w/cpp/regex/regex_replace. - ReplacementText *wrappers.StringValue `protobuf:"bytes,5,opt,name=replacement_text,json=replacementText,proto3" json:"replacement_text,omitempty"` + ReplacementText *wrapperspb.StringValue `protobuf:"bytes,5,opt,name=replacement_text,json=replacementText,proto3" json:"replacement_text,omitempty"` // The mode of operation for the extraction. // Defaults to EXTRACT. Mode Extraction_Mode `protobuf:"varint,6,opt,name=mode,proto3,enum=transformation.options.gloo.solo.io.Extraction_Mode" json:"mode,omitempty"` @@ -680,11 +668,9 @@ type Extraction struct { func (x *Extraction) Reset() { *x = Extraction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Extraction) String() string { @@ -695,7 +681,7 @@ func (*Extraction) ProtoMessage() {} func (x *Extraction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -724,7 +710,7 @@ func (x *Extraction) GetHeader() string { return "" } -func (x *Extraction) GetBody() *empty.Empty { +func (x *Extraction) GetBody() *emptypb.Empty { if x, ok := x.GetSource().(*Extraction_Body); ok { return x.Body } @@ -745,7 +731,7 @@ func (x *Extraction) GetSubgroup() uint32 { return 0 } -func (x *Extraction) GetReplacementText() *wrappers.StringValue { +func (x *Extraction) GetReplacementText() *wrapperspb.StringValue { if x != nil { return x.ReplacementText } @@ -770,7 +756,7 @@ type Extraction_Header struct { type Extraction_Body struct { // Extract information from the request/response body - Body *empty.Empty `protobuf:"bytes,4,opt,name=body,proto3,oneof"` + Body *emptypb.Empty `protobuf:"bytes,4,opt,name=body,proto3,oneof"` } func (*Extraction_Header) isExtraction_Source() {} @@ -858,7 +844,7 @@ type TransformationTemplate struct { // characters that would need to be escaped to be valid JSON. Note that this // sets the behavior for the entire transformation. Use raw_strings function // for fine-grained control within a template. - EscapeCharacters *wrappers.BoolValue `protobuf:"bytes,12,opt,name=escape_characters,json=escapeCharacters,proto3" json:"escape_characters,omitempty"` + EscapeCharacters *wrapperspb.BoolValue `protobuf:"bytes,12,opt,name=escape_characters,json=escapeCharacters,proto3" json:"escape_characters,omitempty"` // Use this field to modify the span of the trace. This field can only be // applied on requestTransformations. Attempting to set this on a // responseTransformation will result in an error. @@ -867,11 +853,9 @@ type TransformationTemplate struct { func (x *TransformationTemplate) Reset() { *x = TransformationTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationTemplate) String() string { @@ -882,7 +866,7 @@ func (*TransformationTemplate) ProtoMessage() {} func (x *TransformationTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -988,7 +972,7 @@ func (x *TransformationTemplate) GetDynamicMetadataValues() []*TransformationTem return nil } -func (x *TransformationTemplate) GetEscapeCharacters() *wrappers.BoolValue { +func (x *TransformationTemplate) GetEscapeCharacters() *wrapperspb.BoolValue { if x != nil { return x.EscapeCharacters } @@ -1073,11 +1057,9 @@ type InjaTemplate struct { func (x *InjaTemplate) Reset() { *x = InjaTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *InjaTemplate) String() string { @@ -1088,7 +1070,7 @@ func (*InjaTemplate) ProtoMessage() {} func (x *InjaTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1118,11 +1100,9 @@ type Passthrough struct { func (x *Passthrough) Reset() { *x = Passthrough{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Passthrough) String() string { @@ -1133,7 +1113,7 @@ func (*Passthrough) ProtoMessage() {} func (x *Passthrough) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1156,11 +1136,9 @@ type MergeExtractorsToBody struct { func (x *MergeExtractorsToBody) Reset() { *x = MergeExtractorsToBody{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MergeExtractorsToBody) String() string { @@ -1171,7 +1149,7 @@ func (*MergeExtractorsToBody) ProtoMessage() {} func (x *MergeExtractorsToBody) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1214,11 +1192,9 @@ type MergeJsonKeys struct { func (x *MergeJsonKeys) Reset() { *x = MergeJsonKeys{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MergeJsonKeys) String() string { @@ -1229,7 +1205,7 @@ func (*MergeJsonKeys) ProtoMessage() {} func (x *MergeJsonKeys) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1264,11 +1240,9 @@ type HeaderBodyTransform struct { func (x *HeaderBodyTransform) Reset() { *x = HeaderBodyTransform{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderBodyTransform) String() string { @@ -1279,7 +1253,7 @@ func (*HeaderBodyTransform) ProtoMessage() {} func (x *HeaderBodyTransform) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1315,11 +1289,9 @@ type TransformationTemplate_HeaderToAppend struct { func (x *TransformationTemplate_HeaderToAppend) Reset() { *x = TransformationTemplate_HeaderToAppend{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationTemplate_HeaderToAppend) String() string { @@ -1330,7 +1302,7 @@ func (*TransformationTemplate_HeaderToAppend) ProtoMessage() {} func (x *TransformationTemplate_HeaderToAppend) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1380,11 +1352,9 @@ type TransformationTemplate_DynamicMetadataValue struct { func (x *TransformationTemplate_DynamicMetadataValue) Reset() { *x = TransformationTemplate_DynamicMetadataValue{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationTemplate_DynamicMetadataValue) String() string { @@ -1395,7 +1365,7 @@ func (*TransformationTemplate_DynamicMetadataValue) ProtoMessage() {} func (x *TransformationTemplate_DynamicMetadataValue) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1452,11 +1422,9 @@ type TransformationTemplate_SpanTransformer struct { func (x *TransformationTemplate_SpanTransformer) Reset() { *x = TransformationTemplate_SpanTransformer{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TransformationTemplate_SpanTransformer) String() string { @@ -1467,7 +1435,7 @@ func (*TransformationTemplate_SpanTransformer) ProtoMessage() {} func (x *TransformationTemplate_SpanTransformer) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1502,11 +1470,9 @@ type MergeJsonKeys_OverridableTemplate struct { func (x *MergeJsonKeys_OverridableTemplate) Reset() { *x = MergeJsonKeys_OverridableTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MergeJsonKeys_OverridableTemplate) String() string { @@ -1517,7 +1483,7 @@ func (*MergeJsonKeys_OverridableTemplate) ProtoMessage() {} func (x *MergeJsonKeys_OverridableTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1908,7 +1874,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_t var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes = make([]protoimpl.MessageInfo, 20) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_goTypes = []any{ (Extraction_Mode)(0), // 0: transformation.options.gloo.solo.io.Extraction.Mode (TransformationTemplate_RequestBodyParse)(0), // 1: transformation.options.gloo.solo.io.TransformationTemplate.RequestBodyParse (*ResponseMatch)(nil), // 2: transformation.options.gloo.solo.io.ResponseMatch @@ -1933,10 +1899,10 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_tr nil, // 21: transformation.options.gloo.solo.io.MergeJsonKeys.JsonKeysEntry (*matchers.HeaderMatcher)(nil), // 22: matchers.core.gloo.solo.io.HeaderMatcher (*matchers.Matcher)(nil), // 23: matchers.core.gloo.solo.io.Matcher - (*wrappers.BoolValue)(nil), // 24: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 24: google.protobuf.BoolValue (*xslt.XsltTransformation)(nil), // 25: envoy.config.transformer.xslt.v2.XsltTransformation - (*empty.Empty)(nil), // 26: google.protobuf.Empty - (*wrappers.StringValue)(nil), // 27: google.protobuf.StringValue + (*emptypb.Empty)(nil), // 26: google.protobuf.Empty + (*wrapperspb.StringValue)(nil), // 27: google.protobuf.StringValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_depIdxs = []int32{ 22, // 0: transformation.options.gloo.solo.io.ResponseMatch.matchers:type_name -> matchers.core.gloo.solo.io.HeaderMatcher @@ -1992,222 +1958,16 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_t if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RequestMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Transformations); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RequestResponseTransformations); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationStages); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Transformation); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Extraction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*InjaTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Passthrough); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MergeExtractorsToBody); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MergeJsonKeys); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderBodyTransform); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationTemplate_HeaderToAppend); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationTemplate_DynamicMetadataValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TransformationTemplate_SpanTransformer); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MergeJsonKeys_OverridableTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[5].OneofWrappers = []any{ (*Transformation_TransformationTemplate)(nil), (*Transformation_HeaderBodyTransform)(nil), (*Transformation_XsltTransformation)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[6].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[6].OneofWrappers = []any{ (*Extraction_Header)(nil), (*Extraction_Body)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[7].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_transformation_transformation_proto_msgTypes[7].OneofWrappers = []any{ (*TransformationTemplate_Body)(nil), (*TransformationTemplate_Passthrough)(nil), (*TransformationTemplate_MergeExtractorsToBody)(nil), diff --git a/pkg/api/gloo.solo.io/v1/options/wasm/wasm.pb.clone.go b/pkg/api/gloo.solo.io/v1/options/wasm/wasm.pb.clone.go index ea7568eb3..558843ce9 100644 --- a/pkg/api/gloo.solo.io/v1/options/wasm/wasm.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/options/wasm/wasm.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" ) // ensure the imports are used @@ -60,9 +60,9 @@ func (m *WasmFilter) Clone() proto.Message { target = &WasmFilter{} if h, ok := interface{}(m.GetConfig()).(clone.Cloner); ok { - target.Config = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.Config = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.Config = proto.Clone(m.GetConfig()).(*github_com_golang_protobuf_ptypes_any.Any) + target.Config = proto.Clone(m.GetConfig()).(*google_golang_org_protobuf_types_known_anypb.Any) } if h, ok := interface{}(m.GetFilterStage()).(clone.Cloner); ok { diff --git a/pkg/api/gloo.solo.io/v1/options/wasm/wasm.pb.go b/pkg/api/gloo.solo.io/v1/options/wasm/wasm.pb.go index 2e6de15ae..f3a0a8586 100644 --- a/pkg/api/gloo.solo.io/v1/options/wasm/wasm.pb.go +++ b/pkg/api/gloo.solo.io/v1/options/wasm/wasm.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/wasm/wasm.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - any1 "github.com/golang/protobuf/ptypes/any" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" ) const ( @@ -202,11 +202,9 @@ type PluginSource struct { func (x *PluginSource) Reset() { *x = PluginSource{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PluginSource) String() string { @@ -217,7 +215,7 @@ func (*PluginSource) ProtoMessage() {} func (x *PluginSource) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -255,7 +253,7 @@ type WasmFilter struct { // `google.protobuf.Struct` is serialized as JSON before // passing it to the plugin. `google.protobuf.BytesValue` and // `google.protobuf.StringValue` are passed directly without the wrapper. - Config *any1.Any `protobuf:"bytes,3,opt,name=config,proto3" json:"config,omitempty"` + Config *anypb.Any `protobuf:"bytes,3,opt,name=config,proto3" json:"config,omitempty"` // the stage in the filter chain where this filter should be placed FilterStage *FilterStage `protobuf:"bytes,4,opt,name=filter_stage,json=filterStage,proto3" json:"filter_stage,omitempty"` // the name of the filter, used for logging @@ -271,11 +269,9 @@ type WasmFilter struct { func (x *WasmFilter) Reset() { *x = WasmFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *WasmFilter) String() string { @@ -286,7 +282,7 @@ func (*WasmFilter) ProtoMessage() {} func (x *WasmFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -322,7 +318,7 @@ func (x *WasmFilter) GetFilePath() string { return "" } -func (x *WasmFilter) GetConfig() *any1.Any { +func (x *WasmFilter) GetConfig() *anypb.Any { if x != nil { return x.Config } @@ -395,11 +391,9 @@ type FilterStage struct { func (x *FilterStage) Reset() { *x = FilterStage{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *FilterStage) String() string { @@ -410,7 +404,7 @@ func (*FilterStage) ProtoMessage() {} func (x *FilterStage) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -525,14 +519,14 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_goTypes = []any{ (WasmFilter_VmType)(0), // 0: wasm.options.gloo.solo.io.WasmFilter.VmType (FilterStage_Stage)(0), // 1: wasm.options.gloo.solo.io.FilterStage.Stage (FilterStage_Predicate)(0), // 2: wasm.options.gloo.solo.io.FilterStage.Predicate (*PluginSource)(nil), // 3: wasm.options.gloo.solo.io.PluginSource (*WasmFilter)(nil), // 4: wasm.options.gloo.solo.io.WasmFilter (*FilterStage)(nil), // 5: wasm.options.gloo.solo.io.FilterStage - (*any1.Any)(nil), // 6: google.protobuf.Any + (*anypb.Any)(nil), // 6: google.protobuf.Any } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_depIdxs = []int32{ 4, // 0: wasm.options.gloo.solo.io.PluginSource.filters:type_name -> wasm.options.gloo.solo.io.WasmFilter @@ -553,45 +547,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_ if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PluginSource); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WasmFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FilterStage); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_options_wasm_wasm_proto_msgTypes[1].OneofWrappers = []any{ (*WasmFilter_Image)(nil), (*WasmFilter_FilePath)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/proxy.pb.clone.go b/pkg/api/gloo.solo.io/v1/proxy.pb.clone.go index d25774a80..72ef2da72 100644 --- a/pkg/api/gloo.solo.io/v1/proxy.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/proxy.pb.clone.go @@ -13,14 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" - - github_com_golang_protobuf_ptypes_empty "github.com/golang/protobuf/ptypes/empty" - - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_config_core_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_type_matcher_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" @@ -34,6 +26,14 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" + + google_golang_org_protobuf_types_known_emptypb "google.golang.org/protobuf/types/known/emptypb" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -101,9 +101,9 @@ func (m *Listener) Clone() proto.Message { } if h, ok := interface{}(m.GetUseProxyProto()).(clone.Cloner); ok { - target.UseProxyProto = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseProxyProto = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UseProxyProto = proto.Clone(m.GetUseProxyProto()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseProxyProto = proto.Clone(m.GetUseProxyProto()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetOptions()).(clone.Cloner); ok { @@ -176,11 +176,11 @@ func (m *Listener) Clone() proto.Message { if h, ok := interface{}(m.GetMetadata()).(clone.Cloner); ok { target.OpaqueMetadata = &Listener_Metadata{ - Metadata: h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct), + Metadata: h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct), } } else { target.OpaqueMetadata = &Listener_Metadata{ - Metadata: proto.Clone(m.GetMetadata()).(*github_com_golang_protobuf_ptypes_struct.Struct), + Metadata: proto.Clone(m.GetMetadata()).(*google_golang_org_protobuf_types_known_structpb.Struct), } } @@ -475,9 +475,9 @@ func (m *Matcher) Clone() proto.Message { } if h, ok := interface{}(m.GetDestinationPort()).(clone.Cloner); ok { - target.DestinationPort = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.DestinationPort = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.DestinationPort = proto.Clone(m.GetDestinationPort()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.DestinationPort = proto.Clone(m.GetDestinationPort()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if m.GetPassthroughCipherSuites() != nil { @@ -579,11 +579,11 @@ func (m *VirtualHost) Clone() proto.Message { if h, ok := interface{}(m.GetMetadata()).(clone.Cloner); ok { target.OpaqueMetadata = &VirtualHost_Metadata{ - Metadata: h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct), + Metadata: h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct), } } else { target.OpaqueMetadata = &VirtualHost_Metadata{ - Metadata: proto.Clone(m.GetMetadata()).(*github_com_golang_protobuf_ptypes_struct.Struct), + Metadata: proto.Clone(m.GetMetadata()).(*google_golang_org_protobuf_types_known_structpb.Struct), } } @@ -691,11 +691,11 @@ func (m *Route) Clone() proto.Message { if h, ok := interface{}(m.GetMetadata()).(clone.Cloner); ok { target.OpaqueMetadata = &Route_Metadata{ - Metadata: h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct), + Metadata: h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct), } } else { target.OpaqueMetadata = &Route_Metadata{ - Metadata: proto.Clone(m.GetMetadata()).(*github_com_golang_protobuf_ptypes_struct.Struct), + Metadata: proto.Clone(m.GetMetadata()).(*google_golang_org_protobuf_types_known_structpb.Struct), } } @@ -961,9 +961,9 @@ func (m *WeightedDestination) Clone() proto.Message { } if h, ok := interface{}(m.GetWeight()).(clone.Cloner); ok { - target.Weight = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Weight = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.Weight = proto.Clone(m.GetWeight()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.Weight = proto.Clone(m.GetWeight()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetOptions()).(clone.Cloner); ok { @@ -992,9 +992,9 @@ func (m *RedirectAction) Clone() proto.Message { target.StripQuery = m.GetStripQuery() if h, ok := interface{}(m.GetPortRedirect()).(clone.Cloner); ok { - target.PortRedirect = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PortRedirect = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.PortRedirect = proto.Clone(m.GetPortRedirect()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PortRedirect = proto.Clone(m.GetPortRedirect()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } switch m.PathRewriteSpecifier.(type) { @@ -1084,9 +1084,9 @@ func (m *CustomEnvoyFilter) Clone() proto.Message { target.Name = m.GetName() if h, ok := interface{}(m.GetConfig()).(clone.Cloner); ok { - target.Config = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.Config = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.Config = proto.Clone(m.GetConfig()).(*github_com_golang_protobuf_ptypes_any.Any) + target.Config = proto.Clone(m.GetConfig()).(*google_golang_org_protobuf_types_known_anypb.Any) } return target @@ -1120,9 +1120,9 @@ func (m *UpstreamGroupStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -1180,9 +1180,9 @@ func (m *ProxyStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -1262,11 +1262,11 @@ func (m *TcpHost_TcpAction) Clone() proto.Message { if h, ok := interface{}(m.GetForwardSniClusterName()).(clone.Cloner); ok { target.Destination = &TcpHost_TcpAction_ForwardSniClusterName{ - ForwardSniClusterName: h.Clone().(*github_com_golang_protobuf_ptypes_empty.Empty), + ForwardSniClusterName: h.Clone().(*google_golang_org_protobuf_types_known_emptypb.Empty), } } else { target.Destination = &TcpHost_TcpAction_ForwardSniClusterName{ - ForwardSniClusterName: proto.Clone(m.GetForwardSniClusterName()).(*github_com_golang_protobuf_ptypes_empty.Empty), + ForwardSniClusterName: proto.Clone(m.GetForwardSniClusterName()).(*google_golang_org_protobuf_types_known_emptypb.Empty), } } diff --git a/pkg/api/gloo.solo.io/v1/proxy.pb.go b/pkg/api/gloo.solo.io/v1/proxy.pb.go index 31edaeacc..1e37b20d2 100644 --- a/pkg/api/gloo.solo.io/v1/proxy.pb.go +++ b/pkg/api/gloo.solo.io/v1/proxy.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/proxy.proto @@ -10,10 +10,6 @@ import ( reflect "reflect" sync "sync" - any1 "github.com/golang/protobuf/ptypes/any" - empty "github.com/golang/protobuf/ptypes/empty" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/core/v3" v31 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/matcher/v3" @@ -24,6 +20,10 @@ import ( core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + emptypb "google.golang.org/protobuf/types/known/emptypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -235,11 +235,9 @@ type ProxySpec struct { func (x *ProxySpec) Reset() { *x = ProxySpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxySpec) String() string { @@ -250,7 +248,7 @@ func (*ProxySpec) ProtoMessage() {} func (x *ProxySpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -313,7 +311,7 @@ type Listener struct { // If configured, the listener option (filter config) overrides any setting here. // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/v1/proxy.proto. - UseProxyProto *wrappers.BoolValue `protobuf:"bytes,7,opt,name=use_proxy_proto,json=useProxyProto,proto3" json:"use_proxy_proto,omitempty"` + UseProxyProto *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=use_proxy_proto,json=useProxyProto,proto3" json:"use_proxy_proto,omitempty"` // top level options Options *ListenerOptions `protobuf:"bytes,8,opt,name=options,proto3" json:"options,omitempty"` // Types that are assignable to OpaqueMetadata: @@ -327,11 +325,9 @@ type Listener struct { func (x *Listener) Reset() { *x = Listener{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Listener) String() string { @@ -342,7 +338,7 @@ func (*Listener) ProtoMessage() {} func (x *Listener) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -421,7 +417,7 @@ func (x *Listener) GetSslConfigurations() []*ssl.SslConfig { } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/v1/proxy.proto. -func (x *Listener) GetUseProxyProto() *wrappers.BoolValue { +func (x *Listener) GetUseProxyProto() *wrapperspb.BoolValue { if x != nil { return x.UseProxyProto } @@ -442,7 +438,7 @@ func (m *Listener) GetOpaqueMetadata() isListener_OpaqueMetadata { return nil } -func (x *Listener) GetMetadata() *_struct.Struct { +func (x *Listener) GetMetadata() *structpb.Struct { if x, ok := x.GetOpaqueMetadata().(*Listener_Metadata); ok { return x.Metadata } @@ -506,7 +502,7 @@ type Listener_Metadata struct { // by controllers to track ownership of routes within a proxy // as they are typically generated by a controller (such as the gateway) // Deprecated: prefer the any field below - Metadata *_struct.Struct `protobuf:"bytes,9,opt,name=metadata,proto3,oneof"` + Metadata *structpb.Struct `protobuf:"bytes,9,opt,name=metadata,proto3,oneof"` } type Listener_MetadataStatic struct { @@ -539,11 +535,9 @@ type TcpListener struct { func (x *TcpListener) Reset() { *x = TcpListener{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TcpListener) String() string { @@ -554,7 +548,7 @@ func (*TcpListener) ProtoMessage() {} func (x *TcpListener) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -611,11 +605,9 @@ type TcpHost struct { func (x *TcpHost) Reset() { *x = TcpHost{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TcpHost) String() string { @@ -626,7 +618,7 @@ func (*TcpHost) ProtoMessage() {} func (x *TcpHost) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -689,11 +681,9 @@ type HttpListener struct { func (x *HttpListener) Reset() { *x = HttpListener{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HttpListener) String() string { @@ -704,7 +694,7 @@ func (*HttpListener) ProtoMessage() {} func (x *HttpListener) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -764,11 +754,9 @@ type HybridListener struct { func (x *HybridListener) Reset() { *x = HybridListener{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HybridListener) String() string { @@ -779,7 +767,7 @@ func (*HybridListener) ProtoMessage() {} func (x *HybridListener) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -824,11 +812,9 @@ type MatchedListener struct { func (x *MatchedListener) Reset() { *x = MatchedListener{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchedListener) String() string { @@ -839,7 +825,7 @@ func (*MatchedListener) ProtoMessage() {} func (x *MatchedListener) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -919,11 +905,9 @@ type MatchedTcpListener struct { func (x *MatchedTcpListener) Reset() { *x = MatchedTcpListener{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MatchedTcpListener) String() string { @@ -934,7 +918,7 @@ func (*MatchedTcpListener) ProtoMessage() {} func (x *MatchedTcpListener) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -982,17 +966,15 @@ type Matcher struct { // Filter chains that specify the destination port of incoming traffic are the most specific match. // If no filter chain specifies the exact destination port, // the filter chains which do not specify ports are the most specific match. - DestinationPort *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"` - PassthroughCipherSuites []string `protobuf:"bytes,3,rep,name=passthrough_cipher_suites,json=passthroughCipherSuites,proto3" json:"passthrough_cipher_suites,omitempty"` + DestinationPort *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"` + PassthroughCipherSuites []string `protobuf:"bytes,3,rep,name=passthrough_cipher_suites,json=passthroughCipherSuites,proto3" json:"passthrough_cipher_suites,omitempty"` } func (x *Matcher) Reset() { *x = Matcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Matcher) String() string { @@ -1003,7 +985,7 @@ func (*Matcher) ProtoMessage() {} func (x *Matcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1039,7 +1021,7 @@ func (x *Matcher) GetPrefixRanges() []*v3.CidrRange { return nil } -func (x *Matcher) GetDestinationPort() *wrappers.UInt32Value { +func (x *Matcher) GetDestinationPort() *wrapperspb.UInt32Value { if x != nil { return x.DestinationPort } @@ -1069,11 +1051,9 @@ type AggregateListener struct { func (x *AggregateListener) Reset() { *x = AggregateListener{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AggregateListener) String() string { @@ -1084,7 +1064,7 @@ func (*AggregateListener) ProtoMessage() {} func (x *AggregateListener) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1154,11 +1134,9 @@ type VirtualHost struct { func (x *VirtualHost) Reset() { *x = VirtualHost{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualHost) String() string { @@ -1169,7 +1147,7 @@ func (*VirtualHost) ProtoMessage() {} func (x *VirtualHost) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1219,7 +1197,7 @@ func (m *VirtualHost) GetOpaqueMetadata() isVirtualHost_OpaqueMetadata { return nil } -func (x *VirtualHost) GetMetadata() *_struct.Struct { +func (x *VirtualHost) GetMetadata() *structpb.Struct { if x, ok := x.GetOpaqueMetadata().(*VirtualHost_Metadata); ok { return x.Metadata } @@ -1243,7 +1221,7 @@ type VirtualHost_Metadata struct { // by controllers to track ownership of routes within a proxy // as they are typically generated by a controller (such as the gateway) // Deprecated: prefer the any field below - Metadata *_struct.Struct `protobuf:"bytes,6,opt,name=metadata,proto3,oneof"` + Metadata *structpb.Struct `protobuf:"bytes,6,opt,name=metadata,proto3,oneof"` } type VirtualHost_MetadataStatic struct { @@ -1289,11 +1267,9 @@ type Route struct { func (x *Route) Reset() { *x = Route{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Route) String() string { @@ -1304,7 +1280,7 @@ func (*Route) ProtoMessage() {} func (x *Route) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1376,7 +1352,7 @@ func (m *Route) GetOpaqueMetadata() isRoute_OpaqueMetadata { return nil } -func (x *Route) GetMetadata() *_struct.Struct { +func (x *Route) GetMetadata() *structpb.Struct { if x, ok := x.GetOpaqueMetadata().(*Route_Metadata); ok { return x.Metadata } @@ -1446,7 +1422,7 @@ type Route_Metadata struct { // by controllers to track ownership of routes within a proxy // as they are typically generated by a controller (such as the gateway) // Deprecated: prefer the any field below - Metadata *_struct.Struct `protobuf:"bytes,6,opt,name=metadata,proto3,oneof"` + Metadata *structpb.Struct `protobuf:"bytes,6,opt,name=metadata,proto3,oneof"` } type Route_MetadataStatic struct { @@ -1480,11 +1456,9 @@ type RouteAction struct { func (x *RouteAction) Reset() { *x = RouteAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteAction) String() string { @@ -1495,7 +1469,7 @@ func (*RouteAction) ProtoMessage() {} func (x *RouteAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1623,11 +1597,9 @@ type Destination struct { func (x *Destination) Reset() { *x = Destination{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Destination) String() string { @@ -1638,7 +1610,7 @@ func (*Destination) ProtoMessage() {} func (x *Destination) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1734,11 +1706,9 @@ type KubernetesServiceDestination struct { func (x *KubernetesServiceDestination) Reset() { *x = KubernetesServiceDestination{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *KubernetesServiceDestination) String() string { @@ -1749,7 +1719,7 @@ func (*KubernetesServiceDestination) ProtoMessage() {} func (x *KubernetesServiceDestination) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1799,11 +1769,9 @@ type ConsulServiceDestination struct { func (x *ConsulServiceDestination) Reset() { *x = ConsulServiceDestination{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ConsulServiceDestination) String() string { @@ -1814,7 +1782,7 @@ func (*ConsulServiceDestination) ProtoMessage() {} func (x *ConsulServiceDestination) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1861,11 +1829,9 @@ type UpstreamGroupSpec struct { func (x *UpstreamGroupSpec) Reset() { *x = UpstreamGroupSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamGroupSpec) String() string { @@ -1876,7 +1842,7 @@ func (*UpstreamGroupSpec) ProtoMessage() {} func (x *UpstreamGroupSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1912,11 +1878,9 @@ type MultiDestination struct { func (x *MultiDestination) Reset() { *x = MultiDestination{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MultiDestination) String() string { @@ -1927,7 +1891,7 @@ func (*MultiDestination) ProtoMessage() {} func (x *MultiDestination) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1961,18 +1925,16 @@ type WeightedDestination struct { // weight on a route. For example, if the weight for one destination is 2, and the total weight of all // destinations on the route is 6, the destination receives 2/6 of the traffic. Note that a weight of 0 // routes no traffic to the destination. - Weight *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` + Weight *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=weight,proto3" json:"weight,omitempty"` // Apply configuration to traffic that is sent to this weighted destination Options *WeightedDestinationOptions `protobuf:"bytes,3,opt,name=options,proto3" json:"options,omitempty"` } func (x *WeightedDestination) Reset() { *x = WeightedDestination{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *WeightedDestination) String() string { @@ -1983,7 +1945,7 @@ func (*WeightedDestination) ProtoMessage() {} func (x *WeightedDestination) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2005,7 +1967,7 @@ func (x *WeightedDestination) GetDestination() *Destination { return nil } -func (x *WeightedDestination) GetWeight() *wrappers.UInt32Value { +func (x *WeightedDestination) GetWeight() *wrapperspb.UInt32Value { if x != nil { return x.Weight } @@ -2042,16 +2004,14 @@ type RedirectAction struct { // be removed. Default value is false. StripQuery bool `protobuf:"varint,6,opt,name=strip_query,json=stripQuery,proto3" json:"strip_query,omitempty"` // Which port to redirect to if different than original. - PortRedirect *wrappers.UInt32Value `protobuf:"bytes,7,opt,name=port_redirect,json=portRedirect,proto3" json:"port_redirect,omitempty"` + PortRedirect *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=port_redirect,json=portRedirect,proto3" json:"port_redirect,omitempty"` } func (x *RedirectAction) Reset() { *x = RedirectAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RedirectAction) String() string { @@ -2062,7 +2022,7 @@ func (*RedirectAction) ProtoMessage() {} func (x *RedirectAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2133,7 +2093,7 @@ func (x *RedirectAction) GetStripQuery() bool { return false } -func (x *RedirectAction) GetPortRedirect() *wrappers.UInt32Value { +func (x *RedirectAction) GetPortRedirect() *wrapperspb.UInt32Value { if x != nil { return x.PortRedirect } @@ -2215,11 +2175,9 @@ type DirectResponseAction struct { func (x *DirectResponseAction) Reset() { *x = DirectResponseAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DirectResponseAction) String() string { @@ -2230,7 +2188,7 @@ func (*DirectResponseAction) ProtoMessage() {} func (x *DirectResponseAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2274,11 +2232,9 @@ type SourceMetadata struct { func (x *SourceMetadata) Reset() { *x = SourceMetadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SourceMetadata) String() string { @@ -2289,7 +2245,7 @@ func (*SourceMetadata) ProtoMessage() {} func (x *SourceMetadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2323,16 +2279,14 @@ type CustomEnvoyFilter struct { // The name of the filter configuration. Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` // Filter specific configuration. - Config *any1.Any `protobuf:"bytes,3,opt,name=config,proto3" json:"config,omitempty"` + Config *anypb.Any `protobuf:"bytes,3,opt,name=config,proto3" json:"config,omitempty"` } func (x *CustomEnvoyFilter) Reset() { *x = CustomEnvoyFilter{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CustomEnvoyFilter) String() string { @@ -2343,7 +2297,7 @@ func (*CustomEnvoyFilter) ProtoMessage() {} func (x *CustomEnvoyFilter) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2372,7 +2326,7 @@ func (x *CustomEnvoyFilter) GetName() string { return "" } -func (x *CustomEnvoyFilter) GetConfig() *any1.Any { +func (x *CustomEnvoyFilter) GetConfig() *anypb.Any { if x != nil { return x.Config } @@ -2393,16 +2347,14 @@ type UpstreamGroupStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*UpstreamGroupStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *UpstreamGroupStatus) Reset() { *x = UpstreamGroupStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamGroupStatus) String() string { @@ -2413,7 +2365,7 @@ func (*UpstreamGroupStatus) ProtoMessage() {} func (x *UpstreamGroupStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2456,7 +2408,7 @@ func (x *UpstreamGroupStatus) GetSubresourceStatuses() map[string]*UpstreamGroup return nil } -func (x *UpstreamGroupStatus) GetDetails() *_struct.Struct { +func (x *UpstreamGroupStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -2473,11 +2425,9 @@ type UpstreamGroupNamespacedStatuses struct { func (x *UpstreamGroupNamespacedStatuses) Reset() { *x = UpstreamGroupNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamGroupNamespacedStatuses) String() string { @@ -2488,7 +2438,7 @@ func (*UpstreamGroupNamespacedStatuses) ProtoMessage() {} func (x *UpstreamGroupNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2524,16 +2474,14 @@ type ProxyStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*ProxyStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *ProxyStatus) Reset() { *x = ProxyStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxyStatus) String() string { @@ -2544,7 +2492,7 @@ func (*ProxyStatus) ProtoMessage() {} func (x *ProxyStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2587,7 +2535,7 @@ func (x *ProxyStatus) GetSubresourceStatuses() map[string]*ProxyStatus { return nil } -func (x *ProxyStatus) GetDetails() *_struct.Struct { +func (x *ProxyStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -2604,11 +2552,9 @@ type ProxyNamespacedStatuses struct { func (x *ProxyNamespacedStatuses) Reset() { *x = ProxyNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ProxyNamespacedStatuses) String() string { @@ -2619,7 +2565,7 @@ func (*ProxyNamespacedStatuses) ProtoMessage() {} func (x *ProxyNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2659,11 +2605,9 @@ type TcpHost_TcpAction struct { func (x *TcpHost_TcpAction) Reset() { *x = TcpHost_TcpAction{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TcpHost_TcpAction) String() string { @@ -2674,7 +2618,7 @@ func (*TcpHost_TcpAction) ProtoMessage() {} func (x *TcpHost_TcpAction) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2717,7 +2661,7 @@ func (x *TcpHost_TcpAction) GetUpstreamGroup() *core.ResourceRef { return nil } -func (x *TcpHost_TcpAction) GetForwardSniClusterName() *empty.Empty { +func (x *TcpHost_TcpAction) GetForwardSniClusterName() *emptypb.Empty { if x, ok := x.GetDestination().(*TcpHost_TcpAction_ForwardSniClusterName); ok { return x.ForwardSniClusterName } @@ -2747,7 +2691,7 @@ type TcpHost_TcpAction_ForwardSniClusterName struct { // Forwards the request to a cluster name matching the TLS SNI name // https://www.envoyproxy.io/docs/envoy/latest/api-v2/config/filter/network/sni_cluster/empty/sni_cluster // Note: This filter will only work properly with TLS connections in which the upstream SNI domain is specified - ForwardSniClusterName *empty.Empty `protobuf:"bytes,4,opt,name=forward_sni_cluster_name,json=forwardSniClusterName,proto3,oneof"` + ForwardSniClusterName *emptypb.Empty `protobuf:"bytes,4,opt,name=forward_sni_cluster_name,json=forwardSniClusterName,proto3,oneof"` } func (*TcpHost_TcpAction_Single) isTcpHost_TcpAction_Destination() {} @@ -2771,11 +2715,9 @@ type AggregateListener_HttpResources struct { func (x *AggregateListener_HttpResources) Reset() { *x = AggregateListener_HttpResources{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AggregateListener_HttpResources) String() string { @@ -2786,7 +2728,7 @@ func (*AggregateListener_HttpResources) ProtoMessage() {} func (x *AggregateListener_HttpResources) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2836,11 +2778,9 @@ type AggregateListener_HttpFilterChain struct { func (x *AggregateListener_HttpFilterChain) Reset() { *x = AggregateListener_HttpFilterChain{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[29] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[29] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AggregateListener_HttpFilterChain) String() string { @@ -2851,7 +2791,7 @@ func (*AggregateListener_HttpFilterChain) ProtoMessage() {} func (x *AggregateListener_HttpFilterChain) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[29] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2916,11 +2856,9 @@ type SourceMetadata_SourceRef struct { func (x *SourceMetadata_SourceRef) Reset() { *x = SourceMetadata_SourceRef{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[32] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[32] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SourceMetadata_SourceRef) String() string { @@ -2931,7 +2869,7 @@ func (*SourceMetadata_SourceRef) ProtoMessage() {} func (x *SourceMetadata_SourceRef) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[32] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3616,7 +3554,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_rawDescGZIP( var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 37) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_goTypes = []any{ (RedirectAction_RedirectResponseCode)(0), // 0: gloo.solo.io.RedirectAction.RedirectResponseCode (UpstreamGroupStatus_State)(0), // 1: gloo.solo.io.UpstreamGroupStatus.State (ProxyStatus_State)(0), // 2: gloo.solo.io.ProxyStatus.State @@ -3658,14 +3596,14 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_goTypes = []i nil, // 38: gloo.solo.io.ProxyStatus.SubresourceStatusesEntry nil, // 39: gloo.solo.io.ProxyNamespacedStatuses.StatusesEntry (*ssl.SslConfig)(nil), // 40: gloo.solo.io.SslConfig - (*wrappers.BoolValue)(nil), // 41: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 41: google.protobuf.BoolValue (*ListenerOptions)(nil), // 42: gloo.solo.io.ListenerOptions - (*_struct.Struct)(nil), // 43: google.protobuf.Struct + (*structpb.Struct)(nil), // 43: google.protobuf.Struct (*RouteConfigurationOptions)(nil), // 44: gloo.solo.io.RouteConfigurationOptions (*TcpListenerOptions)(nil), // 45: gloo.solo.io.TcpListenerOptions (*HttpListenerOptions)(nil), // 46: gloo.solo.io.HttpListenerOptions (*v3.CidrRange)(nil), // 47: solo.io.envoy.config.core.v3.CidrRange - (*wrappers.UInt32Value)(nil), // 48: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 48: google.protobuf.UInt32Value (*VirtualHostOptions)(nil), // 49: gloo.solo.io.VirtualHostOptions (*matchers.Matcher)(nil), // 50: matchers.core.gloo.solo.io.Matcher (*core.ResourceRef)(nil), // 51: core.solo.io.ResourceRef @@ -3676,8 +3614,8 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_goTypes = []i (*WeightedDestinationOptions)(nil), // 56: gloo.solo.io.WeightedDestinationOptions (*v31.RegexMatchAndSubstitute)(nil), // 57: solo.io.envoy.type.matcher.v3.RegexMatchAndSubstitute (*filters.FilterStage)(nil), // 58: filters.gloo.solo.io.FilterStage - (*any1.Any)(nil), // 59: google.protobuf.Any - (*empty.Empty)(nil), // 60: google.protobuf.Empty + (*anypb.Any)(nil), // 59: google.protobuf.Any + (*emptypb.Empty)(nil), // 60: google.protobuf.Empty } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_depIdxs = []int32{ 4, // 0: gloo.solo.io.ProxySpec.listeners:type_name -> gloo.solo.io.Listener @@ -3792,381 +3730,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_init() { file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_options_proto_init() file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_init() file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_destination_spec_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxySpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Listener); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TcpListener); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TcpHost); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HttpListener); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HybridListener); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchedListener); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchedTcpListener); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Matcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AggregateListener); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualHost); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Route); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Destination); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*KubernetesServiceDestination); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConsulServiceDestination); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamGroupSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MultiDestination); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WeightedDestination); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RedirectAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DirectResponseAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SourceMetadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CustomEnvoyFilter); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamGroupStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamGroupNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxyStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ProxyNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TcpHost_TcpAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AggregateListener_HttpResources); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AggregateListener_HttpFilterChain); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SourceMetadata_SourceRef); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[1].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[1].OneofWrappers = []any{ (*Listener_HttpListener)(nil), (*Listener_TcpListener)(nil), (*Listener_HybridListener)(nil), @@ -4174,15 +3738,15 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_init() { (*Listener_Metadata)(nil), (*Listener_MetadataStatic)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[6].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[6].OneofWrappers = []any{ (*MatchedListener_HttpListener)(nil), (*MatchedListener_TcpListener)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[10].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[10].OneofWrappers = []any{ (*VirtualHost_Metadata)(nil), (*VirtualHost_MetadataStatic)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[11].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[11].OneofWrappers = []any{ (*Route_RouteAction)(nil), (*Route_RedirectAction)(nil), (*Route_DirectResponseAction)(nil), @@ -4190,24 +3754,24 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_init() { (*Route_Metadata)(nil), (*Route_MetadataStatic)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[12].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[12].OneofWrappers = []any{ (*RouteAction_Single)(nil), (*RouteAction_Multi)(nil), (*RouteAction_UpstreamGroup)(nil), (*RouteAction_ClusterHeader)(nil), (*RouteAction_DynamicForwardProxy)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[13].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[13].OneofWrappers = []any{ (*Destination_Upstream)(nil), (*Destination_Kube)(nil), (*Destination_Consul)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[19].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[19].OneofWrappers = []any{ (*RedirectAction_PathRedirect)(nil), (*RedirectAction_PrefixRewrite)(nil), (*RedirectAction_RegexRewrite)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[27].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_proxy_proto_msgTypes[27].OneofWrappers = []any{ (*TcpHost_TcpAction_Single)(nil), (*TcpHost_TcpAction_Multi)(nil), (*TcpHost_TcpAction_UpstreamGroup)(nil), diff --git a/pkg/api/gloo.solo.io/v1/route_configuration_options.pb.clone.go b/pkg/api/gloo.solo.io/v1/route_configuration_options.pb.clone.go index 5f9446b39..f798fde4b 100644 --- a/pkg/api/gloo.solo.io/v1/route_configuration_options.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/route_configuration_options.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -36,15 +36,15 @@ func (m *RouteConfigurationOptions) Clone() proto.Message { target = &RouteConfigurationOptions{} if h, ok := interface{}(m.GetMaxDirectResponseBodySizeBytes()).(clone.Cloner); ok { - target.MaxDirectResponseBodySizeBytes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxDirectResponseBodySizeBytes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxDirectResponseBodySizeBytes = proto.Clone(m.GetMaxDirectResponseBodySizeBytes()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxDirectResponseBodySizeBytes = proto.Clone(m.GetMaxDirectResponseBodySizeBytes()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetMostSpecificHeaderMutationsWins()).(clone.Cloner); ok { - target.MostSpecificHeaderMutationsWins = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.MostSpecificHeaderMutationsWins = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.MostSpecificHeaderMutationsWins = proto.Clone(m.GetMostSpecificHeaderMutationsWins()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.MostSpecificHeaderMutationsWins = proto.Clone(m.GetMostSpecificHeaderMutationsWins()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target diff --git a/pkg/api/gloo.solo.io/v1/route_configuration_options.pb.go b/pkg/api/gloo.solo.io/v1/route_configuration_options.pb.go index b58c46619..a3c4c86f9 100644 --- a/pkg/api/gloo.solo.io/v1/route_configuration_options.pb.go +++ b/pkg/api/gloo.solo.io/v1/route_configuration_options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/route_configuration_options.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -31,20 +31,18 @@ type RouteConfigurationOptions struct { // The maximum bytes of the response direct response body size. If not specified the default is 4096. // Please refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/route/v3/route.proto#envoy-v3-api-field-config-route-v3-routeconfiguration-max-direct-response-body-size-bytes) // for more details about the `max_direct_response_body_size_bytes` attribute. - MaxDirectResponseBodySizeBytes *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_direct_response_body_size_bytes,json=maxDirectResponseBodySizeBytes,proto3" json:"max_direct_response_body_size_bytes,omitempty"` + MaxDirectResponseBodySizeBytes *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_direct_response_body_size_bytes,json=maxDirectResponseBodySizeBytes,proto3" json:"max_direct_response_body_size_bytes,omitempty"` // By default, headers that should be added/removed are evaluated from most to least specific. // To allow setting overrides at the route or virtual host level, this order can be reversed by setting this option to true. // Refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/route/v3/route.proto#envoy-v3-api-field-config-route-v3-routeconfiguration-most-specific-header-mutations-wins) for more details. - MostSpecificHeaderMutationsWins *wrappers.BoolValue `protobuf:"bytes,2,opt,name=most_specific_header_mutations_wins,json=mostSpecificHeaderMutationsWins,proto3" json:"most_specific_header_mutations_wins,omitempty"` + MostSpecificHeaderMutationsWins *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=most_specific_header_mutations_wins,json=mostSpecificHeaderMutationsWins,proto3" json:"most_specific_header_mutations_wins,omitempty"` } func (x *RouteConfigurationOptions) Reset() { *x = RouteConfigurationOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteConfigurationOptions) String() string { @@ -55,7 +53,7 @@ func (*RouteConfigurationOptions) ProtoMessage() {} func (x *RouteConfigurationOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -70,14 +68,14 @@ func (*RouteConfigurationOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto_rawDescGZIP(), []int{0} } -func (x *RouteConfigurationOptions) GetMaxDirectResponseBodySizeBytes() *wrappers.UInt32Value { +func (x *RouteConfigurationOptions) GetMaxDirectResponseBodySizeBytes() *wrapperspb.UInt32Value { if x != nil { return x.MaxDirectResponseBodySizeBytes } return nil } -func (x *RouteConfigurationOptions) GetMostSpecificHeaderMutationsWins() *wrappers.BoolValue { +func (x *RouteConfigurationOptions) GetMostSpecificHeaderMutationsWins() *wrapperspb.BoolValue { if x != nil { return x.MostSpecificHeaderMutationsWins } @@ -132,10 +130,10 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_opti } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto_goTypes = []any{ (*RouteConfigurationOptions)(nil), // 0: gloo.solo.io.RouteConfigurationOptions - (*wrappers.UInt32Value)(nil), // 1: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 2: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 1: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 2: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto_depIdxs = []int32{ 1, // 0: gloo.solo.io.RouteConfigurationOptions.max_direct_response_body_size_bytes:type_name -> google.protobuf.UInt32Value @@ -154,20 +152,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_opti if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_configuration_options_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteConfigurationOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/route_options.pb.clone.go b/pkg/api/gloo.solo.io/v1/route_options.pb.clone.go index caab0f1c1..627584a6a 100644 --- a/pkg/api/gloo.solo.io/v1/route_options.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/route_options.pb.clone.go @@ -13,12 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_enterprise_gloo_solo_io_v1 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_extensions_filters_http_buffer_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3" @@ -58,6 +52,12 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_tracing "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/tracing" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_transformation "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/transformation" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -92,15 +92,15 @@ func (m *RouteOptions) Clone() proto.Message { } if h, ok := interface{}(m.GetPrefixRewrite()).(clone.Cloner); ok { - target.PrefixRewrite = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.PrefixRewrite = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.PrefixRewrite = proto.Clone(m.GetPrefixRewrite()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.PrefixRewrite = proto.Clone(m.GetPrefixRewrite()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRetries()).(clone.Cloner); ok { @@ -134,9 +134,9 @@ func (m *RouteOptions) Clone() proto.Message { } if h, ok := interface{}(m.GetAppendXForwardedHost()).(clone.Cloner); ok { - target.AppendXForwardedHost = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AppendXForwardedHost = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AppendXForwardedHost = proto.Clone(m.GetAppendXForwardedHost()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AppendXForwardedHost = proto.Clone(m.GetAppendXForwardedHost()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetCors()).(clone.Cloner); ok { @@ -213,13 +213,13 @@ func (m *RouteOptions) Clone() proto.Message { } if m.GetEnvoyMetadata() != nil { - target.EnvoyMetadata = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetEnvoyMetadata())) + target.EnvoyMetadata = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetEnvoyMetadata())) for k, v := range m.GetEnvoyMetadata() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.EnvoyMetadata[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.EnvoyMetadata[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.EnvoyMetadata[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.EnvoyMetadata[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } @@ -238,9 +238,9 @@ func (m *RouteOptions) Clone() proto.Message { } if h, ok := interface{}(m.GetIdleTimeout()).(clone.Cloner); ok { - target.IdleTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.IdleTimeout = proto.Clone(m.GetIdleTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetExtProc()).(clone.Cloner); ok { @@ -267,11 +267,11 @@ func (m *RouteOptions) Clone() proto.Message { if h, ok := interface{}(m.GetAutoHostRewrite()).(clone.Cloner); ok { target.HostRewriteType = &RouteOptions_AutoHostRewrite{ - AutoHostRewrite: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + AutoHostRewrite: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } else { target.HostRewriteType = &RouteOptions_AutoHostRewrite{ - AutoHostRewrite: proto.Clone(m.GetAutoHostRewrite()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue), + AutoHostRewrite: proto.Clone(m.GetAutoHostRewrite()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue), } } @@ -291,11 +291,11 @@ func (m *RouteOptions) Clone() proto.Message { if h, ok := interface{}(m.GetHostRewriteHeader()).(clone.Cloner); ok { target.HostRewriteType = &RouteOptions_HostRewriteHeader{ - HostRewriteHeader: h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue), + HostRewriteHeader: h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue), } } else { target.HostRewriteType = &RouteOptions_HostRewriteHeader{ - HostRewriteHeader: proto.Clone(m.GetHostRewriteHeader()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue), + HostRewriteHeader: proto.Clone(m.GetHostRewriteHeader()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue), } } @@ -437,21 +437,21 @@ func (m *RouteOptions_MaxStreamDuration) Clone() proto.Message { target = &RouteOptions_MaxStreamDuration{} if h, ok := interface{}(m.GetMaxStreamDuration()).(clone.Cloner); ok { - target.MaxStreamDuration = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxStreamDuration = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.MaxStreamDuration = proto.Clone(m.GetMaxStreamDuration()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.MaxStreamDuration = proto.Clone(m.GetMaxStreamDuration()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetGrpcTimeoutHeaderMax()).(clone.Cloner); ok { - target.GrpcTimeoutHeaderMax = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.GrpcTimeoutHeaderMax = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.GrpcTimeoutHeaderMax = proto.Clone(m.GetGrpcTimeoutHeaderMax()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.GrpcTimeoutHeaderMax = proto.Clone(m.GetGrpcTimeoutHeaderMax()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetGrpcTimeoutHeaderOffset()).(clone.Cloner); ok { - target.GrpcTimeoutHeaderOffset = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.GrpcTimeoutHeaderOffset = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.GrpcTimeoutHeaderOffset = proto.Clone(m.GetGrpcTimeoutHeaderOffset()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.GrpcTimeoutHeaderOffset = proto.Clone(m.GetGrpcTimeoutHeaderOffset()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target diff --git a/pkg/api/gloo.solo.io/v1/route_options.pb.go b/pkg/api/gloo.solo.io/v1/route_options.pb.go index 26023be61..1ceb058b2 100644 --- a/pkg/api/gloo.solo.io/v1/route_options.pb.go +++ b/pkg/api/gloo.solo.io/v1/route_options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/route_options.proto @@ -10,9 +10,6 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3" @@ -36,6 +33,9 @@ import ( transformation "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/transformation" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -61,11 +61,11 @@ type RouteOptions struct { Transformations *transformation.Transformations `protobuf:"bytes,1,opt,name=transformations,proto3" json:"transformations,omitempty"` Faults *faultinjection.RouteFaults `protobuf:"bytes,2,opt,name=faults,proto3" json:"faults,omitempty"` // For requests matched on this route, rewrite the HTTP request path to the provided value before forwarding upstream - PrefixRewrite *wrappers.StringValue `protobuf:"bytes,3,opt,name=prefix_rewrite,json=prefixRewrite,proto3" json:"prefix_rewrite,omitempty"` + PrefixRewrite *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=prefix_rewrite,json=prefixRewrite,proto3" json:"prefix_rewrite,omitempty"` // Specifies the upstream timeout for the route. If not specified, the default is 15s. This spans between the point // at which the entire downstream request (i.e. end-of-stream) has been processed and when the upstream response has // been completely processed. A value of 0 will disable the route’s timeout. - Timeout *duration.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,4,opt,name=timeout,proto3" json:"timeout,omitempty"` Retries *retries.RetryPolicy `protobuf:"bytes,5,opt,name=retries,proto3" json:"retries,omitempty"` // Extensions will be passed along from Listeners, Gateways, VirtualServices, Routes, and Route tables to the // underlying Proxy, making them useful for controllers, validation tools, etc. which interact with kubernetes yaml. @@ -94,7 +94,7 @@ type RouteOptions struct { // *RouteOptions_HostRewriteHeader HostRewriteType isRouteOptions_HostRewriteType `protobuf_oneof:"host_rewrite_type"` // If true and there is a host rewrite, appends the x-forwarded-host header to requests. - AppendXForwardedHost *wrappers.BoolValue `protobuf:"bytes,146,opt,name=append_x_forwarded_host,json=appendXForwardedHost,proto3" json:"append_x_forwarded_host,omitempty"` + AppendXForwardedHost *wrapperspb.BoolValue `protobuf:"bytes,146,opt,name=append_x_forwarded_host,json=appendXForwardedHost,proto3" json:"append_x_forwarded_host,omitempty"` // Defines a CORS policy for the route. // If a CORS policy is defined on both the route and the virtual host, the merge behavior for these policies is // determined by the CorsPolicyMergeSettings defined on the VirtualHost. @@ -158,7 +158,7 @@ type RouteOptions struct { // The value of this field will be propagated to the `metadata` attribute of the corresponding Envoy route. // Please refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/route/v3/route_components.proto#config-route-v3-route) // for more details about the `metadata` attribute. - EnvoyMetadata map[string]*_struct.Struct `protobuf:"bytes,26,rep,name=envoy_metadata,json=envoyMetadata,proto3" json:"envoy_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + EnvoyMetadata map[string]*structpb.Struct `protobuf:"bytes,26,rep,name=envoy_metadata,json=envoyMetadata,proto3" json:"envoy_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // For requests matched on this route, rewrite the HTTP request path according to the provided regex pattern before forwarding upstream // Please refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/v1.14.1/api-v3/config/route/v3/route_components.proto#envoy-v3-api-field-config-route-v3-routeaction-regex-rewrite) // for more details about the `regex_rewrite` attribute @@ -170,7 +170,7 @@ type RouteOptions struct { // although the Gateway's [httpConnectionManagerSettings](https://docs.solo.io/gloo-edge/latest/reference/api/github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/hcm/hcm.proto.sk/#httpconnectionmanagersettings) // wide stream_idle_timeout will still apply. A value of 0 will completely disable the route’s idle timeout, even if a connection manager stream idle timeout is configured. // Please refer to the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/route/v3/route_components.proto#envoy-v3-api-field-config-route-v3-routeaction-idle-timeout) - IdleTimeout *duration.Duration `protobuf:"bytes,29,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` + IdleTimeout *durationpb.Duration `protobuf:"bytes,29,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // Enterprise-only: External Processing filter settings for the route. This can be used to // override certain HttpListenerOptions or VirtualHostOptions settings. ExtProc *extproc.RouteSettings `protobuf:"bytes,30,opt,name=ext_proc,json=extProc,proto3" json:"ext_proc,omitempty"` @@ -181,11 +181,9 @@ type RouteOptions struct { func (x *RouteOptions) Reset() { *x = RouteOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteOptions) String() string { @@ -196,7 +194,7 @@ func (*RouteOptions) ProtoMessage() {} func (x *RouteOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -226,14 +224,14 @@ func (x *RouteOptions) GetFaults() *faultinjection.RouteFaults { return nil } -func (x *RouteOptions) GetPrefixRewrite() *wrappers.StringValue { +func (x *RouteOptions) GetPrefixRewrite() *wrapperspb.StringValue { if x != nil { return x.PrefixRewrite } return nil } -func (x *RouteOptions) GetTimeout() *duration.Duration { +func (x *RouteOptions) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -289,7 +287,7 @@ func (x *RouteOptions) GetHostRewrite() string { return "" } -func (x *RouteOptions) GetAutoHostRewrite() *wrappers.BoolValue { +func (x *RouteOptions) GetAutoHostRewrite() *wrapperspb.BoolValue { if x, ok := x.GetHostRewriteType().(*RouteOptions_AutoHostRewrite); ok { return x.AutoHostRewrite } @@ -303,14 +301,14 @@ func (x *RouteOptions) GetHostRewritePathRegex() *v32.RegexMatchAndSubstitute { return nil } -func (x *RouteOptions) GetHostRewriteHeader() *wrappers.StringValue { +func (x *RouteOptions) GetHostRewriteHeader() *wrapperspb.StringValue { if x, ok := x.GetHostRewriteType().(*RouteOptions_HostRewriteHeader); ok { return x.HostRewriteHeader } return nil } -func (x *RouteOptions) GetAppendXForwardedHost() *wrappers.BoolValue { +func (x *RouteOptions) GetAppendXForwardedHost() *wrapperspb.BoolValue { if x != nil { return x.AppendXForwardedHost } @@ -486,7 +484,7 @@ func (x *RouteOptions) GetStagedTransformations() *transformation.Transformation return nil } -func (x *RouteOptions) GetEnvoyMetadata() map[string]*_struct.Struct { +func (x *RouteOptions) GetEnvoyMetadata() map[string]*structpb.Struct { if x != nil { return x.EnvoyMetadata } @@ -507,7 +505,7 @@ func (x *RouteOptions) GetMaxStreamDuration() *RouteOptions_MaxStreamDuration { return nil } -func (x *RouteOptions) GetIdleTimeout() *duration.Duration { +func (x *RouteOptions) GetIdleTimeout() *durationpb.Duration { if x != nil { return x.IdleTimeout } @@ -542,7 +540,7 @@ type RouteOptions_AutoHostRewrite struct { // Indicates that the host header will be swapped with the hostname of the upstream host. // This setting is only honored for upstreams that use DNS resolution (i.e., their generated Envoy cluster is // of type STRICT_DNS or LOGICAL_DNS -- think aws, azure, or static upstreams with hostnames) - AutoHostRewrite *wrappers.BoolValue `protobuf:"bytes,19,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` + AutoHostRewrite *wrapperspb.BoolValue `protobuf:"bytes,19,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"` } type RouteOptions_HostRewritePathRegex struct { @@ -555,7 +553,7 @@ type RouteOptions_HostRewriteHeader struct { // Indicates that during forwarding, the host header will be swapped with the content of given downstream or custom header. // If header value is empty, host header is left intact. // Using this option will append the x-forwarded-host header if append_x_forwarded_host is set. - HostRewriteHeader *wrappers.StringValue `protobuf:"bytes,147,opt,name=host_rewrite_header,json=hostRewriteHeader,proto3,oneof"` + HostRewriteHeader *wrapperspb.StringValue `protobuf:"bytes,147,opt,name=host_rewrite_header,json=hostRewriteHeader,proto3,oneof"` } func (*RouteOptions_HostRewrite) isRouteOptions_HostRewriteType() {} @@ -690,27 +688,25 @@ type RouteOptions_MaxStreamDuration struct { // from the [max_stream_duration](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/core/v3/protocol.proto#envoy-v3-api-field-config-core-v3-httpprotocoloptions-max-stream-duration) // field in [HttpConnectionManager.common_http_protocol_options](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto#envoy-v3-api-field-extensions-filters-network-http-connection-manager-v3-httpconnectionmanager-common-http-protocol-options) // is used. If this field is set explicitly to zero, any HttpConnectionManager max_stream_duration timeout will be disabled for this route. - MaxStreamDuration *duration.Duration `protobuf:"bytes,1,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` + MaxStreamDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"` // If present, and the request contains a [grpc-timeout header](https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md), use that value as the // `max_stream_duration`, but limit the applied timeout to the maximum value specified here. // If set to 0, the `grpc-timeout` header is used without modification. - GrpcTimeoutHeaderMax *duration.Duration `protobuf:"bytes,2,opt,name=grpc_timeout_header_max,json=grpcTimeoutHeaderMax,proto3" json:"grpc_timeout_header_max,omitempty"` + GrpcTimeoutHeaderMax *durationpb.Duration `protobuf:"bytes,2,opt,name=grpc_timeout_header_max,json=grpcTimeoutHeaderMax,proto3" json:"grpc_timeout_header_max,omitempty"` // If present, Envoy will adjust the timeout provided by the `grpc-timeout` header by // subtracting the provided duration from the header. This is useful for allowing Envoy to set // its global timeout to be less than that of the deadline imposed by the calling client, which // makes it more likely that Envoy will handle the timeout instead of having the call canceled // by the client. If, after applying the offset, the resulting timeout is zero or negative, // the stream will timeout immediately. - GrpcTimeoutHeaderOffset *duration.Duration `protobuf:"bytes,3,opt,name=grpc_timeout_header_offset,json=grpcTimeoutHeaderOffset,proto3" json:"grpc_timeout_header_offset,omitempty"` + GrpcTimeoutHeaderOffset *durationpb.Duration `protobuf:"bytes,3,opt,name=grpc_timeout_header_offset,json=grpcTimeoutHeaderOffset,proto3" json:"grpc_timeout_header_offset,omitempty"` } func (x *RouteOptions_MaxStreamDuration) Reset() { *x = RouteOptions_MaxStreamDuration{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RouteOptions_MaxStreamDuration) String() string { @@ -721,7 +717,7 @@ func (*RouteOptions_MaxStreamDuration) ProtoMessage() {} func (x *RouteOptions_MaxStreamDuration) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -736,21 +732,21 @@ func (*RouteOptions_MaxStreamDuration) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_rawDescGZIP(), []int{0, 1} } -func (x *RouteOptions_MaxStreamDuration) GetMaxStreamDuration() *duration.Duration { +func (x *RouteOptions_MaxStreamDuration) GetMaxStreamDuration() *durationpb.Duration { if x != nil { return x.MaxStreamDuration } return nil } -func (x *RouteOptions_MaxStreamDuration) GetGrpcTimeoutHeaderMax() *duration.Duration { +func (x *RouteOptions_MaxStreamDuration) GetGrpcTimeoutHeaderMax() *durationpb.Duration { if x != nil { return x.GrpcTimeoutHeaderMax } return nil } -func (x *RouteOptions_MaxStreamDuration) GetGrpcTimeoutHeaderOffset() *duration.Duration { +func (x *RouteOptions_MaxStreamDuration) GetGrpcTimeoutHeaderOffset() *durationpb.Duration { if x != nil { return x.GrpcTimeoutHeaderOffset } @@ -1137,20 +1133,20 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_rawD } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_goTypes = []any{ (*RouteOptions)(nil), // 0: gloo.solo.io.RouteOptions nil, // 1: gloo.solo.io.RouteOptions.EnvoyMetadataEntry (*RouteOptions_MaxStreamDuration)(nil), // 2: gloo.solo.io.RouteOptions.MaxStreamDuration (*transformation.Transformations)(nil), // 3: transformation.options.gloo.solo.io.Transformations (*faultinjection.RouteFaults)(nil), // 4: fault.options.gloo.solo.io.RouteFaults - (*wrappers.StringValue)(nil), // 5: google.protobuf.StringValue - (*duration.Duration)(nil), // 6: google.protobuf.Duration + (*wrapperspb.StringValue)(nil), // 5: google.protobuf.StringValue + (*durationpb.Duration)(nil), // 6: google.protobuf.Duration (*retries.RetryPolicy)(nil), // 7: retries.options.gloo.solo.io.RetryPolicy (*Extensions)(nil), // 8: gloo.solo.io.Extensions (*tracing.RouteTracingSettings)(nil), // 9: tracing.options.gloo.solo.io.RouteTracingSettings (*shadowing.RouteShadowing)(nil), // 10: shadowing.options.gloo.solo.io.RouteShadowing (*headers.HeaderManipulation)(nil), // 11: headers.options.gloo.solo.io.HeaderManipulation - (*wrappers.BoolValue)(nil), // 12: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 12: google.protobuf.BoolValue (*v32.RegexMatchAndSubstitute)(nil), // 13: solo.io.envoy.type.matcher.v3.RegexMatchAndSubstitute (*cors.CorsPolicy)(nil), // 14: cors.options.gloo.solo.io.CorsPolicy (*lbhash.RouteActionHashConfig)(nil), // 15: lbhash.options.gloo.solo.io.RouteActionHashConfig @@ -1170,7 +1166,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_goTyp (*transformation.TransformationStages)(nil), // 29: transformation.options.gloo.solo.io.TransformationStages (*extproc.RouteSettings)(nil), // 30: extproc.options.gloo.solo.io.RouteSettings (*ai.RouteSettings)(nil), // 31: ai.options.gloo.solo.io.RouteSettings - (*_struct.Struct)(nil), // 32: google.protobuf.Struct + (*structpb.Struct)(nil), // 32: google.protobuf.Struct } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_depIdxs = []int32{ 3, // 0: gloo.solo.io.RouteOptions.transformations:type_name -> transformation.options.gloo.solo.io.Transformations @@ -1229,33 +1225,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_init return } file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RouteOptions_MaxStreamDuration); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_route_options_proto_msgTypes[0].OneofWrappers = []any{ (*RouteOptions_HostRewrite)(nil), (*RouteOptions_AutoHostRewrite)(nil), (*RouteOptions_HostRewritePathRegex)(nil), diff --git a/pkg/api/gloo.solo.io/v1/secret.pb.go b/pkg/api/gloo.solo.io/v1/secret.pb.go index dfac8b275..a687ed71e 100644 --- a/pkg/api/gloo.solo.io/v1/secret.pb.go +++ b/pkg/api/gloo.solo.io/v1/secret.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/secret.proto @@ -57,11 +57,9 @@ type Secret struct { func (x *Secret) Reset() { *x = Secret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Secret) String() string { @@ -72,7 +70,7 @@ func (*Secret) ProtoMessage() {} func (x *Secret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -309,11 +307,9 @@ type AwsSecret struct { func (x *AwsSecret) Reset() { *x = AwsSecret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AwsSecret) String() string { @@ -324,7 +320,7 @@ func (*AwsSecret) ProtoMessage() {} func (x *AwsSecret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -371,11 +367,9 @@ type AzureSecret struct { func (x *AzureSecret) Reset() { *x = AzureSecret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AzureSecret) String() string { @@ -386,7 +380,7 @@ func (*AzureSecret) ProtoMessage() {} func (x *AzureSecret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -426,11 +420,9 @@ type TlsSecret struct { func (x *TlsSecret) Reset() { *x = TlsSecret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TlsSecret) String() string { @@ -441,7 +433,7 @@ func (*TlsSecret) ProtoMessage() {} func (x *TlsSecret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -496,11 +488,9 @@ type HeaderSecret struct { func (x *HeaderSecret) Reset() { *x = HeaderSecret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderSecret) String() string { @@ -511,7 +501,7 @@ func (*HeaderSecret) ProtoMessage() {} func (x *HeaderSecret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -546,11 +536,9 @@ type AccountCredentialsSecret struct { func (x *AccountCredentialsSecret) Reset() { *x = AccountCredentialsSecret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *AccountCredentialsSecret) String() string { @@ -561,7 +549,7 @@ func (*AccountCredentialsSecret) ProtoMessage() {} func (x *AccountCredentialsSecret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -603,11 +591,9 @@ type EncryptionKeySecret struct { func (x *EncryptionKeySecret) Reset() { *x = EncryptionKeySecret{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EncryptionKeySecret) String() string { @@ -618,7 +604,7 @@ func (*EncryptionKeySecret) ProtoMessage() {} func (x *EncryptionKeySecret) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -764,7 +750,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_rawDescGZIP } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes = make([]protoimpl.MessageInfo, 9) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_goTypes = []any{ (*Secret)(nil), // 0: gloo.solo.io.Secret (*AwsSecret)(nil), // 1: gloo.solo.io.AwsSecret (*AzureSecret)(nil), // 2: gloo.solo.io.AzureSecret @@ -805,93 +791,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_init() { return } file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Secret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AwsSecret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AzureSecret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TlsSecret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderSecret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AccountCredentialsSecret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EncryptionKeySecret); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_secret_proto_msgTypes[0].OneofWrappers = []any{ (*Secret_Aws)(nil), (*Secret_Azure)(nil), (*Secret_Tls)(nil), diff --git a/pkg/api/gloo.solo.io/v1/settings.pb.clone.go b/pkg/api/gloo.solo.io/v1/settings.pb.clone.go index feb24a7a6..571d858c7 100644 --- a/pkg/api/gloo.solo.io/v1/settings.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/settings.pb.clone.go @@ -13,12 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_enterprise_gloo_solo_io_v1 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_extensions_aws "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/aws" @@ -36,6 +30,12 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -75,9 +75,9 @@ func (m *SettingsSpec) Clone() proto.Message { } if h, ok := interface{}(m.GetRefreshRate()).(clone.Cloner); ok { - target.RefreshRate = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RefreshRate = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.RefreshRate = proto.Clone(m.GetRefreshRate()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.RefreshRate = proto.Clone(m.GetRefreshRate()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.DevMode = m.GetDevMode() @@ -443,9 +443,9 @@ func (m *GlooOptions) Clone() proto.Message { } if h, ok := interface{}(m.GetEndpointsWarmingTimeout()).(clone.Cloner); ok { - target.EndpointsWarmingTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.EndpointsWarmingTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.EndpointsWarmingTimeout = proto.Clone(m.GetEndpointsWarmingTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.EndpointsWarmingTimeout = proto.Clone(m.GetEndpointsWarmingTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetAwsOptions()).(clone.Cloner); ok { @@ -463,55 +463,55 @@ func (m *GlooOptions) Clone() proto.Message { target.DisableKubernetesDestinations = m.GetDisableKubernetesDestinations() if h, ok := interface{}(m.GetDisableGrpcWeb()).(clone.Cloner); ok { - target.DisableGrpcWeb = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableGrpcWeb = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableGrpcWeb = proto.Clone(m.GetDisableGrpcWeb()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableGrpcWeb = proto.Clone(m.GetDisableGrpcWeb()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetDisableProxyGarbageCollection()).(clone.Cloner); ok { - target.DisableProxyGarbageCollection = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableProxyGarbageCollection = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableProxyGarbageCollection = proto.Clone(m.GetDisableProxyGarbageCollection()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableProxyGarbageCollection = proto.Clone(m.GetDisableProxyGarbageCollection()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetRegexMaxProgramSize()).(clone.Cloner); ok { - target.RegexMaxProgramSize = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.RegexMaxProgramSize = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.RegexMaxProgramSize = proto.Clone(m.GetRegexMaxProgramSize()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.RegexMaxProgramSize = proto.Clone(m.GetRegexMaxProgramSize()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.RestXdsBindAddr = m.GetRestXdsBindAddr() if h, ok := interface{}(m.GetEnableRestEds()).(clone.Cloner); ok { - target.EnableRestEds = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableRestEds = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EnableRestEds = proto.Clone(m.GetEnableRestEds()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableRestEds = proto.Clone(m.GetEnableRestEds()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetFailoverUpstreamDnsPollingInterval()).(clone.Cloner); ok { - target.FailoverUpstreamDnsPollingInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.FailoverUpstreamDnsPollingInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.FailoverUpstreamDnsPollingInterval = proto.Clone(m.GetFailoverUpstreamDnsPollingInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.FailoverUpstreamDnsPollingInterval = proto.Clone(m.GetFailoverUpstreamDnsPollingInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetRemoveUnusedFilters()).(clone.Cloner); ok { - target.RemoveUnusedFilters = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.RemoveUnusedFilters = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.RemoveUnusedFilters = proto.Clone(m.GetRemoveUnusedFilters()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.RemoveUnusedFilters = proto.Clone(m.GetRemoveUnusedFilters()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } target.ProxyDebugBindAddr = m.GetProxyDebugBindAddr() if h, ok := interface{}(m.GetLogTransformationRequestResponseInfo()).(clone.Cloner); ok { - target.LogTransformationRequestResponseInfo = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LogTransformationRequestResponseInfo = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.LogTransformationRequestResponseInfo = proto.Clone(m.GetLogTransformationRequestResponseInfo()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.LogTransformationRequestResponseInfo = proto.Clone(m.GetLogTransformationRequestResponseInfo()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetTransformationEscapeCharacters()).(clone.Cloner); ok { - target.TransformationEscapeCharacters = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TransformationEscapeCharacters = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.TransformationEscapeCharacters = proto.Clone(m.GetTransformationEscapeCharacters()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TransformationEscapeCharacters = proto.Clone(m.GetTransformationEscapeCharacters()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetIstioOptions()).(clone.Cloner); ok { @@ -532,9 +532,9 @@ func (m *VirtualServiceOptions) Clone() proto.Message { target = &VirtualServiceOptions{} if h, ok := interface{}(m.GetOneWayTls()).(clone.Cloner); ok { - target.OneWayTls = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OneWayTls = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.OneWayTls = proto.Clone(m.GetOneWayTls()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OneWayTls = proto.Clone(m.GetOneWayTls()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -569,27 +569,27 @@ func (m *GatewayOptions) Clone() proto.Message { } if h, ok := interface{}(m.GetPersistProxySpec()).(clone.Cloner); ok { - target.PersistProxySpec = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.PersistProxySpec = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.PersistProxySpec = proto.Clone(m.GetPersistProxySpec()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.PersistProxySpec = proto.Clone(m.GetPersistProxySpec()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetEnableGatewayController()).(clone.Cloner); ok { - target.EnableGatewayController = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableGatewayController = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EnableGatewayController = proto.Clone(m.GetEnableGatewayController()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableGatewayController = proto.Clone(m.GetEnableGatewayController()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetIsolateVirtualHostsBySslConfig()).(clone.Cloner); ok { - target.IsolateVirtualHostsBySslConfig = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IsolateVirtualHostsBySslConfig = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.IsolateVirtualHostsBySslConfig = proto.Clone(m.GetIsolateVirtualHostsBySslConfig()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IsolateVirtualHostsBySslConfig = proto.Clone(m.GetIsolateVirtualHostsBySslConfig()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetTranslateEmptyGateways()).(clone.Cloner); ok { - target.TranslateEmptyGateways = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TranslateEmptyGateways = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.TranslateEmptyGateways = proto.Clone(m.GetTranslateEmptyGateways()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.TranslateEmptyGateways = proto.Clone(m.GetTranslateEmptyGateways()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -604,15 +604,15 @@ func (m *ConsoleOptions) Clone() proto.Message { target = &ConsoleOptions{} if h, ok := interface{}(m.GetReadOnly()).(clone.Cloner); ok { - target.ReadOnly = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ReadOnly = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.ReadOnly = proto.Clone(m.GetReadOnly()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ReadOnly = proto.Clone(m.GetReadOnly()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetApiExplorerEnabled()).(clone.Cloner); ok { - target.ApiExplorerEnabled = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ApiExplorerEnabled = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.ApiExplorerEnabled = proto.Clone(m.GetApiExplorerEnabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ApiExplorerEnabled = proto.Clone(m.GetApiExplorerEnabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -663,9 +663,9 @@ func (m *SettingsStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -764,9 +764,9 @@ func (m *SettingsSpec_VaultSecrets) Clone() proto.Message { target.TlsServerName = m.GetTlsServerName() if h, ok := interface{}(m.GetInsecure()).(clone.Cloner); ok { - target.Insecure = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Insecure = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Insecure = proto.Clone(m.GetInsecure()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Insecure = proto.Clone(m.GetInsecure()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } target.RootKey = m.GetRootKey() @@ -850,9 +850,9 @@ func (m *SettingsSpec_VaultTlsConfig) Clone() proto.Message { target.TlsServerName = m.GetTlsServerName() if h, ok := interface{}(m.GetInsecure()).(clone.Cloner); ok { - target.Insecure = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Insecure = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Insecure = proto.Clone(m.GetInsecure()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Insecure = proto.Clone(m.GetInsecure()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -964,15 +964,15 @@ func (m *SettingsSpec_ConsulConfiguration) Clone() proto.Message { target.KeyFile = m.GetKeyFile() if h, ok := interface{}(m.GetInsecureSkipVerify()).(clone.Cloner); ok { - target.InsecureSkipVerify = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.InsecureSkipVerify = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.InsecureSkipVerify = proto.Clone(m.GetInsecureSkipVerify()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.InsecureSkipVerify = proto.Clone(m.GetInsecureSkipVerify()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetWaitTime()).(clone.Cloner); ok { - target.WaitTime = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.WaitTime = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.WaitTime = proto.Clone(m.GetWaitTime()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.WaitTime = proto.Clone(m.GetWaitTime()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetServiceDiscovery()).(clone.Cloner); ok { @@ -986,9 +986,9 @@ func (m *SettingsSpec_ConsulConfiguration) Clone() proto.Message { target.DnsAddress = m.GetDnsAddress() if h, ok := interface{}(m.GetDnsPollingInterval()).(clone.Cloner); ok { - target.DnsPollingInterval = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DnsPollingInterval = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.DnsPollingInterval = proto.Clone(m.GetDnsPollingInterval()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DnsPollingInterval = proto.Clone(m.GetDnsPollingInterval()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -1032,9 +1032,9 @@ func (m *SettingsSpec_ConsulUpstreamDiscoveryConfiguration) Clone() proto.Messag } if h, ok := interface{}(m.GetEdsBlockingQueries()).(clone.Cloner); ok { - target.EdsBlockingQueries = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EdsBlockingQueries = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EdsBlockingQueries = proto.Clone(m.GetEdsBlockingQueries()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EdsBlockingQueries = proto.Clone(m.GetEdsBlockingQueries()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1147,9 +1147,9 @@ func (m *SettingsSpec_DiscoveryOptions_UdsOptions) Clone() proto.Message { target = &SettingsSpec_DiscoveryOptions_UdsOptions{} if h, ok := interface{}(m.GetEnabled()).(clone.Cloner); ok { - target.Enabled = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Enabled = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Enabled = proto.Clone(m.GetEnabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Enabled = proto.Clone(m.GetEnabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetWatchLabels() != nil { @@ -1173,9 +1173,9 @@ func (m *SettingsSpec_DiscoveryOptions_FdsOptions) Clone() proto.Message { target = &SettingsSpec_DiscoveryOptions_FdsOptions{} if h, ok := interface{}(m.GetGraphqlEnabled()).(clone.Cloner); ok { - target.GraphqlEnabled = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.GraphqlEnabled = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.GraphqlEnabled = proto.Clone(m.GetGraphqlEnabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.GraphqlEnabled = proto.Clone(m.GetGraphqlEnabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1225,9 +1225,9 @@ func (m *SettingsSpec_ObservabilityOptions_GrafanaIntegration) Clone() proto.Mes target = &SettingsSpec_ObservabilityOptions_GrafanaIntegration{} if h, ok := interface{}(m.GetDefaultDashboardFolderId()).(clone.Cloner); ok { - target.DefaultDashboardFolderId = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.DefaultDashboardFolderId = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.DefaultDashboardFolderId = proto.Clone(m.GetDefaultDashboardFolderId()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.DefaultDashboardFolderId = proto.Clone(m.GetDefaultDashboardFolderId()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } target.DashboardPrefix = m.GetDashboardPrefix() @@ -1266,21 +1266,21 @@ func (m *GlooOptions_AWSOptions) Clone() proto.Message { target = &GlooOptions_AWSOptions{} if h, ok := interface{}(m.GetPropagateOriginalRouting()).(clone.Cloner); ok { - target.PropagateOriginalRouting = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.PropagateOriginalRouting = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.PropagateOriginalRouting = proto.Clone(m.GetPropagateOriginalRouting()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.PropagateOriginalRouting = proto.Clone(m.GetPropagateOriginalRouting()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetCredentialRefreshDelay()).(clone.Cloner); ok { - target.CredentialRefreshDelay = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CredentialRefreshDelay = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.CredentialRefreshDelay = proto.Clone(m.GetCredentialRefreshDelay()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.CredentialRefreshDelay = proto.Clone(m.GetCredentialRefreshDelay()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetFallbackToFirstFunction()).(clone.Cloner); ok { - target.FallbackToFirstFunction = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.FallbackToFirstFunction = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.FallbackToFirstFunction = proto.Clone(m.GetFallbackToFirstFunction()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.FallbackToFirstFunction = proto.Clone(m.GetFallbackToFirstFunction()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } switch m.CredentialsFetcher.(type) { @@ -1334,21 +1334,21 @@ func (m *GlooOptions_IstioOptions) Clone() proto.Message { target = &GlooOptions_IstioOptions{} if h, ok := interface{}(m.GetAppendXForwardedHost()).(clone.Cloner); ok { - target.AppendXForwardedHost = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AppendXForwardedHost = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AppendXForwardedHost = proto.Clone(m.GetAppendXForwardedHost()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AppendXForwardedHost = proto.Clone(m.GetAppendXForwardedHost()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetEnableAutoMtls()).(clone.Cloner); ok { - target.EnableAutoMtls = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableAutoMtls = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EnableAutoMtls = proto.Clone(m.GetEnableAutoMtls()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableAutoMtls = proto.Clone(m.GetEnableAutoMtls()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetEnableIntegration()).(clone.Cloner); ok { - target.EnableIntegration = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableIntegration = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.EnableIntegration = proto.Clone(m.GetEnableIntegration()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.EnableIntegration = proto.Clone(m.GetEnableIntegration()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1371,51 +1371,51 @@ func (m *GatewayOptions_ValidationOptions) Clone() proto.Message { target.IgnoreGlooValidationFailure = m.GetIgnoreGlooValidationFailure() if h, ok := interface{}(m.GetAlwaysAccept()).(clone.Cloner); ok { - target.AlwaysAccept = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AlwaysAccept = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AlwaysAccept = proto.Clone(m.GetAlwaysAccept()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AlwaysAccept = proto.Clone(m.GetAlwaysAccept()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetAllowWarnings()).(clone.Cloner); ok { - target.AllowWarnings = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowWarnings = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowWarnings = proto.Clone(m.GetAllowWarnings()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowWarnings = proto.Clone(m.GetAllowWarnings()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetWarnRouteShortCircuiting()).(clone.Cloner); ok { - target.WarnRouteShortCircuiting = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.WarnRouteShortCircuiting = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.WarnRouteShortCircuiting = proto.Clone(m.GetWarnRouteShortCircuiting()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.WarnRouteShortCircuiting = proto.Clone(m.GetWarnRouteShortCircuiting()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetDisableTransformationValidation()).(clone.Cloner); ok { - target.DisableTransformationValidation = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableTransformationValidation = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableTransformationValidation = proto.Clone(m.GetDisableTransformationValidation()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableTransformationValidation = proto.Clone(m.GetDisableTransformationValidation()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetValidationServerGrpcMaxSizeBytes()).(clone.Cloner); ok { - target.ValidationServerGrpcMaxSizeBytes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.Int32Value) + target.ValidationServerGrpcMaxSizeBytes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.Int32Value) } else { - target.ValidationServerGrpcMaxSizeBytes = proto.Clone(m.GetValidationServerGrpcMaxSizeBytes()).(*github_com_golang_protobuf_ptypes_wrappers.Int32Value) + target.ValidationServerGrpcMaxSizeBytes = proto.Clone(m.GetValidationServerGrpcMaxSizeBytes()).(*google_golang_org_protobuf_types_known_wrapperspb.Int32Value) } if h, ok := interface{}(m.GetServerEnabled()).(clone.Cloner); ok { - target.ServerEnabled = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ServerEnabled = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.ServerEnabled = proto.Clone(m.GetServerEnabled()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.ServerEnabled = proto.Clone(m.GetServerEnabled()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetWarnMissingTlsSecret()).(clone.Cloner); ok { - target.WarnMissingTlsSecret = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.WarnMissingTlsSecret = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.WarnMissingTlsSecret = proto.Clone(m.GetWarnMissingTlsSecret()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.WarnMissingTlsSecret = proto.Clone(m.GetWarnMissingTlsSecret()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetFullEnvoyValidation()).(clone.Cloner); ok { - target.FullEnvoyValidation = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.FullEnvoyValidation = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.FullEnvoyValidation = proto.Clone(m.GetFullEnvoyValidation()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.FullEnvoyValidation = proto.Clone(m.GetFullEnvoyValidation()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } return target @@ -1430,9 +1430,9 @@ func (m *GraphqlOptions_SchemaChangeValidationOptions) Clone() proto.Message { target = &GraphqlOptions_SchemaChangeValidationOptions{} if h, ok := interface{}(m.GetRejectBreakingChanges()).(clone.Cloner); ok { - target.RejectBreakingChanges = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.RejectBreakingChanges = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.RejectBreakingChanges = proto.Clone(m.GetRejectBreakingChanges()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.RejectBreakingChanges = proto.Clone(m.GetRejectBreakingChanges()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetProcessingRules() != nil { diff --git a/pkg/api/gloo.solo.io/v1/settings.pb.go b/pkg/api/gloo.solo.io/v1/settings.pb.go index d3c94067a..245053286 100644 --- a/pkg/api/gloo.solo.io/v1/settings.pb.go +++ b/pkg/api/gloo.solo.io/v1/settings.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/settings.proto @@ -10,9 +10,6 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" aws "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/aws" @@ -25,6 +22,9 @@ import ( core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -256,7 +256,7 @@ type SettingsSpec struct { // *SettingsSpec_ConsulKvArtifactSource ArtifactSource isSettingsSpec_ArtifactSource `protobuf_oneof:"artifact_source"` // How frequently to resync watches, etc - RefreshRate *duration.Duration `protobuf:"bytes,12,opt,name=refresh_rate,json=refreshRate,proto3" json:"refresh_rate,omitempty"` + RefreshRate *durationpb.Duration `protobuf:"bytes,12,opt,name=refresh_rate,json=refreshRate,proto3" json:"refresh_rate,omitempty"` // DEPRECATED: In the past DevMode was used to expose endpoints that behave as an Admin API // https://github.com/solo-io/gloo/issues/6494 // We now support an Admin API on port 9091. See the following guide for more details @@ -371,11 +371,9 @@ type SettingsSpec struct { func (x *SettingsSpec) Reset() { *x = SettingsSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec) String() string { @@ -386,7 +384,7 @@ func (*SettingsSpec) ProtoMessage() {} func (x *SettingsSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -506,7 +504,7 @@ func (x *SettingsSpec) GetConsulKvArtifactSource() *SettingsSpec_ConsulKv { return nil } -func (x *SettingsSpec) GetRefreshRate() *duration.Duration { +func (x *SettingsSpec) GetRefreshRate() *durationpb.Duration { if x != nil { return x.RefreshRate } @@ -757,11 +755,9 @@ type LabelSelector struct { func (x *LabelSelector) Reset() { *x = LabelSelector{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LabelSelector) String() string { @@ -772,7 +768,7 @@ func (*LabelSelector) ProtoMessage() {} func (x *LabelSelector) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -827,11 +823,9 @@ type LabelSelectorRequirement struct { func (x *LabelSelectorRequirement) Reset() { *x = LabelSelectorRequirement{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *LabelSelectorRequirement) String() string { @@ -842,7 +836,7 @@ func (*LabelSelectorRequirement) ProtoMessage() {} func (x *LabelSelectorRequirement) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -893,11 +887,9 @@ type UpstreamOptions struct { func (x *UpstreamOptions) Reset() { *x = UpstreamOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamOptions) String() string { @@ -908,7 +900,7 @@ func (*UpstreamOptions) ProtoMessage() {} func (x *UpstreamOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -953,7 +945,7 @@ type GlooOptions struct { // Timeout to get initial snapshot of resources. If set to zero, Gloo will not wait for initial // snapshot - if nonzero and gloo could not fetch it's initial snapshot before the timeout // reached, gloo will panic. If unset, Gloo defaults to 5 minutes. - EndpointsWarmingTimeout *duration.Duration `protobuf:"bytes,4,opt,name=endpoints_warming_timeout,json=endpointsWarmingTimeout,proto3" json:"endpoints_warming_timeout,omitempty"` + EndpointsWarmingTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=endpoints_warming_timeout,json=endpointsWarmingTimeout,proto3" json:"endpoints_warming_timeout,omitempty"` AwsOptions *GlooOptions_AWSOptions `protobuf:"bytes,5,opt,name=aws_options,json=awsOptions,proto3" json:"aws_options,omitempty"` // set these options to fine-tune the way Gloo handles invalid user configuration InvalidConfigPolicy *GlooOptions_InvalidConfigPolicy `protobuf:"bytes,6,opt,name=invalid_config_policy,json=invalidConfigPolicy,proto3" json:"invalid_config_policy,omitempty"` @@ -972,53 +964,51 @@ type GlooOptions struct { // set to true if you do not wish grpc-web to be automatically enabled. // set to false if you wish grpc-web enabled unless disabled on the listener level. // If not specified, defaults to `false`. - DisableGrpcWeb *wrappers.BoolValue `protobuf:"bytes,8,opt,name=disable_grpc_web,json=disableGrpcWeb,proto3" json:"disable_grpc_web,omitempty"` + DisableGrpcWeb *wrapperspb.BoolValue `protobuf:"bytes,8,opt,name=disable_grpc_web,json=disableGrpcWeb,proto3" json:"disable_grpc_web,omitempty"` // Set this option to determine the state of the envoy configuration when a virtual service is deleted, resulting in a // proxy with no configured routes. // set to true if you wish to keep envoy serving the routes from the latest valid configuration. // set to false if you wish to reset the envoy configuration to a clean slate with no routes. // If not specified, defaults to `false`. - DisableProxyGarbageCollection *wrappers.BoolValue `protobuf:"bytes,9,opt,name=disable_proxy_garbage_collection,json=disableProxyGarbageCollection,proto3" json:"disable_proxy_garbage_collection,omitempty"` + DisableProxyGarbageCollection *wrapperspb.BoolValue `protobuf:"bytes,9,opt,name=disable_proxy_garbage_collection,json=disableProxyGarbageCollection,proto3" json:"disable_proxy_garbage_collection,omitempty"` // Set this option to specify the default max program size for regexes. If not specified, // defaults to 100. - RegexMaxProgramSize *wrappers.UInt32Value `protobuf:"bytes,10,opt,name=regex_max_program_size,json=regexMaxProgramSize,proto3" json:"regex_max_program_size,omitempty"` + RegexMaxProgramSize *wrapperspb.UInt32Value `protobuf:"bytes,10,opt,name=regex_max_program_size,json=regexMaxProgramSize,proto3" json:"regex_max_program_size,omitempty"` // Where the `gloo` REST xDS server should bind. // Defaults to `0.0.0.0:9976` RestXdsBindAddr string `protobuf:"bytes,11,opt,name=rest_xds_bind_addr,json=restXdsBindAddr,proto3" json:"rest_xds_bind_addr,omitempty"` // Whether or not to use rest xds for all EDS by default. // Rest XDS, as opposed to grpc, uses http polling rather than streaming // It is strongly recommended that this field be set to false, due to the superior performance of GRPC XDS - EnableRestEds *wrappers.BoolValue `protobuf:"bytes,12,opt,name=enable_rest_eds,json=enableRestEds,proto3" json:"enable_rest_eds,omitempty"` + EnableRestEds *wrapperspb.BoolValue `protobuf:"bytes,12,opt,name=enable_rest_eds,json=enableRestEds,proto3" json:"enable_rest_eds,omitempty"` // The polling interval for the DNS server if upstream failover is configured. // If there is a failover upstream address with a hostname instead of an IP, Gloo will resolve the // hostname with the configured frequency to update endpoints with any changes to DNS resolution. // Defaults to 10s. - FailoverUpstreamDnsPollingInterval *duration.Duration `protobuf:"bytes,13,opt,name=failover_upstream_dns_polling_interval,json=failoverUpstreamDnsPollingInterval,proto3" json:"failover_upstream_dns_polling_interval,omitempty"` + FailoverUpstreamDnsPollingInterval *durationpb.Duration `protobuf:"bytes,13,opt,name=failover_upstream_dns_polling_interval,json=failoverUpstreamDnsPollingInterval,proto3" json:"failover_upstream_dns_polling_interval,omitempty"` // By default gloo adds a series of filters to envoy to ensure that new routes are picked up // Even if the listener previously did not have a filter on the chain previously. // When set to true unused filters are not added to the chain by default. // Defaults to false - RemoveUnusedFilters *wrappers.BoolValue `protobuf:"bytes,14,opt,name=remove_unused_filters,json=removeUnusedFilters,proto3" json:"remove_unused_filters,omitempty"` + RemoveUnusedFilters *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=remove_unused_filters,json=removeUnusedFilters,proto3" json:"remove_unused_filters,omitempty"` // Where the `gloo` proxy debug server should bind. Defaults to `gloo:9966` ProxyDebugBindAddr string `protobuf:"bytes,15,opt,name=proxy_debug_bind_addr,json=proxyDebugBindAddr,proto3" json:"proxy_debug_bind_addr,omitempty"` // When enabled, log the request/response body and headers before and after // any transformations are applied. May be useful in the case where many // transformations are applied and it is difficult to determine which are // causing issues. Defaults to false. - LogTransformationRequestResponseInfo *wrappers.BoolValue `protobuf:"bytes,16,opt,name=log_transformation_request_response_info,json=logTransformationRequestResponseInfo,proto3" json:"log_transformation_request_response_info,omitempty"` + LogTransformationRequestResponseInfo *wrapperspb.BoolValue `protobuf:"bytes,16,opt,name=log_transformation_request_response_info,json=logTransformationRequestResponseInfo,proto3" json:"log_transformation_request_response_info,omitempty"` // Set escapeCharacters for all TransformationTemplates on all vhosts and routes. // This setting can be overridden in individual TransformationTemplates - TransformationEscapeCharacters *wrappers.BoolValue `protobuf:"bytes,17,opt,name=transformation_escape_characters,json=transformationEscapeCharacters,proto3" json:"transformation_escape_characters,omitempty"` + TransformationEscapeCharacters *wrapperspb.BoolValue `protobuf:"bytes,17,opt,name=transformation_escape_characters,json=transformationEscapeCharacters,proto3" json:"transformation_escape_characters,omitempty"` IstioOptions *GlooOptions_IstioOptions `protobuf:"bytes,18,opt,name=istio_options,json=istioOptions,proto3" json:"istio_options,omitempty"` } func (x *GlooOptions) Reset() { *x = GlooOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooOptions) String() string { @@ -1029,7 +1019,7 @@ func (*GlooOptions) ProtoMessage() {} func (x *GlooOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1065,7 +1055,7 @@ func (x *GlooOptions) GetCircuitBreakers() *CircuitBreakerConfig { return nil } -func (x *GlooOptions) GetEndpointsWarmingTimeout() *duration.Duration { +func (x *GlooOptions) GetEndpointsWarmingTimeout() *durationpb.Duration { if x != nil { return x.EndpointsWarmingTimeout } @@ -1093,21 +1083,21 @@ func (x *GlooOptions) GetDisableKubernetesDestinations() bool { return false } -func (x *GlooOptions) GetDisableGrpcWeb() *wrappers.BoolValue { +func (x *GlooOptions) GetDisableGrpcWeb() *wrapperspb.BoolValue { if x != nil { return x.DisableGrpcWeb } return nil } -func (x *GlooOptions) GetDisableProxyGarbageCollection() *wrappers.BoolValue { +func (x *GlooOptions) GetDisableProxyGarbageCollection() *wrapperspb.BoolValue { if x != nil { return x.DisableProxyGarbageCollection } return nil } -func (x *GlooOptions) GetRegexMaxProgramSize() *wrappers.UInt32Value { +func (x *GlooOptions) GetRegexMaxProgramSize() *wrapperspb.UInt32Value { if x != nil { return x.RegexMaxProgramSize } @@ -1121,21 +1111,21 @@ func (x *GlooOptions) GetRestXdsBindAddr() string { return "" } -func (x *GlooOptions) GetEnableRestEds() *wrappers.BoolValue { +func (x *GlooOptions) GetEnableRestEds() *wrapperspb.BoolValue { if x != nil { return x.EnableRestEds } return nil } -func (x *GlooOptions) GetFailoverUpstreamDnsPollingInterval() *duration.Duration { +func (x *GlooOptions) GetFailoverUpstreamDnsPollingInterval() *durationpb.Duration { if x != nil { return x.FailoverUpstreamDnsPollingInterval } return nil } -func (x *GlooOptions) GetRemoveUnusedFilters() *wrappers.BoolValue { +func (x *GlooOptions) GetRemoveUnusedFilters() *wrapperspb.BoolValue { if x != nil { return x.RemoveUnusedFilters } @@ -1149,14 +1139,14 @@ func (x *GlooOptions) GetProxyDebugBindAddr() string { return "" } -func (x *GlooOptions) GetLogTransformationRequestResponseInfo() *wrappers.BoolValue { +func (x *GlooOptions) GetLogTransformationRequestResponseInfo() *wrapperspb.BoolValue { if x != nil { return x.LogTransformationRequestResponseInfo } return nil } -func (x *GlooOptions) GetTransformationEscapeCharacters() *wrappers.BoolValue { +func (x *GlooOptions) GetTransformationEscapeCharacters() *wrapperspb.BoolValue { if x != nil { return x.TransformationEscapeCharacters } @@ -1180,16 +1170,14 @@ type VirtualServiceOptions struct { // Default one_way_tls value to use for all virtual services where one_way_tls config has not been specified. // If the SSL config has the ca.crt (root CA) provided, Gloo uses it to perform mTLS by default. // Set oneWayTls to true to disable mTLS in favor of server-only TLS (one-way TLS), even if Gloo has the root CA. - OneWayTls *wrappers.BoolValue `protobuf:"bytes,1,opt,name=one_way_tls,json=oneWayTls,proto3" json:"one_way_tls,omitempty"` + OneWayTls *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=one_way_tls,json=oneWayTls,proto3" json:"one_way_tls,omitempty"` } func (x *VirtualServiceOptions) Reset() { *x = VirtualServiceOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualServiceOptions) String() string { @@ -1200,7 +1188,7 @@ func (*VirtualServiceOptions) ProtoMessage() {} func (x *VirtualServiceOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1215,7 +1203,7 @@ func (*VirtualServiceOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_rawDescGZIP(), []int{5} } -func (x *VirtualServiceOptions) GetOneWayTls() *wrappers.BoolValue { +func (x *VirtualServiceOptions) GetOneWayTls() *wrapperspb.BoolValue { if x != nil { return x.OneWayTls } @@ -1249,31 +1237,29 @@ type GatewayOptions struct { VirtualServiceOptions *VirtualServiceOptions `protobuf:"bytes,7,opt,name=virtual_service_options,json=virtualServiceOptions,proto3" json:"virtual_service_options,omitempty"` // Set this to persist the Proxy CRD to etcd By default, proxies are kept in memory to improve performance. // Proxies can be persisted to etcd to allow external tools and other pods to read the contents the Proxy CRD. - PersistProxySpec *wrappers.BoolValue `protobuf:"bytes,8,opt,name=persist_proxy_spec,json=persistProxySpec,proto3" json:"persist_proxy_spec,omitempty"` + PersistProxySpec *wrapperspb.BoolValue `protobuf:"bytes,8,opt,name=persist_proxy_spec,json=persistProxySpec,proto3" json:"persist_proxy_spec,omitempty"` // This is set based on the install mode. It indicates to gloo whether or not it should run the gateway // translations and validation. - EnableGatewayController *wrappers.BoolValue `protobuf:"bytes,9,opt,name=enable_gateway_controller,json=enableGatewayController,proto3" json:"enable_gateway_controller,omitempty"` + EnableGatewayController *wrapperspb.BoolValue `protobuf:"bytes,9,opt,name=enable_gateway_controller,json=enableGatewayController,proto3" json:"enable_gateway_controller,omitempty"` // If set, group virtual hosts by matching ssl config, and isolate them on separate filter chains // The default behavior is to aggregate all virtual hosts, and expose them on identical filter chains, // each with a FilterChainMatch that corresponds to the ssl config. // Individual Gateways can override this behavior by configuring the "gateway.solo.io/isolate_vhost" annotation // to be a truthy ("true", "false") value - IsolateVirtualHostsBySslConfig *wrappers.BoolValue `protobuf:"bytes,10,opt,name=isolate_virtual_hosts_by_ssl_config,json=isolateVirtualHostsBySslConfig,proto3" json:"isolate_virtual_hosts_by_ssl_config,omitempty"` + IsolateVirtualHostsBySslConfig *wrapperspb.BoolValue `protobuf:"bytes,10,opt,name=isolate_virtual_hosts_by_ssl_config,json=isolateVirtualHostsBySslConfig,proto3" json:"isolate_virtual_hosts_by_ssl_config,omitempty"` // If set, gateways will be translated into Envoy listeners even if no VirtualServices exist or match a gateway. // When there are no VirtualServices that implies there are no routes to serve, so all requests will return a 404. // Defaults to false. // The default behavior when no VirtualServices are defined or no Gateways match a VirtualService is that // the gateway is not converted into an Envoy listener. - TranslateEmptyGateways *wrappers.BoolValue `protobuf:"bytes,11,opt,name=translate_empty_gateways,json=translateEmptyGateways,proto3" json:"translate_empty_gateways,omitempty"` + TranslateEmptyGateways *wrapperspb.BoolValue `protobuf:"bytes,11,opt,name=translate_empty_gateways,json=translateEmptyGateways,proto3" json:"translate_empty_gateways,omitempty"` } func (x *GatewayOptions) Reset() { *x = GatewayOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GatewayOptions) String() string { @@ -1284,7 +1270,7 @@ func (*GatewayOptions) ProtoMessage() {} func (x *GatewayOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1342,28 +1328,28 @@ func (x *GatewayOptions) GetVirtualServiceOptions() *VirtualServiceOptions { return nil } -func (x *GatewayOptions) GetPersistProxySpec() *wrappers.BoolValue { +func (x *GatewayOptions) GetPersistProxySpec() *wrapperspb.BoolValue { if x != nil { return x.PersistProxySpec } return nil } -func (x *GatewayOptions) GetEnableGatewayController() *wrappers.BoolValue { +func (x *GatewayOptions) GetEnableGatewayController() *wrapperspb.BoolValue { if x != nil { return x.EnableGatewayController } return nil } -func (x *GatewayOptions) GetIsolateVirtualHostsBySslConfig() *wrappers.BoolValue { +func (x *GatewayOptions) GetIsolateVirtualHostsBySslConfig() *wrapperspb.BoolValue { if x != nil { return x.IsolateVirtualHostsBySslConfig } return nil } -func (x *GatewayOptions) GetTranslateEmptyGateways() *wrappers.BoolValue { +func (x *GatewayOptions) GetTranslateEmptyGateways() *wrapperspb.BoolValue { if x != nil { return x.TranslateEmptyGateways } @@ -1382,19 +1368,17 @@ type ConsoleOptions struct { // Currently, create/update/delete operations are only supported for GraphQL resources. // This feature requires a Gloo Edge Enterprise license with GraphQL enabled. // Defaults to true. - ReadOnly *wrappers.BoolValue `protobuf:"bytes,1,opt,name=read_only,json=readOnly,proto3" json:"read_only,omitempty"` + ReadOnly *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=read_only,json=readOnly,proto3" json:"read_only,omitempty"` // Whether to enable the GraphQL API Explorer. This feature requires a Gloo Edge Enterprise license with GraphQL enabled. // Defaults to true. - ApiExplorerEnabled *wrappers.BoolValue `protobuf:"bytes,2,opt,name=api_explorer_enabled,json=apiExplorerEnabled,proto3" json:"api_explorer_enabled,omitempty"` + ApiExplorerEnabled *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=api_explorer_enabled,json=apiExplorerEnabled,proto3" json:"api_explorer_enabled,omitempty"` } func (x *ConsoleOptions) Reset() { *x = ConsoleOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ConsoleOptions) String() string { @@ -1405,7 +1389,7 @@ func (*ConsoleOptions) ProtoMessage() {} func (x *ConsoleOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1420,14 +1404,14 @@ func (*ConsoleOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_rawDescGZIP(), []int{7} } -func (x *ConsoleOptions) GetReadOnly() *wrappers.BoolValue { +func (x *ConsoleOptions) GetReadOnly() *wrapperspb.BoolValue { if x != nil { return x.ReadOnly } return nil } -func (x *ConsoleOptions) GetApiExplorerEnabled() *wrappers.BoolValue { +func (x *ConsoleOptions) GetApiExplorerEnabled() *wrapperspb.BoolValue { if x != nil { return x.ApiExplorerEnabled } @@ -1447,11 +1431,9 @@ type GraphqlOptions struct { func (x *GraphqlOptions) Reset() { *x = GraphqlOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GraphqlOptions) String() string { @@ -1462,7 +1444,7 @@ func (*GraphqlOptions) ProtoMessage() {} func (x *GraphqlOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1498,16 +1480,14 @@ type SettingsStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*SettingsStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *SettingsStatus) Reset() { *x = SettingsStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsStatus) String() string { @@ -1518,7 +1498,7 @@ func (*SettingsStatus) ProtoMessage() {} func (x *SettingsStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1561,7 +1541,7 @@ func (x *SettingsStatus) GetSubresourceStatuses() map[string]*SettingsStatus { return nil } -func (x *SettingsStatus) GetDetails() *_struct.Struct { +func (x *SettingsStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -1578,11 +1558,9 @@ type SettingsNamespacedStatuses struct { func (x *SettingsNamespacedStatuses) Reset() { *x = SettingsNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsNamespacedStatuses) String() string { @@ -1593,7 +1571,7 @@ func (*SettingsNamespacedStatuses) ProtoMessage() {} func (x *SettingsNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1627,11 +1605,9 @@ type SettingsSpec_SecretOptions struct { func (x *SettingsSpec_SecretOptions) Reset() { *x = SettingsSpec_SecretOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_SecretOptions) String() string { @@ -1642,7 +1618,7 @@ func (*SettingsSpec_SecretOptions) ProtoMessage() {} func (x *SettingsSpec_SecretOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1673,11 +1649,9 @@ type SettingsSpec_KubernetesCrds struct { func (x *SettingsSpec_KubernetesCrds) Reset() { *x = SettingsSpec_KubernetesCrds{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_KubernetesCrds) String() string { @@ -1688,7 +1662,7 @@ func (*SettingsSpec_KubernetesCrds) ProtoMessage() {} func (x *SettingsSpec_KubernetesCrds) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1712,11 +1686,9 @@ type SettingsSpec_KubernetesSecrets struct { func (x *SettingsSpec_KubernetesSecrets) Reset() { *x = SettingsSpec_KubernetesSecrets{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_KubernetesSecrets) String() string { @@ -1727,7 +1699,7 @@ func (*SettingsSpec_KubernetesSecrets) ProtoMessage() {} func (x *SettingsSpec_KubernetesSecrets) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1774,7 +1746,7 @@ type SettingsSpec_VaultSecrets struct { TlsServerName string `protobuf:"bytes,7,opt,name=tls_server_name,json=tlsServerName,proto3" json:"tls_server_name,omitempty"` // DEPRECATED: use field tls_config to configure TLS connection to Vault // When set to true, disables TLS verification - Insecure *wrappers.BoolValue `protobuf:"bytes,8,opt,name=insecure,proto3" json:"insecure,omitempty"` + Insecure *wrapperspb.BoolValue `protobuf:"bytes,8,opt,name=insecure,proto3" json:"insecure,omitempty"` // all keys stored in Vault will begin with this Vault // this can be used to run multiple instances of Gloo against the same Vault cluster // defaults to `gloo` @@ -1797,11 +1769,9 @@ type SettingsSpec_VaultSecrets struct { func (x *SettingsSpec_VaultSecrets) Reset() { *x = SettingsSpec_VaultSecrets{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_VaultSecrets) String() string { @@ -1812,7 +1782,7 @@ func (*SettingsSpec_VaultSecrets) ProtoMessage() {} func (x *SettingsSpec_VaultSecrets) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1876,7 +1846,7 @@ func (x *SettingsSpec_VaultSecrets) GetTlsServerName() string { return "" } -func (x *SettingsSpec_VaultSecrets) GetInsecure() *wrappers.BoolValue { +func (x *SettingsSpec_VaultSecrets) GetInsecure() *wrapperspb.BoolValue { if x != nil { return x.Insecure } @@ -1973,11 +1943,9 @@ type SettingsSpec_VaultAwsAuth struct { func (x *SettingsSpec_VaultAwsAuth) Reset() { *x = SettingsSpec_VaultAwsAuth{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_VaultAwsAuth) String() string { @@ -1988,7 +1956,7 @@ func (*SettingsSpec_VaultAwsAuth) ProtoMessage() {} func (x *SettingsSpec_VaultAwsAuth) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2079,16 +2047,14 @@ type SettingsSpec_VaultTlsConfig struct { // TLS. TlsServerName string `protobuf:"bytes,5,opt,name=tls_server_name,json=tlsServerName,proto3" json:"tls_server_name,omitempty"` // When set to true, disables TLS verification - Insecure *wrappers.BoolValue `protobuf:"bytes,6,opt,name=insecure,proto3" json:"insecure,omitempty"` + Insecure *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=insecure,proto3" json:"insecure,omitempty"` } func (x *SettingsSpec_VaultTlsConfig) Reset() { *x = SettingsSpec_VaultTlsConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_VaultTlsConfig) String() string { @@ -2099,7 +2065,7 @@ func (*SettingsSpec_VaultTlsConfig) ProtoMessage() {} func (x *SettingsSpec_VaultTlsConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2149,7 +2115,7 @@ func (x *SettingsSpec_VaultTlsConfig) GetTlsServerName() string { return "" } -func (x *SettingsSpec_VaultTlsConfig) GetInsecure() *wrappers.BoolValue { +func (x *SettingsSpec_VaultTlsConfig) GetInsecure() *wrapperspb.BoolValue { if x != nil { return x.Insecure } @@ -2172,11 +2138,9 @@ type SettingsSpec_ConsulKv struct { func (x *SettingsSpec_ConsulKv) Reset() { *x = SettingsSpec_ConsulKv{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_ConsulKv) String() string { @@ -2187,7 +2151,7 @@ func (*SettingsSpec_ConsulKv) ProtoMessage() {} func (x *SettingsSpec_ConsulKv) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2218,11 +2182,9 @@ type SettingsSpec_KubernetesConfigmaps struct { func (x *SettingsSpec_KubernetesConfigmaps) Reset() { *x = SettingsSpec_KubernetesConfigmaps{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_KubernetesConfigmaps) String() string { @@ -2233,7 +2195,7 @@ func (*SettingsSpec_KubernetesConfigmaps) ProtoMessage() {} func (x *SettingsSpec_KubernetesConfigmaps) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2260,11 +2222,9 @@ type SettingsSpec_Directory struct { func (x *SettingsSpec_Directory) Reset() { *x = SettingsSpec_Directory{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_Directory) String() string { @@ -2275,7 +2235,7 @@ func (*SettingsSpec_Directory) ProtoMessage() {} func (x *SettingsSpec_Directory) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2318,11 +2278,9 @@ type SettingsSpec_KnativeOptions struct { func (x *SettingsSpec_KnativeOptions) Reset() { *x = SettingsSpec_KnativeOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_KnativeOptions) String() string { @@ -2333,7 +2291,7 @@ func (*SettingsSpec_KnativeOptions) ProtoMessage() {} func (x *SettingsSpec_KnativeOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2381,11 +2339,9 @@ type SettingsSpec_DiscoveryOptions struct { func (x *SettingsSpec_DiscoveryOptions) Reset() { *x = SettingsSpec_DiscoveryOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_DiscoveryOptions) String() string { @@ -2396,7 +2352,7 @@ func (*SettingsSpec_DiscoveryOptions) ProtoMessage() {} func (x *SettingsSpec_DiscoveryOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2471,10 +2427,10 @@ type SettingsSpec_ConsulConfiguration struct { // If this is set then you need to also set CertFile. KeyFile string `protobuf:"bytes,9,opt,name=key_file,json=keyFile,proto3" json:"key_file,omitempty"` // InsecureSkipVerify if set to true will disable TLS host verification. - InsecureSkipVerify *wrappers.BoolValue `protobuf:"bytes,10,opt,name=insecure_skip_verify,json=insecureSkipVerify,proto3" json:"insecure_skip_verify,omitempty"` + InsecureSkipVerify *wrapperspb.BoolValue `protobuf:"bytes,10,opt,name=insecure_skip_verify,json=insecureSkipVerify,proto3" json:"insecure_skip_verify,omitempty"` // WaitTime limits how long a watches for Consul resources will block. // If not provided, the agent default values will be used. - WaitTime *duration.Duration `protobuf:"bytes,11,opt,name=wait_time,json=waitTime,proto3" json:"wait_time,omitempty"` + WaitTime *durationpb.Duration `protobuf:"bytes,11,opt,name=wait_time,json=waitTime,proto3" json:"wait_time,omitempty"` // Enable Service Discovery via Consul with this field // set to empty struct `{}` to enable with defaults ServiceDiscovery *SettingsSpec_ConsulConfiguration_ServiceDiscoveryOptions `protobuf:"bytes,12,opt,name=service_discovery,json=serviceDiscovery,proto3" json:"service_discovery,omitempty"` @@ -2490,16 +2446,14 @@ type SettingsSpec_ConsulConfiguration struct { // If there is a Consul service address with a hostname instead of an IP, Gloo will resolve the // hostname with the configured frequency to update endpoints with any changes to DNS resolution. // Defaults to 5s. - DnsPollingInterval *duration.Duration `protobuf:"bytes,15,opt,name=dns_polling_interval,json=dnsPollingInterval,proto3" json:"dns_polling_interval,omitempty"` + DnsPollingInterval *durationpb.Duration `protobuf:"bytes,15,opt,name=dns_polling_interval,json=dnsPollingInterval,proto3" json:"dns_polling_interval,omitempty"` } func (x *SettingsSpec_ConsulConfiguration) Reset() { *x = SettingsSpec_ConsulConfiguration{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_ConsulConfiguration) String() string { @@ -2510,7 +2464,7 @@ func (*SettingsSpec_ConsulConfiguration) ProtoMessage() {} func (x *SettingsSpec_ConsulConfiguration) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2589,14 +2543,14 @@ func (x *SettingsSpec_ConsulConfiguration) GetKeyFile() string { return "" } -func (x *SettingsSpec_ConsulConfiguration) GetInsecureSkipVerify() *wrappers.BoolValue { +func (x *SettingsSpec_ConsulConfiguration) GetInsecureSkipVerify() *wrapperspb.BoolValue { if x != nil { return x.InsecureSkipVerify } return nil } -func (x *SettingsSpec_ConsulConfiguration) GetWaitTime() *duration.Duration { +func (x *SettingsSpec_ConsulConfiguration) GetWaitTime() *durationpb.Duration { if x != nil { return x.WaitTime } @@ -2624,7 +2578,7 @@ func (x *SettingsSpec_ConsulConfiguration) GetDnsAddress() string { return "" } -func (x *SettingsSpec_ConsulConfiguration) GetDnsPollingInterval() *duration.Duration { +func (x *SettingsSpec_ConsulConfiguration) GetDnsPollingInterval() *durationpb.Duration { if x != nil { return x.DnsPollingInterval } @@ -2671,16 +2625,14 @@ type SettingsSpec_ConsulUpstreamDiscoveryConfiguration struct { // `query_options` above to configure caching; caching is enabled by default). // // Defaults to false. - EdsBlockingQueries *wrappers.BoolValue `protobuf:"bytes,23,opt,name=eds_blocking_queries,json=edsBlockingQueries,proto3" json:"eds_blocking_queries,omitempty"` + EdsBlockingQueries *wrapperspb.BoolValue `protobuf:"bytes,23,opt,name=eds_blocking_queries,json=edsBlockingQueries,proto3" json:"eds_blocking_queries,omitempty"` } func (x *SettingsSpec_ConsulUpstreamDiscoveryConfiguration) Reset() { *x = SettingsSpec_ConsulUpstreamDiscoveryConfiguration{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_ConsulUpstreamDiscoveryConfiguration) String() string { @@ -2691,7 +2643,7 @@ func (*SettingsSpec_ConsulUpstreamDiscoveryConfiguration) ProtoMessage() {} func (x *SettingsSpec_ConsulUpstreamDiscoveryConfiguration) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2755,7 +2707,7 @@ func (x *SettingsSpec_ConsulUpstreamDiscoveryConfiguration) GetServiceTagsAllowl return nil } -func (x *SettingsSpec_ConsulUpstreamDiscoveryConfiguration) GetEdsBlockingQueries() *wrappers.BoolValue { +func (x *SettingsSpec_ConsulUpstreamDiscoveryConfiguration) GetEdsBlockingQueries() *wrapperspb.BoolValue { if x != nil { return x.EdsBlockingQueries } @@ -2774,11 +2726,9 @@ type SettingsSpec_KubernetesConfiguration struct { func (x *SettingsSpec_KubernetesConfiguration) Reset() { *x = SettingsSpec_KubernetesConfiguration{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_KubernetesConfiguration) String() string { @@ -2789,7 +2739,7 @@ func (*SettingsSpec_KubernetesConfiguration) ProtoMessage() {} func (x *SettingsSpec_KubernetesConfiguration) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2828,11 +2778,9 @@ type SettingsSpec_ObservabilityOptions struct { func (x *SettingsSpec_ObservabilityOptions) Reset() { *x = SettingsSpec_ObservabilityOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_ObservabilityOptions) String() string { @@ -2843,7 +2791,7 @@ func (*SettingsSpec_ObservabilityOptions) ProtoMessage() {} func (x *SettingsSpec_ObservabilityOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2889,11 +2837,9 @@ type SettingsSpec_SecretOptions_Source struct { func (x *SettingsSpec_SecretOptions_Source) Reset() { *x = SettingsSpec_SecretOptions_Source{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_SecretOptions_Source) String() string { @@ -2904,7 +2850,7 @@ func (*SettingsSpec_SecretOptions_Source) ProtoMessage() {} func (x *SettingsSpec_SecretOptions_Source) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2975,18 +2921,16 @@ type SettingsSpec_DiscoveryOptions_UdsOptions struct { unknownFields protoimpl.UnknownFields // Enable upstream discovery service. Defaults to true. - Enabled *wrappers.BoolValue `protobuf:"bytes,1,opt,name=enabled,proto3" json:"enabled,omitempty"` + Enabled *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=enabled,proto3" json:"enabled,omitempty"` // Map of labels to watch. Only services which match all of the selectors specified here will be discovered by UDS. WatchLabels map[string]string `protobuf:"bytes,2,rep,name=watch_labels,json=watchLabels,proto3" json:"watch_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *SettingsSpec_DiscoveryOptions_UdsOptions) Reset() { *x = SettingsSpec_DiscoveryOptions_UdsOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_DiscoveryOptions_UdsOptions) String() string { @@ -2997,7 +2941,7 @@ func (*SettingsSpec_DiscoveryOptions_UdsOptions) ProtoMessage() {} func (x *SettingsSpec_DiscoveryOptions_UdsOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3012,7 +2956,7 @@ func (*SettingsSpec_DiscoveryOptions_UdsOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_rawDescGZIP(), []int{0, 10, 0} } -func (x *SettingsSpec_DiscoveryOptions_UdsOptions) GetEnabled() *wrappers.BoolValue { +func (x *SettingsSpec_DiscoveryOptions_UdsOptions) GetEnabled() *wrapperspb.BoolValue { if x != nil { return x.Enabled } @@ -3035,16 +2979,14 @@ type SettingsSpec_DiscoveryOptions_FdsOptions struct { // Enable function discovery service on GraphQL gRPC and OpenApi upstreams. Defaults to true. // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/v1/settings.proto. - GraphqlEnabled *wrappers.BoolValue `protobuf:"bytes,1,opt,name=graphql_enabled,json=graphqlEnabled,proto3" json:"graphql_enabled,omitempty"` + GraphqlEnabled *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=graphql_enabled,json=graphqlEnabled,proto3" json:"graphql_enabled,omitempty"` } func (x *SettingsSpec_DiscoveryOptions_FdsOptions) Reset() { *x = SettingsSpec_DiscoveryOptions_FdsOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[29] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[29] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_DiscoveryOptions_FdsOptions) String() string { @@ -3055,7 +2997,7 @@ func (*SettingsSpec_DiscoveryOptions_FdsOptions) ProtoMessage() {} func (x *SettingsSpec_DiscoveryOptions_FdsOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[29] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3071,7 +3013,7 @@ func (*SettingsSpec_DiscoveryOptions_FdsOptions) Descriptor() ([]byte, []int) { } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/v1/settings.proto. -func (x *SettingsSpec_DiscoveryOptions_FdsOptions) GetGraphqlEnabled() *wrappers.BoolValue { +func (x *SettingsSpec_DiscoveryOptions_FdsOptions) GetGraphqlEnabled() *wrapperspb.BoolValue { if x != nil { return x.GraphqlEnabled } @@ -3091,11 +3033,9 @@ type SettingsSpec_ConsulConfiguration_ServiceDiscoveryOptions struct { func (x *SettingsSpec_ConsulConfiguration_ServiceDiscoveryOptions) Reset() { *x = SettingsSpec_ConsulConfiguration_ServiceDiscoveryOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[31] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[31] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_ConsulConfiguration_ServiceDiscoveryOptions) String() string { @@ -3106,7 +3046,7 @@ func (*SettingsSpec_ConsulConfiguration_ServiceDiscoveryOptions) ProtoMessage() func (x *SettingsSpec_ConsulConfiguration_ServiceDiscoveryOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[31] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3142,11 +3082,9 @@ type SettingsSpec_KubernetesConfiguration_RateLimits struct { func (x *SettingsSpec_KubernetesConfiguration_RateLimits) Reset() { *x = SettingsSpec_KubernetesConfiguration_RateLimits{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[32] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[32] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_KubernetesConfiguration_RateLimits) String() string { @@ -3157,7 +3095,7 @@ func (*SettingsSpec_KubernetesConfiguration_RateLimits) ProtoMessage() {} func (x *SettingsSpec_KubernetesConfiguration_RateLimits) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[32] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3206,7 +3144,7 @@ type SettingsSpec_ObservabilityOptions_GrafanaIntegration struct { // kubectl -n gloo-system port-forward deployment/glooe-grafana 3000 // 2. Request all folder data (after admin:admin is replaced with the correct credentials): // curl http://admin:admin@localhost:3000/api/folders - DefaultDashboardFolderId *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=default_dashboard_folder_id,json=defaultDashboardFolderId,proto3" json:"default_dashboard_folder_id,omitempty"` + DefaultDashboardFolderId *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=default_dashboard_folder_id,json=defaultDashboardFolderId,proto3" json:"default_dashboard_folder_id,omitempty"` // The prefix of the UIDs and Titles for all dashboards created on grafana. // This is restricted to 20 characters. DashboardPrefix string `protobuf:"bytes,2,opt,name=dashboard_prefix,json=dashboardPrefix,proto3" json:"dashboard_prefix,omitempty"` @@ -3219,11 +3157,9 @@ type SettingsSpec_ObservabilityOptions_GrafanaIntegration struct { func (x *SettingsSpec_ObservabilityOptions_GrafanaIntegration) Reset() { *x = SettingsSpec_ObservabilityOptions_GrafanaIntegration{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[33] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[33] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_ObservabilityOptions_GrafanaIntegration) String() string { @@ -3234,7 +3170,7 @@ func (*SettingsSpec_ObservabilityOptions_GrafanaIntegration) ProtoMessage() {} func (x *SettingsSpec_ObservabilityOptions_GrafanaIntegration) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[33] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3249,7 +3185,7 @@ func (*SettingsSpec_ObservabilityOptions_GrafanaIntegration) Descriptor() ([]byt return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_rawDescGZIP(), []int{0, 15, 0} } -func (x *SettingsSpec_ObservabilityOptions_GrafanaIntegration) GetDefaultDashboardFolderId() *wrappers.UInt32Value { +func (x *SettingsSpec_ObservabilityOptions_GrafanaIntegration) GetDefaultDashboardFolderId() *wrapperspb.UInt32Value { if x != nil { return x.DefaultDashboardFolderId } @@ -3286,11 +3222,9 @@ type SettingsSpec_ObservabilityOptions_MetricLabels struct { func (x *SettingsSpec_ObservabilityOptions_MetricLabels) Reset() { *x = SettingsSpec_ObservabilityOptions_MetricLabels{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[34] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SettingsSpec_ObservabilityOptions_MetricLabels) String() string { @@ -3301,7 +3235,7 @@ func (*SettingsSpec_ObservabilityOptions_MetricLabels) ProtoMessage() {} func (x *SettingsSpec_ObservabilityOptions_MetricLabels) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[34] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3336,27 +3270,25 @@ type GlooOptions_AWSOptions struct { // Send downstream path and method as `x-envoy-original-path` and // `x-envoy-original-method` headers on the request to AWS lambda. // Defaults to false. - PropagateOriginalRouting *wrappers.BoolValue `protobuf:"bytes,3,opt,name=propagate_original_routing,json=propagateOriginalRouting,proto3" json:"propagate_original_routing,omitempty"` + PropagateOriginalRouting *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=propagate_original_routing,json=propagateOriginalRouting,proto3" json:"propagate_original_routing,omitempty"` // Sets cadence for refreshing credentials for Service Account. // Does nothing if Service account is not set. // Does not affect the default filewatch for service account only augments it. // Defaults to not refreshing on time period. Suggested is 15 minutes. - CredentialRefreshDelay *duration.Duration `protobuf:"bytes,4,opt,name=credential_refresh_delay,json=credentialRefreshDelay,proto3" json:"credential_refresh_delay,omitempty"` + CredentialRefreshDelay *durationpb.Duration `protobuf:"bytes,4,opt,name=credential_refresh_delay,json=credentialRefreshDelay,proto3" json:"credential_refresh_delay,omitempty"` // Sets the unsafe behavior where a route can specify a lambda upstream // but not set the function to target. It will use the first function which // if discovery is enabled the first function is the first function name alphabetically // from the last discovery run. This means that the lambda being pointed to could change. // Defaults to false. - FallbackToFirstFunction *wrappers.BoolValue `protobuf:"bytes,5,opt,name=fallback_to_first_function,json=fallbackToFirstFunction,proto3" json:"fallback_to_first_function,omitempty"` + FallbackToFirstFunction *wrapperspb.BoolValue `protobuf:"bytes,5,opt,name=fallback_to_first_function,json=fallbackToFirstFunction,proto3" json:"fallback_to_first_function,omitempty"` } func (x *GlooOptions_AWSOptions) Reset() { *x = GlooOptions_AWSOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[39] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[39] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooOptions_AWSOptions) String() string { @@ -3367,7 +3299,7 @@ func (*GlooOptions_AWSOptions) ProtoMessage() {} func (x *GlooOptions_AWSOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[39] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3403,21 +3335,21 @@ func (x *GlooOptions_AWSOptions) GetServiceAccountCredentials() *aws.AWSLambdaCo return nil } -func (x *GlooOptions_AWSOptions) GetPropagateOriginalRouting() *wrappers.BoolValue { +func (x *GlooOptions_AWSOptions) GetPropagateOriginalRouting() *wrapperspb.BoolValue { if x != nil { return x.PropagateOriginalRouting } return nil } -func (x *GlooOptions_AWSOptions) GetCredentialRefreshDelay() *duration.Duration { +func (x *GlooOptions_AWSOptions) GetCredentialRefreshDelay() *durationpb.Duration { if x != nil { return x.CredentialRefreshDelay } return nil } -func (x *GlooOptions_AWSOptions) GetFallbackToFirstFunction() *wrappers.BoolValue { +func (x *GlooOptions_AWSOptions) GetFallbackToFirstFunction() *wrapperspb.BoolValue { if x != nil { return x.FallbackToFirstFunction } @@ -3490,11 +3422,9 @@ type GlooOptions_InvalidConfigPolicy struct { func (x *GlooOptions_InvalidConfigPolicy) Reset() { *x = GlooOptions_InvalidConfigPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[40] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[40] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooOptions_InvalidConfigPolicy) String() string { @@ -3505,7 +3435,7 @@ func (*GlooOptions_InvalidConfigPolicy) ProtoMessage() {} func (x *GlooOptions_InvalidConfigPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[40] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3551,24 +3481,22 @@ type GlooOptions_IstioOptions struct { // Warning: This value is deprecated and will be removed in a future release. Also, you cannot use this value with a Kubernetes Gateway API proxy. // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/v1/settings.proto. - AppendXForwardedHost *wrappers.BoolValue `protobuf:"bytes,1,opt,name=append_x_forwarded_host,json=appendXForwardedHost,proto3" json:"append_x_forwarded_host,omitempty"` + AppendXForwardedHost *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=append_x_forwarded_host,json=appendXForwardedHost,proto3" json:"append_x_forwarded_host,omitempty"` // Set to true to enable automatic mTLS for all upstreams. Istio integration must be enabled for this to take effect. // Defaults to false - EnableAutoMtls *wrappers.BoolValue `protobuf:"bytes,2,opt,name=enable_auto_mtls,json=enableAutoMtls,proto3" json:"enable_auto_mtls,omitempty"` + EnableAutoMtls *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=enable_auto_mtls,json=enableAutoMtls,proto3" json:"enable_auto_mtls,omitempty"` // Istio integration is enabled via global.istioIntegration.enabled on the helm chart. // If enabled, an istio-proxy container and sds container are assumed to exist alongside the // gateway proxy. These containers are created by enabling the istioIntegration.enabled option in the helm chart. // Defaults to false - EnableIntegration *wrappers.BoolValue `protobuf:"bytes,3,opt,name=enable_integration,json=enableIntegration,proto3" json:"enable_integration,omitempty"` + EnableIntegration *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=enable_integration,json=enableIntegration,proto3" json:"enable_integration,omitempty"` } func (x *GlooOptions_IstioOptions) Reset() { *x = GlooOptions_IstioOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[41] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[41] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GlooOptions_IstioOptions) String() string { @@ -3579,7 +3507,7 @@ func (*GlooOptions_IstioOptions) ProtoMessage() {} func (x *GlooOptions_IstioOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[41] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3595,21 +3523,21 @@ func (*GlooOptions_IstioOptions) Descriptor() ([]byte, []int) { } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/v1/settings.proto. -func (x *GlooOptions_IstioOptions) GetAppendXForwardedHost() *wrappers.BoolValue { +func (x *GlooOptions_IstioOptions) GetAppendXForwardedHost() *wrapperspb.BoolValue { if x != nil { return x.AppendXForwardedHost } return nil } -func (x *GlooOptions_IstioOptions) GetEnableAutoMtls() *wrappers.BoolValue { +func (x *GlooOptions_IstioOptions) GetEnableAutoMtls() *wrapperspb.BoolValue { if x != nil { return x.EnableAutoMtls } return nil } -func (x *GlooOptions_IstioOptions) GetEnableIntegration() *wrappers.BoolValue { +func (x *GlooOptions_IstioOptions) GetEnableIntegration() *wrapperspb.BoolValue { if x != nil { return x.EnableIntegration } @@ -3641,12 +3569,12 @@ type GatewayOptions_ValidationOptions struct { // Always accept resources even if validation produced an error. // Validation will still log the error and increment the validation.gateway.solo.io/resources_rejected stat. // Currently defaults to true - must be set to `false` to prevent writing invalid resources to storage. - AlwaysAccept *wrappers.BoolValue `protobuf:"bytes,6,opt,name=always_accept,json=alwaysAccept,proto3" json:"always_accept,omitempty"` + AlwaysAccept *wrapperspb.BoolValue `protobuf:"bytes,6,opt,name=always_accept,json=alwaysAccept,proto3" json:"always_accept,omitempty"` // Accept resources if validation produced a warning (defaults to true). // By setting to false, this means that validation will start rejecting resources that would result // in warnings, rather than just those that would result in errors. Note that this setting has no impact on // Kubernetes Gateway API validation, as warnings will always be allowed in that context. - AllowWarnings *wrappers.BoolValue `protobuf:"bytes,7,opt,name=allow_warnings,json=allowWarnings,proto3" json:"allow_warnings,omitempty"` + AllowWarnings *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=allow_warnings,json=allowWarnings,proto3" json:"allow_warnings,omitempty"` // Deprecated: See `server_enabled` and consider configuring it to `false` instead. // Write a warning to route resources if validation produced a route ordering warning (defaults to false). // By setting to true, this means that Gloo will start assigning warnings to resources that would result @@ -3656,28 +3584,28 @@ type GatewayOptions_ValidationOptions struct { // - duplicate matchers // // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/v1/settings.proto. - WarnRouteShortCircuiting *wrappers.BoolValue `protobuf:"bytes,8,opt,name=warn_route_short_circuiting,json=warnRouteShortCircuiting,proto3" json:"warn_route_short_circuiting,omitempty"` + WarnRouteShortCircuiting *wrapperspb.BoolValue `protobuf:"bytes,8,opt,name=warn_route_short_circuiting,json=warnRouteShortCircuiting,proto3" json:"warn_route_short_circuiting,omitempty"` // By default gloo will attempt to validate transformations by calling out to a local envoy binary in `validate` mode. // Calling this local envoy binary can become slow when done many times during a single validation. // Setting this to true will stop gloo from calling out to envoy to validate the transformations, which may speed up the // validation time considerably, but may also cause the transformation config to fail after being sent to envoy. // When disabling this, ensure that your transformations are valid prior to applying them. - DisableTransformationValidation *wrappers.BoolValue `protobuf:"bytes,9,opt,name=disable_transformation_validation,json=disableTransformationValidation,proto3" json:"disable_transformation_validation,omitempty"` + DisableTransformationValidation *wrapperspb.BoolValue `protobuf:"bytes,9,opt,name=disable_transformation_validation,json=disableTransformationValidation,proto3" json:"disable_transformation_validation,omitempty"` // By default, gRPC validation messages between gateway and gloo pods have a max message size of 100 MB. // Setting this value sets the gRPC max message size in bytes for the gloo validation server. This should // only be changed if necessary. // If not included, the gRPC max message size will be the default of 100 MB. - ValidationServerGrpcMaxSizeBytes *wrappers.Int32Value `protobuf:"bytes,11,opt,name=validation_server_grpc_max_size_bytes,json=validationServerGrpcMaxSizeBytes,proto3" json:"validation_server_grpc_max_size_bytes,omitempty"` + ValidationServerGrpcMaxSizeBytes *wrapperspb.Int32Value `protobuf:"bytes,11,opt,name=validation_server_grpc_max_size_bytes,json=validationServerGrpcMaxSizeBytes,proto3" json:"validation_server_grpc_max_size_bytes,omitempty"` // By providing the validation field (parent of this object) the user is implicitly opting into validation. // This field allows the user to opt out of the validation server, while still configuring pre-existing fields // such as `warn_route_short_circuiting` and `disable_transformation_validation`. // // If not included, the validation server will be enabled. - ServerEnabled *wrappers.BoolValue `protobuf:"bytes,12,opt,name=server_enabled,json=serverEnabled,proto3" json:"server_enabled,omitempty"` + ServerEnabled *wrapperspb.BoolValue `protobuf:"bytes,12,opt,name=server_enabled,json=serverEnabled,proto3" json:"server_enabled,omitempty"` // Allows configuring validation to report a missing TLS secret referenced by a SslConfig or UpstreamSslConfig // as a warning instead of an error. This will allow for eventually consistent workloads, but will also permit // the accidental deletion of secrets being referenced, which would cause disruption in traffic. - WarnMissingTlsSecret *wrappers.BoolValue `protobuf:"bytes,13,opt,name=warn_missing_tls_secret,json=warnMissingTlsSecret,proto3" json:"warn_missing_tls_secret,omitempty"` + WarnMissingTlsSecret *wrapperspb.BoolValue `protobuf:"bytes,13,opt,name=warn_missing_tls_secret,json=warnMissingTlsSecret,proto3" json:"warn_missing_tls_secret,omitempty"` // Configures the Gloo translation loop to send the final product of translation through Envoy // validation mode. This has an negative impact on the total translation throughput, but it // helps ensure the configuration will not be nacked when served to Envoy. @@ -3688,16 +3616,14 @@ type GatewayOptions_ValidationOptions struct { // Large configurations can take more than 10 seconds to validate, causing the validating webhook to timeout. // When enabling this feature, consider increasing the timeout for the validating webhook // (`.Values.gateway.validation.webhook.timeoutSeconds`). - FullEnvoyValidation *wrappers.BoolValue `protobuf:"bytes,14,opt,name=full_envoy_validation,json=fullEnvoyValidation,proto3" json:"full_envoy_validation,omitempty"` + FullEnvoyValidation *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=full_envoy_validation,json=fullEnvoyValidation,proto3" json:"full_envoy_validation,omitempty"` } func (x *GatewayOptions_ValidationOptions) Reset() { *x = GatewayOptions_ValidationOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[42] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[42] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GatewayOptions_ValidationOptions) String() string { @@ -3708,7 +3634,7 @@ func (*GatewayOptions_ValidationOptions) ProtoMessage() {} func (x *GatewayOptions_ValidationOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[42] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3752,14 +3678,14 @@ func (x *GatewayOptions_ValidationOptions) GetIgnoreGlooValidationFailure() bool return false } -func (x *GatewayOptions_ValidationOptions) GetAlwaysAccept() *wrappers.BoolValue { +func (x *GatewayOptions_ValidationOptions) GetAlwaysAccept() *wrapperspb.BoolValue { if x != nil { return x.AlwaysAccept } return nil } -func (x *GatewayOptions_ValidationOptions) GetAllowWarnings() *wrappers.BoolValue { +func (x *GatewayOptions_ValidationOptions) GetAllowWarnings() *wrapperspb.BoolValue { if x != nil { return x.AllowWarnings } @@ -3767,42 +3693,42 @@ func (x *GatewayOptions_ValidationOptions) GetAllowWarnings() *wrappers.BoolValu } // Deprecated: Marked as deprecated in github.com/solo-io/solo-apis/api/gloo/gloo/v1/settings.proto. -func (x *GatewayOptions_ValidationOptions) GetWarnRouteShortCircuiting() *wrappers.BoolValue { +func (x *GatewayOptions_ValidationOptions) GetWarnRouteShortCircuiting() *wrapperspb.BoolValue { if x != nil { return x.WarnRouteShortCircuiting } return nil } -func (x *GatewayOptions_ValidationOptions) GetDisableTransformationValidation() *wrappers.BoolValue { +func (x *GatewayOptions_ValidationOptions) GetDisableTransformationValidation() *wrapperspb.BoolValue { if x != nil { return x.DisableTransformationValidation } return nil } -func (x *GatewayOptions_ValidationOptions) GetValidationServerGrpcMaxSizeBytes() *wrappers.Int32Value { +func (x *GatewayOptions_ValidationOptions) GetValidationServerGrpcMaxSizeBytes() *wrapperspb.Int32Value { if x != nil { return x.ValidationServerGrpcMaxSizeBytes } return nil } -func (x *GatewayOptions_ValidationOptions) GetServerEnabled() *wrappers.BoolValue { +func (x *GatewayOptions_ValidationOptions) GetServerEnabled() *wrapperspb.BoolValue { if x != nil { return x.ServerEnabled } return nil } -func (x *GatewayOptions_ValidationOptions) GetWarnMissingTlsSecret() *wrappers.BoolValue { +func (x *GatewayOptions_ValidationOptions) GetWarnMissingTlsSecret() *wrapperspb.BoolValue { if x != nil { return x.WarnMissingTlsSecret } return nil } -func (x *GatewayOptions_ValidationOptions) GetFullEnvoyValidation() *wrappers.BoolValue { +func (x *GatewayOptions_ValidationOptions) GetFullEnvoyValidation() *wrapperspb.BoolValue { if x != nil { return x.FullEnvoyValidation } @@ -3817,7 +3743,7 @@ type GraphqlOptions_SchemaChangeValidationOptions struct { // Schema definition updates can be considered safe, dangerous, or breaking. // If this field is set to true, then breaking schema updates will be rejected. // Defaults to false. - RejectBreakingChanges *wrappers.BoolValue `protobuf:"bytes,1,opt,name=reject_breaking_changes,json=rejectBreakingChanges,proto3" json:"reject_breaking_changes,omitempty"` + RejectBreakingChanges *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=reject_breaking_changes,json=rejectBreakingChanges,proto3" json:"reject_breaking_changes,omitempty"` // We use [GraphQL Inspector](https://www.graphql-inspector.com/docs/essentials/diff) to detect breaking changes // to GraphQL schemas. This field allows for passing [processing rules](https://www.graphql-inspector.com/docs/essentials/diff#rules) // to GraphQL Inspector to customize how various change types are handled. @@ -3826,11 +3752,9 @@ type GraphqlOptions_SchemaChangeValidationOptions struct { func (x *GraphqlOptions_SchemaChangeValidationOptions) Reset() { *x = GraphqlOptions_SchemaChangeValidationOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[43] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[43] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GraphqlOptions_SchemaChangeValidationOptions) String() string { @@ -3841,7 +3765,7 @@ func (*GraphqlOptions_SchemaChangeValidationOptions) ProtoMessage() {} func (x *GraphqlOptions_SchemaChangeValidationOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[43] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -3856,7 +3780,7 @@ func (*GraphqlOptions_SchemaChangeValidationOptions) Descriptor() ([]byte, []int return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_rawDescGZIP(), []int{8, 0} } -func (x *GraphqlOptions_SchemaChangeValidationOptions) GetRejectBreakingChanges() *wrappers.BoolValue { +func (x *GraphqlOptions_SchemaChangeValidationOptions) GetRejectBreakingChanges() *wrapperspb.BoolValue { if x != nil { return x.RejectBreakingChanges } @@ -4821,7 +4745,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_rawDescGZ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes = make([]protoimpl.MessageInfo, 46) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_goTypes = []any{ (SettingsSpec_DiscoveryOptions_FdsMode)(0), // 0: gloo.solo.io.SettingsSpec.DiscoveryOptions.FdsMode (GraphqlOptions_SchemaChangeValidationOptions_ProcessingRule)(0), // 1: gloo.solo.io.GraphqlOptions.SchemaChangeValidationOptions.ProcessingRule (SettingsStatus_State)(0), // 2: gloo.solo.io.SettingsStatus.State @@ -4871,7 +4795,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_goTypes = (*GraphqlOptions_SchemaChangeValidationOptions)(nil), // 46: gloo.solo.io.GraphqlOptions.SchemaChangeValidationOptions nil, // 47: gloo.solo.io.SettingsStatus.SubresourceStatusesEntry nil, // 48: gloo.solo.io.SettingsNamespacedStatuses.StatusesEntry - (*duration.Duration)(nil), // 49: google.protobuf.Duration + (*durationpb.Duration)(nil), // 49: google.protobuf.Duration (*Extensions)(nil), // 50: gloo.solo.io.Extensions (*ratelimit.ServiceSettings)(nil), // 51: ratelimit.options.gloo.solo.io.ServiceSettings (*ratelimit.Settings)(nil), // 52: ratelimit.options.gloo.solo.io.Settings @@ -4881,14 +4805,14 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_goTypes = (*extproc.Settings)(nil), // 56: extproc.options.gloo.solo.io.Settings (*ssl.SslParameters)(nil), // 57: gloo.solo.io.SslParameters (*CircuitBreakerConfig)(nil), // 58: gloo.solo.io.CircuitBreakerConfig - (*wrappers.BoolValue)(nil), // 59: google.protobuf.BoolValue - (*wrappers.UInt32Value)(nil), // 60: google.protobuf.UInt32Value - (*_struct.Struct)(nil), // 61: google.protobuf.Struct + (*wrapperspb.BoolValue)(nil), // 59: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 60: google.protobuf.UInt32Value + (*structpb.Struct)(nil), // 61: google.protobuf.Struct (*core.ResourceRef)(nil), // 62: core.solo.io.ResourceRef (consul.ConsulConsistencyModes)(0), // 63: consul.options.gloo.solo.io.ConsulConsistencyModes (*consul.QueryOptions)(nil), // 64: consul.options.gloo.solo.io.QueryOptions (*aws.AWSLambdaConfig_ServiceAccountCredentials)(nil), // 65: envoy.config.filter.http.aws_lambda.v2.AWSLambdaConfig.ServiceAccountCredentials - (*wrappers.Int32Value)(nil), // 66: google.protobuf.Int32Value + (*wrapperspb.Int32Value)(nil), // 66: google.protobuf.Int32Value } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_depIdxs = []int32{ 15, // 0: gloo.solo.io.SettingsSpec.kubernetes_config_source:type_name -> gloo.solo.io.SettingsSpec.KubernetesCrds @@ -5015,465 +4939,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_init() { } file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_init() file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_circuit_breaker_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LabelSelector); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LabelSelectorRequirement); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualServiceOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GatewayOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConsoleOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GraphqlOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_SecretOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_KubernetesCrds); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_KubernetesSecrets); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_VaultSecrets); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_VaultAwsAuth); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_VaultTlsConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_ConsulKv); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_KubernetesConfigmaps); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_Directory); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_KnativeOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_DiscoveryOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_ConsulConfiguration); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_ConsulUpstreamDiscoveryConfiguration); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_KubernetesConfiguration); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_ObservabilityOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_SecretOptions_Source); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_DiscoveryOptions_UdsOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_DiscoveryOptions_FdsOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_ConsulConfiguration_ServiceDiscoveryOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_KubernetesConfiguration_RateLimits); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_ObservabilityOptions_GrafanaIntegration); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SettingsSpec_ObservabilityOptions_MetricLabels); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooOptions_AWSOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooOptions_InvalidConfigPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GlooOptions_IstioOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GatewayOptions_ValidationOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GraphqlOptions_SchemaChangeValidationOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[0].OneofWrappers = []any{ (*SettingsSpec_KubernetesConfigSource)(nil), (*SettingsSpec_DirectoryConfigSource)(nil), (*SettingsSpec_ConsulKvSource)(nil), @@ -5484,16 +4950,16 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_init() { (*SettingsSpec_DirectoryArtifactSource)(nil), (*SettingsSpec_ConsulKvArtifactSource)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[14].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[14].OneofWrappers = []any{ (*SettingsSpec_VaultSecrets_AccessToken)(nil), (*SettingsSpec_VaultSecrets_Aws)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[27].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[27].OneofWrappers = []any{ (*SettingsSpec_SecretOptions_Source_Kubernetes)(nil), (*SettingsSpec_SecretOptions_Source_Vault)(nil), (*SettingsSpec_SecretOptions_Source_Directory)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[39].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_settings_proto_msgTypes[39].OneofWrappers = []any{ (*GlooOptions_AWSOptions_EnableCredentialsDiscovey)(nil), (*GlooOptions_AWSOptions_ServiceAccountCredentials)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/ssl/ssl.pb.clone.go b/pkg/api/gloo.solo.io/v1/ssl/ssl.pb.clone.go index ef2ee7119..26a1bbc42 100644 --- a/pkg/api/gloo.solo.io/v1/ssl/ssl.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/ssl/ssl.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -73,21 +73,21 @@ func (m *SslConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetOneWayTls()).(clone.Cloner); ok { - target.OneWayTls = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OneWayTls = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.OneWayTls = proto.Clone(m.GetOneWayTls()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OneWayTls = proto.Clone(m.GetOneWayTls()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetDisableTlsSessionResumption()).(clone.Cloner); ok { - target.DisableTlsSessionResumption = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableTlsSessionResumption = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableTlsSessionResumption = proto.Clone(m.GetDisableTlsSessionResumption()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableTlsSessionResumption = proto.Clone(m.GetDisableTlsSessionResumption()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetTransportSocketConnectTimeout()).(clone.Cloner); ok { - target.TransportSocketConnectTimeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.TransportSocketConnectTimeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.TransportSocketConnectTimeout = proto.Clone(m.GetTransportSocketConnectTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.TransportSocketConnectTimeout = proto.Clone(m.GetTransportSocketConnectTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } target.OcspStaplePolicy = m.GetOcspStaplePolicy() @@ -189,15 +189,15 @@ func (m *UpstreamSslConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetAllowRenegotiation()).(clone.Cloner); ok { - target.AllowRenegotiation = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowRenegotiation = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.AllowRenegotiation = proto.Clone(m.GetAllowRenegotiation()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.AllowRenegotiation = proto.Clone(m.GetAllowRenegotiation()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetOneWayTls()).(clone.Cloner); ok { - target.OneWayTls = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OneWayTls = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.OneWayTls = proto.Clone(m.GetOneWayTls()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OneWayTls = proto.Clone(m.GetOneWayTls()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } switch m.SslSecrets.(type) { diff --git a/pkg/api/gloo.solo.io/v1/ssl/ssl.pb.go b/pkg/api/gloo.solo.io/v1/ssl/ssl.pb.go index 4fb6d66e0..1a9fed792 100644 --- a/pkg/api/gloo.solo.io/v1/ssl/ssl.pb.go +++ b/pkg/api/gloo.solo.io/v1/ssl/ssl.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/ssl/ssl.proto @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - duration "github.com/golang/protobuf/ptypes/duration" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -166,13 +166,13 @@ type SslConfig struct { // If the SSL config has the ca.crt (root CA) provided, Gloo uses it to perform mTLS by default. // Set oneWayTls to true to disable mTLS in favor of server-only TLS (one-way TLS), even if Gloo has the root CA. // If unset, defaults to false. - OneWayTls *wrappers.BoolValue `protobuf:"bytes,8,opt,name=one_way_tls,json=oneWayTls,proto3" json:"one_way_tls,omitempty"` + OneWayTls *wrapperspb.BoolValue `protobuf:"bytes,8,opt,name=one_way_tls,json=oneWayTls,proto3" json:"one_way_tls,omitempty"` // If set to true, the TLS session resumption will be deactivated, note that it deactivates only the tickets based tls session resumption (not the cache). - DisableTlsSessionResumption *wrappers.BoolValue `protobuf:"bytes,9,opt,name=disable_tls_session_resumption,json=disableTlsSessionResumption,proto3" json:"disable_tls_session_resumption,omitempty"` + DisableTlsSessionResumption *wrapperspb.BoolValue `protobuf:"bytes,9,opt,name=disable_tls_session_resumption,json=disableTlsSessionResumption,proto3" json:"disable_tls_session_resumption,omitempty"` // If present and nonzero, the amount of time to allow incoming connections to complete any // transport socket negotiations. If this expires before the transport reports connection // establishment, the connection is summarily closed. - TransportSocketConnectTimeout *duration.Duration `protobuf:"bytes,10,opt,name=transport_socket_connect_timeout,json=transportSocketConnectTimeout,proto3" json:"transport_socket_connect_timeout,omitempty"` + TransportSocketConnectTimeout *durationpb.Duration `protobuf:"bytes,10,opt,name=transport_socket_connect_timeout,json=transportSocketConnectTimeout,proto3" json:"transport_socket_connect_timeout,omitempty"` // The OCSP staple policy to use for this listener. // Defaults to `LENIENT_STAPLING`. // https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/transport_sockets/tls/v3/tls.proto#enum-extensions-transport-sockets-tls-v3-downstreamtlscontext-ocspstaplepolicy @@ -181,11 +181,9 @@ type SslConfig struct { func (x *SslConfig) Reset() { *x = SslConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SslConfig) String() string { @@ -196,7 +194,7 @@ func (*SslConfig) ProtoMessage() {} func (x *SslConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -267,21 +265,21 @@ func (x *SslConfig) GetAlpnProtocols() []string { return nil } -func (x *SslConfig) GetOneWayTls() *wrappers.BoolValue { +func (x *SslConfig) GetOneWayTls() *wrapperspb.BoolValue { if x != nil { return x.OneWayTls } return nil } -func (x *SslConfig) GetDisableTlsSessionResumption() *wrappers.BoolValue { +func (x *SslConfig) GetDisableTlsSessionResumption() *wrapperspb.BoolValue { if x != nil { return x.DisableTlsSessionResumption } return nil } -func (x *SslConfig) GetTransportSocketConnectTimeout() *duration.Duration { +func (x *SslConfig) GetTransportSocketConnectTimeout() *durationpb.Duration { if x != nil { return x.TransportSocketConnectTimeout } @@ -338,11 +336,9 @@ type SSLFiles struct { func (x *SSLFiles) Reset() { *x = SSLFiles{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SSLFiles) String() string { @@ -353,7 +349,7 @@ func (*SSLFiles) ProtoMessage() {} func (x *SSLFiles) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -419,21 +415,19 @@ type UpstreamSslConfig struct { AlpnProtocols []string `protobuf:"bytes,8,rep,name=alpn_protocols,json=alpnProtocols,proto3" json:"alpn_protocols,omitempty"` // Allow Tls renegotiation, the default value is false. // TLS renegotiation is considered insecure and shouldn’t be used unless absolutely necessary. - AllowRenegotiation *wrappers.BoolValue `protobuf:"bytes,10,opt,name=allow_renegotiation,json=allowRenegotiation,proto3" json:"allow_renegotiation,omitempty"` + AllowRenegotiation *wrapperspb.BoolValue `protobuf:"bytes,10,opt,name=allow_renegotiation,json=allowRenegotiation,proto3" json:"allow_renegotiation,omitempty"` // If the SSL config has the ca.crt (root CA) provided, Gloo uses it to perform mTLS by default. // Set oneWayTls to true to disable mTLS in favor of server-only TLS (one-way TLS), even if Gloo has the root CA. // This flag does nothing if SDS is configured. // If unset, defaults to false. - OneWayTls *wrappers.BoolValue `protobuf:"bytes,11,opt,name=one_way_tls,json=oneWayTls,proto3" json:"one_way_tls,omitempty"` + OneWayTls *wrapperspb.BoolValue `protobuf:"bytes,11,opt,name=one_way_tls,json=oneWayTls,proto3" json:"one_way_tls,omitempty"` } func (x *UpstreamSslConfig) Reset() { *x = UpstreamSslConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSslConfig) String() string { @@ -444,7 +438,7 @@ func (*UpstreamSslConfig) ProtoMessage() {} func (x *UpstreamSslConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -515,14 +509,14 @@ func (x *UpstreamSslConfig) GetAlpnProtocols() []string { return nil } -func (x *UpstreamSslConfig) GetAllowRenegotiation() *wrappers.BoolValue { +func (x *UpstreamSslConfig) GetAllowRenegotiation() *wrapperspb.BoolValue { if x != nil { return x.AllowRenegotiation } return nil } -func (x *UpstreamSslConfig) GetOneWayTls() *wrappers.BoolValue { +func (x *UpstreamSslConfig) GetOneWayTls() *wrapperspb.BoolValue { if x != nil { return x.OneWayTls } @@ -575,11 +569,9 @@ type SDSConfig struct { func (x *SDSConfig) Reset() { *x = SDSConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SDSConfig) String() string { @@ -590,7 +582,7 @@ func (*SDSConfig) ProtoMessage() {} func (x *SDSConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -676,11 +668,9 @@ type CallCredentials struct { func (x *CallCredentials) Reset() { *x = CallCredentials{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CallCredentials) String() string { @@ -691,7 +681,7 @@ func (*CallCredentials) ProtoMessage() {} func (x *CallCredentials) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -728,11 +718,9 @@ type SslParameters struct { func (x *SslParameters) Reset() { *x = SslParameters{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SslParameters) String() string { @@ -743,7 +731,7 @@ func (*SslParameters) ProtoMessage() {} func (x *SslParameters) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -799,11 +787,9 @@ type CallCredentials_FileCredentialSource struct { func (x *CallCredentials_FileCredentialSource) Reset() { *x = CallCredentials_FileCredentialSource{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *CallCredentials_FileCredentialSource) String() string { @@ -814,7 +800,7 @@ func (*CallCredentials_FileCredentialSource) ProtoMessage() {} func (x *CallCredentials_FileCredentialSource) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1025,7 +1011,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_rawDescGZI var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_goTypes = []any{ (SslConfig_OcspStaplePolicy)(0), // 0: gloo.solo.io.SslConfig.OcspStaplePolicy (SslParameters_ProtocolVersion)(0), // 1: gloo.solo.io.SslParameters.ProtocolVersion (*SslConfig)(nil), // 2: gloo.solo.io.SslConfig @@ -1036,8 +1022,8 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_goTypes = [ (*SslParameters)(nil), // 7: gloo.solo.io.SslParameters (*CallCredentials_FileCredentialSource)(nil), // 8: gloo.solo.io.CallCredentials.FileCredentialSource (*core.ResourceRef)(nil), // 9: core.solo.io.ResourceRef - (*wrappers.BoolValue)(nil), // 10: google.protobuf.BoolValue - (*duration.Duration)(nil), // 11: google.protobuf.Duration + (*wrapperspb.BoolValue)(nil), // 10: google.protobuf.BoolValue + (*durationpb.Duration)(nil), // 11: google.protobuf.Duration } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_depIdxs = []int32{ 9, // 0: gloo.solo.io.SslConfig.secret_ref:type_name -> core.solo.io.ResourceRef @@ -1070,103 +1056,17 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_init() { if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SslConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SSLFiles); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSslConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SDSConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CallCredentials); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SslParameters); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CallCredentials_FileCredentialSource); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[0].OneofWrappers = []any{ (*SslConfig_SecretRef)(nil), (*SslConfig_SslFiles)(nil), (*SslConfig_Sds)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[2].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[2].OneofWrappers = []any{ (*UpstreamSslConfig_SecretRef)(nil), (*UpstreamSslConfig_SslFiles)(nil), (*UpstreamSslConfig_Sds)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_ssl_ssl_proto_msgTypes[3].OneofWrappers = []any{ (*SDSConfig_CallCredentials)(nil), (*SDSConfig_ClusterName)(nil), } diff --git a/pkg/api/gloo.solo.io/v1/subset.pb.go b/pkg/api/gloo.solo.io/v1/subset.pb.go index 6851feac0..642025307 100644 --- a/pkg/api/gloo.solo.io/v1/subset.pb.go +++ b/pkg/api/gloo.solo.io/v1/subset.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/subset.proto @@ -32,11 +32,9 @@ type Subset struct { func (x *Subset) Reset() { *x = Subset{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Subset) String() string { @@ -47,7 +45,7 @@ func (*Subset) ProtoMessage() {} func (x *Subset) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -106,7 +104,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_rawDescGZIP } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_goTypes = []any{ (*Subset)(nil), // 0: gloo.solo.io.Subset nil, // 1: gloo.solo.io.Subset.ValuesEntry } @@ -124,20 +122,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_init() { if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_subset_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Subset); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/tcp_listener_options.pb.go b/pkg/api/gloo.solo.io/v1/tcp_listener_options.pb.go index 5842df428..5d0be62a4 100644 --- a/pkg/api/gloo.solo.io/v1/tcp_listener_options.pb.go +++ b/pkg/api/gloo.solo.io/v1/tcp_listener_options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/tcp_listener_options.proto @@ -41,11 +41,9 @@ type TcpListenerOptions struct { func (x *TcpListenerOptions) Reset() { *x = TcpListenerOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *TcpListenerOptions) String() string { @@ -56,7 +54,7 @@ func (*TcpListenerOptions) ProtoMessage() {} func (x *TcpListenerOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -157,7 +155,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_pro } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_proto_goTypes = []any{ (*TcpListenerOptions)(nil), // 0: gloo.solo.io.TcpListenerOptions (*tcp.TcpProxySettings)(nil), // 1: tcp.options.gloo.solo.io.TcpProxySettings (*connection_limit.ConnectionLimit)(nil), // 2: connection_limit.options.gloo.solo.io.ConnectionLimit @@ -179,20 +177,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_pro if File_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_tcp_listener_options_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TcpListenerOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/gloo.solo.io/v1/upstream.pb.clone.go b/pkg/api/gloo.solo.io/v1/upstream.pb.clone.go index 593f1054a..282b5043e 100644 --- a/pkg/api/gloo.solo.io/v1/upstream.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/upstream.pb.clone.go @@ -13,12 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" - - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" - - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_api_v2_cluster "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_api_v2_core "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/api/v2/core" @@ -42,6 +36,12 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_static "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/static" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_ssl "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" + + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" + + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -121,39 +121,39 @@ func (m *UpstreamSpec) Clone() proto.Message { target.ProtocolSelection = m.GetProtocolSelection() if h, ok := interface{}(m.GetUseHttp2()).(clone.Cloner); ok { - target.UseHttp2 = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseHttp2 = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.UseHttp2 = proto.Clone(m.GetUseHttp2()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.UseHttp2 = proto.Clone(m.GetUseHttp2()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetInitialStreamWindowSize()).(clone.Cloner); ok { - target.InitialStreamWindowSize = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialStreamWindowSize = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.InitialStreamWindowSize = proto.Clone(m.GetInitialStreamWindowSize()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialStreamWindowSize = proto.Clone(m.GetInitialStreamWindowSize()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetInitialConnectionWindowSize()).(clone.Cloner); ok { - target.InitialConnectionWindowSize = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialConnectionWindowSize = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.InitialConnectionWindowSize = proto.Clone(m.GetInitialConnectionWindowSize()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.InitialConnectionWindowSize = proto.Clone(m.GetInitialConnectionWindowSize()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetMaxConcurrentStreams()).(clone.Cloner); ok { - target.MaxConcurrentStreams = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxConcurrentStreams = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxConcurrentStreams = proto.Clone(m.GetMaxConcurrentStreams()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxConcurrentStreams = proto.Clone(m.GetMaxConcurrentStreams()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetOverrideStreamErrorOnInvalidHttpMessage()).(clone.Cloner); ok { - target.OverrideStreamErrorOnInvalidHttpMessage = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OverrideStreamErrorOnInvalidHttpMessage = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.OverrideStreamErrorOnInvalidHttpMessage = proto.Clone(m.GetOverrideStreamErrorOnInvalidHttpMessage()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.OverrideStreamErrorOnInvalidHttpMessage = proto.Clone(m.GetOverrideStreamErrorOnInvalidHttpMessage()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetHttpProxyHostname()).(clone.Cloner); ok { - target.HttpProxyHostname = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.HttpProxyHostname = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.HttpProxyHostname = proto.Clone(m.GetHttpProxyHostname()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.HttpProxyHostname = proto.Clone(m.GetHttpProxyHostname()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetHttpConnectSslConfig()).(clone.Cloner); ok { @@ -176,27 +176,27 @@ func (m *UpstreamSpec) Clone() proto.Message { } if h, ok := interface{}(m.GetIgnoreHealthOnHostRemoval()).(clone.Cloner); ok { - target.IgnoreHealthOnHostRemoval = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IgnoreHealthOnHostRemoval = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.IgnoreHealthOnHostRemoval = proto.Clone(m.GetIgnoreHealthOnHostRemoval()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IgnoreHealthOnHostRemoval = proto.Clone(m.GetIgnoreHealthOnHostRemoval()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetRespectDnsTtl()).(clone.Cloner); ok { - target.RespectDnsTtl = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.RespectDnsTtl = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.RespectDnsTtl = proto.Clone(m.GetRespectDnsTtl()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.RespectDnsTtl = proto.Clone(m.GetRespectDnsTtl()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetDnsRefreshRate()).(clone.Cloner); ok { - target.DnsRefreshRate = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DnsRefreshRate = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.DnsRefreshRate = proto.Clone(m.GetDnsRefreshRate()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.DnsRefreshRate = proto.Clone(m.GetDnsRefreshRate()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } if h, ok := interface{}(m.GetProxyProtocolVersion()).(clone.Cloner); ok { - target.ProxyProtocolVersion = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ProxyProtocolVersion = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.ProxyProtocolVersion = proto.Clone(m.GetProxyProtocolVersion()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.ProxyProtocolVersion = proto.Clone(m.GetProxyProtocolVersion()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetPreconnectPolicy()).(clone.Cloner); ok { @@ -206,9 +206,9 @@ func (m *UpstreamSpec) Clone() proto.Message { } if h, ok := interface{}(m.GetDisableIstioAutoMtls()).(clone.Cloner); ok { - target.DisableIstioAutoMtls = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableIstioAutoMtls = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DisableIstioAutoMtls = proto.Clone(m.GetDisableIstioAutoMtls()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DisableIstioAutoMtls = proto.Clone(m.GetDisableIstioAutoMtls()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } switch m.UpstreamType.(type) { @@ -370,15 +370,15 @@ func (m *PreconnectPolicy) Clone() proto.Message { target = &PreconnectPolicy{} if h, ok := interface{}(m.GetPerUpstreamPreconnectRatio()).(clone.Cloner); ok { - target.PerUpstreamPreconnectRatio = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.PerUpstreamPreconnectRatio = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } else { - target.PerUpstreamPreconnectRatio = proto.Clone(m.GetPerUpstreamPreconnectRatio()).(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.PerUpstreamPreconnectRatio = proto.Clone(m.GetPerUpstreamPreconnectRatio()).(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } if h, ok := interface{}(m.GetPredictivePreconnectRatio()).(clone.Cloner); ok { - target.PredictivePreconnectRatio = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.PredictivePreconnectRatio = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } else { - target.PredictivePreconnectRatio = proto.Clone(m.GetPredictivePreconnectRatio()).(*github_com_golang_protobuf_ptypes_wrappers.DoubleValue) + target.PredictivePreconnectRatio = proto.Clone(m.GetPredictivePreconnectRatio()).(*google_golang_org_protobuf_types_known_wrapperspb.DoubleValue) } return target @@ -412,9 +412,9 @@ func (m *UpstreamStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target diff --git a/pkg/api/gloo.solo.io/v1/upstream.pb.go b/pkg/api/gloo.solo.io/v1/upstream.pb.go index 28db51449..c7dda5597 100644 --- a/pkg/api/gloo.solo.io/v1/upstream.pb.go +++ b/pkg/api/gloo.solo.io/v1/upstream.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/upstream.proto @@ -11,9 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" cluster "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/api/v2/cluster" core "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/api/v2/core" @@ -30,6 +27,9 @@ import ( _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -193,7 +193,7 @@ type UpstreamSpec struct { // Use http2 when communicating with this upstream // this field is evaluated `true` for upstreams // with a grpc service spec. otherwise defaults to `false` - UseHttp2 *wrappers.BoolValue `protobuf:"bytes,10,opt,name=use_http2,json=useHttp2,proto3" json:"use_http2,omitempty"` + UseHttp2 *wrapperspb.BoolValue `protobuf:"bytes,10,opt,name=use_http2,json=useHttp2,proto3" json:"use_http2,omitempty"` // (UInt32Value) Initial stream-level flow-control window size. // Valid values range from 65535 (2^16 - 1, HTTP/2 default) to 2147483647 (2^31 - 1, HTTP/2 maximum) // and defaults to 268435456 (256 * 1024 * 1024). @@ -203,15 +203,15 @@ type UpstreamSpec struct { // in the HTTP/2 codec buffers. Once the buffer reaches this pointer, // watermark callbacks will fire to stop the flow of data to the codec buffers. // Requires UseHttp2 to be true to be acknowledged. - InitialStreamWindowSize *wrappers.UInt32Value `protobuf:"bytes,19,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` + InitialStreamWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,19,opt,name=initial_stream_window_size,json=initialStreamWindowSize,proto3" json:"initial_stream_window_size,omitempty"` // (UInt32Value) Similar to initial_stream_window_size, but for connection-level flow-control window. // Currently, this has the same minimum/maximum/default as initial_stream_window_size. // Requires UseHttp2 to be true to be acknowledged. - InitialConnectionWindowSize *wrappers.UInt32Value `protobuf:"bytes,20,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` + InitialConnectionWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,20,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"` // (UInt32Value) Maximum concurrent streams allowed for peer on one HTTP/2 connection. // Valid values range from 1 to 2147483647 (2^31 - 1) and defaults to 2147483647. // Requires UseHttp2 to be true to be acknowledged. - MaxConcurrentStreams *wrappers.UInt32Value `protobuf:"bytes,24,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` + MaxConcurrentStreams *wrapperspb.UInt32Value `protobuf:"bytes,24,opt,name=max_concurrent_streams,json=maxConcurrentStreams,proto3" json:"max_concurrent_streams,omitempty"` // Allows invalid HTTP messaging and headers. When this option is disabled (default), then // the whole HTTP/2 connection is terminated upon receiving invalid HEADERS frame. However, // when this option is enabled, only the offending stream is terminated. @@ -220,7 +220,7 @@ type UpstreamSpec struct { // ` // // See [RFC7540, sec. 8.1](https://datatracker.ietf.org/doc/html/rfc7540#section-8.1) for details. - OverrideStreamErrorOnInvalidHttpMessage *wrappers.BoolValue `protobuf:"bytes,26,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` + OverrideStreamErrorOnInvalidHttpMessage *wrapperspb.BoolValue `protobuf:"bytes,26,opt,name=override_stream_error_on_invalid_http_message,json=overrideStreamErrorOnInvalidHttpMessage,proto3" json:"override_stream_error_on_invalid_http_message,omitempty"` // Tells envoy that the upstream is an HTTP proxy (e.g., another proxy in a DMZ) that supports HTTP Connect. // This configuration sets the hostname used as part of the HTTP Connect request. // For example, setting to: host.com:443 and making a request routed to the upstream such as `curl :/v1` @@ -235,7 +235,7 @@ type UpstreamSpec struct { // accept: */* // // Note: if setting this field to a hostname rather than IP:PORT, you may want to also set `host_rewrite` on the route - HttpProxyHostname *wrappers.StringValue `protobuf:"bytes,21,opt,name=http_proxy_hostname,json=httpProxyHostname,proto3" json:"http_proxy_hostname,omitempty"` + HttpProxyHostname *wrapperspb.StringValue `protobuf:"bytes,21,opt,name=http_proxy_hostname,json=httpProxyHostname,proto3" json:"http_proxy_hostname,omitempty"` // HttpConnectSslConfig contains the options necessary to configure envoy to originate TLS to an HTTP Connect proxy. // If you also want to ensure the bytes proxied by the HTTP Connect proxy are encrypted, you should also // specify `ssl_config`. @@ -244,18 +244,18 @@ type UpstreamSpec struct { HttpConnectHeaders []*HeaderValue `protobuf:"bytes,28,rep,name=http_connect_headers,json=httpConnectHeaders,proto3" json:"http_connect_headers,omitempty"` // (bool) If set to true, Envoy will ignore the health value of a host when processing its removal from service discovery. // This means that if active health checking is used, Envoy will not wait for the endpoint to go unhealthy before removing it. - IgnoreHealthOnHostRemoval *wrappers.BoolValue `protobuf:"bytes,22,opt,name=ignore_health_on_host_removal,json=ignoreHealthOnHostRemoval,proto3" json:"ignore_health_on_host_removal,omitempty"` + IgnoreHealthOnHostRemoval *wrapperspb.BoolValue `protobuf:"bytes,22,opt,name=ignore_health_on_host_removal,json=ignoreHealthOnHostRemoval,proto3" json:"ignore_health_on_host_removal,omitempty"` // If set to true, Service Discovery update period will be triggered once the TTL is expired. // If minimum TTL of all records is 0 then dns_refresh_rate will be used. - RespectDnsTtl *wrappers.BoolValue `protobuf:"bytes,29,opt,name=respect_dns_ttl,json=respectDnsTtl,proto3" json:"respect_dns_ttl,omitempty"` + RespectDnsTtl *wrapperspb.BoolValue `protobuf:"bytes,29,opt,name=respect_dns_ttl,json=respectDnsTtl,proto3" json:"respect_dns_ttl,omitempty"` // Service Discovery DNS Refresh Rate. // Minimum value is 1 ms. Values below the minimum are considered invalid. // Only valid for STRICT_DNS and LOGICAL_DNS cluster types. All other cluster types are considered invalid. - DnsRefreshRate *duration.Duration `protobuf:"bytes,30,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` + DnsRefreshRate *durationpb.Duration `protobuf:"bytes,30,opt,name=dns_refresh_rate,json=dnsRefreshRate,proto3" json:"dns_refresh_rate,omitempty"` // Proxy Protocol Version to add when communicating with the upstream. // If unset will not wrap the transport socket. // These are of the format "V1" or "V2" - ProxyProtocolVersion *wrappers.StringValue `protobuf:"bytes,31,opt,name=proxy_protocol_version,json=proxyProtocolVersion,proto3" json:"proxy_protocol_version,omitempty"` + ProxyProtocolVersion *wrapperspb.StringValue `protobuf:"bytes,31,opt,name=proxy_protocol_version,json=proxyProtocolVersion,proto3" json:"proxy_protocol_version,omitempty"` // Preconnect policy for the cluster // Aligns as closely as possible with https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto#envoy-v3-api-msg-config-cluster-v3-cluster-preconnectpolicy // This is not recommended for use unless you are sure you need it. @@ -263,16 +263,14 @@ type UpstreamSpec struct { PreconnectPolicy *PreconnectPolicy `protobuf:"bytes,32,opt,name=preconnect_policy,json=preconnectPolicy,proto3" json:"preconnect_policy,omitempty"` // If set to true, the proxy will not allow automatic mTLS detection for Istio upstreams. // Defaults to false. - DisableIstioAutoMtls *wrappers.BoolValue `protobuf:"bytes,33,opt,name=disable_istio_auto_mtls,json=disableIstioAutoMtls,proto3" json:"disable_istio_auto_mtls,omitempty"` + DisableIstioAutoMtls *wrapperspb.BoolValue `protobuf:"bytes,33,opt,name=disable_istio_auto_mtls,json=disableIstioAutoMtls,proto3" json:"disable_istio_auto_mtls,omitempty"` } func (x *UpstreamSpec) Reset() { *x = UpstreamSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamSpec) String() string { @@ -283,7 +281,7 @@ func (*UpstreamSpec) ProtoMessage() {} func (x *UpstreamSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -431,42 +429,42 @@ func (x *UpstreamSpec) GetProtocolSelection() UpstreamSpec_ClusterProtocolSelect return UpstreamSpec_USE_CONFIGURED_PROTOCOL } -func (x *UpstreamSpec) GetUseHttp2() *wrappers.BoolValue { +func (x *UpstreamSpec) GetUseHttp2() *wrapperspb.BoolValue { if x != nil { return x.UseHttp2 } return nil } -func (x *UpstreamSpec) GetInitialStreamWindowSize() *wrappers.UInt32Value { +func (x *UpstreamSpec) GetInitialStreamWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialStreamWindowSize } return nil } -func (x *UpstreamSpec) GetInitialConnectionWindowSize() *wrappers.UInt32Value { +func (x *UpstreamSpec) GetInitialConnectionWindowSize() *wrapperspb.UInt32Value { if x != nil { return x.InitialConnectionWindowSize } return nil } -func (x *UpstreamSpec) GetMaxConcurrentStreams() *wrappers.UInt32Value { +func (x *UpstreamSpec) GetMaxConcurrentStreams() *wrapperspb.UInt32Value { if x != nil { return x.MaxConcurrentStreams } return nil } -func (x *UpstreamSpec) GetOverrideStreamErrorOnInvalidHttpMessage() *wrappers.BoolValue { +func (x *UpstreamSpec) GetOverrideStreamErrorOnInvalidHttpMessage() *wrapperspb.BoolValue { if x != nil { return x.OverrideStreamErrorOnInvalidHttpMessage } return nil } -func (x *UpstreamSpec) GetHttpProxyHostname() *wrappers.StringValue { +func (x *UpstreamSpec) GetHttpProxyHostname() *wrapperspb.StringValue { if x != nil { return x.HttpProxyHostname } @@ -487,28 +485,28 @@ func (x *UpstreamSpec) GetHttpConnectHeaders() []*HeaderValue { return nil } -func (x *UpstreamSpec) GetIgnoreHealthOnHostRemoval() *wrappers.BoolValue { +func (x *UpstreamSpec) GetIgnoreHealthOnHostRemoval() *wrapperspb.BoolValue { if x != nil { return x.IgnoreHealthOnHostRemoval } return nil } -func (x *UpstreamSpec) GetRespectDnsTtl() *wrappers.BoolValue { +func (x *UpstreamSpec) GetRespectDnsTtl() *wrapperspb.BoolValue { if x != nil { return x.RespectDnsTtl } return nil } -func (x *UpstreamSpec) GetDnsRefreshRate() *duration.Duration { +func (x *UpstreamSpec) GetDnsRefreshRate() *durationpb.Duration { if x != nil { return x.DnsRefreshRate } return nil } -func (x *UpstreamSpec) GetProxyProtocolVersion() *wrappers.StringValue { +func (x *UpstreamSpec) GetProxyProtocolVersion() *wrapperspb.StringValue { if x != nil { return x.ProxyProtocolVersion } @@ -522,7 +520,7 @@ func (x *UpstreamSpec) GetPreconnectPolicy() *PreconnectPolicy { return nil } -func (x *UpstreamSpec) GetDisableIstioAutoMtls() *wrappers.BoolValue { +func (x *UpstreamSpec) GetDisableIstioAutoMtls() *wrapperspb.BoolValue { if x != nil { return x.DisableIstioAutoMtls } @@ -599,11 +597,9 @@ type DiscoveryMetadata struct { func (x *DiscoveryMetadata) Reset() { *x = DiscoveryMetadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *DiscoveryMetadata) String() string { @@ -614,7 +610,7 @@ func (*DiscoveryMetadata) ProtoMessage() {} func (x *DiscoveryMetadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -650,11 +646,9 @@ type HeaderValue struct { func (x *HeaderValue) Reset() { *x = HeaderValue{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *HeaderValue) String() string { @@ -665,7 +659,7 @@ func (*HeaderValue) ProtoMessage() {} func (x *HeaderValue) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -723,7 +717,7 @@ type PreconnectPolicy struct { // // This is limited somewhat arbitrarily to 3 because preconnecting too aggressively can // harm latency more than the preconnecting helps. - PerUpstreamPreconnectRatio *wrappers.DoubleValue `protobuf:"bytes,1,opt,name=per_upstream_preconnect_ratio,json=perUpstreamPreconnectRatio,proto3" json:"per_upstream_preconnect_ratio,omitempty"` + PerUpstreamPreconnectRatio *wrapperspb.DoubleValue `protobuf:"bytes,1,opt,name=per_upstream_preconnect_ratio,json=perUpstreamPreconnectRatio,proto3" json:"per_upstream_preconnect_ratio,omitempty"` // Indicates how many streams (rounded up) can be anticipated across a cluster for each // stream, useful for low QPS services. This is currently supported for a subset of // deterministic non-hash-based load-balancing algorithms (weighted round robin, random). @@ -746,16 +740,14 @@ type PreconnectPolicy struct { // If both this and preconnect_ratio are set, Envoy will make sure both predicted needs are met, // basically preconnecting max(predictive-preconnect, per-upstream-preconnect), for each // upstream. - PredictivePreconnectRatio *wrappers.DoubleValue `protobuf:"bytes,2,opt,name=predictive_preconnect_ratio,json=predictivePreconnectRatio,proto3" json:"predictive_preconnect_ratio,omitempty"` + PredictivePreconnectRatio *wrapperspb.DoubleValue `protobuf:"bytes,2,opt,name=predictive_preconnect_ratio,json=predictivePreconnectRatio,proto3" json:"predictive_preconnect_ratio,omitempty"` } func (x *PreconnectPolicy) Reset() { *x = PreconnectPolicy{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PreconnectPolicy) String() string { @@ -766,7 +758,7 @@ func (*PreconnectPolicy) ProtoMessage() {} func (x *PreconnectPolicy) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -781,14 +773,14 @@ func (*PreconnectPolicy) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_rawDescGZIP(), []int{3} } -func (x *PreconnectPolicy) GetPerUpstreamPreconnectRatio() *wrappers.DoubleValue { +func (x *PreconnectPolicy) GetPerUpstreamPreconnectRatio() *wrapperspb.DoubleValue { if x != nil { return x.PerUpstreamPreconnectRatio } return nil } -func (x *PreconnectPolicy) GetPredictivePreconnectRatio() *wrappers.DoubleValue { +func (x *PreconnectPolicy) GetPredictivePreconnectRatio() *wrapperspb.DoubleValue { if x != nil { return x.PredictivePreconnectRatio } @@ -809,16 +801,14 @@ type UpstreamStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*UpstreamStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *UpstreamStatus) Reset() { *x = UpstreamStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamStatus) String() string { @@ -829,7 +819,7 @@ func (*UpstreamStatus) ProtoMessage() {} func (x *UpstreamStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -872,7 +862,7 @@ func (x *UpstreamStatus) GetSubresourceStatuses() map[string]*UpstreamStatus { return nil } -func (x *UpstreamStatus) GetDetails() *_struct.Struct { +func (x *UpstreamStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -889,11 +879,9 @@ type UpstreamNamespacedStatuses struct { func (x *UpstreamNamespacedStatuses) Reset() { *x = UpstreamNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UpstreamNamespacedStatuses) String() string { @@ -904,7 +892,7 @@ func (*UpstreamNamespacedStatuses) ProtoMessage() {} func (x *UpstreamNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1274,7 +1262,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_rawDescGZ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_enumTypes = make([]protoimpl.EnumInfo, 2) var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes = make([]protoimpl.MessageInfo, 9) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_goTypes = []any{ (UpstreamSpec_ClusterProtocolSelection)(0), // 0: gloo.solo.io.UpstreamSpec.ClusterProtocolSelection (UpstreamStatus_State)(0), // 1: gloo.solo.io.UpstreamStatus.State (*UpstreamSpec)(nil), // 2: gloo.solo.io.UpstreamSpec @@ -1302,12 +1290,12 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_goTypes = (*ai.UpstreamSpec)(nil), // 24: ai.options.gloo.solo.io.UpstreamSpec (*Failover)(nil), // 25: gloo.solo.io.Failover (*ConnectionConfig)(nil), // 26: gloo.solo.io.ConnectionConfig - (*wrappers.BoolValue)(nil), // 27: google.protobuf.BoolValue - (*wrappers.UInt32Value)(nil), // 28: google.protobuf.UInt32Value - (*wrappers.StringValue)(nil), // 29: google.protobuf.StringValue - (*duration.Duration)(nil), // 30: google.protobuf.Duration - (*wrappers.DoubleValue)(nil), // 31: google.protobuf.DoubleValue - (*_struct.Struct)(nil), // 32: google.protobuf.Struct + (*wrapperspb.BoolValue)(nil), // 27: google.protobuf.BoolValue + (*wrapperspb.UInt32Value)(nil), // 28: google.protobuf.UInt32Value + (*wrapperspb.StringValue)(nil), // 29: google.protobuf.StringValue + (*durationpb.Duration)(nil), // 30: google.protobuf.Duration + (*wrapperspb.DoubleValue)(nil), // 31: google.protobuf.DoubleValue + (*structpb.Struct)(nil), // 32: google.protobuf.Struct } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_depIdxs = []int32{ 3, // 0: gloo.solo.io.UpstreamSpec.discovery_metadata:type_name -> gloo.solo.io.DiscoveryMetadata @@ -1367,81 +1355,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_init() { file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_load_balancer_proto_init() file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_connection_proto_init() file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_failover_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DiscoveryMetadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeaderValue); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PreconnectPolicy); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpstreamNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_upstream_proto_msgTypes[0].OneofWrappers = []any{ (*UpstreamSpec_Kube)(nil), (*UpstreamSpec_Static)(nil), (*UpstreamSpec_Pipe)(nil), diff --git a/pkg/api/gloo.solo.io/v1/virtual_host_options.pb.clone.go b/pkg/api/gloo.solo.io/v1/virtual_host_options.pb.clone.go index a76d66169..d692e730f 100644 --- a/pkg/api/gloo.solo.io/v1/virtual_host_options.pb.clone.go +++ b/pkg/api/gloo.solo.io/v1/virtual_host_options.pb.clone.go @@ -13,8 +13,6 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" - github_com_solo_io_solo_apis_pkg_api_enterprise_gloo_solo_io_v1 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_external_envoy_extensions_filters_http_buffer_v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3" @@ -42,6 +40,8 @@ import ( github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_stats "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/stats" github_com_solo_io_solo_apis_pkg_api_gloo_solo_io_v1_options_transformation "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/transformation" + + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -142,15 +142,15 @@ func (m *VirtualHostOptions) Clone() proto.Message { } if h, ok := interface{}(m.GetIncludeRequestAttemptCount()).(clone.Cloner); ok { - target.IncludeRequestAttemptCount = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IncludeRequestAttemptCount = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.IncludeRequestAttemptCount = proto.Clone(m.GetIncludeRequestAttemptCount()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IncludeRequestAttemptCount = proto.Clone(m.GetIncludeRequestAttemptCount()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetIncludeAttemptCountInResponse()).(clone.Cloner); ok { - target.IncludeAttemptCountInResponse = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IncludeAttemptCountInResponse = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.IncludeAttemptCountInResponse = proto.Clone(m.GetIncludeAttemptCountInResponse()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.IncludeAttemptCountInResponse = proto.Clone(m.GetIncludeAttemptCountInResponse()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetStagedTransformations()).(clone.Cloner); ok { diff --git a/pkg/api/gloo.solo.io/v1/virtual_host_options.pb.go b/pkg/api/gloo.solo.io/v1/virtual_host_options.pb.go index f30a4d5ae..b9b760c89 100644 --- a/pkg/api/gloo.solo.io/v1/virtual_host_options.pb.go +++ b/pkg/api/gloo.solo.io/v1/virtual_host_options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/virtual_host_options.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/buffer/v3" @@ -28,6 +27,7 @@ import ( transformation "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/transformation" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -116,14 +116,14 @@ type VirtualHostOptions struct { // so in the case of two Envoys on the request path with this option enabled, // the upstream will see the attempt count as perceived by the second Envoy. // Defaults to false. - IncludeRequestAttemptCount *wrappers.BoolValue `protobuf:"bytes,15,opt,name=include_request_attempt_count,json=includeRequestAttemptCount,proto3" json:"include_request_attempt_count,omitempty"` + IncludeRequestAttemptCount *wrapperspb.BoolValue `protobuf:"bytes,15,opt,name=include_request_attempt_count,json=includeRequestAttemptCount,proto3" json:"include_request_attempt_count,omitempty"` // IncludeAttemptCountInResponse decides whether the x-envoy-attempt-count header // should be included in the downstream response. // Setting this option will cause the router to override any existing header value, // so in the case of two Envoys on the request path with this option enabled, // the downstream will see the attempt count as perceived by the Envoy closest upstream from itself. // Defaults to false. - IncludeAttemptCountInResponse *wrappers.BoolValue `protobuf:"bytes,16,opt,name=include_attempt_count_in_response,json=includeAttemptCountInResponse,proto3" json:"include_attempt_count_in_response,omitempty"` + IncludeAttemptCountInResponse *wrapperspb.BoolValue `protobuf:"bytes,16,opt,name=include_attempt_count_in_response,json=includeAttemptCountInResponse,proto3" json:"include_attempt_count_in_response,omitempty"` // Early transformations stage. These transformations run before most other options are processed. // If the `regular` field is set in here, the `transformations` field is ignored. StagedTransformations *transformation.TransformationStages `protobuf:"bytes,17,opt,name=staged_transformations,json=stagedTransformations,proto3" json:"staged_transformations,omitempty"` @@ -136,11 +136,9 @@ type VirtualHostOptions struct { func (x *VirtualHostOptions) Reset() { *x = VirtualHostOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *VirtualHostOptions) String() string { @@ -151,7 +149,7 @@ func (*VirtualHostOptions) ProtoMessage() {} func (x *VirtualHostOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -343,14 +341,14 @@ func (x *VirtualHostOptions) GetCsrf() *v31.CsrfPolicy { return nil } -func (x *VirtualHostOptions) GetIncludeRequestAttemptCount() *wrappers.BoolValue { +func (x *VirtualHostOptions) GetIncludeRequestAttemptCount() *wrapperspb.BoolValue { if x != nil { return x.IncludeRequestAttemptCount } return nil } -func (x *VirtualHostOptions) GetIncludeAttemptCountInResponse() *wrappers.BoolValue { +func (x *VirtualHostOptions) GetIncludeAttemptCountInResponse() *wrapperspb.BoolValue { if x != nil { return x.IncludeAttemptCountInResponse } @@ -737,7 +735,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_pro } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_proto_goTypes = []any{ (*VirtualHostOptions)(nil), // 0: gloo.solo.io.VirtualHostOptions (*Extensions)(nil), // 1: gloo.solo.io.Extensions (*retries.RetryPolicy)(nil), // 2: retries.options.gloo.solo.io.RetryPolicy @@ -756,7 +754,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_prot (*dlp.Config)(nil), // 15: dlp.options.gloo.solo.io.Config (*v3.BufferPerRoute)(nil), // 16: solo.io.envoy.extensions.filters.http.buffer.v3.BufferPerRoute (*v31.CsrfPolicy)(nil), // 17: solo.io.envoy.extensions.filters.http.csrf.v3.CsrfPolicy - (*wrappers.BoolValue)(nil), // 18: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 18: google.protobuf.BoolValue (*transformation.TransformationStages)(nil), // 19: transformation.options.gloo.solo.io.TransformationStages (*extproc.RouteSettings)(nil), // 20: extproc.options.gloo.solo.io.RouteSettings (*cors.CorsPolicyMergeSettings)(nil), // 21: cors.options.gloo.solo.io.CorsPolicyMergeSettings @@ -801,21 +799,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_pro return } file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VirtualHostOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_virtual_host_options_proto_msgTypes[0].OneofWrappers = []any{ (*VirtualHostOptions_RatelimitEarly)(nil), (*VirtualHostOptions_RateLimitEarlyConfigs)(nil), (*VirtualHostOptions_Ratelimit)(nil), diff --git a/pkg/api/gloo.solo.io/v1/weighted_destination_options.pb.go b/pkg/api/gloo.solo.io/v1/weighted_destination_options.pb.go index e9768434c..e7bef23e2 100644 --- a/pkg/api/gloo.solo.io/v1/weighted_destination_options.pb.go +++ b/pkg/api/gloo.solo.io/v1/weighted_destination_options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/weighted_destination_options.proto @@ -69,11 +69,9 @@ type WeightedDestinationOptions struct { func (x *WeightedDestinationOptions) Reset() { *x = WeightedDestinationOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_options_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_options_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *WeightedDestinationOptions) String() string { @@ -84,7 +82,7 @@ func (*WeightedDestinationOptions) ProtoMessage() {} func (x *WeightedDestinationOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_options_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -253,7 +251,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_opt } var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_options_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_options_proto_goTypes = []any{ (*WeightedDestinationOptions)(nil), // 0: gloo.solo.io.WeightedDestinationOptions (*headers.HeaderManipulation)(nil), // 1: headers.options.gloo.solo.io.HeaderManipulation (*transformation.Transformations)(nil), // 2: transformation.options.gloo.solo.io.Transformations @@ -286,20 +284,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_opt return } file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_extensions_proto_init() - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_gloo_v1_weighted_destination_options_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WeightedDestinationOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/graphql.gloo.solo.io/v1beta1/clients.go b/pkg/api/graphql.gloo.solo.io/v1beta1/clients.go index db7413b7a..0a51a0274 100644 --- a/pkg/api/graphql.gloo.solo.io/v1beta1/clients.go +++ b/pkg/api/graphql.gloo.solo.io/v1beta1/clients.go @@ -121,15 +121,15 @@ type GraphQLApiClient interface { GraphQLApiStatusWriter } -type graphQLApiClient struct { +type graphQlapiClient struct { client client.Client } -func NewGraphQLApiClient(client client.Client) *graphQLApiClient { - return &graphQLApiClient{client: client} +func NewGraphQLApiClient(client client.Client) *graphQlapiClient { + return &graphQlapiClient{client: client} } -func (c *graphQLApiClient) GetGraphQLApi(ctx context.Context, key client.ObjectKey) (*GraphQLApi, error) { +func (c *graphQlapiClient) GetGraphQLApi(ctx context.Context, key client.ObjectKey) (*GraphQLApi, error) { obj := &GraphQLApi{} if err := c.client.Get(ctx, key, obj); err != nil { return nil, err @@ -137,7 +137,7 @@ func (c *graphQLApiClient) GetGraphQLApi(ctx context.Context, key client.ObjectK return obj, nil } -func (c *graphQLApiClient) ListGraphQLApi(ctx context.Context, opts ...client.ListOption) (*GraphQLApiList, error) { +func (c *graphQlapiClient) ListGraphQLApi(ctx context.Context, opts ...client.ListOption) (*GraphQLApiList, error) { list := &GraphQLApiList{} if err := c.client.List(ctx, list, opts...); err != nil { return nil, err @@ -145,31 +145,31 @@ func (c *graphQLApiClient) ListGraphQLApi(ctx context.Context, opts ...client.Li return list, nil } -func (c *graphQLApiClient) CreateGraphQLApi(ctx context.Context, obj *GraphQLApi, opts ...client.CreateOption) error { +func (c *graphQlapiClient) CreateGraphQLApi(ctx context.Context, obj *GraphQLApi, opts ...client.CreateOption) error { return c.client.Create(ctx, obj, opts...) } -func (c *graphQLApiClient) DeleteGraphQLApi(ctx context.Context, key client.ObjectKey, opts ...client.DeleteOption) error { +func (c *graphQlapiClient) DeleteGraphQLApi(ctx context.Context, key client.ObjectKey, opts ...client.DeleteOption) error { obj := &GraphQLApi{} obj.SetName(key.Name) obj.SetNamespace(key.Namespace) return c.client.Delete(ctx, obj, opts...) } -func (c *graphQLApiClient) UpdateGraphQLApi(ctx context.Context, obj *GraphQLApi, opts ...client.UpdateOption) error { +func (c *graphQlapiClient) UpdateGraphQLApi(ctx context.Context, obj *GraphQLApi, opts ...client.UpdateOption) error { return c.client.Update(ctx, obj, opts...) } -func (c *graphQLApiClient) PatchGraphQLApi(ctx context.Context, obj *GraphQLApi, patch client.Patch, opts ...client.PatchOption) error { +func (c *graphQlapiClient) PatchGraphQLApi(ctx context.Context, obj *GraphQLApi, patch client.Patch, opts ...client.PatchOption) error { return c.client.Patch(ctx, obj, patch, opts...) } -func (c *graphQLApiClient) DeleteAllOfGraphQLApi(ctx context.Context, opts ...client.DeleteAllOfOption) error { +func (c *graphQlapiClient) DeleteAllOfGraphQLApi(ctx context.Context, opts ...client.DeleteAllOfOption) error { obj := &GraphQLApi{} return c.client.DeleteAllOf(ctx, obj, opts...) } -func (c *graphQLApiClient) UpsertGraphQLApi(ctx context.Context, obj *GraphQLApi, transitionFuncs ...GraphQLApiTransitionFunction) error { +func (c *graphQlapiClient) UpsertGraphQLApi(ctx context.Context, obj *GraphQLApi, transitionFuncs ...GraphQLApiTransitionFunction) error { genericTxFunc := func(existing, desired runtime.Object) error { for _, txFunc := range transitionFuncs { if err := txFunc(existing.(*GraphQLApi), desired.(*GraphQLApi)); err != nil { @@ -182,11 +182,11 @@ func (c *graphQLApiClient) UpsertGraphQLApi(ctx context.Context, obj *GraphQLApi return err } -func (c *graphQLApiClient) UpdateGraphQLApiStatus(ctx context.Context, obj *GraphQLApi, opts ...client.SubResourceUpdateOption) error { +func (c *graphQlapiClient) UpdateGraphQLApiStatus(ctx context.Context, obj *GraphQLApi, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *graphQLApiClient) PatchGraphQLApiStatus(ctx context.Context, obj *GraphQLApi, patch client.Patch, opts ...client.SubResourcePatchOption) error { +func (c *graphQlapiClient) PatchGraphQLApiStatus(ctx context.Context, obj *GraphQLApi, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } diff --git a/pkg/api/graphql.gloo.solo.io/v1beta1/controller/event_handlers.go b/pkg/api/graphql.gloo.solo.io/v1beta1/controller/event_handlers.go index 8a7ee8766..b8ce975f9 100644 --- a/pkg/api/graphql.gloo.solo.io/v1beta1/controller/event_handlers.go +++ b/pkg/api/graphql.gloo.solo.io/v1beta1/controller/event_handlers.go @@ -65,17 +65,17 @@ type GraphQLApiEventWatcher interface { AddEventHandler(ctx context.Context, h GraphQLApiEventHandler, predicates ...predicate.Predicate) error } -type graphQLApiEventWatcher struct { +type graphQlapiEventWatcher struct { watcher events.EventWatcher } func NewGraphQLApiEventWatcher(name string, mgr manager.Manager) GraphQLApiEventWatcher { - return &graphQLApiEventWatcher{ + return &graphQlapiEventWatcher{ watcher: events.NewWatcher(name, mgr, &graphql_gloo_solo_io_v1beta1.GraphQLApi{}), } } -func (c *graphQLApiEventWatcher) AddEventHandler(ctx context.Context, h GraphQLApiEventHandler, predicates ...predicate.Predicate) error { +func (c *graphQlapiEventWatcher) AddEventHandler(ctx context.Context, h GraphQLApiEventHandler, predicates ...predicate.Predicate) error { handler := genericGraphQLApiHandler{handler: h} if err := c.watcher.Watch(ctx, handler, predicates...); err != nil { return err diff --git a/pkg/api/graphql.gloo.solo.io/v1beta1/controller/reconcilers.go b/pkg/api/graphql.gloo.solo.io/v1beta1/controller/reconcilers.go index 1154dfa27..248be6879 100644 --- a/pkg/api/graphql.gloo.solo.io/v1beta1/controller/reconcilers.go +++ b/pkg/api/graphql.gloo.solo.io/v1beta1/controller/reconcilers.go @@ -68,18 +68,18 @@ type GraphQLApiReconcileLoop interface { RunGraphQLApiReconciler(ctx context.Context, rec GraphQLApiReconciler, predicates ...predicate.Predicate) error } -type graphQLApiReconcileLoop struct { +type graphQlapiReconcileLoop struct { loop reconcile.Loop } func NewGraphQLApiReconcileLoop(name string, mgr manager.Manager, options reconcile.Options) GraphQLApiReconcileLoop { - return &graphQLApiReconcileLoop{ + return &graphQlapiReconcileLoop{ // empty cluster indicates this reconciler is built for the local cluster loop: reconcile.NewLoop(name, "", mgr, &graphql_gloo_solo_io_v1beta1.GraphQLApi{}, options), } } -func (c *graphQLApiReconcileLoop) RunGraphQLApiReconciler(ctx context.Context, reconciler GraphQLApiReconciler, predicates ...predicate.Predicate) error { +func (c *graphQlapiReconcileLoop) RunGraphQLApiReconciler(ctx context.Context, reconciler GraphQLApiReconciler, predicates ...predicate.Predicate) error { genericReconciler := genericGraphQLApiReconciler{ reconciler: reconciler, } diff --git a/pkg/api/graphql.gloo.solo.io/v1beta1/graphql.pb.clone.go b/pkg/api/graphql.gloo.solo.io/v1beta1/graphql.pb.clone.go index c65f22125..deafbc77b 100644 --- a/pkg/api/graphql.gloo.solo.io/v1beta1/graphql.pb.clone.go +++ b/pkg/api/graphql.gloo.solo.io/v1beta1/graphql.pb.clone.go @@ -13,13 +13,13 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -60,9 +60,9 @@ func (m *RequestTemplate) Clone() proto.Message { } if h, ok := interface{}(m.GetBody()).(clone.Cloner); ok { - target.Body = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Value) + target.Body = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Value) } else { - target.Body = proto.Clone(m.GetBody()).(*github_com_golang_protobuf_ptypes_struct.Value) + target.Body = proto.Clone(m.GetBody()).(*google_golang_org_protobuf_types_known_structpb.Value) } return target @@ -99,9 +99,9 @@ func (m *GrpcRequestTemplate) Clone() proto.Message { target = &GrpcRequestTemplate{} if h, ok := interface{}(m.GetOutgoingMessageJson()).(clone.Cloner); ok { - target.OutgoingMessageJson = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Value) + target.OutgoingMessageJson = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Value) } else { - target.OutgoingMessageJson = proto.Clone(m.GetOutgoingMessageJson()).(*github_com_golang_protobuf_ptypes_struct.Value) + target.OutgoingMessageJson = proto.Clone(m.GetOutgoingMessageJson()).(*google_golang_org_protobuf_types_known_structpb.Value) } target.ServiceName = m.GetServiceName() @@ -149,9 +149,9 @@ func (m *RESTResolver) Clone() proto.Message { target.SpanName = m.GetSpanName() if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -227,9 +227,9 @@ func (m *GrpcResolver) Clone() proto.Message { target.SpanName = m.GetSpanName() if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -273,11 +273,11 @@ func (m *MockResolver) Clone() proto.Message { if h, ok := interface{}(m.GetSyncResponse()).(clone.Cloner); ok { target.Response = &MockResolver_SyncResponse{ - SyncResponse: h.Clone().(*github_com_golang_protobuf_ptypes_struct.Value), + SyncResponse: h.Clone().(*google_golang_org_protobuf_types_known_structpb.Value), } } else { target.Response = &MockResolver_SyncResponse{ - SyncResponse: proto.Clone(m.GetSyncResponse()).(*github_com_golang_protobuf_ptypes_struct.Value), + SyncResponse: proto.Clone(m.GetSyncResponse()).(*google_golang_org_protobuf_types_known_structpb.Value), } } @@ -313,9 +313,9 @@ func (m *Resolution) Clone() proto.Message { target = &Resolution{} if h, ok := interface{}(m.GetStatPrefix()).(clone.Cloner); ok { - target.StatPrefix = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.StatPrefix = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.StatPrefix = proto.Clone(m.GetStatPrefix()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.StatPrefix = proto.Clone(m.GetStatPrefix()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } switch m.Resolver.(type) { @@ -370,9 +370,9 @@ func (m *GraphQLApiSpec) Clone() proto.Message { target = &GraphQLApiSpec{} if h, ok := interface{}(m.GetStatPrefix()).(clone.Cloner); ok { - target.StatPrefix = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.StatPrefix = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } else { - target.StatPrefix = proto.Clone(m.GetStatPrefix()).(*github_com_golang_protobuf_ptypes_wrappers.StringValue) + target.StatPrefix = proto.Clone(m.GetStatPrefix()).(*google_golang_org_protobuf_types_known_wrapperspb.StringValue) } if h, ok := interface{}(m.GetPersistedQueryCacheConfig()).(clone.Cloner); ok { @@ -532,9 +532,9 @@ func (m *GraphQLApiStatus) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -649,15 +649,15 @@ func (m *MockResolver_AsyncResponse) Clone() proto.Message { target = &MockResolver_AsyncResponse{} if h, ok := interface{}(m.GetResponse()).(clone.Cloner); ok { - target.Response = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Value) + target.Response = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Value) } else { - target.Response = proto.Clone(m.GetResponse()).(*github_com_golang_protobuf_ptypes_struct.Value) + target.Response = proto.Clone(m.GetResponse()).(*google_golang_org_protobuf_types_known_structpb.Value) } if h, ok := interface{}(m.GetDelay()).(clone.Cloner); ok { - target.Delay = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Delay = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Delay = proto.Clone(m.GetDelay()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Delay = proto.Clone(m.GetDelay()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } return target @@ -754,9 +754,9 @@ func (m *Executor_Local_LocalExecutorOptions) Clone() proto.Message { target = &Executor_Local_LocalExecutorOptions{} if h, ok := interface{}(m.GetMaxDepth()).(clone.Cloner); ok { - target.MaxDepth = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxDepth = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.MaxDepth = proto.Clone(m.GetMaxDepth()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.MaxDepth = proto.Clone(m.GetMaxDepth()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/graphql.gloo.solo.io/v1beta1/graphql.pb.go b/pkg/api/graphql.gloo.solo.io/v1beta1/graphql.pb.go index 95e941d23..59ab2cac7 100644 --- a/pkg/api/graphql.gloo.solo.io/v1beta1/graphql.pb.go +++ b/pkg/api/graphql.gloo.solo.io/v1beta1/graphql.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/graphql.gloo/v1beta1/graphql.proto @@ -11,14 +11,14 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" - _ "github.com/golang/protobuf/ptypes/empty" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/emptypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -118,16 +118,14 @@ type RequestTemplate struct { // Used to construct the outgoing body to the upstream from the // graphql value providers. // All string values can be templated strings. - Body *_struct.Value `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"` + Body *structpb.Value `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"` } func (x *RequestTemplate) Reset() { *x = RequestTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RequestTemplate) String() string { @@ -138,7 +136,7 @@ func (*RequestTemplate) ProtoMessage() {} func (x *RequestTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -167,7 +165,7 @@ func (x *RequestTemplate) GetQueryParams() map[string]string { return nil } -func (x *RequestTemplate) GetBody() *_struct.Value { +func (x *RequestTemplate) GetBody() *structpb.Value { if x != nil { return x.Body } @@ -219,11 +217,9 @@ type ResponseTemplate struct { func (x *ResponseTemplate) Reset() { *x = ResponseTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ResponseTemplate) String() string { @@ -234,7 +230,7 @@ func (*ResponseTemplate) ProtoMessage() {} func (x *ResponseTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -271,7 +267,7 @@ type GrpcRequestTemplate struct { unknownFields protoimpl.UnknownFields // json representation of outgoing gRPC message to be sent to gRPC service - OutgoingMessageJson *_struct.Value `protobuf:"bytes,1,opt,name=outgoing_message_json,json=outgoingMessageJson,proto3" json:"outgoing_message_json,omitempty"` + OutgoingMessageJson *structpb.Value `protobuf:"bytes,1,opt,name=outgoing_message_json,json=outgoingMessageJson,proto3" json:"outgoing_message_json,omitempty"` // request has shape matching service with name registered in registry // is the full_name(), e.g. main.Bookstore ServiceName string `protobuf:"bytes,2,opt,name=service_name,json=serviceName,proto3" json:"service_name,omitempty"` @@ -285,11 +281,9 @@ type GrpcRequestTemplate struct { func (x *GrpcRequestTemplate) Reset() { *x = GrpcRequestTemplate{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcRequestTemplate) String() string { @@ -300,7 +294,7 @@ func (*GrpcRequestTemplate) ProtoMessage() {} func (x *GrpcRequestTemplate) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -315,7 +309,7 @@ func (*GrpcRequestTemplate) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_rawDescGZIP(), []int{2} } -func (x *GrpcRequestTemplate) GetOutgoingMessageJson() *_struct.Value { +func (x *GrpcRequestTemplate) GetOutgoingMessageJson() *structpb.Value { if x != nil { return x.OutgoingMessageJson } @@ -359,16 +353,14 @@ type RESTResolver struct { SpanName string `protobuf:"bytes,4,opt,name=span_name,json=spanName,proto3" json:"span_name,omitempty"` // The timeout to use for this resolver. If unset, the upstream connection timeout // or a default of 1 second will be used. - Timeout *duration.Duration `protobuf:"bytes,5,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,5,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *RESTResolver) Reset() { *x = RESTResolver{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RESTResolver) String() string { @@ -379,7 +371,7 @@ func (*RESTResolver) ProtoMessage() {} func (x *RESTResolver) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -422,7 +414,7 @@ func (x *RESTResolver) GetSpanName() string { return "" } -func (x *RESTResolver) GetTimeout() *duration.Duration { +func (x *RESTResolver) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -447,11 +439,9 @@ type GrpcDescriptorRegistry struct { func (x *GrpcDescriptorRegistry) Reset() { *x = GrpcDescriptorRegistry{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcDescriptorRegistry) String() string { @@ -462,7 +452,7 @@ func (*GrpcDescriptorRegistry) ProtoMessage() {} func (x *GrpcDescriptorRegistry) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -550,16 +540,14 @@ type GrpcResolver struct { SpanName string `protobuf:"bytes,4,opt,name=span_name,json=spanName,proto3" json:"span_name,omitempty"` // The timeout to use for this resolver. If unset, the upstream connection timeout // or a default of 1 second will be used. - Timeout *duration.Duration `protobuf:"bytes,5,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,5,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *GrpcResolver) Reset() { *x = GrpcResolver{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcResolver) String() string { @@ -570,7 +558,7 @@ func (*GrpcResolver) ProtoMessage() {} func (x *GrpcResolver) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -606,7 +594,7 @@ func (x *GrpcResolver) GetSpanName() string { return "" } -func (x *GrpcResolver) GetTimeout() *duration.Duration { +func (x *GrpcResolver) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -625,11 +613,9 @@ type StitchedSchema struct { func (x *StitchedSchema) Reset() { *x = StitchedSchema{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StitchedSchema) String() string { @@ -640,7 +626,7 @@ func (*StitchedSchema) ProtoMessage() {} func (x *StitchedSchema) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -678,11 +664,9 @@ type MockResolver struct { func (x *MockResolver) Reset() { *x = MockResolver{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MockResolver) String() string { @@ -693,7 +677,7 @@ func (*MockResolver) ProtoMessage() {} func (x *MockResolver) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -715,7 +699,7 @@ func (m *MockResolver) GetResponse() isMockResolver_Response { return nil } -func (x *MockResolver) GetSyncResponse() *_struct.Value { +func (x *MockResolver) GetSyncResponse() *structpb.Value { if x, ok := x.GetResponse().(*MockResolver_SyncResponse); ok { return x.SyncResponse } @@ -742,7 +726,7 @@ type isMockResolver_Response interface { type MockResolver_SyncResponse struct { // The JSON response from the resolver that will be "responded" immediately. - SyncResponse *_struct.Value `protobuf:"bytes,1,opt,name=sync_response,json=syncResponse,proto3,oneof"` + SyncResponse *structpb.Value `protobuf:"bytes,1,opt,name=sync_response,json=syncResponse,proto3,oneof"` } type MockResolver_AsyncResponse_ struct { @@ -782,16 +766,14 @@ type Resolution struct { Resolver isResolution_Resolver `protobuf_oneof:"resolver"` // The stats prefix which will be used for this resolver. // If empty, will generate a stats prefix ${RESOLVER_NAME} - StatPrefix *wrappers.StringValue `protobuf:"bytes,3,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"` + StatPrefix *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"` } func (x *Resolution) Reset() { *x = Resolution{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Resolution) String() string { @@ -802,7 +784,7 @@ func (*Resolution) ProtoMessage() {} func (x *Resolution) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -845,7 +827,7 @@ func (x *Resolution) GetMockResolver() *MockResolver { return nil } -func (x *Resolution) GetStatPrefix() *wrappers.StringValue { +func (x *Resolution) GetStatPrefix() *wrapperspb.StringValue { if x != nil { return x.StatPrefix } @@ -901,7 +883,7 @@ type GraphQLApiSpec struct { Schema isGraphQLApiSpec_Schema `protobuf_oneof:"schema"` // The stats prefix which will be used for this route config. // If empty, will generate a stats prefix ${GRAPHQLAPI_REF} - StatPrefix *wrappers.StringValue `protobuf:"bytes,3,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"` + StatPrefix *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"` // Configuration settings for persisted query cache PersistedQueryCacheConfig *PersistedQueryCacheConfig `protobuf:"bytes,4,opt,name=persisted_query_cache_config,json=persistedQueryCacheConfig,proto3" json:"persisted_query_cache_config,omitempty"` // Safelist: only allow queries to be executed that match these sha256 hashes. @@ -913,11 +895,9 @@ type GraphQLApiSpec struct { func (x *GraphQLApiSpec) Reset() { *x = GraphQLApiSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GraphQLApiSpec) String() string { @@ -928,7 +908,7 @@ func (*GraphQLApiSpec) ProtoMessage() {} func (x *GraphQLApiSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -964,7 +944,7 @@ func (x *GraphQLApiSpec) GetStitchedSchema() *StitchedSchema { return nil } -func (x *GraphQLApiSpec) GetStatPrefix() *wrappers.StringValue { +func (x *GraphQLApiSpec) GetStatPrefix() *wrapperspb.StringValue { if x != nil { return x.StatPrefix } @@ -1024,11 +1004,9 @@ type PersistedQueryCacheConfig struct { func (x *PersistedQueryCacheConfig) Reset() { *x = PersistedQueryCacheConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *PersistedQueryCacheConfig) String() string { @@ -1039,7 +1017,7 @@ func (*PersistedQueryCacheConfig) ProtoMessage() {} func (x *PersistedQueryCacheConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1096,11 +1074,9 @@ type ExecutableSchema struct { func (x *ExecutableSchema) Reset() { *x = ExecutableSchema{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *ExecutableSchema) String() string { @@ -1111,7 +1087,7 @@ func (*ExecutableSchema) ProtoMessage() {} func (x *ExecutableSchema) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1162,11 +1138,9 @@ type Executor struct { func (x *Executor) Reset() { *x = Executor{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor) String() string { @@ -1177,7 +1151,7 @@ func (*Executor) ProtoMessage() {} func (x *Executor) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1243,16 +1217,14 @@ type GraphQLApiStatus struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*GraphQLApiStatus `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } func (x *GraphQLApiStatus) Reset() { *x = GraphQLApiStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GraphQLApiStatus) String() string { @@ -1263,7 +1235,7 @@ func (*GraphQLApiStatus) ProtoMessage() {} func (x *GraphQLApiStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1306,7 +1278,7 @@ func (x *GraphQLApiStatus) GetSubresourceStatuses() map[string]*GraphQLApiStatus return nil } -func (x *GraphQLApiStatus) GetDetails() *_struct.Struct { +func (x *GraphQLApiStatus) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -1323,11 +1295,9 @@ type GraphQLApiNamespacedStatuses struct { func (x *GraphQLApiNamespacedStatuses) Reset() { *x = GraphQLApiNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GraphQLApiNamespacedStatuses) String() string { @@ -1338,7 +1308,7 @@ func (*GraphQLApiNamespacedStatuses) ProtoMessage() {} func (x *GraphQLApiNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1374,11 +1344,9 @@ type GrpcDescriptorRegistry_ProtoRefs struct { func (x *GrpcDescriptorRegistry_ProtoRefs) Reset() { *x = GrpcDescriptorRegistry_ProtoRefs{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GrpcDescriptorRegistry_ProtoRefs) String() string { @@ -1389,7 +1357,7 @@ func (*GrpcDescriptorRegistry_ProtoRefs) ProtoMessage() {} func (x *GrpcDescriptorRegistry_ProtoRefs) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1464,11 +1432,9 @@ type StitchedSchema_SubschemaConfig struct { func (x *StitchedSchema_SubschemaConfig) Reset() { *x = StitchedSchema_SubschemaConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StitchedSchema_SubschemaConfig) String() string { @@ -1479,7 +1445,7 @@ func (*StitchedSchema_SubschemaConfig) ProtoMessage() {} func (x *StitchedSchema_SubschemaConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1532,11 +1498,9 @@ type StitchedSchema_SubschemaConfig_TypeMergeConfig struct { func (x *StitchedSchema_SubschemaConfig_TypeMergeConfig) Reset() { *x = StitchedSchema_SubschemaConfig_TypeMergeConfig{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *StitchedSchema_SubschemaConfig_TypeMergeConfig) String() string { @@ -1547,7 +1511,7 @@ func (*StitchedSchema_SubschemaConfig_TypeMergeConfig) ProtoMessage() {} func (x *StitchedSchema_SubschemaConfig_TypeMergeConfig) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1589,18 +1553,16 @@ type MockResolver_AsyncResponse struct { unknownFields protoimpl.UnknownFields // The response from the resolver as a JSON. - Response *_struct.Value `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"` + Response *structpb.Value `protobuf:"bytes,1,opt,name=response,proto3" json:"response,omitempty"` // The delay time before this response is sent back to the graphql server - Delay *duration.Duration `protobuf:"bytes,2,opt,name=delay,proto3" json:"delay,omitempty"` + Delay *durationpb.Duration `protobuf:"bytes,2,opt,name=delay,proto3" json:"delay,omitempty"` } func (x *MockResolver_AsyncResponse) Reset() { *x = MockResolver_AsyncResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[24] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MockResolver_AsyncResponse) String() string { @@ -1611,7 +1573,7 @@ func (*MockResolver_AsyncResponse) ProtoMessage() {} func (x *MockResolver_AsyncResponse) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[24] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1626,14 +1588,14 @@ func (*MockResolver_AsyncResponse) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_rawDescGZIP(), []int{7, 0} } -func (x *MockResolver_AsyncResponse) GetResponse() *_struct.Value { +func (x *MockResolver_AsyncResponse) GetResponse() *structpb.Value { if x != nil { return x.Response } return nil } -func (x *MockResolver_AsyncResponse) GetDelay() *duration.Duration { +func (x *MockResolver_AsyncResponse) GetDelay() *durationpb.Duration { if x != nil { return x.Delay } @@ -1654,11 +1616,9 @@ type GraphQLApiSpec_GraphQLApiOptions struct { func (x *GraphQLApiSpec_GraphQLApiOptions) Reset() { *x = GraphQLApiSpec_GraphQLApiOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GraphQLApiSpec_GraphQLApiOptions) String() string { @@ -1669,7 +1629,7 @@ func (*GraphQLApiSpec_GraphQLApiOptions) ProtoMessage() {} func (x *GraphQLApiSpec_GraphQLApiOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[25] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1725,11 +1685,9 @@ type Executor_Local struct { func (x *Executor_Local) Reset() { *x = Executor_Local{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[26] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor_Local) String() string { @@ -1740,7 +1698,7 @@ func (*Executor_Local) ProtoMessage() {} func (x *Executor_Local) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[26] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1799,11 +1757,9 @@ type Executor_Remote struct { func (x *Executor_Remote) Reset() { *x = Executor_Remote{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[27] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor_Remote) String() string { @@ -1814,7 +1770,7 @@ func (*Executor_Remote) ProtoMessage() {} func (x *Executor_Remote) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[27] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1908,16 +1864,14 @@ type Executor_Local_LocalExecutorOptions struct { // } // // If not configured, or the value is 0, the query depth will be unbounded. - MaxDepth *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=max_depth,json=maxDepth,proto3" json:"max_depth,omitempty"` + MaxDepth *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=max_depth,json=maxDepth,proto3" json:"max_depth,omitempty"` } func (x *Executor_Local_LocalExecutorOptions) Reset() { *x = Executor_Local_LocalExecutorOptions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[28] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Executor_Local_LocalExecutorOptions) String() string { @@ -1928,7 +1882,7 @@ func (*Executor_Local_LocalExecutorOptions) ProtoMessage() {} func (x *Executor_Local_LocalExecutorOptions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[28] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1943,7 +1897,7 @@ func (*Executor_Local_LocalExecutorOptions) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_rawDescGZIP(), []int{12, 0, 0} } -func (x *Executor_Local_LocalExecutorOptions) GetMaxDepth() *wrappers.UInt32Value { +func (x *Executor_Local_LocalExecutorOptions) GetMaxDepth() *wrapperspb.UInt32Value { if x != nil { return x.MaxDepth } @@ -2353,7 +2307,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_pro var file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes = make([]protoimpl.MessageInfo, 34) -var file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_goTypes = []any{ (GraphQLApiStatus_State)(0), // 0: graphql.gloo.solo.io.GraphQLApiStatus.State (*RequestTemplate)(nil), // 1: graphql.gloo.solo.io.RequestTemplate (*ResponseTemplate)(nil), // 2: graphql.gloo.solo.io.ResponseTemplate @@ -2384,17 +2338,17 @@ var file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_prot (*Executor_Local)(nil), // 27: graphql.gloo.solo.io.Executor.Local (*Executor_Remote)(nil), // 28: graphql.gloo.solo.io.Executor.Remote (*Executor_Local_LocalExecutorOptions)(nil), // 29: graphql.gloo.solo.io.Executor.Local.LocalExecutorOptions - nil, // 30: graphql.gloo.solo.io.Executor.Local.ResolutionsEntry - nil, // 31: graphql.gloo.solo.io.Executor.Remote.HeadersEntry - nil, // 32: graphql.gloo.solo.io.Executor.Remote.QueryParamsEntry - nil, // 33: graphql.gloo.solo.io.GraphQLApiStatus.SubresourceStatusesEntry - nil, // 34: graphql.gloo.solo.io.GraphQLApiNamespacedStatuses.StatusesEntry - (*_struct.Value)(nil), // 35: google.protobuf.Value - (*core.ResourceRef)(nil), // 36: core.solo.io.ResourceRef - (*duration.Duration)(nil), // 37: google.protobuf.Duration - (*wrappers.StringValue)(nil), // 38: google.protobuf.StringValue - (*_struct.Struct)(nil), // 39: google.protobuf.Struct - (*wrappers.UInt32Value)(nil), // 40: google.protobuf.UInt32Value + nil, // 30: graphql.gloo.solo.io.Executor.Local.ResolutionsEntry + nil, // 31: graphql.gloo.solo.io.Executor.Remote.HeadersEntry + nil, // 32: graphql.gloo.solo.io.Executor.Remote.QueryParamsEntry + nil, // 33: graphql.gloo.solo.io.GraphQLApiStatus.SubresourceStatusesEntry + nil, // 34: graphql.gloo.solo.io.GraphQLApiNamespacedStatuses.StatusesEntry + (*structpb.Value)(nil), // 35: google.protobuf.Value + (*core.ResourceRef)(nil), // 36: core.solo.io.ResourceRef + (*durationpb.Duration)(nil), // 37: google.protobuf.Duration + (*wrapperspb.StringValue)(nil), // 38: google.protobuf.StringValue + (*structpb.Struct)(nil), // 39: google.protobuf.Struct + (*wrapperspb.UInt32Value)(nil), // 40: google.protobuf.UInt32Value } var file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_depIdxs = []int32{ 16, // 0: graphql.gloo.solo.io.RequestTemplate.headers:type_name -> graphql.gloo.solo.io.RequestTemplate.HeadersEntry @@ -2458,304 +2412,26 @@ func file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_pro if File_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RequestTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ResponseTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcRequestTemplate); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RESTResolver); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcDescriptorRegistry); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcResolver); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StitchedSchema); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MockResolver); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Resolution); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GraphQLApiSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PersistedQueryCacheConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ExecutableSchema); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GraphQLApiStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GraphQLApiNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GrpcDescriptorRegistry_ProtoRefs); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StitchedSchema_SubschemaConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StitchedSchema_SubschemaConfig_TypeMergeConfig); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MockResolver_AsyncResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GraphQLApiSpec_GraphQLApiOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor_Local); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor_Remote); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Executor_Local_LocalExecutorOptions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[4].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[4].OneofWrappers = []any{ (*GrpcDescriptorRegistry_ProtoDescriptor)(nil), (*GrpcDescriptorRegistry_ProtoDescriptorBin)(nil), (*GrpcDescriptorRegistry_ProtoRefsList)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[7].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[7].OneofWrappers = []any{ (*MockResolver_SyncResponse)(nil), (*MockResolver_AsyncResponse_)(nil), (*MockResolver_ErrorResponse)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[8].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[8].OneofWrappers = []any{ (*Resolution_RestResolver)(nil), (*Resolution_GrpcResolver)(nil), (*Resolution_MockResolver)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[9].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[9].OneofWrappers = []any{ (*GraphQLApiSpec_ExecutableSchema)(nil), (*GraphQLApiSpec_StitchedSchema)(nil), } - file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[12].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_gloo_graphql_gloo_v1beta1_graphql_proto_msgTypes[12].OneofWrappers = []any{ (*Executor_Local_)(nil), (*Executor_Remote_)(nil), } diff --git a/pkg/api/graphql.gloo.solo.io/v1beta1/sets/mocks/sets.go b/pkg/api/graphql.gloo.solo.io/v1beta1/sets/mocks/sets.go index 357b68f56..2aa0ccf6a 100644 --- a/pkg/api/graphql.gloo.solo.io/v1beta1/sets/mocks/sets.go +++ b/pkg/api/graphql.gloo.solo.io/v1beta1/sets/mocks/sets.go @@ -53,15 +53,15 @@ func (mr *MockGraphQLApiSetMockRecorder) Clone() *gomock.Call { } // Delete mocks base method. -func (m *MockGraphQLApiSet) Delete(graphQLApi ezkube.ResourceId) { +func (m *MockGraphQLApiSet) Delete(graphQlapi ezkube.ResourceId) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Delete", graphQLApi) + m.ctrl.Call(m, "Delete", graphQlapi) } // Delete indicates an expected call of Delete. -func (mr *MockGraphQLApiSetMockRecorder) Delete(graphQLApi interface{}) *gomock.Call { +func (mr *MockGraphQLApiSetMockRecorder) Delete(graphQlapi interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockGraphQLApiSet)(nil).Delete), graphQLApi) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockGraphQLApiSet)(nil).Delete), graphQlapi) } // Delta mocks base method. @@ -93,17 +93,17 @@ func (mr *MockGraphQLApiSetMockRecorder) Difference(set interface{}) *gomock.Cal } // Equal mocks base method. -func (m *MockGraphQLApiSet) Equal(graphQLApiSet v1beta1sets.GraphQLApiSet) bool { +func (m *MockGraphQLApiSet) Equal(graphQlapiSet v1beta1sets.GraphQLApiSet) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Equal", graphQLApiSet) + ret := m.ctrl.Call(m, "Equal", graphQlapiSet) ret0, _ := ret[0].(bool) return ret0 } // Equal indicates an expected call of Equal. -func (mr *MockGraphQLApiSetMockRecorder) Equal(graphQLApiSet interface{}) *gomock.Call { +func (mr *MockGraphQLApiSetMockRecorder) Equal(graphQlapiSet interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Equal", reflect.TypeOf((*MockGraphQLApiSet)(nil).Equal), graphQLApiSet) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Equal", reflect.TypeOf((*MockGraphQLApiSet)(nil).Equal), graphQlapiSet) } // Find mocks base method. @@ -136,33 +136,33 @@ func (mr *MockGraphQLApiSetMockRecorder) Generic() *gomock.Call { } // Has mocks base method. -func (m *MockGraphQLApiSet) Has(graphQLApi ezkube.ResourceId) bool { +func (m *MockGraphQLApiSet) Has(graphQlapi ezkube.ResourceId) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Has", graphQLApi) + ret := m.ctrl.Call(m, "Has", graphQlapi) ret0, _ := ret[0].(bool) return ret0 } // Has indicates an expected call of Has. -func (mr *MockGraphQLApiSetMockRecorder) Has(graphQLApi interface{}) *gomock.Call { +func (mr *MockGraphQLApiSetMockRecorder) Has(graphQlapi interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Has", reflect.TypeOf((*MockGraphQLApiSet)(nil).Has), graphQLApi) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Has", reflect.TypeOf((*MockGraphQLApiSet)(nil).Has), graphQlapi) } // Insert mocks base method. -func (m *MockGraphQLApiSet) Insert(graphQLApi ...*v1beta1.GraphQLApi) { +func (m *MockGraphQLApiSet) Insert(graphQlapi ...*v1beta1.GraphQLApi) { m.ctrl.T.Helper() varargs := []interface{}{} - for _, a := range graphQLApi { + for _, a := range graphQlapi { varargs = append(varargs, a) } m.ctrl.Call(m, "Insert", varargs...) } // Insert indicates an expected call of Insert. -func (mr *MockGraphQLApiSetMockRecorder) Insert(graphQLApi ...interface{}) *gomock.Call { +func (mr *MockGraphQLApiSetMockRecorder) Insert(graphQlapi ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Insert", reflect.TypeOf((*MockGraphQLApiSet)(nil).Insert), graphQLApi...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Insert", reflect.TypeOf((*MockGraphQLApiSet)(nil).Insert), graphQlapi...) } // Intersection mocks base method. diff --git a/pkg/api/graphql.gloo.solo.io/v1beta1/sets/sets.go b/pkg/api/graphql.gloo.solo.io/v1beta1/sets/sets.go index 37820b728..e826f36b2 100644 --- a/pkg/api/graphql.gloo.solo.io/v1beta1/sets/sets.go +++ b/pkg/api/graphql.gloo.solo.io/v1beta1/sets/sets.go @@ -25,13 +25,13 @@ type GraphQLApiSet interface { // Return the Set as a map of key to resource. Map() map[string]*graphql_gloo_solo_io_v1beta1.GraphQLApi // Insert a resource into the set. - Insert(graphQLApi ...*graphql_gloo_solo_io_v1beta1.GraphQLApi) + Insert(graphQlapi ...*graphql_gloo_solo_io_v1beta1.GraphQLApi) // Compare the equality of the keys in two sets (not the resources themselves) - Equal(graphQLApiSet GraphQLApiSet) bool + Equal(graphQlapiSet GraphQLApiSet) bool // Check if the set contains a key matching the resource (not the resource itself) - Has(graphQLApi ezkube.ResourceId) bool + Has(graphQlapi ezkube.ResourceId) bool // Delete the key matching the resource - Delete(graphQLApi ezkube.ResourceId) + Delete(graphQlapi ezkube.ResourceId) // Return the union with the provided set Union(set GraphQLApiSet) GraphQLApiSet // Return the difference with the provided set @@ -50,38 +50,38 @@ type GraphQLApiSet interface { Clone() GraphQLApiSet } -func makeGenericGraphQLApiSet(graphQLApiList []*graphql_gloo_solo_io_v1beta1.GraphQLApi) sksets.ResourceSet { +func makeGenericGraphQLApiSet(graphQlapiList []*graphql_gloo_solo_io_v1beta1.GraphQLApi) sksets.ResourceSet { var genericResources []ezkube.ResourceId - for _, obj := range graphQLApiList { + for _, obj := range graphQlapiList { genericResources = append(genericResources, obj) } return sksets.NewResourceSet(genericResources...) } -type graphQLApiSet struct { +type graphQlapiSet struct { set sksets.ResourceSet } -func NewGraphQLApiSet(graphQLApiList ...*graphql_gloo_solo_io_v1beta1.GraphQLApi) GraphQLApiSet { - return &graphQLApiSet{set: makeGenericGraphQLApiSet(graphQLApiList)} +func NewGraphQLApiSet(graphQlapiList ...*graphql_gloo_solo_io_v1beta1.GraphQLApi) GraphQLApiSet { + return &graphQlapiSet{set: makeGenericGraphQLApiSet(graphQlapiList)} } -func NewGraphQLApiSetFromList(graphQLApiList *graphql_gloo_solo_io_v1beta1.GraphQLApiList) GraphQLApiSet { - list := make([]*graphql_gloo_solo_io_v1beta1.GraphQLApi, 0, len(graphQLApiList.Items)) - for idx := range graphQLApiList.Items { - list = append(list, &graphQLApiList.Items[idx]) +func NewGraphQLApiSetFromList(graphQlapiList *graphql_gloo_solo_io_v1beta1.GraphQLApiList) GraphQLApiSet { + list := make([]*graphql_gloo_solo_io_v1beta1.GraphQLApi, 0, len(graphQlapiList.Items)) + for idx := range graphQlapiList.Items { + list = append(list, &graphQlapiList.Items[idx]) } - return &graphQLApiSet{set: makeGenericGraphQLApiSet(list)} + return &graphQlapiSet{set: makeGenericGraphQLApiSet(list)} } -func (s *graphQLApiSet) Keys() sets.String { +func (s *graphQlapiSet) Keys() sets.String { if s == nil { return sets.String{} } return s.Generic().Keys() } -func (s *graphQLApiSet) List(filterResource ...func(*graphql_gloo_solo_io_v1beta1.GraphQLApi) bool) []*graphql_gloo_solo_io_v1beta1.GraphQLApi { +func (s *graphQlapiSet) List(filterResource ...func(*graphql_gloo_solo_io_v1beta1.GraphQLApi) bool) []*graphql_gloo_solo_io_v1beta1.GraphQLApi { if s == nil { return nil } @@ -94,14 +94,14 @@ func (s *graphQLApiSet) List(filterResource ...func(*graphql_gloo_solo_io_v1beta } objs := s.Generic().List(genericFilters...) - graphQLApiList := make([]*graphql_gloo_solo_io_v1beta1.GraphQLApi, 0, len(objs)) + graphQlapiList := make([]*graphql_gloo_solo_io_v1beta1.GraphQLApi, 0, len(objs)) for _, obj := range objs { - graphQLApiList = append(graphQLApiList, obj.(*graphql_gloo_solo_io_v1beta1.GraphQLApi)) + graphQlapiList = append(graphQlapiList, obj.(*graphql_gloo_solo_io_v1beta1.GraphQLApi)) } - return graphQLApiList + return graphQlapiList } -func (s *graphQLApiSet) UnsortedList(filterResource ...func(*graphql_gloo_solo_io_v1beta1.GraphQLApi) bool) []*graphql_gloo_solo_io_v1beta1.GraphQLApi { +func (s *graphQlapiSet) UnsortedList(filterResource ...func(*graphql_gloo_solo_io_v1beta1.GraphQLApi) bool) []*graphql_gloo_solo_io_v1beta1.GraphQLApi { if s == nil { return nil } @@ -113,14 +113,14 @@ func (s *graphQLApiSet) UnsortedList(filterResource ...func(*graphql_gloo_solo_i }) } - var graphQLApiList []*graphql_gloo_solo_io_v1beta1.GraphQLApi + var graphQlapiList []*graphql_gloo_solo_io_v1beta1.GraphQLApi for _, obj := range s.Generic().UnsortedList(genericFilters...) { - graphQLApiList = append(graphQLApiList, obj.(*graphql_gloo_solo_io_v1beta1.GraphQLApi)) + graphQlapiList = append(graphQlapiList, obj.(*graphql_gloo_solo_io_v1beta1.GraphQLApi)) } - return graphQLApiList + return graphQlapiList } -func (s *graphQLApiSet) Map() map[string]*graphql_gloo_solo_io_v1beta1.GraphQLApi { +func (s *graphQlapiSet) Map() map[string]*graphql_gloo_solo_io_v1beta1.GraphQLApi { if s == nil { return nil } @@ -132,69 +132,69 @@ func (s *graphQLApiSet) Map() map[string]*graphql_gloo_solo_io_v1beta1.GraphQLAp return newMap } -func (s *graphQLApiSet) Insert( - graphQLApiList ...*graphql_gloo_solo_io_v1beta1.GraphQLApi, +func (s *graphQlapiSet) Insert( + graphQlapiList ...*graphql_gloo_solo_io_v1beta1.GraphQLApi, ) { if s == nil { panic("cannot insert into nil set") } - for _, obj := range graphQLApiList { + for _, obj := range graphQlapiList { s.Generic().Insert(obj) } } -func (s *graphQLApiSet) Has(graphQLApi ezkube.ResourceId) bool { +func (s *graphQlapiSet) Has(graphQlapi ezkube.ResourceId) bool { if s == nil { return false } - return s.Generic().Has(graphQLApi) + return s.Generic().Has(graphQlapi) } -func (s *graphQLApiSet) Equal( - graphQLApiSet GraphQLApiSet, +func (s *graphQlapiSet) Equal( + graphQlapiSet GraphQLApiSet, ) bool { if s == nil { - return graphQLApiSet == nil + return graphQlapiSet == nil } - return s.Generic().Equal(graphQLApiSet.Generic()) + return s.Generic().Equal(graphQlapiSet.Generic()) } -func (s *graphQLApiSet) Delete(GraphQLApi ezkube.ResourceId) { +func (s *graphQlapiSet) Delete(GraphQLApi ezkube.ResourceId) { if s == nil { return } s.Generic().Delete(GraphQLApi) } -func (s *graphQLApiSet) Union(set GraphQLApiSet) GraphQLApiSet { +func (s *graphQlapiSet) Union(set GraphQLApiSet) GraphQLApiSet { if s == nil { return set } return NewGraphQLApiSet(append(s.List(), set.List()...)...) } -func (s *graphQLApiSet) Difference(set GraphQLApiSet) GraphQLApiSet { +func (s *graphQlapiSet) Difference(set GraphQLApiSet) GraphQLApiSet { if s == nil { return set } newSet := s.Generic().Difference(set.Generic()) - return &graphQLApiSet{set: newSet} + return &graphQlapiSet{set: newSet} } -func (s *graphQLApiSet) Intersection(set GraphQLApiSet) GraphQLApiSet { +func (s *graphQlapiSet) Intersection(set GraphQLApiSet) GraphQLApiSet { if s == nil { return nil } newSet := s.Generic().Intersection(set.Generic()) - var graphQLApiList []*graphql_gloo_solo_io_v1beta1.GraphQLApi + var graphQlapiList []*graphql_gloo_solo_io_v1beta1.GraphQLApi for _, obj := range newSet.List() { - graphQLApiList = append(graphQLApiList, obj.(*graphql_gloo_solo_io_v1beta1.GraphQLApi)) + graphQlapiList = append(graphQlapiList, obj.(*graphql_gloo_solo_io_v1beta1.GraphQLApi)) } - return NewGraphQLApiSet(graphQLApiList...) + return NewGraphQLApiSet(graphQlapiList...) } -func (s *graphQLApiSet) Find(id ezkube.ResourceId) (*graphql_gloo_solo_io_v1beta1.GraphQLApi, error) { +func (s *graphQlapiSet) Find(id ezkube.ResourceId) (*graphql_gloo_solo_io_v1beta1.GraphQLApi, error) { if s == nil { return nil, eris.Errorf("empty set, cannot find GraphQLApi %v", sksets.Key(id)) } @@ -206,21 +206,21 @@ func (s *graphQLApiSet) Find(id ezkube.ResourceId) (*graphql_gloo_solo_io_v1beta return obj.(*graphql_gloo_solo_io_v1beta1.GraphQLApi), nil } -func (s *graphQLApiSet) Length() int { +func (s *graphQlapiSet) Length() int { if s == nil { return 0 } return s.Generic().Length() } -func (s *graphQLApiSet) Generic() sksets.ResourceSet { +func (s *graphQlapiSet) Generic() sksets.ResourceSet { if s == nil { return nil } return s.set } -func (s *graphQLApiSet) Delta(newSet GraphQLApiSet) sksets.ResourceDelta { +func (s *graphQlapiSet) Delta(newSet GraphQLApiSet) sksets.ResourceDelta { if s == nil { return sksets.ResourceDelta{ Inserted: newSet.Generic(), @@ -229,9 +229,9 @@ func (s *graphQLApiSet) Delta(newSet GraphQLApiSet) sksets.ResourceDelta { return s.Generic().Delta(newSet.Generic()) } -func (s *graphQLApiSet) Clone() GraphQLApiSet { +func (s *graphQlapiSet) Clone() GraphQLApiSet { if s == nil { return nil } - return &graphQLApiSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} + return &graphQlapiSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} } diff --git a/pkg/api/graphql.gloo.solo.io/v1beta1/types.go b/pkg/api/graphql.gloo.solo.io/v1beta1/types.go index e1c6b31ad..45a85f37b 100644 --- a/pkg/api/graphql.gloo.solo.io/v1beta1/types.go +++ b/pkg/api/graphql.gloo.solo.io/v1beta1/types.go @@ -20,7 +20,7 @@ var GraphQLApiGVK = schema.GroupVersionKind{ Kind: "GraphQLApi", } -// GraphQLApi is the Schema for the graphQLApi API +// GraphQLApi is the Schema for the graphQlapi API type GraphQLApi struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/pkg/api/multicluster.solo.io/v1alpha1/types/multicluster.pb.go b/pkg/api/multicluster.solo.io/v1alpha1/types/multicluster.pb.go index 180ceadf8..0f63fa322 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/types/multicluster.pb.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/types/multicluster.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/multicluster/v1alpha1/multicluster.proto @@ -10,11 +10,11 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -93,11 +93,9 @@ type Placement struct { func (x *Placement) Reset() { *x = Placement{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Placement) String() string { @@ -108,7 +106,7 @@ func (*Placement) ProtoMessage() {} func (x *Placement) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -147,11 +145,9 @@ type MultiClusterRoleSpec struct { func (x *MultiClusterRoleSpec) Reset() { *x = MultiClusterRoleSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MultiClusterRoleSpec) String() string { @@ -162,7 +158,7 @@ func (*MultiClusterRoleSpec) ProtoMessage() {} func (x *MultiClusterRoleSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -192,11 +188,9 @@ type MultiClusterRoleStatus struct { func (x *MultiClusterRoleStatus) Reset() { *x = MultiClusterRoleStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MultiClusterRoleStatus) String() string { @@ -207,7 +201,7 @@ func (*MultiClusterRoleStatus) ProtoMessage() {} func (x *MultiClusterRoleStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -235,11 +229,9 @@ type MultiClusterRoleBindingSpec struct { func (x *MultiClusterRoleBindingSpec) Reset() { *x = MultiClusterRoleBindingSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MultiClusterRoleBindingSpec) String() string { @@ -250,7 +242,7 @@ func (*MultiClusterRoleBindingSpec) ProtoMessage() {} func (x *MultiClusterRoleBindingSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -287,11 +279,9 @@ type MultiClusterRoleBindingStatus struct { func (x *MultiClusterRoleBindingStatus) Reset() { *x = MultiClusterRoleBindingStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MultiClusterRoleBindingStatus) String() string { @@ -302,7 +292,7 @@ func (*MultiClusterRoleBindingStatus) ProtoMessage() {} func (x *MultiClusterRoleBindingStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -324,7 +314,7 @@ type MultiClusterRoleSpec_Rule struct { ApiGroup string `protobuf:"bytes,1,opt,name=api_group,json=apiGroup,proto3" json:"api_group,omitempty"` // The kind of the object to apply to, if left empty will apply to all kinds in a group. - Kind *wrappers.StringValue `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"` + Kind *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"` Action MultiClusterRoleSpec_Rule_Action `protobuf:"varint,3,opt,name=action,proto3,enum=multicluster.solo.io.MultiClusterRoleSpec_Rule_Action" json:"action,omitempty"` // The clusters and namespaces this rule applies to. Placements []*Placement `protobuf:"bytes,4,rep,name=placements,proto3" json:"placements,omitempty"` @@ -332,11 +322,9 @@ type MultiClusterRoleSpec_Rule struct { func (x *MultiClusterRoleSpec_Rule) Reset() { *x = MultiClusterRoleSpec_Rule{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MultiClusterRoleSpec_Rule) String() string { @@ -347,7 +335,7 @@ func (*MultiClusterRoleSpec_Rule) ProtoMessage() {} func (x *MultiClusterRoleSpec_Rule) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -369,7 +357,7 @@ func (x *MultiClusterRoleSpec_Rule) GetApiGroup() string { return "" } -func (x *MultiClusterRoleSpec_Rule) GetKind() *wrappers.StringValue { +func (x *MultiClusterRoleSpec_Rule) GetKind() *wrapperspb.StringValue { if x != nil { return x.Kind } @@ -470,7 +458,7 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multic var file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_goTypes = []any{ (MultiClusterRoleSpec_Rule_Action)(0), // 0: multicluster.solo.io.MultiClusterRoleSpec.Rule.Action (*Placement)(nil), // 1: multicluster.solo.io.Placement (*MultiClusterRoleSpec)(nil), // 2: multicluster.solo.io.MultiClusterRoleSpec @@ -480,7 +468,7 @@ var file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicl (*MultiClusterRoleSpec_Rule)(nil), // 6: multicluster.solo.io.MultiClusterRoleSpec.Rule (*v1.TypedObjectRef)(nil), // 7: core.skv2.solo.io.TypedObjectRef (*v1.ObjectRef)(nil), // 8: core.skv2.solo.io.ObjectRef - (*wrappers.StringValue)(nil), // 9: google.protobuf.StringValue + (*wrapperspb.StringValue)(nil), // 9: google.protobuf.StringValue } var file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_depIdxs = []int32{ 6, // 0: multicluster.solo.io.MultiClusterRoleSpec.rules:type_name -> multicluster.solo.io.MultiClusterRoleSpec.Rule @@ -503,80 +491,6 @@ func file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multic if File_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Placement); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MultiClusterRoleSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MultiClusterRoleStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MultiClusterRoleBindingSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MultiClusterRoleBindingStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_gloo_fed_multicluster_v1alpha1_multicluster_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MultiClusterRoleSpec_Rule); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/ratelimit.solo.io/v1alpha1/ratelimit.pb.go b/pkg/api/ratelimit.solo.io/v1alpha1/ratelimit.pb.go index 77cb47a8c..c0d02df67 100644 --- a/pkg/api/ratelimit.solo.io/v1alpha1/ratelimit.pb.go +++ b/pkg/api/ratelimit.solo.io/v1alpha1/ratelimit.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.35.1 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/rate-limiter/v1alpha1/ratelimit.proto @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -193,11 +193,9 @@ type RateLimitConfigSpec struct { func (x *RateLimitConfigSpec) Reset() { *x = RateLimitConfigSpec{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitConfigSpec) String() string { @@ -208,7 +206,7 @@ func (*RateLimitConfigSpec) ProtoMessage() {} func (x *RateLimitConfigSpec) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -265,11 +263,9 @@ type RateLimitConfigStatus struct { func (x *RateLimitConfigStatus) Reset() { *x = RateLimitConfigStatus{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitConfigStatus) String() string { @@ -280,7 +276,7 @@ func (*RateLimitConfigStatus) ProtoMessage() {} func (x *RateLimitConfigStatus) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -326,11 +322,9 @@ type RateLimitConfigNamespacedStatuses struct { func (x *RateLimitConfigNamespacedStatuses) Reset() { *x = RateLimitConfigNamespacedStatuses{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitConfigNamespacedStatuses) String() string { @@ -341,7 +335,7 @@ func (*RateLimitConfigNamespacedStatuses) ProtoMessage() {} func (x *RateLimitConfigNamespacedStatuses) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -423,11 +417,9 @@ type Descriptor struct { func (x *Descriptor) Reset() { *x = Descriptor{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Descriptor) String() string { @@ -438,7 +430,7 @@ func (*Descriptor) ProtoMessage() {} func (x *Descriptor) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -546,11 +538,9 @@ type SetDescriptor struct { func (x *SetDescriptor) Reset() { *x = SetDescriptor{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SetDescriptor) String() string { @@ -561,7 +551,7 @@ func (*SetDescriptor) ProtoMessage() {} func (x *SetDescriptor) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -627,11 +617,9 @@ type SimpleDescriptor struct { func (x *SimpleDescriptor) Reset() { *x = SimpleDescriptor{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SimpleDescriptor) String() string { @@ -642,7 +630,7 @@ func (*SimpleDescriptor) ProtoMessage() {} func (x *SimpleDescriptor) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -751,11 +739,9 @@ type RateLimitActions struct { func (x *RateLimitActions) Reset() { *x = RateLimitActions{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitActions) String() string { @@ -766,7 +752,7 @@ func (*RateLimitActions) ProtoMessage() {} func (x *RateLimitActions) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -814,11 +800,9 @@ type RateLimit struct { func (x *RateLimit) Reset() { *x = RateLimit{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimit) String() string { @@ -829,7 +813,7 @@ func (*RateLimit) ProtoMessage() {} func (x *RateLimit) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -879,11 +863,9 @@ type Action struct { func (x *Action) Reset() { *x = Action{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action) String() string { @@ -894,7 +876,7 @@ func (*Action) ProtoMessage() {} func (x *Action) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1040,11 +1022,9 @@ type MetaData struct { func (x *MetaData) Reset() { *x = MetaData{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetaData) String() string { @@ -1055,7 +1035,7 @@ func (*MetaData) ProtoMessage() {} func (x *MetaData) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1113,11 +1093,9 @@ type Override struct { func (x *Override) Reset() { *x = Override{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Override) String() string { @@ -1128,7 +1106,7 @@ func (*Override) ProtoMessage() {} func (x *Override) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1189,11 +1167,9 @@ type RateLimitConfigSpec_Raw struct { func (x *RateLimitConfigSpec_Raw) Reset() { *x = RateLimitConfigSpec_Raw{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *RateLimitConfigSpec_Raw) String() string { @@ -1204,7 +1180,7 @@ func (*RateLimitConfigSpec_Raw) ProtoMessage() {} func (x *RateLimitConfigSpec_Raw) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1257,11 +1233,9 @@ type Action_SourceCluster struct { func (x *Action_SourceCluster) Reset() { *x = Action_SourceCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_SourceCluster) String() string { @@ -1272,7 +1246,7 @@ func (*Action_SourceCluster) ProtoMessage() {} func (x *Action_SourceCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1313,11 +1287,9 @@ type Action_DestinationCluster struct { func (x *Action_DestinationCluster) Reset() { *x = Action_DestinationCluster{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_DestinationCluster) String() string { @@ -1328,7 +1300,7 @@ func (*Action_DestinationCluster) ProtoMessage() {} func (x *Action_DestinationCluster) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1366,11 +1338,9 @@ type Action_RequestHeaders struct { func (x *Action_RequestHeaders) Reset() { *x = Action_RequestHeaders{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_RequestHeaders) String() string { @@ -1381,7 +1351,7 @@ func (*Action_RequestHeaders) ProtoMessage() {} func (x *Action_RequestHeaders) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1426,11 +1396,9 @@ type Action_RemoteAddress struct { func (x *Action_RemoteAddress) Reset() { *x = Action_RemoteAddress{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_RemoteAddress) String() string { @@ -1441,7 +1409,7 @@ func (*Action_RemoteAddress) ProtoMessage() {} func (x *Action_RemoteAddress) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1474,11 +1442,9 @@ type Action_GenericKey struct { func (x *Action_GenericKey) Reset() { *x = Action_GenericKey{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_GenericKey) String() string { @@ -1489,7 +1455,7 @@ func (*Action_GenericKey) ProtoMessage() {} func (x *Action_GenericKey) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1529,7 +1495,7 @@ type Action_HeaderValueMatch struct { // request matches the headers. If set to false, the action will append a // descriptor entry when the request does not match the headers. The // default value is true. - ExpectMatch *wrappers.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` + ExpectMatch *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=expect_match,json=expectMatch,proto3" json:"expect_match,omitempty"` // Specifies a set of headers that the rate limit action should match // on. The action will check the request’s headers against all the // specified headers in the config. A match will happen if all the @@ -1540,11 +1506,9 @@ type Action_HeaderValueMatch struct { func (x *Action_HeaderValueMatch) Reset() { *x = Action_HeaderValueMatch{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_HeaderValueMatch) String() string { @@ -1555,7 +1519,7 @@ func (*Action_HeaderValueMatch) ProtoMessage() {} func (x *Action_HeaderValueMatch) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1577,7 +1541,7 @@ func (x *Action_HeaderValueMatch) GetDescriptorValue() string { return "" } -func (x *Action_HeaderValueMatch) GetExpectMatch() *wrappers.BoolValue { +func (x *Action_HeaderValueMatch) GetExpectMatch() *wrapperspb.BoolValue { if x != nil { return x.ExpectMatch } @@ -1620,11 +1584,9 @@ type Action_HeaderValueMatch_HeaderMatcher struct { func (x *Action_HeaderValueMatch_HeaderMatcher) Reset() { *x = Action_HeaderValueMatch_HeaderMatcher{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_HeaderValueMatch_HeaderMatcher) String() string { @@ -1635,7 +1597,7 @@ func (*Action_HeaderValueMatch_HeaderMatcher) ProtoMessage() {} func (x *Action_HeaderValueMatch_HeaderMatcher) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1810,11 +1772,9 @@ type Action_HeaderValueMatch_HeaderMatcher_Int64Range struct { func (x *Action_HeaderValueMatch_HeaderMatcher_Int64Range) Reset() { *x = Action_HeaderValueMatch_HeaderMatcher_Int64Range{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Action_HeaderValueMatch_HeaderMatcher_Int64Range) String() string { @@ -1825,7 +1785,7 @@ func (*Action_HeaderValueMatch_HeaderMatcher_Int64Range) ProtoMessage() {} func (x *Action_HeaderValueMatch_HeaderMatcher_Int64Range) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1897,11 +1857,9 @@ type MetaData_MetadataKey struct { func (x *MetaData_MetadataKey) Reset() { *x = MetaData_MetadataKey{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetaData_MetadataKey) String() string { @@ -1912,7 +1870,7 @@ func (*MetaData_MetadataKey) ProtoMessage() {} func (x *MetaData_MetadataKey) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1956,11 +1914,9 @@ type MetaData_MetadataKey_PathSegment struct { func (x *MetaData_MetadataKey_PathSegment) Reset() { *x = MetaData_MetadataKey_PathSegment{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MetaData_MetadataKey_PathSegment) String() string { @@ -1971,7 +1927,7 @@ func (*MetaData_MetadataKey_PathSegment) ProtoMessage() {} func (x *MetaData_MetadataKey_PathSegment) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2026,11 +1982,9 @@ type Override_DynamicMetadata struct { func (x *Override_DynamicMetadata) Reset() { *x = Override_DynamicMetadata{} - if protoimpl.UnsafeEnabled { - mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[23] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Override_DynamicMetadata) String() string { @@ -2041,7 +1995,7 @@ func (*Override_DynamicMetadata) ProtoMessage() {} func (x *Override_DynamicMetadata) ProtoReflect() protoreflect.Message { mi := &file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[23] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -2338,7 +2292,7 @@ func file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto var file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes = make([]protoimpl.MessageInfo, 24) -var file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_goTypes = []interface{}{ +var file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_goTypes = []any{ (RateLimitConfigStatus_State)(0), // 0: ratelimit.api.solo.io.RateLimitConfigStatus.State (RateLimit_Unit)(0), // 1: ratelimit.api.solo.io.RateLimit.Unit (MetaData_Source)(0), // 2: ratelimit.api.solo.io.MetaData.Source @@ -2366,7 +2320,7 @@ var file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_ (*MetaData_MetadataKey)(nil), // 24: ratelimit.api.solo.io.MetaData.MetadataKey (*MetaData_MetadataKey_PathSegment)(nil), // 25: ratelimit.api.solo.io.MetaData.MetadataKey.PathSegment (*Override_DynamicMetadata)(nil), // 26: ratelimit.api.solo.io.Override.DynamicMetadata - (*wrappers.BoolValue)(nil), // 27: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 27: google.protobuf.BoolValue } var file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_depIdxs = []int32{ 14, // 0: ratelimit.api.solo.io.RateLimitConfigSpec.raw:type_name -> ratelimit.api.solo.io.RateLimitConfigSpec.Raw @@ -2411,288 +2365,10 @@ func file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto if File_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitConfigSpec); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitConfigStatus); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitConfigNamespacedStatuses); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Descriptor); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetDescriptor); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SimpleDescriptor); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitActions); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimit); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetaData); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Override); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RateLimitConfigSpec_Raw); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_SourceCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_DestinationCluster); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_RequestHeaders); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_RemoteAddress); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_GenericKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_HeaderValueMatch); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_HeaderValueMatch_HeaderMatcher); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Action_HeaderValueMatch_HeaderMatcher_Int64Range); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetaData_MetadataKey); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MetaData_MetadataKey_PathSegment); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Override_DynamicMetadata); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[0].OneofWrappers = []any{ (*RateLimitConfigSpec_Raw_)(nil), } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[8].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[8].OneofWrappers = []any{ (*Action_SourceCluster_)(nil), (*Action_DestinationCluster_)(nil), (*Action_RequestHeaders_)(nil), @@ -2701,10 +2377,10 @@ func file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto (*Action_HeaderValueMatch_)(nil), (*Action_Metadata)(nil), } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[10].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[10].OneofWrappers = []any{ (*Override_DynamicMetadata_)(nil), } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[19].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[19].OneofWrappers = []any{ (*Action_HeaderValueMatch_HeaderMatcher_ExactMatch)(nil), (*Action_HeaderValueMatch_HeaderMatcher_RegexMatch)(nil), (*Action_HeaderValueMatch_HeaderMatcher_RangeMatch)(nil), @@ -2712,7 +2388,7 @@ func file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto (*Action_HeaderValueMatch_HeaderMatcher_PrefixMatch)(nil), (*Action_HeaderValueMatch_HeaderMatcher_SuffixMatch)(nil), } - file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[22].OneofWrappers = []interface{}{ + file_github_com_solo_io_solo_apis_api_rate_limiter_v1alpha1_ratelimit_proto_msgTypes[22].OneofWrappers = []any{ (*MetaData_MetadataKey_PathSegment_Key)(nil), } type x struct{}