From 71954722ed79a9e21663f6fa5ed697cd6710fd01 Mon Sep 17 00:00:00 2001 From: npolshakova Date: Mon, 2 Aug 2021 13:53:49 -0400 Subject: [PATCH] Bump skv2 (#158) * bump skv2 * Merge branch 'master' into bump-skv2-0.18.3 * Regen * regen with REGENERATE_CLIENTS --- go.mod | 10 +++- go.sum | 28 +++++----- .../v1/auth_config.pb.go | 7 +-- .../v1/sets/mocks/sets.go | 14 +++++ .../enterprise.gloo.solo.io/v1/sets/sets.go | 9 +++ .../v1/types/auth_config.pb.go | 7 +-- .../v1/types/gateway.pb.go | 7 +-- .../v1/types/route_table.pb.go | 7 +-- .../v1/types/virtual_service.pb.go | 7 +-- .../fed.gloo.solo.io/v1/types/settings.pb.go | 7 +-- .../fed.gloo.solo.io/v1/types/upstream.pb.go | 7 +-- .../v1/types/upstream_group.pb.go | 7 +-- pkg/api/fed.rpc/v1/common.pb.go | 7 +-- .../v1/enterprise_gloo_resources.pb.go | 7 +-- pkg/api/fed.rpc/v1/failover_scheme.pb.go | 7 +-- .../federated_enterprise_gloo_resources.pb.go | 7 +-- .../v1/federated_gateway_resources.pb.go | 7 +-- .../fed.rpc/v1/federated_gloo_resources.pb.go | 7 +-- pkg/api/fed.rpc/v1/gateway_resources.pb.go | 7 +-- pkg/api/fed.rpc/v1/gloo_resources.pb.go | 7 +-- pkg/api/fed.rpc/v1/glooinstance.pb.go | 7 +-- pkg/api/fed.rpc/v1/rt_selector.pb.go | 7 +-- pkg/api/fed.solo.io/core/v1/placement.pb.go | 7 +-- pkg/api/fed.solo.io/v1/types/failover.pb.go | 7 +-- pkg/api/fed.solo.io/v1/types/instance.pb.go | 7 +-- .../gateway.solo.io/v1/external_options.pb.go | 7 +-- pkg/api/gateway.solo.io/v1/gateway.pb.go | 7 +-- pkg/api/gateway.solo.io/v1/route_table.pb.go | 7 +-- pkg/api/gateway.solo.io/v1/sets/mocks/sets.go | 42 ++++++++++++++ pkg/api/gateway.solo.io/v1/sets/sets.go | 27 +++++++++ .../gateway.solo.io/v1/virtual_service.pb.go | 7 +-- .../envoy/annotations/deprecation.pb.go | 7 +-- .../api/v2/cluster/outlier_detection.pb.go | 7 +-- .../envoy/api/v2/core/health_check.pb.go | 7 +-- .../external/envoy/api/v2/route/route.pb.go | 7 +-- .../envoy/config/core/v3/address.pb.go | 7 +-- .../envoy/config/core/v3/backoff.pb.go | 7 +-- .../external/envoy/config/core/v3/base.pb.go | 7 +-- .../config/core/v3/event_service_config.pb.go | 7 +-- .../envoy/config/core/v3/extension.pb.go | 7 +-- .../envoy/config/core/v3/grpc_service.pb.go | 7 +-- .../envoy/config/core/v3/health_check.pb.go | 7 +-- .../envoy/config/core/v3/http_uri.pb.go | 7 +-- .../envoy/config/core/v3/proxy_protocol.pb.go | 7 +-- .../envoy/config/core/v3/socket_option.pb.go | 7 +-- .../config/filter/http/gzip/v2/gzip.pb.go | 7 +-- .../config/route/v3/route_components.pb.go | 7 +-- .../envoy/config/trace/v3/datadog.pb.go | 7 +-- .../envoy/config/trace/v3/zipkin.pb.go | 7 +-- .../advanced_http/advanced_http.pb.go | 7 +-- .../envoy/extensions/aws/filter.pb.go | 7 +-- .../envoy/extensions/extauth/sanitize.pb.go | 7 +-- .../filters/http/buffer/v3/buffer.pb.go | 7 +-- .../filters/http/csrf/v3/csrf.pb.go | 7 +-- .../filters/http/jwt_authn/v3/config.pb.go | 7 +-- .../filters/http/wasm/v3/wasm.pb.go | 7 +-- .../extensions/http_path/http_path.pb.go | 7 +-- .../envoy/extensions/jwt/solo_jwt_authn.pb.go | 7 +-- .../proxylatency/proxylatency.pb.go | 7 +-- .../transformation/transformation.pb.go | 7 +-- .../transformation_ee/transformation.pb.go | 7 +-- .../transformers/xslt/xslt_transformer.pb.go | 7 +-- .../external/envoy/extensions/waf/waf.pb.go | 7 +-- .../envoy/extensions/wasm/v3/wasm.pb.go | 7 +-- .../xff_offset/solo_xff_offset_filter.pb.go | 7 +-- .../envoy/type/matcher/v3/regex.pb.go | 7 +-- .../envoy/type/matcher/v3/string.pb.go | 7 +-- .../envoy/type/metadata/v3/metadata.pb.go | 7 +-- .../external/envoy/type/range.pb.go | 7 +-- .../envoy/type/tracing/v3/custom_tag.pb.go | 7 +-- .../external/envoy/type/v3/http.pb.go | 7 +-- .../external/envoy/type/v3/percent.pb.go | 7 +-- .../external/envoy/type/v3/range.pb.go | 7 +-- .../envoy/type/v3/semantic_version.pb.go | 7 +-- .../external/udpa/annotations/migrate.pb.go | 7 +-- .../external/udpa/annotations/sensitive.pb.go | 7 +-- .../external/udpa/annotations/status.pb.go | 7 +-- .../udpa/annotations/versioning.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/artifact.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/circuit_breaker.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/connection.pb.go | 7 +-- .../v1/core/matchers/matchers.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/endpoint.pb.go | 7 +-- .../v1/enterprise/options/dlp/dlp.pb.go | 7 +-- .../v1/enterprise/options/jwt/jwt.pb.go | 7 +-- .../options/ratelimit/ratelimit.pb.go | 7 +-- .../v1/enterprise/options/rbac/rbac.pb.go | 7 +-- .../v1/enterprise/options/waf/waf.pb.go | 7 +-- .../v1/enterprise/ratelimit.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/extensions.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/failover.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/load_balancer.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/options.pb.go | 7 +-- .../options/advanced_http/advanced_http.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/options/als/als.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/options/aws/aws.pb.go | 7 +-- .../v1/options/aws/ec2/aws_ec2.pb.go | 7 +-- .../gloo.solo.io/v1/options/azure/azure.pb.go | 7 +-- .../v1/options/consul/consul.pb.go | 7 +-- .../gloo.solo.io/v1/options/cors/cors.pb.go | 7 +-- .../v1/options/faultinjection/fault.pb.go | 7 +-- .../gloo.solo.io/v1/options/grpc/grpc.pb.go | 7 +-- .../v1/options/grpc_json/grpc_json.pb.go | 7 +-- .../v1/options/grpc_web/grpc_web.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/options/hcm/hcm.pb.go | 7 +-- .../v1/options/headers/headers.pb.go | 7 +-- .../v1/options/healthcheck/healthcheck.pb.go | 7 +-- .../v1/options/kubernetes/kubernetes.pb.go | 7 +-- .../v1/options/lbhash/lbhash.pb.go | 7 +-- .../gloo.solo.io/v1/options/pipe/pipe.pb.go | 7 +-- .../protocol_upgrade/protocol_upgrade.pb.go | 7 +-- .../gloo.solo.io/v1/options/rest/rest.pb.go | 7 +-- .../v1/options/retries/retries.pb.go | 7 +-- .../v1/options/service_spec.pb.go | 7 +-- .../v1/options/shadowing/shadowing.pb.go | 7 +-- .../v1/options/static/static.pb.go | 7 +-- .../gloo.solo.io/v1/options/stats/stats.pb.go | 7 +-- .../gloo.solo.io/v1/options/subset_spec.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/options/tcp/tcp.pb.go | 7 +-- .../v1/options/tracing/tracing.pb.go | 7 +-- .../options/transformation/parameters.pb.go | 7 +-- .../transformation/transformation.pb.go | 7 +-- .../gloo.solo.io/v1/options/wasm/wasm.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/proxy.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/secret.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/sets/mocks/sets.go | 56 +++++++++++++++++++ pkg/api/gloo.solo.io/v1/sets/sets.go | 36 ++++++++++++ pkg/api/gloo.solo.io/v1/settings.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/ssl.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/subset.pb.go | 7 +-- pkg/api/gloo.solo.io/v1/upstream.pb.go | 7 +-- .../v1alpha1/multicluster.pb.go | 7 +-- .../v1alpha1/sets/mocks/sets.go | 14 +++++ .../v1alpha1/sets/sets.go | 9 +++ .../v1alpha1/ratelimit.pb.go | 7 +-- .../v1alpha1/sets/mocks/sets.go | 14 +++++ .../ratelimit.solo.io/v1alpha1/sets/sets.go | 9 +++ 137 files changed, 377 insertions(+), 766 deletions(-) diff --git a/go.mod b/go.mod index df92cc61e..1a73555fd 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,10 @@ module github.com/solo-io/solo-apis go 1.14 replace ( + // pinned to solo-io's fork of cue version 308aee4ff0928a8e0ec25b9cbbdc445264038463 + // note(ilackarms): this replace must be shared in any skv2-based go module due to incompatibility with upstream versions of cue + cuelang.org/go => github.com/solo-io/cue v0.4.1-0.20210623143425-308aee4ff092 + github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 k8s.io/apimachinery => k8s.io/apimachinery v0.19.6 k8s.io/client-go => k8s.io/client-go v0.19.6 @@ -18,7 +22,7 @@ require ( github.com/envoyproxy/protoc-gen-validate v0.4.1 github.com/gogo/protobuf v1.3.1 github.com/golang/mock v1.4.4 - github.com/golang/protobuf v1.4.3 + github.com/golang/protobuf v1.5.2 github.com/mitchellh/hashstructure v1.0.0 github.com/onsi/ginkgo v1.14.1 github.com/onsi/gomega v1.10.5 @@ -26,12 +30,12 @@ require ( github.com/rotisserie/eris v0.1.1 github.com/solo-io/go-utils v0.21.6 github.com/solo-io/protoc-gen-ext v0.0.13 - github.com/solo-io/skv2 v0.17.17 + github.com/solo-io/skv2 v0.18.3 github.com/solo-io/solo-kit v0.21.0 golang.org/x/tools v0.1.0 google.golang.org/genproto v0.0.0-20210218151259-fe80b386bf06 google.golang.org/grpc v1.36.0 - google.golang.org/protobuf v1.25.0 + google.golang.org/protobuf v1.26.0 istio.io/tools v0.0.0-20200918020118-6d0a0e49b5d3 k8s.io/apimachinery v0.19.6 k8s.io/client-go v8.0.0+incompatible diff --git a/go.sum b/go.sum index 2d6b0ce59..5572a3967 100644 --- a/go.sum +++ b/go.sum @@ -39,10 +39,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A= -cuelang.org/go v0.0.16-0.20200320220106-76252f4b7486/go.mod h1:NTaUCGX9N+OYqrQDaFuvROeLellLCkCnXp0sLS1StVY= -cuelang.org/go v0.2.2/go.mod h1:Dyjk8Y/B3CfFT1jQKJU0g5PpCeMiDe0yMOhk57oXwqo= -cuelang.org/go v0.3.2 h1:/Am5yFDwqnaEi+g942OPM1M4/qtfVSm49wtkQbeh5Z4= -cuelang.org/go v0.3.2/go.mod h1:jvMO35Q4D2D3m2ujAmKESICaYkjMbu5+D+2zIGuWTpQ= 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= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -428,6 +424,7 @@ github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -458,8 +455,10 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= @@ -476,8 +475,9 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github/v29 v29.0.2/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E= github.com/google/go-github/v29 v29.0.3/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E= github.com/google/go-github/v32 v32.0.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI= @@ -882,6 +882,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= 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= github.com/pseudomuto/protoc-gen-doc v1.0.0/go.mod h1:fwtQAY9erXp3mC92O8OTECnDlJT2r0Ff4KSEKbGEmy0= github.com/pseudomuto/protoc-gen-doc v1.4.1/go.mod h1:exDTOVwqpp30eV/EDPFLZy3Pwr2sn6hBC1WIYH/UbIg= github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= @@ -897,10 +899,8 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.6.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/rogpeppe/testscript v1.1.0/go.mod h1:lzMlnW8LS56mcdJoQYkrlzqOoTFCOemzt5LusJ93bDM= github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtISeXco0L5PKQ= github.com/rotisserie/eris v0.1.1 h1:C0wEdnJ6+3jYx2r8RS4xBM+ZW+mVrXGocIaFbTdRYCA= github.com/rotisserie/eris v0.1.1/go.mod h1:2ik3CyJrzlOjGyDGrKfqZivSfmkhCS3ktE+T1mNzzLk= @@ -941,6 +941,8 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/solo-io/anyvendor v0.0.1/go.mod h1:SLucIeU8qBOYI82BveNVn2LzZFcMWJSCf8Kd1S4Jcr4= github.com/solo-io/anyvendor v0.0.3 h1:vtN3LbxFuIByjqF12hd3RnMiVZhv2EkF9ci3NV8NcLI= github.com/solo-io/anyvendor v0.0.3/go.mod h1:xHZ0KMrsG620iI4VnRDJGJ1gk8bR79HG/tlTWfY15UA= +github.com/solo-io/cue v0.4.1-0.20210623143425-308aee4ff092 h1:E8mWtYOHBhEnpRyQmUTeQdajLU/aBRiaRu+FJIqI8V4= +github.com/solo-io/cue v0.4.1-0.20210623143425-308aee4ff092/go.mod h1:tz/edkPi+T37AZcb5GlPY+WJkL6KiDlDVupKwL3vvjs= github.com/solo-io/go-list-licenses v0.0.4/go.mod h1:x6LSp/NrYgVXwNum7ZOiaAYTpg6B3F6TrWYfcdHVroA= github.com/solo-io/go-utils v0.19.0/go.mod h1:If8NiehXROCFU65PGeDTrrZCNA5gJXvbcVoXI8Fqjko= github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c= @@ -952,8 +954,8 @@ github.com/solo-io/k8s-utils v0.0.8 h1:GJ+DLBFfR8WRg2WofGQ3o3DVPByDEYgANX9kQYhpr github.com/solo-io/k8s-utils v0.0.8/go.mod h1:Cg2ymG0xhLdyS3NJ0D98yxiSWjAKYPNopzPTwVDl7e4= github.com/solo-io/protoc-gen-ext v0.0.13 h1:grQ41RRAiMzl1zMzXNug1hoXl2QRETGmXyRJyskv6qY= github.com/solo-io/protoc-gen-ext v0.0.13/go.mod h1:/U/jMDtVI7R6N323sfaUXK9Mmo54D7SY3pP7JtI/kMo= -github.com/solo-io/skv2 v0.17.17 h1:reWPYrRI7VjZG0piQusPH6BdIXiBLs+piR5eeuQgEG4= -github.com/solo-io/skv2 v0.17.17/go.mod h1:nYjANLlL1SLPV/7Gr2mKgfxO3Jta/yNAxKnAHKhSamM= +github.com/solo-io/skv2 v0.18.3 h1:rSdn/zXMGEubGFDmX+xPaAE9hgJfi5uCjMQy0IXrR1g= +github.com/solo-io/skv2 v0.18.3/go.mod h1:yTLh572dJGj9gQJ0GpzGEIHntdINzq8rD79jrKeBz2g= github.com/solo-io/solo-kit v0.21.0 h1:NhVyzchGNwj3FoC7aEHQK7GrhXprfUUSr2NVxD1XbQs= github.com/solo-io/solo-kit v0.21.0/go.mod h1:OPetRcesvIyh1mboxqqAXH+YXRUwQBzZ5vPQ39y/GyU= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= @@ -992,7 +994,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.1/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= @@ -1120,7 +1121,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= 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-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/exp v0.0.0-20210126221216-84987778548c/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= 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= @@ -1516,8 +1516,10 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/AlecAivazis/survey.v1 v1.8.2/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= 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 62262cd62..4d59a05ac 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/enterprise.gloo/v1/auth_config.proto @@ -12,7 +12,6 @@ import ( sync "sync" v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" empty "github.com/golang/protobuf/ptypes/empty" _struct "github.com/golang/protobuf/ptypes/struct" @@ -34,10 +33,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Describes the transport protocol version to use when connecting to the ext auth server. type Settings_ApiVersion int32 diff --git a/pkg/api/enterprise.gloo.solo.io/v1/sets/mocks/sets.go b/pkg/api/enterprise.gloo.solo.io/v1/sets/mocks/sets.go index b4e544b77..ae0ab48b0 100644 --- a/pkg/api/enterprise.gloo.solo.io/v1/sets/mocks/sets.go +++ b/pkg/api/enterprise.gloo.solo.io/v1/sets/mocks/sets.go @@ -256,3 +256,17 @@ func (mr *MockAuthConfigSetMockRecorder) Delta(newSet interface{}) *gomock.Call mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockAuthConfigSet)(nil).Delta), newSet) } + +// Clone mocks base method +func (m *MockAuthConfigSet) Clone() v1sets.AuthConfigSet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1sets.AuthConfigSet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockAuthConfigSetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockAuthConfigSet)(nil).Clone)) +} diff --git a/pkg/api/enterprise.gloo.solo.io/v1/sets/sets.go b/pkg/api/enterprise.gloo.solo.io/v1/sets/sets.go index 1bb763ad5..1e115eac5 100644 --- a/pkg/api/enterprise.gloo.solo.io/v1/sets/sets.go +++ b/pkg/api/enterprise.gloo.solo.io/v1/sets/sets.go @@ -44,6 +44,8 @@ type AuthConfigSet interface { Generic() sksets.ResourceSet // returns the delta between this and and another AuthConfigSet Delta(newSet AuthConfigSet) sksets.ResourceDelta + // Create a deep copy of the current AuthConfigSet + Clone() AuthConfigSet } func makeGenericAuthConfigSet(authConfigList []*enterprise_gloo_solo_io_v1.AuthConfig) sksets.ResourceSet { @@ -222,3 +224,10 @@ func (s *authConfigSet) Delta(newSet AuthConfigSet) sksets.ResourceDelta { } return s.Generic().Delta(newSet.Generic()) } + +func (s *authConfigSet) Clone() AuthConfigSet { + if s == nil { + return nil + } + return &authConfigSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +} 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 73e128890..7d7377dd5 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.enterprise.gloo/v1/auth_config.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v11 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" v1 "github.com/solo-io/solo-apis/pkg/api/fed.solo.io/core/v1" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedAuthConfigSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 22e2d9f40..9c68ee6b8 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gateway/v1/gateway.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedGatewaySpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 7ad0130f2..d134c6bcc 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gateway/v1/route_table.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedRouteTableSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 91d448f3c..2ed9d2dfa 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gateway/v1/virtual_service.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedVirtualServiceSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 8953d47b6..676b8917e 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gloo/v1/settings.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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/gloo.solo.io/v1" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedSettingsSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 5c086ecf8..a0017c003 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gloo/v1/upstream.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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/gloo.solo.io/v1" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedUpstreamSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 c25041624..cb4b4862e 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.gloo/v1/upstream_group.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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/gloo.solo.io/v1" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedUpstreamGroupSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/fed.rpc/v1/common.pb.go b/pkg/api/fed.rpc/v1/common.pb.go index 4c96e2e91..14e7b1d9e 100644 --- a/pkg/api/fed.rpc/v1/common.pb.go +++ b/pkg/api/fed.rpc/v1/common.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/common.proto @@ -12,7 +12,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create. // This is a boiled-down version of Kubernetes ObjectMeta which can be found at: // https://github.com/kubernetes/apimachinery/blob/master/pkg/apis/meta/v1/generated.proto diff --git a/pkg/api/fed.rpc/v1/enterprise_gloo_resources.pb.go b/pkg/api/fed.rpc/v1/enterprise_gloo_resources.pb.go index 23bbb2a95..41dc25800 100644 --- a/pkg/api/fed.rpc/v1/enterprise_gloo_resources.pb.go +++ b/pkg/api/fed.rpc/v1/enterprise_gloo_resources.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/enterprise_gloo_resources.proto @@ -13,7 +13,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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/enterprise.gloo.solo.io/v1" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type AuthConfig struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/fed.rpc/v1/failover_scheme.pb.go b/pkg/api/fed.rpc/v1/failover_scheme.pb.go index 577fd612d..77ddf62c7 100644 --- a/pkg/api/fed.rpc/v1/failover_scheme.pb.go +++ b/pkg/api/fed.rpc/v1/failover_scheme.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/failover_scheme.proto @@ -11,7 +11,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" types "github.com/solo-io/solo-apis/pkg/api/fed.solo.io/v1/types" @@ -29,10 +28,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FailoverScheme struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/fed.rpc/v1/federated_enterprise_gloo_resources.pb.go b/pkg/api/fed.rpc/v1/federated_enterprise_gloo_resources.pb.go index 7adbf12ea..6dac4ecb3 100644 --- a/pkg/api/fed.rpc/v1/federated_enterprise_gloo_resources.pb.go +++ b/pkg/api/fed.rpc/v1/federated_enterprise_gloo_resources.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/federated_enterprise_gloo_resources.proto @@ -13,7 +13,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" types "github.com/solo-io/solo-apis/pkg/api/fed.enterprise.gloo.solo.io/v1/types" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedAuthConfig struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/fed.rpc/v1/federated_gateway_resources.pb.go b/pkg/api/fed.rpc/v1/federated_gateway_resources.pb.go index ae73ac323..e7e63b274 100644 --- a/pkg/api/fed.rpc/v1/federated_gateway_resources.pb.go +++ b/pkg/api/fed.rpc/v1/federated_gateway_resources.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/federated_gateway_resources.proto @@ -13,7 +13,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" types "github.com/solo-io/solo-apis/pkg/api/fed.gateway.solo.io/v1/types" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedGateway struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/fed.rpc/v1/federated_gloo_resources.pb.go b/pkg/api/fed.rpc/v1/federated_gloo_resources.pb.go index b427dadf2..bea395426 100644 --- a/pkg/api/fed.rpc/v1/federated_gloo_resources.pb.go +++ b/pkg/api/fed.rpc/v1/federated_gloo_resources.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/federated_gloo_resources.proto @@ -13,7 +13,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" types "github.com/solo-io/solo-apis/pkg/api/fed.gloo.solo.io/v1/types" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FederatedUpstream struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/fed.rpc/v1/gateway_resources.pb.go b/pkg/api/fed.rpc/v1/gateway_resources.pb.go index ec2a67d5f..467c92b82 100644 --- a/pkg/api/fed.rpc/v1/gateway_resources.pb.go +++ b/pkg/api/fed.rpc/v1/gateway_resources.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/gateway_resources.proto @@ -13,7 +13,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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/gateway.solo.io/v1" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Gateway struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/fed.rpc/v1/gloo_resources.pb.go b/pkg/api/fed.rpc/v1/gloo_resources.pb.go index ecab2c7bd..f066c6957 100644 --- a/pkg/api/fed.rpc/v1/gloo_resources.pb.go +++ b/pkg/api/fed.rpc/v1/gloo_resources.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/gloo_resources.proto @@ -13,7 +13,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Upstream struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/fed.rpc/v1/glooinstance.pb.go b/pkg/api/fed.rpc/v1/glooinstance.pb.go index b592bb5a9..a6d94d303 100644 --- a/pkg/api/fed.rpc/v1/glooinstance.pb.go +++ b/pkg/api/fed.rpc/v1/glooinstance.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/glooinstance.proto @@ -11,7 +11,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" types "github.com/solo-io/solo-apis/pkg/api/fed.solo.io/v1/types" grpc "google.golang.org/grpc" @@ -28,10 +27,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type GlooInstance struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/fed.rpc/v1/rt_selector.pb.go b/pkg/api/fed.rpc/v1/rt_selector.pb.go index ac2a66ae7..736dc8b3c 100644 --- a/pkg/api/fed.rpc/v1/rt_selector.pb.go +++ b/pkg/api/fed.rpc/v1/rt_selector.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed.rpc/v1/rt_selector.proto @@ -11,7 +11,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v12 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" v11 "github.com/solo-io/solo-apis/pkg/api/gateway.solo.io/v1" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type SubRouteTableRow struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 c9b8ee7e5..3584d4e58 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed/core/v1/placement.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type PlacementStatus_State int32 const ( 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 1787db57e..a93833455 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed/v1/failover.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // The State of a reconciled object type FailoverSchemeStatus_State int32 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 be38c7381..9f2429051 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo-fed/fed/v1/instance.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type GlooInstanceSpec_Proxy_WorkloadController int32 const ( 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 e0a055066..3711967cb 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/external_options.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // // The **VirtualHostOption** holds `options` configuration for a VirtualHost. // VirtualHosts can inherit `options` config from `VirtualHostOption` objects by delegating to them. diff --git a/pkg/api/gateway.solo.io/v1/gateway.pb.go b/pkg/api/gateway.solo.io/v1/gateway.pb.go index 30262a8c9..5e01710fc 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/gateway.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _struct "github.com/golang/protobuf/ptypes/struct" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Virtual Service Selector expression operator, while the set-based syntax differs from Kubernetes (kubernetes: `key: !mylabel`, gloo: `key: mylabel, operator: "!"` | kubernetes: `key: mylabel`, gloo: `key: mylabel, operator: exists`), the functionality remains the same. type VirtualServiceSelectorExpressions_Expression_Operator int32 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 614cc50e5..d2dac7576 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/route_table.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _struct "github.com/golang/protobuf/ptypes/struct" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type RouteTableStatus_State int32 const ( diff --git a/pkg/api/gateway.solo.io/v1/sets/mocks/sets.go b/pkg/api/gateway.solo.io/v1/sets/mocks/sets.go index 95ac6fc81..212338389 100644 --- a/pkg/api/gateway.solo.io/v1/sets/mocks/sets.go +++ b/pkg/api/gateway.solo.io/v1/sets/mocks/sets.go @@ -257,6 +257,20 @@ func (mr *MockGatewaySetMockRecorder) Delta(newSet interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockGatewaySet)(nil).Delta), newSet) } +// Clone mocks base method +func (m *MockGatewaySet) Clone() v1sets.GatewaySet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1sets.GatewaySet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockGatewaySetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockGatewaySet)(nil).Clone)) +} + // MockRouteTableSet is a mock of RouteTableSet interface type MockRouteTableSet struct { ctrl *gomock.Controller @@ -499,6 +513,20 @@ func (mr *MockRouteTableSetMockRecorder) Delta(newSet interface{}) *gomock.Call return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockRouteTableSet)(nil).Delta), newSet) } +// Clone mocks base method +func (m *MockRouteTableSet) Clone() v1sets.RouteTableSet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1sets.RouteTableSet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockRouteTableSetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockRouteTableSet)(nil).Clone)) +} + // MockVirtualServiceSet is a mock of VirtualServiceSet interface type MockVirtualServiceSet struct { ctrl *gomock.Controller @@ -740,3 +768,17 @@ func (mr *MockVirtualServiceSetMockRecorder) Delta(newSet interface{}) *gomock.C mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockVirtualServiceSet)(nil).Delta), newSet) } + +// Clone mocks base method +func (m *MockVirtualServiceSet) Clone() v1sets.VirtualServiceSet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1sets.VirtualServiceSet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockVirtualServiceSetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockVirtualServiceSet)(nil).Clone)) +} diff --git a/pkg/api/gateway.solo.io/v1/sets/sets.go b/pkg/api/gateway.solo.io/v1/sets/sets.go index f4373db29..e6c01d37e 100644 --- a/pkg/api/gateway.solo.io/v1/sets/sets.go +++ b/pkg/api/gateway.solo.io/v1/sets/sets.go @@ -44,6 +44,8 @@ type GatewaySet interface { Generic() sksets.ResourceSet // returns the delta between this and and another GatewaySet Delta(newSet GatewaySet) sksets.ResourceDelta + // Create a deep copy of the current GatewaySet + Clone() GatewaySet } func makeGenericGatewaySet(gatewayList []*gateway_solo_io_v1.Gateway) sksets.ResourceSet { @@ -223,6 +225,13 @@ func (s *gatewaySet) Delta(newSet GatewaySet) sksets.ResourceDelta { return s.Generic().Delta(newSet.Generic()) } +func (s *gatewaySet) Clone() GatewaySet { + if s == nil { + return nil + } + return &gatewaySet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +} + type RouteTableSet interface { // Get the set stored keys Keys() sets.String @@ -254,6 +263,8 @@ type RouteTableSet interface { Generic() sksets.ResourceSet // returns the delta between this and and another RouteTableSet Delta(newSet RouteTableSet) sksets.ResourceDelta + // Create a deep copy of the current RouteTableSet + Clone() RouteTableSet } func makeGenericRouteTableSet(routeTableList []*gateway_solo_io_v1.RouteTable) sksets.ResourceSet { @@ -433,6 +444,13 @@ func (s *routeTableSet) Delta(newSet RouteTableSet) sksets.ResourceDelta { return s.Generic().Delta(newSet.Generic()) } +func (s *routeTableSet) Clone() RouteTableSet { + if s == nil { + return nil + } + return &routeTableSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +} + type VirtualServiceSet interface { // Get the set stored keys Keys() sets.String @@ -464,6 +482,8 @@ type VirtualServiceSet interface { Generic() sksets.ResourceSet // returns the delta between this and and another VirtualServiceSet Delta(newSet VirtualServiceSet) sksets.ResourceDelta + // Create a deep copy of the current VirtualServiceSet + Clone() VirtualServiceSet } func makeGenericVirtualServiceSet(virtualServiceList []*gateway_solo_io_v1.VirtualService) sksets.ResourceSet { @@ -642,3 +662,10 @@ func (s *virtualServiceSet) Delta(newSet VirtualServiceSet) sksets.ResourceDelta } return s.Generic().Delta(newSet.Generic()) } + +func (s *virtualServiceSet) Clone() VirtualServiceSet { + if s == nil { + return nil + } + return &virtualServiceSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +} 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 8681d734f..06fd4617e 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gateway/v1/virtual_service.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _struct "github.com/golang/protobuf/ptypes/struct" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -28,10 +27,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Route Table Selector expression operator, while the set-based syntax differs from Kubernetes (kubernetes: `key: !mylabel`, gloo: `key: mylabel, operator: "!"` | kubernetes: `key: mylabel`, gloo: `key: mylabel, operator: exists`), the functionality remains the same. type RouteTableSelector_Expression_Operator int32 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 d43d16561..6d21321a1 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/annotations/deprecation.proto @@ -9,7 +9,6 @@ package annotations import ( reflect "reflect" - proto "github.com/golang/protobuf/proto" descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_envoy_annotations_deprecation_proto_extTypes = []protoimpl.ExtensionInfo{ { ExtendedType: (*descriptor.FieldOptions)(nil), 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 9ab2b7573..208541753 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/api/v2/cluster/outlier_detection.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // See the `architecture overview (arch_overview_outlier_detection)` for // more information on outlier detection. type OutlierDetection struct { 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 5d7293c26..e276aa945 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/api/v2/core/health_check.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" any "github.com/golang/protobuf/ptypes/any" duration "github.com/golang/protobuf/ptypes/duration" _struct "github.com/golang/protobuf/ptypes/struct" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Endpoint health status. type HealthStatus int32 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 6294a305c..d850e7a6d 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/api/v2/route/route.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" any "github.com/golang/protobuf/ptypes/any" duration "github.com/golang/protobuf/ptypes/duration" _struct "github.com/golang/protobuf/ptypes/struct" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type VirtualHost_TlsRequirementType int32 const ( 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 e65c5ad31..9323dbb4c 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/address.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" 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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type SocketAddress_Protocol int32 const ( 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 3284ea1aa..02dc8018a 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/backoff.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" 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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Configuration defining a jittered exponential back off strategy. type BackoffStrategy struct { state protoimpl.MessageState 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 02a6019b6..3c3017da0 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/base.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" any "github.com/golang/protobuf/ptypes/any" _ "github.com/golang/protobuf/ptypes/duration" _struct "github.com/golang/protobuf/ptypes/struct" @@ -30,10 +29,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Envoy supports :ref:`upstream priority routing // ` both at the route and the virtual // cluster level. The current priority implementation uses different connection 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 4b2ce44de..fc2d9ee99 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/event_service_config.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "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" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // [#not-implemented-hide:] // Configuration of the event reporting service endpoint. type EventServiceConfig struct { 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 955c9710f..ef81992a4 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/extension.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" any "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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Message type for extension configuration. // [#next-major-version: revisit all existing typed_config that doesn't use this wrapper.]. type TypedExtensionConfig struct { 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 d11159c8d..1d802aad4 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/grpc_service.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" any "github.com/golang/protobuf/ptypes/any" duration "github.com/golang/protobuf/ptypes/duration" empty "github.com/golang/protobuf/ptypes/empty" @@ -30,10 +29,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // gRPC service configuration. This is used by :ref:`ApiConfigSource // ` and filter configurations. // [#next-free-field: 6] 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 b54f3f8cc..21f0e3ac1 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/health_check.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" any "github.com/golang/protobuf/ptypes/any" duration "github.com/golang/protobuf/ptypes/duration" _struct "github.com/golang/protobuf/ptypes/struct" @@ -32,10 +31,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Endpoint health status. type HealthStatus int32 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 8e1b9e1e5..71f4003f7 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/http_uri.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" 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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Envoy external URI descriptor type HttpUri struct { state protoimpl.MessageState 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 47a081df7..85301f9b6 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/proxy_protocol.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "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" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type ProxyProtocolConfig_Version int32 const ( 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 989eddedd..76c52ce20 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/socket_option.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "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" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type SocketOption_SocketState int32 const ( 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 de1f97cc5..b0b79b04c 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/filter/http/gzip/v2/gzip.proto @@ -13,7 +13,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Gzip_CompressionStrategy int32 const ( 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 e1e2ac8d6..c593cec68 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/route/v3/route_components.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" any "github.com/golang/protobuf/ptypes/any" duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/golang/protobuf/ptypes/struct" @@ -34,10 +33,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type VirtualHost_TlsRequirementType int32 const ( 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 2c9bd0da0..ec9b2eaf7 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/trace/v3/datadog.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Configuration for the Datadog tracer. // [#extension: envoy.tracers.datadog] type DatadogConfig struct { 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 aaaebbc06..c8ddfc0ff 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/trace/v3/zipkin.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" 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" @@ -28,10 +27,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Available Zipkin collector endpoint versions. type ZipkinConfig_CollectorEndpointVersion int32 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 692adc181..8f16199fb 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/advanced_http/advanced_http.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" 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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type HealthCheckResult int32 const ( 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 125fa1501..4424cc80f 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/aws/filter.proto @@ -13,7 +13,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -28,10 +27,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // AWS Lambda contains the configuration necessary to perform transform regular // http calls to AWS Lambda invocations. type AWSLambdaPerRoute struct { 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 ec1b912fd..35702f89f 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/extauth/sanitize.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) @@ -22,10 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Sanitize struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 f8e2ae24e..04a656bd4 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/filters/http/buffer/v3/buffer.proto @@ -13,7 +13,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Buffer struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 7ea0d923c..19ab6e346 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/filters/http/csrf/v3/csrf.proto @@ -13,7 +13,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "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" @@ -28,10 +27,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // CSRF filter config. type CsrfPolicy struct { state protoimpl.MessageState 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 c1f1bbe6f..649a406ac 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.25.0 +// protoc-gen-go v1.26.0 // 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,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" 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" @@ -28,10 +27,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Please see following for JWT authentication flow: // // * `JSON Web Token (JWT) `_ 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 eeac2a5f9..76d4d213f 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/filters/http/wasm/v3/wasm.proto @@ -13,7 +13,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/wasm/v3" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Wasm struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 c5c5396c7..5c3d01a53 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/http_path/http_path.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Same as HTTP health checker, but allows a custom path per endpoint // The http path to use can be overriden using endpoint metadata. The endpoint specific path should // be in the "io.solo.health_checkers.http_path" namespace, under a string value named "path". 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 863f07430..ed1b71a02 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/jwt/solo_jwt_authn.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/filters/http/jwt_authn/v3" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type JwtWithStage struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 7288d7fb3..a065436f3 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/proxylatency/proxylatency.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // How to perform the latency measurement. Given an incoming request from downstream and // outging request to upstream; or incoming response from upstream and outgoing repsonse to // downstream, This outlines how to measure the latency used by the proxy. 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 0479d8a7f..85d921d9b 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/transformation/transformation.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" _ "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" @@ -28,10 +27,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Determines how the body will be parsed. type TransformationTemplate_RequestBodyParse int32 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 4be06f315..64b66b696 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/transformation_ee/transformation.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" route "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/api/v2/route" _type "github.com/solo-io/solo-kit/pkg/api/external/envoy/type" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FilterTransformations struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 8344a4fbd..c80610317 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/transformers/xslt/xslt_transformer.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) @@ -22,10 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Defines an XSLT Transformation. type XsltTransformation struct { state protoimpl.MessageState 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 c24ae680a..b0cbf62d0 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/waf/waf.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type AuditLogging_AuditLogAction int32 const ( 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 f3f11d9d4..d7d0e2ea0 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/wasm/v3/wasm.proto @@ -13,7 +13,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" any "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" @@ -28,10 +27,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Configuration for a Wasm VM. // [#next-free-field: 7] type VmConfig 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 d075dcca5..3ec568621 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/xff_offset/solo_xff_offset_filter.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) @@ -22,10 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Envoy filter configuration for the solo_xff_offset filter, not set by the user. type SoloXffOffset struct { state protoimpl.MessageState 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 678be8976..9497e4ed7 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/matcher/v3/regex.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" 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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // A regex matcher designed for safety when used with untrusted input. type RegexMatcher struct { state protoimpl.MessageState 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 f23d8bbcd..2ff0fc142 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/matcher/v3/string.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Specifies the way to match a string. // [#next-free-field: 7] type StringMatcher struct { 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 ce13005e3..ad080b55a 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/metadata/v3/metadata.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "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" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // MetadataKey provides a general interface using `key` and `path` to retrieve value from // :ref:`Metadata `. // 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 834dcd9c1..aaf5d54cb 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/range.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Specifies the int64 start and end of the range using half-open interval semantics [start, // end). type Int64Range struct { 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 23fef6780..9aad8b300 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/tracing/v3/custom_tag.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v3 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/type/metadata/v3" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Describes custom tags for the active span. // [#next-free-field: 6] type CustomTag struct { 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 83cec1e69..ec782a43c 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/v3/http.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type CodecClientType int32 const ( 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 55c515701..514b362fd 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/v3/percent.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "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" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Fraction percentages support several fixed denominator values. type FractionalPercent_DenominatorType int32 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 b9219eb69..0526179c6 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/v3/range.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Specifies the int64 start and end of the range using half-open interval semantics [start, // end). type Int64Range struct { 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 4a27a2c10..c614d3525 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/type/v3/semantic_version.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Envoy uses SemVer (https://semver.org/). Major/minor versions indicate // expected behaviors and APIs, the patch version field is used only // for security fixes and can be generally ignored. 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 08f4b6b1e..43d5fc3d8 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/migrate.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type MigrateAnnotation struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 0c9de74f4..8cc9129ab 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/sensitive.proto @@ -9,7 +9,6 @@ package annotations import ( reflect "reflect" - proto "github.com/golang/protobuf/proto" descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -22,10 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - var file_github_com_solo_io_solo_apis_api_gloo_gloo_external_udpa_annotations_sensitive_proto_extTypes = []protoimpl.ExtensionInfo{ { ExtendedType: (*descriptor.FieldOptions)(nil), 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 b34bc457e..2260803d1 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/status.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type PackageVersionStatus int32 const ( 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 d609453c9..ab1d4305c 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/external/udpa/annotations/versioning.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type VersioningAnnotation struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/gloo.solo.io/v1/artifact.pb.go b/pkg/api/gloo.solo.io/v1/artifact.pb.go index 890e2b0da..6863ad1bf 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/artifact.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // //@solo-kit:resource.short_name=art //@solo-kit:resource.plural_name=artifacts 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 064573eef..36ebb26d5 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/circuit_breaker.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // CircuitBreakerConfig contains the options for customizing circuit breaking behavior. // See the [envoy docs](https://www.envoyproxy.io/docs/envoy/v1.14.1/api-v2/api/v2/cluster/circuit_breaker.proto#envoy-api-msg-cluster-circuitbreakers) // for the meaning of these values. diff --git a/pkg/api/gloo.solo.io/v1/connection.pb.go b/pkg/api/gloo.solo.io/v1/connection.pb.go index 1f19638e7..c4218bc63 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/connection.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Action to take when Envoy receives client request with header names containing underscore // characters. // Underscore character is allowed in header names by the RFC-7230 and this behavior is implemented 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 4e64d728d..1d6d30aa9 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/core/matchers/matchers.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Parameters for matching routes to requests received by a Gloo-managed proxy type Matcher struct { state protoimpl.MessageState diff --git a/pkg/api/gloo.solo.io/v1/endpoint.pb.go b/pkg/api/gloo.solo.io/v1/endpoint.pb.go index 0ea42b767..e053615a3 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/endpoint.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // // //Endpoints represent dynamically discovered address/ports where an upstream service is listening 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 868819ab4..5693f6c30 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/dlp/dlp.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" matchers "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/core/matchers" _type "github.com/solo-io/solo-kit/pkg/api/external/envoy/type" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FilterConfig_EnableFor int32 const ( 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 5b3198234..8d905352f 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/jwt/jwt.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/solo-io/protoc-gen-ext/extproto" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type JwtStagedVhostExtension struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 818de185e..e160e0368 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/ratelimit/ratelimit.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Basic rate-limiting API type IngressRateLimit struct { state protoimpl.MessageState 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 715df31cb..f3bb18851 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/rbac/rbac.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Global RBAC settings type Settings struct { state protoimpl.MessageState 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 18f80d3df..14de33021 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/waf/waf.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" waf "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/waf" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Settings struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 07b3b231f..c68a87775 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/ratelimit.proto @@ -12,7 +12,6 @@ import ( sync "sync" v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v1alpha1 "github.com/solo-io/solo-apis/pkg/api/ratelimit.solo.io/v1alpha1" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -30,10 +29,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // //@solo-kit:xds-service=RateLimitDiscoveryService //@solo-kit:resource.no_references diff --git a/pkg/api/gloo.solo.io/v1/extensions.pb.go b/pkg/api/gloo.solo.io/v1/extensions.pb.go index 32155957b..5275d7724 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/extensions.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Extensions struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/gloo.solo.io/v1/failover.pb.go b/pkg/api/gloo.solo.io/v1/failover.pb.go index c32051585..636d01e65 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/failover.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // // //Failover configuration for an upstream. 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 e5e1e023f..87b01d859 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/load_balancer.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" empty "github.com/golang/protobuf/ptypes/empty" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // LoadBalancerConfig is the settings for the load balancer used to send request to the Upstream // endpoints. type LoadBalancerConfig struct { diff --git a/pkg/api/gloo.solo.io/v1/options.pb.go b/pkg/api/gloo.solo.io/v1/options.pb.go index 856bfa100..5c6cbbb18 100644 --- a/pkg/api/gloo.solo.io/v1/options.pb.go +++ b/pkg/api/gloo.solo.io/v1/options.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" _struct "github.com/golang/protobuf/ptypes/struct" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -59,10 +58,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Optional, feature-specific configuration that lives on gateways. // Each ListenerOption object contains configuration for a specific feature. // Note to developers: new Listener plugins must be added to this struct 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 16c35e326..bdee9c45f 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/advanced_http/advanced_http.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type HealthCheckResult int32 const ( 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 1dd5cfac9..7a7a6d33f 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 @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/als/als.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Contains various settings for Envoy's access logging service. // See here for more information: https://www.envoyproxy.io/docs/envoy/latest/api-v2/config/filter/accesslog/v2/accesslog.proto#envoy-api-msg-config-filter-accesslog-v2-accesslog type AccessLoggingService struct { 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 9499d53a1..ba10bad94 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/aws/aws.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type DestinationSpec_InvocationStyle int32 const ( 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 df1fa8e80..e264919f8 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/aws/ec2/aws_ec2.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Upstream Spec for AWS Lambda Upstreams // AWS Upstreams represent a collection of Lambda Functions for a particular AWS Account (IAM Role or User account) // in a particular region 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 01079649b..8df0bbc6e 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/azure/azure.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type UpstreamSpec_FunctionSpec_AuthLevel int32 const ( 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 923931a51..67f18bc29 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/consul/consul.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Upstream Spec for Consul Upstreams // consul Upstreams represent a set of one or more addressable pods for a consul Service // the Gloo consul Upstream maps to a single service port. Because consul Services support multiple ports, 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 ac92e0e80..8ccc4fc71 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/cors/cors.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // CorsPolicy defines Cross-Origin Resource Sharing for a virtual service. type CorsPolicy struct { state protoimpl.MessageState 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 44bbf06f8..697a7dfc5 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/faultinjection/fault.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type RouteAbort struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 e604a18d6..2386350b5 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/grpc/grpc.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" transformation "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/transformation" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Service spec describing GRPC upstreams. This will usually be filled // automatically via function discovery (if the upstream supports reflection). // If your upstream service is a GRPC service, use this service spec (an empty 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 f82fb6a11..a4d35fbb9 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/grpc_json/grpc_json.proto @@ -13,7 +13,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // [#next-free-field: 10] type GrpcJsonTranscoder struct { state protoimpl.MessageState 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 58e31e70c..9ebbc5b0f 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/grpc_web/grpc_web.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" _ "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/transformation" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // GrpcWeb support is enabled be default. Use this extension to disable it. type GrpcWeb struct { state protoimpl.MessageState 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 5456e890a..e06640a18 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/hcm/hcm.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type HttpConnectionManagerSettings_ForwardClientCertDetails int32 const ( 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 59f840b8d..d3a897e96 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/headers/headers.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" 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" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // This plugin provides configuration options to append and remove headers from // requests and responses // HeaderManipulation can be specified on routes, virtual hosts, or weighted destinations 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 f9f91e14d..1656cae7c 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/healthcheck/healthcheck.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Add this config to a Listener/Gateway to Enable Envoy Health Checks on that port type HealthCheck struct { state protoimpl.MessageState 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 1cab1f35e..3d73544d5 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/kubernetes/kubernetes.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Kubernetes Upstreams represent a set of one or more addressable pods for a Kubernetes Service // the Gloo Kubernetes Upstream maps to a single service port. Because Kubernetes Services support multiple ports, // Gloo requires that a different upstream be created for each port 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 cc39d3e4e..2dc27ca74 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/lbhash/lbhash.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Specifies the route’s hashing policy if the upstream cluster uses a hashing load balancer. // https://www.envoyproxy.io/docs/envoy/latest/api-v2/api/v2/route/route.proto#envoy-api-msg-route-routeaction-hashpolicy type RouteActionHashConfig struct { 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 15202707a..c73b46aef 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/pipe/pipe.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Pipe upstreams are used to route request to services listening at a Unix Domain Socket. // Pipe upstreams can be used to proxy any kind of service, and therefore contain a ServiceSpec // for additional service-specific configuration. 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 1617fb67e..6b1838217 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/protocol_upgrade/protocol_upgrade.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type ProtocolUpgradeConfig struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 41345c7d6..443b6b75d 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/rest/rest.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" transformation "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/transformation" transformation1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/transformation" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type ServiceSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 749da92c8..5f225b761 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/retries/retries.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Retry Policy applied at the Route and/or Virtual Hosts levels. type RetryPolicy struct { state protoimpl.MessageState 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 4b951ec92..a03280581 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/service_spec.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" grpc "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/grpc" rest "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/rest" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Describes APIs and application-level information for services // Gloo routes to. ServiceSpec is contained within the UpstreamSpec for certain types // of upstreams, including Kubernetes, Consul, and Static. 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 0b3f3c3f3..311cf6c83 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/shadowing/shadowing.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "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" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Specifies traffic shadowing configuration for the associated route. // If set, Envoy will send a portion of the route's traffic to the shadowed upstream. This can be a useful way to // preview a new service's behavior before putting the service in the critical path. 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 21a8b8bac..b520a571d 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/static/static.proto @@ -11,7 +11,6 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - proto "github.com/golang/protobuf/proto" 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" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Static upstreams are used to route request to services listening at fixed IP/Host & Port pairs. // Static upstreams can be used to proxy any kind of service, and therefore contain a ServiceSpec // for additional service-specific configuration. 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 395d13192..bebf39ad8 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/stats/stats.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // This plugin provides additional configuration options to expose statistics. type Stats struct { state protoimpl.MessageState 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 de2c5e4cc..64f1831e0 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/subset_spec.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type FallbackPolicy int32 const ( 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 87c54eb58..cdcffa36f 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/tcp/tcp.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -26,10 +25,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Contains various settings for Envoy's tcp proxy filter. // See here for more information: https://www.envoyproxy.io/docs/envoy/v1.10.0/api-v2/config/filter/network/tcp_proxy/v2/tcp_proxy.proto#envoy-api-msg-config-filter-network-tcp-proxy-v2-tcpproxy type TcpProxySettings struct { 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 28a73be6d..148f9461f 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/tracing/tracing.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/golang/protobuf/ptypes/any" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Contains settings for configuring Envoy's tracing capabilities at the listener level. // See here for additional information on Envoy's tracing capabilities: https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/observability/tracing.html // See here for additional information about configuring tracing with Gloo: https://gloo.solo.io/user_guides/setup_options/observability/#tracing 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 96c252fc9..b0a2ad259 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/transformation/parameters.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Parameters struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 73113f3a5..63950d7a4 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/transformation/transformation.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" transformation "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/extensions/transformation" @@ -27,10 +26,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type ResponseMatch struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache 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 d87f2b30b..35eed8c40 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/wasm/wasm.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" any "github.com/golang/protobuf/ptypes/any" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // represents the different types of WASM VMs available with which envoy can run // the WASM filter module type WasmFilter_VmType int32 diff --git a/pkg/api/gloo.solo.io/v1/proxy.pb.go b/pkg/api/gloo.solo.io/v1/proxy.pb.go index 4efd03783..5a8c8f3e7 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/proxy.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" _struct "github.com/golang/protobuf/ptypes/struct" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -28,10 +27,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type RedirectAction_RedirectResponseCode int32 const ( diff --git a/pkg/api/gloo.solo.io/v1/secret.pb.go b/pkg/api/gloo.solo.io/v1/secret.pb.go index 957c9978e..78e381d7c 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/secret.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/solo-apis/pkg/api/enterprise.gloo.solo.io/v1" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // //Certain features such as the AWS Lambda option require the use of secrets for authentication, configuration of SSL Certificates, and other data that should not be stored in plaintext configuration. // diff --git a/pkg/api/gloo.solo.io/v1/sets/mocks/sets.go b/pkg/api/gloo.solo.io/v1/sets/mocks/sets.go index 997b74dd4..4de9eb134 100644 --- a/pkg/api/gloo.solo.io/v1/sets/mocks/sets.go +++ b/pkg/api/gloo.solo.io/v1/sets/mocks/sets.go @@ -257,6 +257,20 @@ func (mr *MockSettingsSetMockRecorder) Delta(newSet interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockSettingsSet)(nil).Delta), newSet) } +// Clone mocks base method +func (m *MockSettingsSet) Clone() v1sets.SettingsSet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1sets.SettingsSet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockSettingsSetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockSettingsSet)(nil).Clone)) +} + // MockUpstreamSet is a mock of UpstreamSet interface type MockUpstreamSet struct { ctrl *gomock.Controller @@ -499,6 +513,20 @@ func (mr *MockUpstreamSetMockRecorder) Delta(newSet interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockUpstreamSet)(nil).Delta), newSet) } +// Clone mocks base method +func (m *MockUpstreamSet) Clone() v1sets.UpstreamSet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1sets.UpstreamSet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockUpstreamSetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockUpstreamSet)(nil).Clone)) +} + // MockUpstreamGroupSet is a mock of UpstreamGroupSet interface type MockUpstreamGroupSet struct { ctrl *gomock.Controller @@ -741,6 +769,20 @@ func (mr *MockUpstreamGroupSetMockRecorder) Delta(newSet interface{}) *gomock.Ca return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockUpstreamGroupSet)(nil).Delta), newSet) } +// Clone mocks base method +func (m *MockUpstreamGroupSet) Clone() v1sets.UpstreamGroupSet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1sets.UpstreamGroupSet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockUpstreamGroupSetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockUpstreamGroupSet)(nil).Clone)) +} + // MockProxySet is a mock of ProxySet interface type MockProxySet struct { ctrl *gomock.Controller @@ -982,3 +1024,17 @@ func (mr *MockProxySetMockRecorder) Delta(newSet interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockProxySet)(nil).Delta), newSet) } + +// Clone mocks base method +func (m *MockProxySet) Clone() v1sets.ProxySet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1sets.ProxySet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockProxySetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockProxySet)(nil).Clone)) +} diff --git a/pkg/api/gloo.solo.io/v1/sets/sets.go b/pkg/api/gloo.solo.io/v1/sets/sets.go index dee9c71f2..34e9b4183 100644 --- a/pkg/api/gloo.solo.io/v1/sets/sets.go +++ b/pkg/api/gloo.solo.io/v1/sets/sets.go @@ -44,6 +44,8 @@ type SettingsSet interface { Generic() sksets.ResourceSet // returns the delta between this and and another SettingsSet Delta(newSet SettingsSet) sksets.ResourceDelta + // Create a deep copy of the current SettingsSet + Clone() SettingsSet } func makeGenericSettingsSet(settingsList []*gloo_solo_io_v1.Settings) sksets.ResourceSet { @@ -223,6 +225,13 @@ func (s *settingsSet) Delta(newSet SettingsSet) sksets.ResourceDelta { return s.Generic().Delta(newSet.Generic()) } +func (s *settingsSet) Clone() SettingsSet { + if s == nil { + return nil + } + return &settingsSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +} + type UpstreamSet interface { // Get the set stored keys Keys() sets.String @@ -254,6 +263,8 @@ type UpstreamSet interface { Generic() sksets.ResourceSet // returns the delta between this and and another UpstreamSet Delta(newSet UpstreamSet) sksets.ResourceDelta + // Create a deep copy of the current UpstreamSet + Clone() UpstreamSet } func makeGenericUpstreamSet(upstreamList []*gloo_solo_io_v1.Upstream) sksets.ResourceSet { @@ -433,6 +444,13 @@ func (s *upstreamSet) Delta(newSet UpstreamSet) sksets.ResourceDelta { return s.Generic().Delta(newSet.Generic()) } +func (s *upstreamSet) Clone() UpstreamSet { + if s == nil { + return nil + } + return &upstreamSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +} + type UpstreamGroupSet interface { // Get the set stored keys Keys() sets.String @@ -464,6 +482,8 @@ type UpstreamGroupSet interface { Generic() sksets.ResourceSet // returns the delta between this and and another UpstreamGroupSet Delta(newSet UpstreamGroupSet) sksets.ResourceDelta + // Create a deep copy of the current UpstreamGroupSet + Clone() UpstreamGroupSet } func makeGenericUpstreamGroupSet(upstreamGroupList []*gloo_solo_io_v1.UpstreamGroup) sksets.ResourceSet { @@ -643,6 +663,13 @@ func (s *upstreamGroupSet) Delta(newSet UpstreamGroupSet) sksets.ResourceDelta { return s.Generic().Delta(newSet.Generic()) } +func (s *upstreamGroupSet) Clone() UpstreamGroupSet { + if s == nil { + return nil + } + return &upstreamGroupSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +} + type ProxySet interface { // Get the set stored keys Keys() sets.String @@ -674,6 +701,8 @@ type ProxySet interface { Generic() sksets.ResourceSet // returns the delta between this and and another ProxySet Delta(newSet ProxySet) sksets.ResourceDelta + // Create a deep copy of the current ProxySet + Clone() ProxySet } func makeGenericProxySet(proxyList []*gloo_solo_io_v1.Proxy) sksets.ResourceSet { @@ -852,3 +881,10 @@ func (s *proxySet) Delta(newSet ProxySet) sksets.ResourceDelta { } return s.Generic().Delta(newSet.Generic()) } + +func (s *proxySet) Clone() ProxySet { + if s == nil { + return nil + } + return &proxySet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +} diff --git a/pkg/api/gloo.solo.io/v1/settings.pb.go b/pkg/api/gloo.solo.io/v1/settings.pb.go index 423b2691c..59898abdd 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/settings.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" _struct "github.com/golang/protobuf/ptypes/struct" wrappers "github.com/golang/protobuf/ptypes/wrappers" @@ -31,10 +30,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - // Possible modes for running the function discovery service (FDS). FDS polls services in-cluster for Swagger // and gRPC endpoints. This behavior can be controlled with the use of annotations. // FdsMode specifies what policy FDS will use when determining which services to poll. diff --git a/pkg/api/gloo.solo.io/v1/ssl.pb.go b/pkg/api/gloo.solo.io/v1/ssl.pb.go index 57532f354..68a0ea2a5 100644 --- a/pkg/api/gloo.solo.io/v1/ssl.pb.go +++ b/pkg/api/gloo.solo.io/v1/ssl.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/ssl.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" 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" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type SslParameters_ProtocolVersion int32 const ( diff --git a/pkg/api/gloo.solo.io/v1/subset.pb.go b/pkg/api/gloo.solo.io/v1/subset.pb.go index 60a993619..15b4b69dc 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/subset.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Subset struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/api/gloo.solo.io/v1/upstream.pb.go b/pkg/api/gloo.solo.io/v1/upstream.pb.go index 37a091db6..571f7d314 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/gloo/gloo/v1/upstream.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" _struct "github.com/golang/protobuf/ptypes/struct" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" @@ -35,10 +34,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type UpstreamStatus_State int32 const ( diff --git a/pkg/api/multicluster.solo.io/v1alpha1/multicluster.pb.go b/pkg/api/multicluster.solo.io/v1alpha1/multicluster.pb.go index 31ad5f525..03d0d1dc1 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/multicluster.pb.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/multicluster.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/skv2-enterprise/v1alpha1/multicluster.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" 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" @@ -25,10 +24,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type MultiClusterRoleSpec_Rule_Action int32 const ( diff --git a/pkg/api/multicluster.solo.io/v1alpha1/sets/mocks/sets.go b/pkg/api/multicluster.solo.io/v1alpha1/sets/mocks/sets.go index b58ece350..038803569 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/sets/mocks/sets.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/sets/mocks/sets.go @@ -256,3 +256,17 @@ func (mr *MockMultiClusterRoleSetMockRecorder) Delta(newSet interface{}) *gomock mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockMultiClusterRoleSet)(nil).Delta), newSet) } + +// Clone mocks base method +func (m *MockMultiClusterRoleSet) Clone() v1alpha1sets.MultiClusterRoleSet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1alpha1sets.MultiClusterRoleSet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockMultiClusterRoleSetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockMultiClusterRoleSet)(nil).Clone)) +} diff --git a/pkg/api/multicluster.solo.io/v1alpha1/sets/sets.go b/pkg/api/multicluster.solo.io/v1alpha1/sets/sets.go index 69596eb46..1d64d1d5f 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/sets/sets.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/sets/sets.go @@ -44,6 +44,8 @@ type MultiClusterRoleSet interface { Generic() sksets.ResourceSet // returns the delta between this and and another MultiClusterRoleSet Delta(newSet MultiClusterRoleSet) sksets.ResourceDelta + // Create a deep copy of the current MultiClusterRoleSet + Clone() MultiClusterRoleSet } func makeGenericMultiClusterRoleSet(multiClusterRoleList []*multicluster_solo_io_v1alpha1.MultiClusterRole) sksets.ResourceSet { @@ -222,3 +224,10 @@ func (s *multiClusterRoleSet) Delta(newSet MultiClusterRoleSet) sksets.ResourceD } return s.Generic().Delta(newSet.Generic()) } + +func (s *multiClusterRoleSet) Clone() MultiClusterRoleSet { + if s == nil { + return nil + } + return &multiClusterRoleSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +} diff --git a/pkg/api/ratelimit.solo.io/v1alpha1/ratelimit.pb.go b/pkg/api/ratelimit.solo.io/v1alpha1/ratelimit.pb.go index ba9c5243c..10daa8a4c 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.25.0 +// protoc-gen-go v1.26.0 // protoc v3.6.1 // source: github.com/solo-io/solo-apis/api/rate-limiter/v1alpha1/ratelimit.proto @@ -10,7 +10,6 @@ import ( reflect "reflect" sync "sync" - proto "github.com/golang/protobuf/proto" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -24,10 +23,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type RateLimitConfigStatus_State int32 const ( diff --git a/pkg/api/ratelimit.solo.io/v1alpha1/sets/mocks/sets.go b/pkg/api/ratelimit.solo.io/v1alpha1/sets/mocks/sets.go index 34678e48d..5a0bfbeb2 100644 --- a/pkg/api/ratelimit.solo.io/v1alpha1/sets/mocks/sets.go +++ b/pkg/api/ratelimit.solo.io/v1alpha1/sets/mocks/sets.go @@ -256,3 +256,17 @@ func (mr *MockRateLimitConfigSetMockRecorder) Delta(newSet interface{}) *gomock. mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delta", reflect.TypeOf((*MockRateLimitConfigSet)(nil).Delta), newSet) } + +// Clone mocks base method +func (m *MockRateLimitConfigSet) Clone() v1alpha1sets.RateLimitConfigSet { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Clone") + ret0, _ := ret[0].(v1alpha1sets.RateLimitConfigSet) + return ret0 +} + +// Clone indicates an expected call of Clone +func (mr *MockRateLimitConfigSetMockRecorder) Clone() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clone", reflect.TypeOf((*MockRateLimitConfigSet)(nil).Clone)) +} diff --git a/pkg/api/ratelimit.solo.io/v1alpha1/sets/sets.go b/pkg/api/ratelimit.solo.io/v1alpha1/sets/sets.go index 7325b6a21..90337008a 100644 --- a/pkg/api/ratelimit.solo.io/v1alpha1/sets/sets.go +++ b/pkg/api/ratelimit.solo.io/v1alpha1/sets/sets.go @@ -44,6 +44,8 @@ type RateLimitConfigSet interface { Generic() sksets.ResourceSet // returns the delta between this and and another RateLimitConfigSet Delta(newSet RateLimitConfigSet) sksets.ResourceDelta + // Create a deep copy of the current RateLimitConfigSet + Clone() RateLimitConfigSet } func makeGenericRateLimitConfigSet(rateLimitConfigList []*ratelimit_solo_io_v1alpha1.RateLimitConfig) sksets.ResourceSet { @@ -222,3 +224,10 @@ func (s *rateLimitConfigSet) Delta(newSet RateLimitConfigSet) sksets.ResourceDel } return s.Generic().Delta(newSet.Generic()) } + +func (s *rateLimitConfigSet) Clone() RateLimitConfigSet { + if s == nil { + return nil + } + return &rateLimitConfigSet{set: sksets.NewResourceSet(s.Generic().Clone().List()...)} +}