diff --git a/changelog/v0.38.0/go-124.yaml b/changelog/v0.38.0/go-124.yaml new file mode 100644 index 000000000..0402811c8 --- /dev/null +++ b/changelog/v0.38.0/go-124.yaml @@ -0,0 +1,26 @@ +changelog: + - type: BREAKING_CHANGE + description: > + Bump dependencies to support Go 1.24 + issueLink: https://github.com/solo-io/solo-projects/issues/7609 + resolvesIssue: false + - dependencyOwner: solo-io + dependencyRepo: go-utils + dependencyTag: v0.28.4 + type: DEPENDENCY_BUMP + - dependencyOwner: solo-io + dependencyRepo: anyvendor + dependencyTag: v0.2.0 + type: DEPENDENCY_BUMP + - dependencyOwner: solo-io + dependencyRepo: k8s-utils + dependencyTag: v0.10.0 + type: DEPENDENCY_BUMP + - dependencyOwner: solo-io + dependencyRepo: protoc-gen-ext + dependencyTag: v0.1.0 + type: DEPENDENCY_BUMP + - dependencyOwner: solo-io + dependencyRepo: protoc-gen-openapi + dependencyTag: v0.3.0 + type: DEPENDENCY_BUMP \ No newline at end of file diff --git a/cloudbuild-cache.yaml b/cloudbuild-cache.yaml index 289987812..35aece117 100644 --- a/cloudbuild-cache.yaml +++ b/cloudbuild-cache.yaml @@ -10,17 +10,17 @@ steps: path: /root/.ssh id: 'untar-mod-cache' -- name: 'golang:1.23.0' +- name: 'golang:1.24' args: ['go', 'mod', 'download', 'all'] volumes: *vol id: 'download' -- name: 'golang:1.23.0' +- name: 'golang:1.24' args: ['go', 'mod', 'tidy'] volumes: *vol id: 'tidy' -- name: 'golang:1.23.0' +- name: 'golang:1.24' entrypoint: 'bash' volumes: *vol args: ['-c', ' cd /go/pkg && tar -zvcf solo-kit-mod.tar.gz mod'] diff --git a/cloudbuild.yaml b/cloudbuild.yaml index dee486aa7..2a827fe2c 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -7,7 +7,7 @@ steps: dir: &dir '/workspace/solo-kit' # prepare-workspace to set up the project so it can be built and tested -- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.11.1' +- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.12.0' args: - "--repo-name" - "$REPO_NAME" @@ -20,14 +20,14 @@ steps: id: 'prepare-workspace' # download massive container in parallel -- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.1' +- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.12.0' entrypoint: 'bash' dir: *dir args: ['-c', 'ls'] waitFor: ['-'] # Installs go executables required by codegen tests -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.12.0' args: ['update-all'] waitFor: ['prepare-workspace'] id: 'update-deps' @@ -45,7 +45,7 @@ steps: # check code gen for kubernetes custom resources # this step passes if there is no generated diff, fails otherwise -- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1' +- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.12.0' entrypoint: 'bash' args: ['ci/check-code-gen.sh'] waitFor: ['update-deps'] @@ -55,7 +55,7 @@ steps: # e2e-go-mod-ginkgo is produced from https://github.com/solo-io/cloud-builders/tree/master/e2e-go-mod-ginkgo # sets up redis, consul, kubectl, go with required environment variables # need to use the provided entrypoint -- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.1' +- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.12.0' dir: *dir entrypoint: 'make' args: diff --git a/go.mod b/go.mod index bd901cdc0..662d2658f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/solo-io/solo-kit -go 1.23.3 +go 1.24 require ( cuelang.org/go v0.3.2 @@ -27,12 +27,12 @@ require ( github.com/pseudomuto/protokit v0.2.0 github.com/radovskyb/watcher v1.0.2 github.com/rotisserie/eris v0.1.1 - github.com/solo-io/anyvendor v0.0.1 + github.com/solo-io/anyvendor v0.2.0 github.com/solo-io/go-list-licenses v0.1.4 - github.com/solo-io/go-utils v0.27.4 - github.com/solo-io/k8s-utils v0.9.0 - github.com/solo-io/protoc-gen-ext v0.0.18 - github.com/solo-io/protoc-gen-openapi v0.2.4 + github.com/solo-io/go-utils v0.28.4 + github.com/solo-io/k8s-utils v0.10.0 + github.com/solo-io/protoc-gen-ext v0.1.0 + github.com/solo-io/protoc-gen-openapi v0.3.0 go.opencensus.io v0.24.0 go.uber.org/zap v1.27.0 golang.org/x/sync v0.8.0 @@ -99,7 +99,7 @@ require ( github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-zglob v0.0.1 // indirect + github.com/mattn/go-zglob v0.0.3 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/go.sum b/go.sum index 1a0216433..68a45e99c 100644 --- a/go.sum +++ b/go.sum @@ -399,7 +399,6 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lyft/protoc-gen-star v0.4.14/go.mod h1:mE8fbna26u7aEA2QCVvvfBU/ZrPgocG1206xAFPcs94= github.com/lyft/protoc-gen-star v0.6.0 h1:xOpFu4vwmIoUeUrRuAtdCrZZymT/6AkW/bsUWA506Fo= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star/v2 v2.0.3 h1:/3+/2sWyXeMLzKd1bX+ixWKgEMsULrIivpDsuaF441o= @@ -418,8 +417,8 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-zglob v0.0.1 h1:xsEx/XUoVlI6yXjqBK062zYhRTZltCNmYPx6v+8DNaY= -github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= +github.com/mattn/go-zglob v0.0.3 h1:6Ry4EYsScDyt5di4OI6xw1bYhOqfE5S33Z1OPy+d+To= +github.com/mattn/go-zglob v0.0.3/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14 h1:9jZdLNd/P4+SfEJ0TNyxYpsK8N4GtfylBLqtbYN1sbA= @@ -466,8 +465,6 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= @@ -475,7 +472,6 @@ github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= @@ -558,19 +554,19 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/solo-io/anyvendor v0.0.1 h1:csAXLNLkUQWlr/ll4tgmc+Id9kHw2ibncf35weg03mI= -github.com/solo-io/anyvendor v0.0.1/go.mod h1:SLucIeU8qBOYI82BveNVn2LzZFcMWJSCf8Kd1S4Jcr4= +github.com/solo-io/anyvendor v0.2.0 h1:L8AnSGS/PW7TA24vZpMXrfTlolXi3IyMMFjoDXOH5z4= +github.com/solo-io/anyvendor v0.2.0/go.mod h1:WIJdoBmSQCii7hsiCpjXNWa0AnRzOLbg6PCYkVK4LDE= github.com/solo-io/go-list-licenses v0.1.4 h1:u4xh1OUORT4iSWuAp3Q4NsfHcDaeUV8QRDH8ACQqbxw= github.com/solo-io/go-list-licenses v0.1.4/go.mod h1:x6LSp/NrYgVXwNum7ZOiaAYTpg6B3F6TrWYfcdHVroA= github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c= -github.com/solo-io/go-utils v0.27.4 h1:/VOXUZTsIfnP+aWeWdkiWI4hCyF8nODOr1x+TX+e+dk= -github.com/solo-io/go-utils v0.27.4/go.mod h1:xJncbCIrp5iovb95MReJQFf88q3P23NgB1RyGckzq7k= -github.com/solo-io/k8s-utils v0.9.0 h1:q3/KN8yJ0ps3eGWOjLOwSjdUpwsJHDl0puv0Ur7ZeBk= -github.com/solo-io/k8s-utils v0.9.0/go.mod h1:Yk4DdpjvFnTUl8+SwnoobjEy3/x9E9rdQ4ee5KLCBNI= -github.com/solo-io/protoc-gen-ext v0.0.18 h1:zSAL8NzWpJUGYoA5IyjHiKASNyHjR0uxBQ7eQS94i3A= -github.com/solo-io/protoc-gen-ext v0.0.18/go.mod h1:iGyCvmKmhJNXs5MgBcYFBF0om7LDnCVD2WwhOZGnqeA= -github.com/solo-io/protoc-gen-openapi v0.2.4 h1:9tqGhCAq83IRSzHhKDzpWnPlbPPORTM2izVxjLk0Ftw= -github.com/solo-io/protoc-gen-openapi v0.2.4/go.mod h1:osEjRl1miHqlq4Wl/8SEqHFoyydptPL1EzEdM9c4vfE= +github.com/solo-io/go-utils v0.28.4 h1:IH3p/CttV5kzRgxBgk+beynbdFBQyxNFN2bOsgK1nGs= +github.com/solo-io/go-utils v0.28.4/go.mod h1:/V0ovlR+tGhb4+QNYIffKscuhtUIEoN29mJhWjYLYA4= +github.com/solo-io/k8s-utils v0.10.0 h1:vZkw/5lfIZ6EKd6TV6k87gF/YPY/9YhmQmBJDV4GEVc= +github.com/solo-io/k8s-utils v0.10.0/go.mod h1:hovE8yeAUL9YIFtC4AIscxfkZOP1abrPOuI/nYLziSc= +github.com/solo-io/protoc-gen-ext v0.1.0 h1:WvmXaontRCax9Wq5vAdewv+4tCwTrubC5rbk6coSajQ= +github.com/solo-io/protoc-gen-ext v0.1.0/go.mod h1:pJ8/XXyHs6T3p7dpu9Hmv0B4uhn7HI+OR2YIjT1mKDc= +github.com/solo-io/protoc-gen-openapi v0.3.0 h1:9Cb45r7GtZcWTPQx+VJ6ba4DB6f47/ONsAxz/8tyuOE= +github.com/solo-io/protoc-gen-openapi v0.3.0/go.mod h1:3Zvq9oDldIwsP7UGfsIxeR9CxRovRhFPDvp4gns0C0w= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= diff --git a/pkg/api/external/envoy/api/v2/core/address.pb.clone.go b/pkg/api/external/envoy/api/v2/core/address.pb.clone.go index efcf4f028..a4f19fa4c 100644 --- a/pkg/api/external/envoy/api/v2/core/address.pb.clone.go +++ b/pkg/api/external/envoy/api/v2/core/address.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -86,21 +86,21 @@ func (m *TcpKeepalive) Clone() proto.Message { target = &TcpKeepalive{} if h, ok := interface{}(m.GetKeepaliveProbes()).(clone.Cloner); ok { - target.KeepaliveProbes = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveProbes = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.KeepaliveProbes = proto.Clone(m.GetKeepaliveProbes()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveProbes = proto.Clone(m.GetKeepaliveProbes()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetKeepaliveTime()).(clone.Cloner); ok { - target.KeepaliveTime = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveTime = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.KeepaliveTime = proto.Clone(m.GetKeepaliveTime()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveTime = proto.Clone(m.GetKeepaliveTime()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } if h, ok := interface{}(m.GetKeepaliveInterval()).(clone.Cloner); ok { - target.KeepaliveInterval = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveInterval = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.KeepaliveInterval = proto.Clone(m.GetKeepaliveInterval()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.KeepaliveInterval = proto.Clone(m.GetKeepaliveInterval()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target @@ -121,9 +121,9 @@ func (m *BindConfig) Clone() proto.Message { } if h, ok := interface{}(m.GetFreebind()).(clone.Cloner); ok { - target.Freebind = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Freebind = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Freebind = proto.Clone(m.GetFreebind()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Freebind = proto.Clone(m.GetFreebind()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if m.GetSocketOptions() != nil { @@ -192,9 +192,9 @@ func (m *CidrRange) Clone() proto.Message { target.AddressPrefix = m.GetAddressPrefix() if h, ok := interface{}(m.GetPrefixLen()).(clone.Cloner); ok { - target.PrefixLen = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PrefixLen = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } else { - target.PrefixLen = proto.Clone(m.GetPrefixLen()).(*github_com_golang_protobuf_ptypes_wrappers.UInt32Value) + target.PrefixLen = proto.Clone(m.GetPrefixLen()).(*google_golang_org_protobuf_types_known_wrapperspb.UInt32Value) } return target diff --git a/pkg/api/external/envoy/api/v2/core/address.pb.go b/pkg/api/external/envoy/api/v2/core/address.pb.go index b0e1ad18b..9a6f91727 100644 --- a/pkg/api/external/envoy/api/v2/core/address.pb.go +++ b/pkg/api/external/envoy/api/v2/core/address.pb.go @@ -11,10 +11,10 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -275,14 +275,14 @@ type TcpKeepalive struct { // Maximum number of keepalive probes to send without response before deciding // the connection is dead. Default is to use the OS level configuration (unless // overridden, Linux defaults to 9.) - KeepaliveProbes *wrappers.UInt32Value `protobuf:"bytes,1,opt,name=keepalive_probes,json=keepaliveProbes,proto3" json:"keepalive_probes,omitempty"` + KeepaliveProbes *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=keepalive_probes,json=keepaliveProbes,proto3" json:"keepalive_probes,omitempty"` // The number of seconds a connection needs to be idle before keep-alive probes // start being sent. Default is to use the OS level configuration (unless // overridden, Linux defaults to 7200s (i.e., 2 hours.) - KeepaliveTime *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` + KeepaliveTime *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=keepalive_time,json=keepaliveTime,proto3" json:"keepalive_time,omitempty"` // The number of seconds between keep-alive probes. Default is to use the OS // level configuration (unless overridden, Linux defaults to 75s.) - KeepaliveInterval *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` + KeepaliveInterval *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=keepalive_interval,json=keepaliveInterval,proto3" json:"keepalive_interval,omitempty"` } func (x *TcpKeepalive) Reset() { @@ -317,21 +317,21 @@ func (*TcpKeepalive) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_address_proto_rawDescGZIP(), []int{2} } -func (x *TcpKeepalive) GetKeepaliveProbes() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveProbes() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveProbes } return nil } -func (x *TcpKeepalive) GetKeepaliveTime() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveTime() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveTime } return nil } -func (x *TcpKeepalive) GetKeepaliveInterval() *wrappers.UInt32Value { +func (x *TcpKeepalive) GetKeepaliveInterval() *wrapperspb.UInt32Value { if x != nil { return x.KeepaliveInterval } @@ -352,7 +352,7 @@ type BindConfig struct { // to false, the option *IP_FREEBIND* is disabled on the socket. When this // flag is not set (default), the socket is not modified, i.e. the option is // neither enabled nor disabled. - Freebind *wrappers.BoolValue `protobuf:"bytes,2,opt,name=freebind,proto3" json:"freebind,omitempty"` + Freebind *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=freebind,proto3" json:"freebind,omitempty"` // Additional socket options that may not be present in Envoy source code or // precompiled binaries. SocketOptions []*SocketOption `protobuf:"bytes,3,rep,name=socket_options,json=socketOptions,proto3" json:"socket_options,omitempty"` @@ -397,7 +397,7 @@ func (x *BindConfig) GetSourceAddress() *SocketAddress { return nil } -func (x *BindConfig) GetFreebind() *wrappers.BoolValue { +func (x *BindConfig) GetFreebind() *wrapperspb.BoolValue { if x != nil { return x.Freebind } @@ -505,7 +505,7 @@ type CidrRange struct { // IPv4 or IPv6 address, e.g. “192.0.0.0“ or “2001:db8::“. AddressPrefix string `protobuf:"bytes,1,opt,name=address_prefix,json=addressPrefix,proto3" json:"address_prefix,omitempty"` // Length of prefix, e.g. 0, 32. Defaults to 0 when unset. - PrefixLen *wrappers.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` + PrefixLen *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=prefix_len,json=prefixLen,proto3" json:"prefix_len,omitempty"` } func (x *CidrRange) Reset() { @@ -547,7 +547,7 @@ func (x *CidrRange) GetAddressPrefix() string { return "" } -func (x *CidrRange) GetPrefixLen() *wrappers.UInt32Value { +func (x *CidrRange) GetPrefixLen() *wrapperspb.UInt32Value { if x != nil { return x.PrefixLen } @@ -670,16 +670,16 @@ func file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_address_pro var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_address_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_address_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_address_proto_goTypes = []interface{}{ - (SocketAddress_Protocol)(0), // 0: solo.io.envoy.api.v2.core.SocketAddress.Protocol - (*Pipe)(nil), // 1: solo.io.envoy.api.v2.core.Pipe - (*SocketAddress)(nil), // 2: solo.io.envoy.api.v2.core.SocketAddress - (*TcpKeepalive)(nil), // 3: solo.io.envoy.api.v2.core.TcpKeepalive - (*BindConfig)(nil), // 4: solo.io.envoy.api.v2.core.BindConfig - (*Address)(nil), // 5: solo.io.envoy.api.v2.core.Address - (*CidrRange)(nil), // 6: solo.io.envoy.api.v2.core.CidrRange - (*wrappers.UInt32Value)(nil), // 7: google.protobuf.UInt32Value - (*wrappers.BoolValue)(nil), // 8: google.protobuf.BoolValue - (*SocketOption)(nil), // 9: solo.io.envoy.api.v2.core.SocketOption + (SocketAddress_Protocol)(0), // 0: solo.io.envoy.api.v2.core.SocketAddress.Protocol + (*Pipe)(nil), // 1: solo.io.envoy.api.v2.core.Pipe + (*SocketAddress)(nil), // 2: solo.io.envoy.api.v2.core.SocketAddress + (*TcpKeepalive)(nil), // 3: solo.io.envoy.api.v2.core.TcpKeepalive + (*BindConfig)(nil), // 4: solo.io.envoy.api.v2.core.BindConfig + (*Address)(nil), // 5: solo.io.envoy.api.v2.core.Address + (*CidrRange)(nil), // 6: solo.io.envoy.api.v2.core.CidrRange + (*wrapperspb.UInt32Value)(nil), // 7: google.protobuf.UInt32Value + (*wrapperspb.BoolValue)(nil), // 8: google.protobuf.BoolValue + (*SocketOption)(nil), // 9: solo.io.envoy.api.v2.core.SocketOption } var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_address_proto_depIdxs = []int32{ 0, // 0: solo.io.envoy.api.v2.core.SocketAddress.protocol:type_name -> solo.io.envoy.api.v2.core.SocketAddress.Protocol diff --git a/pkg/api/external/envoy/api/v2/core/base.pb.clone.go b/pkg/api/external/envoy/api/v2/core/base.pb.clone.go index 59a5d828b..c859fd6e1 100644 --- a/pkg/api/external/envoy/api/v2/core/base.pb.clone.go +++ b/pkg/api/external/envoy/api/v2/core/base.pb.clone.go @@ -13,15 +13,15 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" + github_com_solo_io_solo_kit_pkg_api_external_envoy_type "github.com/solo-io/solo-kit/pkg/api/external/envoy/type" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" - github_com_solo_io_solo_kit_pkg_api_external_envoy_type "github.com/solo-io/solo-kit/pkg/api/external/envoy/type" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" - github_com_solo_io_solo_kit_pkg_api_v1_resources_core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -67,9 +67,9 @@ func (m *BuildVersion) Clone() proto.Message { } if h, ok := interface{}(m.GetMetadata()).(clone.Cloner); ok { - target.Metadata = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Metadata = proto.Clone(m.GetMetadata()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata = proto.Clone(m.GetMetadata()).(*google_golang_org_protobuf_types_known_structpb.Struct) } return target @@ -113,9 +113,9 @@ func (m *Node) Clone() proto.Message { target.Cluster = m.GetCluster() if h, ok := interface{}(m.GetMetadata()).(clone.Cloner); ok { - target.Metadata = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Metadata = proto.Clone(m.GetMetadata()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Metadata = proto.Clone(m.GetMetadata()).(*google_golang_org_protobuf_types_known_structpb.Struct) } if h, ok := interface{}(m.GetLocality()).(clone.Cloner); ok { @@ -197,13 +197,13 @@ func (m *Metadata) Clone() proto.Message { target = &Metadata{} if m.GetFilterMetadata() != nil { - target.FilterMetadata = make(map[string]*github_com_golang_protobuf_ptypes_struct.Struct, len(m.GetFilterMetadata())) + target.FilterMetadata = make(map[string]*google_golang_org_protobuf_types_known_structpb.Struct, len(m.GetFilterMetadata())) for k, v := range m.GetFilterMetadata() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.FilterMetadata[k] = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.FilterMetadata[k] = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.FilterMetadata[k] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.FilterMetadata[k] = proto.Clone(v).(*google_golang_org_protobuf_types_known_structpb.Struct) } } @@ -236,9 +236,9 @@ func (m *RuntimeFeatureFlag) Clone() proto.Message { target = &RuntimeFeatureFlag{} if h, ok := interface{}(m.GetDefaultValue()).(clone.Cloner); ok { - target.DefaultValue = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DefaultValue = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.DefaultValue = proto.Clone(m.GetDefaultValue()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.DefaultValue = proto.Clone(m.GetDefaultValue()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } target.RuntimeKey = m.GetRuntimeKey() @@ -270,9 +270,9 @@ func (m *HeaderValueOption) Clone() proto.Message { target = &HeaderValueOption{} if h, ok := interface{}(m.GetAppend()).(clone.Cloner); ok { - target.Append = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Append = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Append = proto.Clone(m.GetAppend()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Append = proto.Clone(m.GetAppend()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } switch m.HeaderOption.(type) { @@ -445,11 +445,11 @@ func (m *TransportSocket) Clone() proto.Message { if h, ok := interface{}(m.GetConfig()).(clone.Cloner); ok { target.ConfigType = &TransportSocket_Config{ - Config: h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct), + Config: h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct), } } else { target.ConfigType = &TransportSocket_Config{ - Config: proto.Clone(m.GetConfig()).(*github_com_golang_protobuf_ptypes_struct.Struct), + Config: proto.Clone(m.GetConfig()).(*google_golang_org_protobuf_types_known_structpb.Struct), } } @@ -457,11 +457,11 @@ func (m *TransportSocket) Clone() proto.Message { if h, ok := interface{}(m.GetTypedConfig()).(clone.Cloner); ok { target.ConfigType = &TransportSocket_TypedConfig{ - TypedConfig: h.Clone().(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any), } } else { target.ConfigType = &TransportSocket_TypedConfig{ - TypedConfig: proto.Clone(m.GetTypedConfig()).(*github_com_golang_protobuf_ptypes_any.Any), + TypedConfig: proto.Clone(m.GetTypedConfig()).(*google_golang_org_protobuf_types_known_anypb.Any), } } diff --git a/pkg/api/external/envoy/api/v2/core/base.pb.go b/pkg/api/external/envoy/api/v2/core/base.pb.go index 04ab6f67f..b1db00a4b 100644 --- a/pkg/api/external/envoy/api/v2/core/base.pb.go +++ b/pkg/api/external/envoy/api/v2/core/base.pb.go @@ -11,14 +11,14 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - any1 "github.com/golang/protobuf/ptypes/any" - _struct "github.com/golang/protobuf/ptypes/struct" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" _type "github.com/solo-io/solo-kit/pkg/api/external/envoy/type" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + structpb "google.golang.org/protobuf/types/known/structpb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -292,7 +292,7 @@ type BuildVersion struct { Version *_type.SemanticVersion `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` // Free-form build information. // Envoy defines several well known keys in the source/common/version/version.h file - Metadata *_struct.Struct `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"` } func (x *BuildVersion) Reset() { @@ -334,7 +334,7 @@ func (x *BuildVersion) GetVersion() *_type.SemanticVersion { return nil } -func (x *BuildVersion) GetMetadata() *_struct.Struct { +func (x *BuildVersion) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -467,7 +467,7 @@ type Node struct { Cluster string `protobuf:"bytes,2,opt,name=cluster,proto3" json:"cluster,omitempty"` // Opaque metadata extending the node identifier. Envoy will pass this // directly to the management server. - Metadata *_struct.Struct `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` + Metadata *structpb.Struct `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` // Locality specifying where the Envoy instance is running. Locality *Locality `protobuf:"bytes,4,opt,name=locality,proto3" json:"locality,omitempty"` // This is motivated by informing a management server during canary which @@ -546,7 +546,7 @@ func (x *Node) GetCluster() string { return "" } -func (x *Node) GetMetadata() *_struct.Struct { +func (x *Node) GetMetadata() *structpb.Struct { if x != nil { return x.Metadata } @@ -664,7 +664,7 @@ type Metadata struct { // Key is the reverse DNS filter name, e.g. com.acme.widget. The envoy.* // namespace is reserved for Envoy's built-in filters. - FilterMetadata map[string]*_struct.Struct `protobuf:"bytes,1,rep,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + FilterMetadata map[string]*structpb.Struct `protobuf:"bytes,1,rep,name=filter_metadata,json=filterMetadata,proto3" json:"filter_metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *Metadata) Reset() { @@ -699,7 +699,7 @@ func (*Metadata) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_base_proto_rawDescGZIP(), []int{4} } -func (x *Metadata) GetFilterMetadata() map[string]*_struct.Struct { +func (x *Metadata) GetFilterMetadata() map[string]*structpb.Struct { if x != nil { return x.FilterMetadata } @@ -771,7 +771,7 @@ type RuntimeFeatureFlag struct { unknownFields protoimpl.UnknownFields // Default value if runtime value is not available. - DefaultValue *wrappers.BoolValue `protobuf:"bytes,1,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` + DefaultValue *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"` // Runtime key to get value for comparison. This value is used if defined. The boolean value must // be represented via its // `canonical JSON encoding `_. @@ -810,7 +810,7 @@ func (*RuntimeFeatureFlag) Descriptor() ([]byte, []int) { return file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_base_proto_rawDescGZIP(), []int{6} } -func (x *RuntimeFeatureFlag) GetDefaultValue() *wrappers.BoolValue { +func (x *RuntimeFeatureFlag) GetDefaultValue() *wrapperspb.BoolValue { if x != nil { return x.DefaultValue } @@ -901,7 +901,7 @@ type HeaderValueOption struct { HeaderOption isHeaderValueOption_HeaderOption `protobuf_oneof:"header_option"` // Should the value be appended? If true (default), the value is appended to // existing values. - Append *wrappers.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` + Append *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=append,proto3" json:"append,omitempty"` } func (x *HeaderValueOption) Reset() { @@ -957,7 +957,7 @@ func (x *HeaderValueOption) GetHeaderSecretRef() *core.ResourceRef { return nil } -func (x *HeaderValueOption) GetAppend() *wrappers.BoolValue { +func (x *HeaderValueOption) GetAppend() *wrapperspb.BoolValue { if x != nil { return x.Append } @@ -1339,14 +1339,14 @@ func (m *TransportSocket) GetConfigType() isTransportSocket_ConfigType { return nil } -func (x *TransportSocket) GetConfig() *_struct.Struct { +func (x *TransportSocket) GetConfig() *structpb.Struct { if x, ok := x.GetConfigType().(*TransportSocket_Config); ok { return x.Config } return nil } -func (x *TransportSocket) GetTypedConfig() *any1.Any { +func (x *TransportSocket) GetTypedConfig() *anypb.Any { if x, ok := x.GetConfigType().(*TransportSocket_TypedConfig); ok { return x.TypedConfig } @@ -1358,11 +1358,11 @@ type isTransportSocket_ConfigType interface { } type TransportSocket_Config struct { - Config *_struct.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` + Config *structpb.Struct `protobuf:"bytes,2,opt,name=config,proto3,oneof"` } type TransportSocket_TypedConfig struct { - TypedConfig *any1.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` + TypedConfig *anypb.Any `protobuf:"bytes,3,opt,name=typed_config,json=typedConfig,proto3,oneof"` } func (*TransportSocket_Config) isTransportSocket_ConfigType() {} @@ -1749,12 +1749,12 @@ var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_base_proto_g (*ControlPlane)(nil), // 18: solo.io.envoy.api.v2.core.ControlPlane nil, // 19: solo.io.envoy.api.v2.core.Metadata.FilterMetadataEntry (*_type.SemanticVersion)(nil), // 20: solo.io.envoy.type.SemanticVersion - (*_struct.Struct)(nil), // 21: google.protobuf.Struct + (*structpb.Struct)(nil), // 21: google.protobuf.Struct (*Address)(nil), // 22: solo.io.envoy.api.v2.core.Address - (*wrappers.BoolValue)(nil), // 23: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 23: google.protobuf.BoolValue (*core.ResourceRef)(nil), // 24: core.solo.io.ResourceRef (*HttpUri)(nil), // 25: solo.io.envoy.api.v2.core.HttpUri - (*any1.Any)(nil), // 26: google.protobuf.Any + (*anypb.Any)(nil), // 26: google.protobuf.Any (*_type.FractionalPercent)(nil), // 27: solo.io.envoy.type.FractionalPercent } var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_base_proto_depIdxs = []int32{ diff --git a/pkg/api/external/envoy/api/v2/core/http_uri.pb.clone.go b/pkg/api/external/envoy/api/v2/core/http_uri.pb.clone.go index 153b82e0a..86fcfa108 100644 --- a/pkg/api/external/envoy/api/v2/core/http_uri.pb.clone.go +++ b/pkg/api/external/envoy/api/v2/core/http_uri.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_duration "github.com/golang/protobuf/ptypes/duration" + google_golang_org_protobuf_types_known_durationpb "google.golang.org/protobuf/types/known/durationpb" ) // ensure the imports are used @@ -38,9 +38,9 @@ func (m *HttpUri) Clone() proto.Message { target.Uri = m.GetUri() if h, ok := interface{}(m.GetTimeout()).(clone.Cloner); ok { - target.Timeout = h.Clone().(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = h.Clone().(*google_golang_org_protobuf_types_known_durationpb.Duration) } else { - target.Timeout = proto.Clone(m.GetTimeout()).(*github_com_golang_protobuf_ptypes_duration.Duration) + target.Timeout = proto.Clone(m.GetTimeout()).(*google_golang_org_protobuf_types_known_durationpb.Duration) } switch m.HttpUpstreamType.(type) { diff --git a/pkg/api/external/envoy/api/v2/core/http_uri.pb.go b/pkg/api/external/envoy/api/v2/core/http_uri.pb.go index b57f92b44..795132e02 100644 --- a/pkg/api/external/envoy/api/v2/core/http_uri.pb.go +++ b/pkg/api/external/envoy/api/v2/core/http_uri.pb.go @@ -11,10 +11,10 @@ import ( sync "sync" _ "github.com/envoyproxy/protoc-gen-validate/validate" - duration "github.com/golang/protobuf/ptypes/duration" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + durationpb "google.golang.org/protobuf/types/known/durationpb" ) const ( @@ -48,7 +48,7 @@ type HttpUri struct { // *HttpUri_Cluster HttpUpstreamType isHttpUri_HttpUpstreamType `protobuf_oneof:"http_upstream_type"` // Sets the maximum duration in milliseconds that a response can take to arrive upon request. - Timeout *duration.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` + Timeout *durationpb.Duration `protobuf:"bytes,3,opt,name=timeout,proto3" json:"timeout,omitempty"` } func (x *HttpUri) Reset() { @@ -104,7 +104,7 @@ func (x *HttpUri) GetCluster() string { return "" } -func (x *HttpUri) GetTimeout() *duration.Duration { +func (x *HttpUri) GetTimeout() *durationpb.Duration { if x != nil { return x.Timeout } @@ -179,8 +179,8 @@ func file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_http_uri_pr var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_http_uri_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_http_uri_proto_goTypes = []interface{}{ - (*HttpUri)(nil), // 0: solo.io.envoy.api.v2.core.HttpUri - (*duration.Duration)(nil), // 1: google.protobuf.Duration + (*HttpUri)(nil), // 0: solo.io.envoy.api.v2.core.HttpUri + (*durationpb.Duration)(nil), // 1: google.protobuf.Duration } var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_core_http_uri_proto_depIdxs = []int32{ 1, // 0: solo.io.envoy.api.v2.core.HttpUri.timeout:type_name -> google.protobuf.Duration diff --git a/pkg/api/external/envoy/api/v2/discovery.pb.clone.go b/pkg/api/external/envoy/api/v2/discovery.pb.clone.go index 741c0632e..16aa31091 100644 --- a/pkg/api/external/envoy/api/v2/discovery.pb.clone.go +++ b/pkg/api/external/envoy/api/v2/discovery.pb.clone.go @@ -13,11 +13,11 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_any "github.com/golang/protobuf/ptypes/any" - github_com_solo_io_solo_kit_pkg_api_external_envoy_api_v2_core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" google_golang_org_genproto_googleapis_rpc_status "google.golang.org/genproto/googleapis/rpc/status" + + google_golang_org_protobuf_types_known_anypb "google.golang.org/protobuf/types/known/anypb" ) // ensure the imports are used @@ -80,13 +80,13 @@ func (m *DiscoveryResponse) Clone() proto.Message { target.VersionInfo = m.GetVersionInfo() if m.GetResources() != nil { - target.Resources = make([]*github_com_golang_protobuf_ptypes_any.Any, len(m.GetResources())) + target.Resources = make([]*google_golang_org_protobuf_types_known_anypb.Any, len(m.GetResources())) for idx, v := range m.GetResources() { if h, ok := interface{}(v).(clone.Cloner); ok { - target.Resources[idx] = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.Resources[idx] = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.Resources[idx] = proto.Clone(v).(*github_com_golang_protobuf_ptypes_any.Any) + target.Resources[idx] = proto.Clone(v).(*google_golang_org_protobuf_types_known_anypb.Any) } } @@ -222,9 +222,9 @@ func (m *Resource) Clone() proto.Message { target.Version = m.GetVersion() if h, ok := interface{}(m.GetResource()).(clone.Cloner); ok { - target.Resource = h.Clone().(*github_com_golang_protobuf_ptypes_any.Any) + target.Resource = h.Clone().(*google_golang_org_protobuf_types_known_anypb.Any) } else { - target.Resource = proto.Clone(m.GetResource()).(*github_com_golang_protobuf_ptypes_any.Any) + target.Resource = proto.Clone(m.GetResource()).(*google_golang_org_protobuf_types_known_anypb.Any) } return target diff --git a/pkg/api/external/envoy/api/v2/discovery.pb.go b/pkg/api/external/envoy/api/v2/discovery.pb.go index 759d0e65a..8eff5500f 100644 --- a/pkg/api/external/envoy/api/v2/discovery.pb.go +++ b/pkg/api/external/envoy/api/v2/discovery.pb.go @@ -10,12 +10,12 @@ import ( reflect "reflect" sync "sync" - any1 "github.com/golang/protobuf/ptypes/any" _ "github.com/solo-io/protoc-gen-ext/extproto" core "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2/core" status "google.golang.org/genproto/googleapis/rpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" ) const ( @@ -149,7 +149,7 @@ type DiscoveryResponse struct { // The version of the response data. VersionInfo string `protobuf:"bytes,1,opt,name=version_info,json=versionInfo,proto3" json:"version_info,omitempty"` // The response resources. These resources are typed and depend on the API being called. - Resources []*any1.Any `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources,omitempty"` + Resources []*anypb.Any `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources,omitempty"` // [#not-implemented-hide:] // Canary is used to support two Envoy command line flags: // @@ -221,7 +221,7 @@ func (x *DiscoveryResponse) GetVersionInfo() string { return "" } -func (x *DiscoveryResponse) GetResources() []*any1.Any { +func (x *DiscoveryResponse) GetResources() []*anypb.Any { if x != nil { return x.Resources } @@ -525,7 +525,7 @@ type Resource struct { // resources. Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` // The resource being tracked. - Resource *any1.Any `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` + Resource *anypb.Any `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` } func (x *Resource) Reset() { @@ -581,7 +581,7 @@ func (x *Resource) GetVersion() string { return "" } -func (x *Resource) GetResource() *any1.Any { +func (x *Resource) GetResource() *anypb.Any { if x != nil { return x.Resource } @@ -726,7 +726,7 @@ var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_discovery_proto_g nil, // 5: envoy.api.v2.DeltaDiscoveryRequest.InitialResourceVersionsEntry (*core.Node)(nil), // 6: solo.io.envoy.api.v2.core.Node (*status.Status)(nil), // 7: google.rpc.Status - (*any1.Any)(nil), // 8: google.protobuf.Any + (*anypb.Any)(nil), // 8: google.protobuf.Any (*core.ControlPlane)(nil), // 9: solo.io.envoy.api.v2.core.ControlPlane } var file_github_com_solo_io_solo_kit_api_external_envoy_api_v2_discovery_proto_depIdxs = []int32{ diff --git a/pkg/api/v1/apiserver/api_server.pb.go b/pkg/api/v1/apiserver/api_server.pb.go index ac487547f..a21533d09 100644 --- a/pkg/api/v1/apiserver/api_server.pb.go +++ b/pkg/api/v1/apiserver/api_server.pb.go @@ -11,12 +11,12 @@ import ( reflect "reflect" sync "sync" - any1 "github.com/golang/protobuf/ptypes/any" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" ) const ( @@ -95,7 +95,7 @@ type ReadResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Resource *any1.Any `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` + Resource *anypb.Any `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` } func (x *ReadResponse) Reset() { @@ -130,7 +130,7 @@ func (*ReadResponse) Descriptor() ([]byte, []int) { return file_api_server_proto_rawDescGZIP(), []int{1} } -func (x *ReadResponse) GetResource() *any1.Any { +func (x *ReadResponse) GetResource() *anypb.Any { if x != nil { return x.Resource } @@ -142,8 +142,8 @@ type WriteRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Resource *any1.Any `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` - OverwriteExisting bool `protobuf:"varint,2,opt,name=overwrite_existing,json=overwriteExisting,proto3" json:"overwrite_existing,omitempty"` + Resource *anypb.Any `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` + OverwriteExisting bool `protobuf:"varint,2,opt,name=overwrite_existing,json=overwriteExisting,proto3" json:"overwrite_existing,omitempty"` } func (x *WriteRequest) Reset() { @@ -178,7 +178,7 @@ func (*WriteRequest) Descriptor() ([]byte, []int) { return file_api_server_proto_rawDescGZIP(), []int{2} } -func (x *WriteRequest) GetResource() *any1.Any { +func (x *WriteRequest) GetResource() *anypb.Any { if x != nil { return x.Resource } @@ -197,7 +197,7 @@ type WriteResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Resource *any1.Any `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` + Resource *anypb.Any `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"` } func (x *WriteResponse) Reset() { @@ -232,7 +232,7 @@ func (*WriteResponse) Descriptor() ([]byte, []int) { return file_api_server_proto_rawDescGZIP(), []int{3} } -func (x *WriteResponse) GetResource() *any1.Any { +func (x *WriteResponse) GetResource() *anypb.Any { if x != nil { return x.Resource } @@ -408,7 +408,7 @@ type ListResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ResourceList []*any1.Any `protobuf:"bytes,1,rep,name=resource_list,json=resourceList,proto3" json:"resource_list,omitempty"` + ResourceList []*anypb.Any `protobuf:"bytes,1,rep,name=resource_list,json=resourceList,proto3" json:"resource_list,omitempty"` } func (x *ListResponse) Reset() { @@ -443,7 +443,7 @@ func (*ListResponse) Descriptor() ([]byte, []int) { return file_api_server_proto_rawDescGZIP(), []int{7} } -func (x *ListResponse) GetResourceList() []*any1.Any { +func (x *ListResponse) GetResourceList() []*anypb.Any { if x != nil { return x.ResourceList } @@ -510,7 +510,7 @@ type WatchResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ResourceList []*any1.Any `protobuf:"bytes,1,rep,name=resource_list,json=resourceList,proto3" json:"resource_list,omitempty"` + ResourceList []*anypb.Any `protobuf:"bytes,1,rep,name=resource_list,json=resourceList,proto3" json:"resource_list,omitempty"` } func (x *WatchResponse) Reset() { @@ -545,7 +545,7 @@ func (*WatchResponse) Descriptor() ([]byte, []int) { return file_api_server_proto_rawDescGZIP(), []int{9} } -func (x *WatchResponse) GetResourceList() []*any1.Any { +func (x *WatchResponse) GetResourceList() []*anypb.Any { if x != nil { return x.ResourceList } @@ -749,7 +749,7 @@ var file_api_server_proto_goTypes = []interface{}{ (*WatchResponse)(nil), // 9: apiserver.api.v1.WatchResponse (*RegisterRequest)(nil), // 10: apiserver.api.v1.RegisterRequest (*RegisterResponse)(nil), // 11: apiserver.api.v1.RegisterResponse - (*any1.Any)(nil), // 12: google.protobuf.Any + (*anypb.Any)(nil), // 12: google.protobuf.Any } var file_api_server_proto_depIdxs = []int32{ 12, // 0: apiserver.api.v1.ReadResponse.resource:type_name -> google.protobuf.Any diff --git a/pkg/api/v1/control-plane/server/generic_server.go b/pkg/api/v1/control-plane/server/generic_server.go index 7af51e2b3..72392977a 100644 --- a/pkg/api/v1/control-plane/server/generic_server.go +++ b/pkg/api/v1/control-plane/server/generic_server.go @@ -302,7 +302,7 @@ func (s *server) process( return status.Errorf(codes.Unavailable, "watching failed") } if resp.Response == nil { - return status.Errorf(codes.Unavailable, "watching failed for "+resp.TypeUrl) + return status.Error(codes.Unavailable, "watching failed for "+resp.TypeUrl) } typeurl := resp.TypeUrl nonce, err := send(*resp.Response, typeurl, streamID, &streamNonce) diff --git a/pkg/api/v1/resources/core/metadata.pb.clone.go b/pkg/api/v1/resources/core/metadata.pb.clone.go index fbcba9ee7..dde0c66a2 100644 --- a/pkg/api/v1/resources/core/metadata.pb.clone.go +++ b/pkg/api/v1/resources/core/metadata.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_wrappers "github.com/golang/protobuf/ptypes/wrappers" + google_golang_org_protobuf_types_known_wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) // ensure the imports are used @@ -90,15 +90,15 @@ func (m *Metadata_OwnerReference) Clone() proto.Message { target.ApiVersion = m.GetApiVersion() if h, ok := interface{}(m.GetBlockOwnerDeletion()).(clone.Cloner); ok { - target.BlockOwnerDeletion = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.BlockOwnerDeletion = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.BlockOwnerDeletion = proto.Clone(m.GetBlockOwnerDeletion()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.BlockOwnerDeletion = proto.Clone(m.GetBlockOwnerDeletion()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } if h, ok := interface{}(m.GetController()).(clone.Cloner); ok { - target.Controller = h.Clone().(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Controller = h.Clone().(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } else { - target.Controller = proto.Clone(m.GetController()).(*github_com_golang_protobuf_ptypes_wrappers.BoolValue) + target.Controller = proto.Clone(m.GetController()).(*google_golang_org_protobuf_types_known_wrapperspb.BoolValue) } target.Kind = m.GetKind() diff --git a/pkg/api/v1/resources/core/metadata.pb.go b/pkg/api/v1/resources/core/metadata.pb.go index a2fd49056..8817f2fc2 100644 --- a/pkg/api/v1/resources/core/metadata.pb.go +++ b/pkg/api/v1/resources/core/metadata.pb.go @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -155,12 +155,12 @@ type Metadata_OwnerReference struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ApiVersion string `protobuf:"bytes,1,opt,name=api_version,json=apiVersion,proto3" json:"api_version,omitempty"` - BlockOwnerDeletion *wrappers.BoolValue `protobuf:"bytes,2,opt,name=block_owner_deletion,json=blockOwnerDeletion,proto3" json:"block_owner_deletion,omitempty"` - Controller *wrappers.BoolValue `protobuf:"bytes,3,opt,name=controller,proto3" json:"controller,omitempty"` - Kind string `protobuf:"bytes,4,opt,name=kind,proto3" json:"kind,omitempty"` - Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` - Uid string `protobuf:"bytes,6,opt,name=uid,proto3" json:"uid,omitempty"` + ApiVersion string `protobuf:"bytes,1,opt,name=api_version,json=apiVersion,proto3" json:"api_version,omitempty"` + BlockOwnerDeletion *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=block_owner_deletion,json=blockOwnerDeletion,proto3" json:"block_owner_deletion,omitempty"` + Controller *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=controller,proto3" json:"controller,omitempty"` + Kind string `protobuf:"bytes,4,opt,name=kind,proto3" json:"kind,omitempty"` + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` + Uid string `protobuf:"bytes,6,opt,name=uid,proto3" json:"uid,omitempty"` } func (x *Metadata_OwnerReference) Reset() { @@ -202,14 +202,14 @@ func (x *Metadata_OwnerReference) GetApiVersion() string { return "" } -func (x *Metadata_OwnerReference) GetBlockOwnerDeletion() *wrappers.BoolValue { +func (x *Metadata_OwnerReference) GetBlockOwnerDeletion() *wrapperspb.BoolValue { if x != nil { return x.BlockOwnerDeletion } return nil } -func (x *Metadata_OwnerReference) GetController() *wrappers.BoolValue { +func (x *Metadata_OwnerReference) GetController() *wrapperspb.BoolValue { if x != nil { return x.Controller } @@ -318,7 +318,7 @@ var file_metadata_proto_goTypes = []interface{}{ nil, // 1: core.solo.io.Metadata.LabelsEntry nil, // 2: core.solo.io.Metadata.AnnotationsEntry (*Metadata_OwnerReference)(nil), // 3: core.solo.io.Metadata.OwnerReference - (*wrappers.BoolValue)(nil), // 4: google.protobuf.BoolValue + (*wrapperspb.BoolValue)(nil), // 4: google.protobuf.BoolValue } var file_metadata_proto_depIdxs = []int32{ 1, // 0: core.solo.io.Metadata.labels:type_name -> core.solo.io.Metadata.LabelsEntry diff --git a/pkg/api/v1/resources/core/solo-kit.pb.go b/pkg/api/v1/resources/core/solo-kit.pb.go index 2212b7203..0a7f48d8a 100644 --- a/pkg/api/v1/resources/core/solo-kit.pb.go +++ b/pkg/api/v1/resources/core/solo-kit.pb.go @@ -10,9 +10,9 @@ import ( reflect "reflect" sync "sync" - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" ) const ( @@ -109,7 +109,7 @@ func (x *Resource) GetSkipHashingAnnotations() bool { var file_solo_kit_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.MessageOptions)(nil), + ExtendedType: (*descriptorpb.MessageOptions)(nil), ExtensionType: (*Resource)(nil), Field: 10000, Name: "core.solo.io.resource", @@ -118,7 +118,7 @@ var file_solo_kit_proto_extTypes = []protoimpl.ExtensionInfo{ }, } -// Extension fields to descriptor.MessageOptions. +// Extension fields to descriptorpb.MessageOptions. var ( // options for a message that's intended to become a solo-kit resource // @@ -172,8 +172,8 @@ func file_solo_kit_proto_rawDescGZIP() []byte { var file_solo_kit_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_solo_kit_proto_goTypes = []interface{}{ - (*Resource)(nil), // 0: core.solo.io.Resource - (*descriptor.MessageOptions)(nil), // 1: google.protobuf.MessageOptions + (*Resource)(nil), // 0: core.solo.io.Resource + (*descriptorpb.MessageOptions)(nil), // 1: google.protobuf.MessageOptions } var file_solo_kit_proto_depIdxs = []int32{ 1, // 0: core.solo.io.resource:extendee -> google.protobuf.MessageOptions diff --git a/pkg/api/v1/resources/core/status.pb.clone.go b/pkg/api/v1/resources/core/status.pb.clone.go index a05b3a9d8..b9766e35a 100644 --- a/pkg/api/v1/resources/core/status.pb.clone.go +++ b/pkg/api/v1/resources/core/status.pb.clone.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/protoc-gen-ext/pkg/clone" "google.golang.org/protobuf/proto" - github_com_golang_protobuf_ptypes_struct "github.com/golang/protobuf/ptypes/struct" + google_golang_org_protobuf_types_known_structpb "google.golang.org/protobuf/types/known/structpb" ) // ensure the imports are used @@ -79,9 +79,9 @@ func (m *Status) Clone() proto.Message { } if h, ok := interface{}(m.GetDetails()).(clone.Cloner); ok { - target.Details = h.Clone().(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = h.Clone().(*google_golang_org_protobuf_types_known_structpb.Struct) } else { - target.Details = proto.Clone(m.GetDetails()).(*github_com_golang_protobuf_ptypes_struct.Struct) + target.Details = proto.Clone(m.GetDetails()).(*google_golang_org_protobuf_types_known_structpb.Struct) } if m.GetMessages() != nil { diff --git a/pkg/api/v1/resources/core/status.pb.go b/pkg/api/v1/resources/core/status.pb.go index 223b7f74c..d5323c737 100644 --- a/pkg/api/v1/resources/core/status.pb.go +++ b/pkg/api/v1/resources/core/status.pb.go @@ -10,10 +10,10 @@ import ( reflect "reflect" sync "sync" - _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" ) const ( @@ -149,7 +149,7 @@ type Status struct { // Reference to statuses (by resource-ref string: "Kind.Namespace.Name") of subresources of the parent resource SubresourceStatuses map[string]*Status `protobuf:"bytes,4,rep,name=subresource_statuses,json=subresourceStatuses,proto3" json:"subresource_statuses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Opaque details about status results - Details *_struct.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` + Details *structpb.Struct `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` // Additional information about the current state of the resource. Messages []string `protobuf:"bytes,6,rep,name=Messages,proto3" json:"Messages,omitempty"` } @@ -214,7 +214,7 @@ func (x *Status) GetSubresourceStatuses() map[string]*Status { return nil } -func (x *Status) GetDetails() *_struct.Struct { +func (x *Status) GetDetails() *structpb.Struct { if x != nil { return x.Details } @@ -303,7 +303,7 @@ var file_status_proto_goTypes = []interface{}{ (*Status)(nil), // 2: core.solo.io.Status nil, // 3: core.solo.io.NamespacedStatuses.StatusesEntry nil, // 4: core.solo.io.Status.SubresourceStatusesEntry - (*_struct.Struct)(nil), // 5: google.protobuf.Struct + (*structpb.Struct)(nil), // 5: google.protobuf.Struct } var file_status_proto_depIdxs = []int32{ 3, // 0: core.solo.io.NamespacedStatuses.statuses:type_name -> core.solo.io.NamespacedStatuses.StatusesEntry diff --git a/pkg/api/v2/reporter/reporter_test.go b/pkg/api/v2/reporter/reporter_test.go index 54d81f425..d7236cfe9 100644 --- a/pkg/api/v2/reporter/reporter_test.go +++ b/pkg/api/v2/reporter/reporter_test.go @@ -175,7 +175,7 @@ var _ = Describe("Reporter", func() { } resourceErrs := rep.ResourceReports{ - r1.(*v1.MockResource): rep.Report{Errors: fmt.Errorf(veryLargeError)}, + r1.(*v1.MockResource): rep.Report{Errors: fmt.Errorf("%s", veryLargeError)}, } err = reporter.WriteReports(context.TODO(), resourceErrs, subresourceStatuses) Expect(err).NotTo(HaveOccurred()) @@ -235,7 +235,7 @@ var _ = Describe("Reporter", func() { } resourceErrs := rep.ResourceReports{ - r1.(*v1.MockResource): rep.Report{Errors: fmt.Errorf(veryLargeError)}, + r1.(*v1.MockResource): rep.Report{Errors: fmt.Errorf("%s", veryLargeError)}, } err = reporter.WriteReports(context.TODO(), resourceErrs, subresourceStatuses) Expect(err).NotTo(HaveOccurred()) diff --git a/test/mocks/v1/mock_resources.pb.go b/test/mocks/v1/mock_resources.pb.go index 44fb9f41f..6367753b3 100644 --- a/test/mocks/v1/mock_resources.pb.go +++ b/test/mocks/v1/mock_resources.pb.go @@ -19,8 +19,6 @@ import ( reflect "reflect" sync "sync" - _ "github.com/golang/protobuf/ptypes/any" - _ "github.com/golang/protobuf/ptypes/struct" _ "github.com/solo-io/protoc-gen-ext/extproto" v2 "github.com/solo-io/solo-kit/pkg/api/external/envoy/api/v2" core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" @@ -30,6 +28,8 @@ import ( status "google.golang.org/grpc/status" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/anypb" + _ "google.golang.org/protobuf/types/known/structpb" ) const ( diff --git a/test/mocks/v1/simple_mock_resources.pb.go b/test/mocks/v1/simple_mock_resources.pb.go index 3cd399370..ed796a6c4 100644 --- a/test/mocks/v1/simple_mock_resources.pb.go +++ b/test/mocks/v1/simple_mock_resources.pb.go @@ -10,17 +10,17 @@ import ( reflect "reflect" sync "sync" - any1 "github.com/golang/protobuf/ptypes/any" - duration "github.com/golang/protobuf/ptypes/duration" - empty "github.com/golang/protobuf/ptypes/empty" - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - 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" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + anypb "google.golang.org/protobuf/types/known/anypb" + durationpb "google.golang.org/protobuf/types/known/durationpb" + emptypb "google.golang.org/protobuf/types/known/emptypb" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) const ( @@ -108,35 +108,35 @@ type SimpleMockResource struct { // nested_message_list comment NestedMessageList []*SimpleMockResource_NestedMessage `protobuf:"bytes,5,rep,name=nested_message_list,json=nestedMessageList,proto3" json:"nested_message_list,omitempty"` // any comment - Any *any1.Any `protobuf:"bytes,11,opt,name=any,proto3" json:"any,omitempty"` + Any *anypb.Any `protobuf:"bytes,11,opt,name=any,proto3" json:"any,omitempty"` // struct comment - Struct *_struct.Struct `protobuf:"bytes,12,opt,name=struct,proto3" json:"struct,omitempty"` + Struct *structpb.Struct `protobuf:"bytes,12,opt,name=struct,proto3" json:"struct,omitempty"` // mapped_struct comment - MappedStruct map[string]*_struct.Struct `protobuf:"bytes,13,rep,name=mapped_struct,json=mappedStruct,proto3" json:"mapped_struct,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MappedStruct map[string]*structpb.Struct `protobuf:"bytes,13,rep,name=mapped_struct,json=mappedStruct,proto3" json:"mapped_struct,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // bool_value comment - BoolValue *wrappers.BoolValue `protobuf:"bytes,14,opt,name=bool_value,json=boolValue,proto3" json:"bool_value,omitempty"` + BoolValue *wrapperspb.BoolValue `protobuf:"bytes,14,opt,name=bool_value,json=boolValue,proto3" json:"bool_value,omitempty"` // int32_value comment - Int32Value *wrappers.Int32Value `protobuf:"bytes,15,opt,name=int32_value,json=int32Value,proto3" json:"int32_value,omitempty"` + Int32Value *wrapperspb.Int32Value `protobuf:"bytes,15,opt,name=int32_value,json=int32Value,proto3" json:"int32_value,omitempty"` // uint32_value comment - Uint32Value *wrappers.UInt32Value `protobuf:"bytes,16,opt,name=uint32_value,json=uint32Value,proto3" json:"uint32_value,omitempty"` + Uint32Value *wrapperspb.UInt32Value `protobuf:"bytes,16,opt,name=uint32_value,json=uint32Value,proto3" json:"uint32_value,omitempty"` // float_value comment - FloatValue *wrappers.FloatValue `protobuf:"bytes,17,opt,name=float_value,json=floatValue,proto3" json:"float_value,omitempty"` + FloatValue *wrapperspb.FloatValue `protobuf:"bytes,17,opt,name=float_value,json=floatValue,proto3" json:"float_value,omitempty"` // duration comment - Duration *duration.Duration `protobuf:"bytes,18,opt,name=duration,proto3" json:"duration,omitempty"` + Duration *durationpb.Duration `protobuf:"bytes,18,opt,name=duration,proto3" json:"duration,omitempty"` // empty comment - Empty *empty.Empty `protobuf:"bytes,19,opt,name=empty,proto3" json:"empty,omitempty"` + Empty *emptypb.Empty `protobuf:"bytes,19,opt,name=empty,proto3" json:"empty,omitempty"` // string_value comment - StringValue *wrappers.StringValue `protobuf:"bytes,20,opt,name=string_value,json=stringValue,proto3" json:"string_value,omitempty"` + StringValue *wrapperspb.StringValue `protobuf:"bytes,20,opt,name=string_value,json=stringValue,proto3" json:"string_value,omitempty"` // double_value comment - DoubleValue *wrappers.DoubleValue `protobuf:"bytes,21,opt,name=double_value,json=doubleValue,proto3" json:"double_value,omitempty"` + DoubleValue *wrapperspb.DoubleValue `protobuf:"bytes,21,opt,name=double_value,json=doubleValue,proto3" json:"double_value,omitempty"` // timestamp comment - Timestamp *timestamp.Timestamp `protobuf:"bytes,22,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,22,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // enum_options comment EnumOptions SimpleMockResource_EnumOptions `protobuf:"varint,30,opt,name=enum_options,json=enumOptions,proto3,enum=testing.solo.io.SimpleMockResource_EnumOptions" json:"enum_options,omitempty"` // int64_value comment - Int64Value *wrappers.Int64Value `protobuf:"bytes,31,opt,name=int64_value,json=int64Value,proto3" json:"int64_value,omitempty"` + Int64Value *wrapperspb.Int64Value `protobuf:"bytes,31,opt,name=int64_value,json=int64Value,proto3" json:"int64_value,omitempty"` // uint64_value comment - Uint64Value *wrappers.UInt64Value `protobuf:"bytes,32,opt,name=uint64_value,json=uint64Value,proto3" json:"uint64_value,omitempty"` + Uint64Value *wrapperspb.UInt64Value `protobuf:"bytes,32,opt,name=uint64_value,json=uint64Value,proto3" json:"uint64_value,omitempty"` } func (x *SimpleMockResource) Reset() { @@ -227,84 +227,84 @@ func (x *SimpleMockResource) GetNestedMessageList() []*SimpleMockResource_Nested return nil } -func (x *SimpleMockResource) GetAny() *any1.Any { +func (x *SimpleMockResource) GetAny() *anypb.Any { if x != nil { return x.Any } return nil } -func (x *SimpleMockResource) GetStruct() *_struct.Struct { +func (x *SimpleMockResource) GetStruct() *structpb.Struct { if x != nil { return x.Struct } return nil } -func (x *SimpleMockResource) GetMappedStruct() map[string]*_struct.Struct { +func (x *SimpleMockResource) GetMappedStruct() map[string]*structpb.Struct { if x != nil { return x.MappedStruct } return nil } -func (x *SimpleMockResource) GetBoolValue() *wrappers.BoolValue { +func (x *SimpleMockResource) GetBoolValue() *wrapperspb.BoolValue { if x != nil { return x.BoolValue } return nil } -func (x *SimpleMockResource) GetInt32Value() *wrappers.Int32Value { +func (x *SimpleMockResource) GetInt32Value() *wrapperspb.Int32Value { if x != nil { return x.Int32Value } return nil } -func (x *SimpleMockResource) GetUint32Value() *wrappers.UInt32Value { +func (x *SimpleMockResource) GetUint32Value() *wrapperspb.UInt32Value { if x != nil { return x.Uint32Value } return nil } -func (x *SimpleMockResource) GetFloatValue() *wrappers.FloatValue { +func (x *SimpleMockResource) GetFloatValue() *wrapperspb.FloatValue { if x != nil { return x.FloatValue } return nil } -func (x *SimpleMockResource) GetDuration() *duration.Duration { +func (x *SimpleMockResource) GetDuration() *durationpb.Duration { if x != nil { return x.Duration } return nil } -func (x *SimpleMockResource) GetEmpty() *empty.Empty { +func (x *SimpleMockResource) GetEmpty() *emptypb.Empty { if x != nil { return x.Empty } return nil } -func (x *SimpleMockResource) GetStringValue() *wrappers.StringValue { +func (x *SimpleMockResource) GetStringValue() *wrapperspb.StringValue { if x != nil { return x.StringValue } return nil } -func (x *SimpleMockResource) GetDoubleValue() *wrappers.DoubleValue { +func (x *SimpleMockResource) GetDoubleValue() *wrapperspb.DoubleValue { if x != nil { return x.DoubleValue } return nil } -func (x *SimpleMockResource) GetTimestamp() *timestamp.Timestamp { +func (x *SimpleMockResource) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -318,14 +318,14 @@ func (x *SimpleMockResource) GetEnumOptions() SimpleMockResource_EnumOptions { return SimpleMockResource_OPTION_A } -func (x *SimpleMockResource) GetInt64Value() *wrappers.Int64Value { +func (x *SimpleMockResource) GetInt64Value() *wrapperspb.Int64Value { if x != nil { return x.Int64Value } return nil } -func (x *SimpleMockResource) GetUint64Value() *wrappers.UInt64Value { +func (x *SimpleMockResource) GetUint64Value() *wrapperspb.UInt64Value { if x != nil { return x.Uint64Value } @@ -556,19 +556,19 @@ var file_github_com_solo_io_solo_kit_test_mocks_api_v1_simple_mock_resources_pro nil, // 3: testing.solo.io.SimpleMockResource.MappedStructEntry (*SimpleMockResource_NestedMessage)(nil), // 4: testing.solo.io.SimpleMockResource.NestedMessage (*core.Metadata)(nil), // 5: core.solo.io.Metadata - (*any1.Any)(nil), // 6: google.protobuf.Any - (*_struct.Struct)(nil), // 7: google.protobuf.Struct - (*wrappers.BoolValue)(nil), // 8: google.protobuf.BoolValue - (*wrappers.Int32Value)(nil), // 9: google.protobuf.Int32Value - (*wrappers.UInt32Value)(nil), // 10: google.protobuf.UInt32Value - (*wrappers.FloatValue)(nil), // 11: google.protobuf.FloatValue - (*duration.Duration)(nil), // 12: google.protobuf.Duration - (*empty.Empty)(nil), // 13: google.protobuf.Empty - (*wrappers.StringValue)(nil), // 14: google.protobuf.StringValue - (*wrappers.DoubleValue)(nil), // 15: google.protobuf.DoubleValue - (*timestamp.Timestamp)(nil), // 16: google.protobuf.Timestamp - (*wrappers.Int64Value)(nil), // 17: google.protobuf.Int64Value - (*wrappers.UInt64Value)(nil), // 18: google.protobuf.UInt64Value + (*anypb.Any)(nil), // 6: google.protobuf.Any + (*structpb.Struct)(nil), // 7: google.protobuf.Struct + (*wrapperspb.BoolValue)(nil), // 8: google.protobuf.BoolValue + (*wrapperspb.Int32Value)(nil), // 9: google.protobuf.Int32Value + (*wrapperspb.UInt32Value)(nil), // 10: google.protobuf.UInt32Value + (*wrapperspb.FloatValue)(nil), // 11: google.protobuf.FloatValue + (*durationpb.Duration)(nil), // 12: google.protobuf.Duration + (*emptypb.Empty)(nil), // 13: google.protobuf.Empty + (*wrapperspb.StringValue)(nil), // 14: google.protobuf.StringValue + (*wrapperspb.DoubleValue)(nil), // 15: google.protobuf.DoubleValue + (*timestamppb.Timestamp)(nil), // 16: google.protobuf.Timestamp + (*wrapperspb.Int64Value)(nil), // 17: google.protobuf.Int64Value + (*wrapperspb.UInt64Value)(nil), // 18: google.protobuf.UInt64Value } var file_github_com_solo_io_solo_kit_test_mocks_api_v1_simple_mock_resources_proto_depIdxs = []int32{ 5, // 0: testing.solo.io.SimpleMockResource.metadata:type_name -> core.solo.io.Metadata