From 346aa7c63fc95ca7678580ecf10ba46cf49ae6a8 Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Tue, 21 Feb 2023 20:45:38 +0000 Subject: [PATCH 01/17] bump controller-runtime to 0.14.4, and other necessary bumps --- ci/oss_compliance/osa_provided.md | 51 +++--- go.mod | 78 ++++---- go.sum | 291 ++++++++---------------------- 3 files changed, 135 insertions(+), 285 deletions(-) diff --git a/ci/oss_compliance/osa_provided.md b/ci/oss_compliance/osa_provided.md index 31fd2ab7a..3150251e1 100644 --- a/ci/oss_compliance/osa_provided.md +++ b/ci/oss_compliance/osa_provided.md @@ -1,60 +1,57 @@ Name|Version|License ---|---|--- -[PuerkitoBio/purell](https://github.com/PuerkitoBio/purell)|v1.1.1|BSD 3-clause "New" or "Revised" License -[PuerkitoBio/urlesc](https://github.com/PuerkitoBio/urlesc)|v0.0.0-20170810143723-de5bf2ad4578|BSD 3-clause "New" or "Revised" License [perks/quantile](https://github.com/beorn7/perks)|v1.0.1|MIT License [xxhash/v2](https://github.com/cespare/xxhash)|v2.1.2|MIT License [go-spew/spew](https://github.com/davecgh/go-spew)|v1.1.1|ISC License -[v3/log](https://github.com/emicklei/go-restful)|v3.8.0|MIT License +[v3/log](https://github.com/emicklei/go-restful)|v3.9.0|MIT License [json-patch/v5](https://github.com/evanphx/json-patch)|v5.6.0|BSD 3-clause "New" or "Revised" License -[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.5.4|BSD 3-clause "New" or "Revised" License +[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.6.0|BSD 3-clause "New" or "Revised" License [go-logr/logr](https://github.com/go-logr/logr)|v1.2.3|Apache License 2.0 [go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.19.5|Apache License 2.0 -[go-openapi/jsonreference](https://github.com/go-openapi/jsonreference)|v0.19.5|Apache License 2.0 +[jsonreference/internal](https://github.com/go-openapi/jsonreference)|v0.20.0|Apache License 2.0 [go-openapi/swag](https://github.com/go-openapi/swag)|v0.19.14|Apache License 2.0 [gogo/protobuf](https://github.com/gogo/protobuf)|v1.3.2|BSD 3-clause "New" or "Revised" License [groupcache/lru](https://github.com/golang/groupcache)|v0.0.0-20210331224755-41bb18bfe9da|Apache License 2.0 [golang/protobuf](https://github.com/golang/protobuf)|v1.5.2|BSD 3-clause "New" or "Revised" License [google/gnostic](https://github.com/google/gnostic)|v0.5.7-v3refs|Apache License 2.0 -[cmp/internal](https://github.com/google/go-cmp)|v0.5.8|BSD 3-clause "New" or "Revised" License +[cmp/internal](https://github.com/google/go-cmp)|v0.5.9|BSD 3-clause "New" or "Revised" License [google/gofuzz](https://github.com/google/gofuzz)|v1.1.0|Apache License 2.0 [google/uuid](https://github.com/google/uuid)|v1.2.0|BSD 3-clause "New" or "Revised" License [josharian/intern](https://github.com/josharian/intern)|v1.0.0|MIT License [json-iterator/go](https://github.com/json-iterator/go)|v1.1.12|MIT License [mailru/easyjson](https://github.com/mailru/easyjson)|v0.7.6|MIT License -[golang_protobuf_extensions/pbutil](https://github.com/matttproud/golang_protobuf_extensions)|v1.0.2-0.20181231171920-c182affec369|Apache License 2.0 +[golang_protobuf_extensions/pbutil](https://github.com/matttproud/golang_protobuf_extensions)|v1.0.2|Apache License 2.0 [modern-go/concurrent](https://github.com/modern-go/concurrent)|v0.0.0-20180306012644-bacd9c7ef1dd|Apache License 2.0 [modern-go/reflect2](https://github.com/modern-go/reflect2)|v1.0.2|Apache License 2.0 [munnerz/goautoneg](https://github.com/munnerz/goautoneg)|v0.0.0-20191010083416-a7dc8b61c822|BSD 3-clause "New" or "Revised" License [pkg/errors](https://github.com/pkg/errors)|v0.9.1|BSD 2-clause "Simplified" License -[client_golang/prometheus](https://github.com/prometheus/client_golang)|v1.12.2|Apache License 2.0 -[client_model/go](https://github.com/prometheus/client_model)|v0.2.0|Apache License 2.0 -[prometheus/common](https://github.com/prometheus/common)|v0.32.1|Apache License 2.0 -[procfs/internal](https://github.com/prometheus/procfs)|v0.7.3|Apache License 2.0 +[client_golang/prometheus](https://github.com/prometheus/client_golang)|v1.14.0|Apache License 2.0 +[client_model/go](https://github.com/prometheus/client_model)|v0.3.0|Apache License 2.0 +[prometheus/common](https://github.com/prometheus/common)|v0.37.0|Apache License 2.0 +[procfs/internal](https://github.com/prometheus/procfs)|v0.8.0|Apache License 2.0 [rotisserie/eris](https://github.com/rotisserie/eris)|v0.1.1|MIT License [go.uber.org/atomic](https://go.uber.org/atomic)|v1.7.0|MIT License [go.uber.org/multierr](https://go.uber.org/multierr)|v1.6.0|MIT License -[go.uber.org/zap](https://go.uber.org/zap)|v1.21.0|MIT License +[go.uber.org/zap](https://go.uber.org/zap)|v1.24.0|MIT License [exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20220921164117-439092de6870|BSD 3-clause "New" or "Revised" License -[x/net](https://golang.org/x/net)|v0.0.0-20220722155237-a158d28d115b|BSD 3-clause "New" or "Revised" License -[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.0.0-20211104180415-d3ed0bb246c8|BSD 3-clause "New" or "Revised" License -[x/sys](https://golang.org/x/sys)|v0.0.0-20220722155257-8c9f86f7a55f|BSD 3-clause "New" or "Revised" License -[x/term](https://golang.org/x/term)|v0.0.0-20210927222741-03fcf44c2211|BSD 3-clause "New" or "Revised" License -[x/text](https://golang.org/x/text)|v0.3.7|BSD 3-clause "New" or "Revised" License -[time/rate](https://golang.org/x/time/rate)|v0.0.0-20220609170525-579cf78fd858|BSD 3-clause "New" or "Revised" License +[x/net](https://golang.org/x/net)|v0.3.1-0.20221206200815-1e63c2f08a10|BSD 3-clause "New" or "Revised" License +[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.0.0-20220223155221-ee480838109b|BSD 3-clause "New" or "Revised" License +[x/term](https://golang.org/x/term)|v0.3.0|BSD 3-clause "New" or "Revised" License +[x/text](https://golang.org/x/text)|v0.5.0|BSD 3-clause "New" or "Revised" License +[time/rate](https://golang.org/x/time/rate)|v0.3.0|BSD 3-clause "New" or "Revised" License [jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.2.0|Apache License 2.0 -[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.28.0|BSD 3-clause "New" or "Revised" License +[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.28.1|BSD 3-clause "New" or "Revised" License [gopkg.in/inf.v0](https://gopkg.in/inf.v0)|v0.9.1|BSD 3-clause "New" or "Revised" License [gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)|v2.4.0|Apache License 2.0 [gopkg.in/yaml.v3](https://gopkg.in/yaml.v3)|v3.0.1|MIT License -[k8s.io/api](https://k8s.io/api)|v0.25.4|Apache License 2.0 -[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.25.4|Apache License 2.0 -[k8s.io/client-go](https://k8s.io/client-go)|v0.25.4|Apache License 2.0 -[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.25.4|Apache License 2.0 -[v2/internal](https://k8s.io/klog/v2/internal)|v2.70.1|Apache License 2.0 -[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20220803162953-67bda5d908f1|Apache License 2.0 -[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20220728103510-ee6ede2d64ed|Apache License 2.0 -[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.13.1|Apache License 2.0 +[k8s.io/api](https://k8s.io/api)|v0.26.1|Apache License 2.0 +[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.26.1|Apache License 2.0 +[k8s.io/client-go](https://k8s.io/client-go)|v0.26.1|Apache License 2.0 +[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.26.1|Apache License 2.0 +[v2/internal](https://k8s.io/klog/v2/internal)|v2.80.1|Apache License 2.0 +[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20221012153701-172d655c2280|Apache License 2.0 +[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20221128185143-99ec85e7a448|Apache License 2.0 +[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.14.4|Apache License 2.0 [encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20220713155537-f223a00ba0e2|Apache License 2.0 [structured-merge-diff/v4](https://sigs.k8s.io/structured-merge-diff/v4)|v4.2.3|Apache License 2.0 [sigs.k8s.io/yaml](https://sigs.k8s.io/yaml)|v1.3.0|MIT License diff --git a/go.mod b/go.mod index 6340a37a8..63eb97fb6 100644 --- a/go.mod +++ b/go.mod @@ -24,10 +24,10 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/hashstructure v1.0.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.20.1 + github.com/onsi/gomega v1.24.1 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.12.2 + github.com/prometheus/client_golang v1.14.0 github.com/pseudomuto/protoc-gen-doc v1.4.1 github.com/rogpeppe/go-internal v1.8.0 github.com/rotisserie/eris v0.1.1 @@ -39,62 +39,52 @@ require ( github.com/solo-io/k8s-utils v0.0.1 github.com/solo-io/protoc-gen-ext v0.0.18 github.com/spf13/pflag v1.0.5 - go.uber.org/zap v1.21.0 + go.uber.org/zap v1.24.0 golang.org/x/exp v0.0.0-20220921164117-439092de6870 - golang.org/x/tools v0.1.12 - google.golang.org/protobuf v1.28.0 + golang.org/x/tools v0.2.0 + google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.25.4 - k8s.io/apiextensions-apiserver v0.25.4 - k8s.io/apimachinery v0.25.4 - k8s.io/client-go v0.25.4 - k8s.io/code-generator v0.25.4 - k8s.io/klog/v2 v2.70.1 - k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed - sigs.k8s.io/controller-runtime v0.13.1 + k8s.io/api v0.26.1 + k8s.io/apiextensions-apiserver v0.26.1 + k8s.io/apimachinery v0.26.1 + k8s.io/client-go v0.26.1 + k8s.io/code-generator v0.26.1 + k8s.io/klog/v2 v2.80.1 + k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 + sigs.k8s.io/controller-runtime v0.14.4 sigs.k8s.io/yaml v1.3.0 ) require ( - cloud.google.com/go v0.97.0 // indirect - github.com/Azure/go-autorest v14.2.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.11.27 // indirect - github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect - github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect - github.com/Azure/go-autorest/logger v0.2.1 // indirect - github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/Masterminds/goutils v1.1.0 // indirect github.com/Masterminds/semver/v3 v3.1.0 // indirect github.com/Masterminds/sprig v2.15.0+incompatible // indirect - github.com/PuerkitoBio/purell v1.1.1 // indirect - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/aokoli/goutils v1.0.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cockroachdb/apd/v2 v2.0.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful/v3 v3.8.0 // indirect + github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/emicklei/proto v1.6.15 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.6.0 // indirect - github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/swag v0.19.14 // indirect github.com/gobuffalo/envy v1.8.1 // indirect github.com/gobuffalo/packd v0.3.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v4 v4.2.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/google/go-cmp v0.5.8 // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.1.0 // indirect github.com/google/uuid v1.2.0 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/huandu/xstrings v1.3.1 // indirect github.com/imdario/mergo v0.3.12 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/joho/godotenv v1.3.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -104,7 +94,7 @@ require ( github.com/mattn/go-colorable v0.1.7 // indirect github.com/mattn/go-isatty v0.0.12 // indirect github.com/mattn/go-zglob v0.0.3 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect github.com/mitchellh/copystructure v1.0.0 // indirect github.com/mitchellh/reflectwalk v1.0.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -113,34 +103,34 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007 // indirect github.com/nxadm/tail v1.4.8 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.37.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect github.com/pseudomuto/protokit v0.2.0 // indirect github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.3.1 // indirect - github.com/spf13/cobra v1.4.0 // indirect + github.com/spf13/cobra v1.6.0 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect + golang.org/x/crypto v0.1.0 // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect - golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect + golang.org/x/mod v0.6.0 // indirect + golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect + golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect - golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect - golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/term v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - k8s.io/component-base v0.25.4 // indirect - k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect - k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect + k8s.io/component-base v0.26.1 // indirect + k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect + k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) diff --git a/go.sum b/go.sum index b9703a41d..993da70fc 100644 --- a/go.sum +++ b/go.sum @@ -15,19 +15,6 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0 h1:3DXvAyifywvq64LfkKaMOmkWPS1CikIQdMe2lY9vxU8= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -52,29 +39,13 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= -github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= -github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg= -github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= -github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= -github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -104,10 +75,8 @@ github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b/go.mod h1:oX5x61 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= @@ -171,10 +140,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= @@ -207,7 +174,7 @@ github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= @@ -246,8 +213,8 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.11.1+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= -github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= +github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/proto v1.6.15 h1:XbpwxmuOPrdES97FrSfpyy67SSCV/wBIKXqgJzh6hNw= github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= @@ -255,10 +222,7 @@ github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.3.0-java/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= @@ -278,8 +242,8 @@ github.com/fgrosse/zaptest v1.1.0/go.mod h1:vMnRSul6kW7kIUXZgnZZcDwyTn8k49ODfAUL github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= -github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gertd/go-pluralize v0.1.1 h1:fQhql/WRRwr4TVp+TCw12s2esCacvEVBdkTUUwNqF/Q= @@ -304,9 +268,11 @@ github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -337,8 +303,8 @@ github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3Hfo github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= +github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= @@ -394,9 +360,6 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU= -github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= 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= @@ -415,7 +378,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -434,10 +396,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= 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.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= 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.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= @@ -452,13 +412,11 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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= @@ -468,8 +426,6 @@ github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -477,13 +433,6 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -493,7 +442,6 @@ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= @@ -554,15 +502,15 @@ github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334/go.mod h1:SK73t github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw= github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/invopop/jsonschema v0.7.0 h1:2vgQcBz1n256N+FpX3Jq7Y17AjYt46Ig3zIWyy770So= github.com/invopop/jsonschema v0.7.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= @@ -657,8 +605,8 @@ github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO github.com/mattn/go-zglob v0.0.3 h1:6Ry4EYsScDyt5di4OI6xw1bYhOqfE5S33Z1OPy+d+To= github.com/mattn/go-zglob v0.0.3/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= +github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -716,7 +664,7 @@ github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ 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= -github.com/onsi/ginkgo/v2 v2.1.6 h1:Fx2POJZfKRQcM1pH49qSZiYeu319wji004qX+GDovrU= +github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -724,8 +672,8 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa 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.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q= -github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= +github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= +github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -764,14 +712,16 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= -github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= @@ -780,8 +730,9 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -791,8 +742,9 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= 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= @@ -869,8 +821,8 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI= +github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -940,15 +892,12 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= @@ -956,8 +905,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= goji.io v2.0.0+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= goji.io v2.0.2+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -985,10 +934,8 @@ golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1015,7 +962,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= @@ -1029,11 +975,9 @@ golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hM golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1076,37 +1020,23 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 h1:Frnccbp+ok2GkUS2tC84yAq/U9Vg+0sIO7aRL3T4Xnc= +golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1176,55 +1106,45 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1283,21 +1203,12 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1324,18 +1235,6 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1378,32 +1277,7 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 h1:hrbNEivu7Zn1pxvHk6MBrq9iE22woVILTHqexqBxe6I= google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -1421,21 +1295,9 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1449,8 +1311,9 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= @@ -1506,61 +1369,61 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= -k8s.io/api v0.25.4 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= -k8s.io/api v0.25.4/go.mod h1:IG2+RzyPQLllQxnhzD8KQNEu4c4YvyDTpSMztf4A0OQ= +k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ= +k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg= k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF+aOdIWDOZxgo= k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= -k8s.io/apiextensions-apiserver v0.25.4 h1:7hu9pF+xikxQuQZ7/30z/qxIPZc2J1lFElPtr7f+B6U= -k8s.io/apiextensions-apiserver v0.25.4/go.mod h1:bkSGki5YBoZWdn5pWtNIdGvDrrsRWlmnvl9a+tAw5vQ= +k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI= +k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.25.4 h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc= -k8s.io/apimachinery v0.25.4/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= +k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ= +k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw= k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= k8s.io/cli-runtime v0.18.0/go.mod h1:1eXfmBsIJosjn9LjEBUd2WVPoPAY9XGTqTFcPMIBsUQ= k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8= k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q= -k8s.io/client-go v0.25.4 h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8= -k8s.io/client-go v0.25.4/go.mod h1:8trHCAC83XKY0wsBIpbirZU4NTUpbuhc2JnI7OruGZw= +k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU= +k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE= k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/code-generator v0.25.4 h1:tjQ7/+9eN7UOiU2DP+0v4ntTI4JZLi2c1N0WllpFhTc= -k8s.io/code-generator v0.25.4/go.mod h1:9F5fuVZOMWRme7MYj2YT3L9ropPWPokd9VRhVyD3+0w= +k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo= +k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I= k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c= k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= -k8s.io/component-base v0.25.4 h1:n1bjg9Yt+G1C0WnIDJmg2fo6wbEU1UGMRiQSjmj7hNQ= -k8s.io/component-base v0.25.4/go.mod h1:nnZJU8OP13PJEm6/p5V2ztgX2oyteIaAGKGMYb2L2cY= +k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= +k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= -k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= +k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= -k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= -k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/kubectl v0.18.0/go.mod h1:LOkWx9Z5DXMEg5KtOjHhRiC1fqJPLyCr3KtQgEolCkU= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/metrics v0.18.0/go.mod h1:8aYTW18koXqjLVKL7Ds05RPMX9ipJZI3mywYvBOxXd4= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= sigs.k8s.io/controller-runtime v0.6.2/go.mod h1:vhcq/rlnENJ09SIRp3EveTaZ0yqH526hjf9iJdbUJ/E= -sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg= -sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI= +sigs.k8s.io/controller-runtime v0.14.4 h1:Kd/Qgx5pd2XUL08eOV2vwIq3L9GhIbJ5Nxengbd4/0M= +sigs.k8s.io/controller-runtime v0.14.4/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= From abb26e7aac74e4ccdde351a9fafd6f80a0512cc8 Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Tue, 21 Feb 2023 20:46:57 +0000 Subject: [PATCH 02/17] Deal with controller-runtime API breakage --- codegen/templates/code/types/clients.gotmpl | 8 +- codegen/test/api/things.test.io/v1/clients.go | 357 +++++----- .../v1/controller/event_handlers.go | 244 +++---- .../v1/controller/multicluster_reconcilers.go | 2 + .../v1/controller/reconcilers.go | 228 +++---- .../test/api/things.test.io/v1/json.gen.go | 17 +- .../api/things.test.io/v1/mocks/clients.go | 16 +- .../api/things.test.io/v1/proto_deepcopy.go | 47 +- .../v1/providers/client_providers.go | 50 +- .../test/api/things.test.io/v1/register.go | 19 +- .../test/api/things.test.io/v1/sets/sets.go | 610 +++++++++--------- .../test/api/things.test.io/v1/test_api.pb.go | 7 +- .../api/things.test.io/v1/type_helpers.go | 3 + codegen/test/api/things.test.io/v1/types.go | 51 +- .../v1/zz_generated.deepcopy.go | 151 ++--- codegen/test/chart-no-desc/values.schema.json | 179 +++++ codegen/test/chart/values.schema.json | 179 +++++ pkg/api/core.skv2.solo.io/v1/core.pb.go | 5 +- .../multicluster.solo.io/v1alpha1/clients.go | 8 +- .../v1alpha1/cluster.pb.go | 18 +- .../v1alpha1/mocks/clients.go | 8 +- pkg/client/client.go | 8 +- .../v1/clients.go | 8 +- .../v1/mocks/clients.go | 8 +- .../k8s/apiextensions.k8s.io/v1/clients.go | 8 +- .../apiextensions.k8s.io/v1/mocks/clients.go | 8 +- .../apiextensions.k8s.io/v1beta1/clients.go | 8 +- .../v1beta1/mocks/clients.go | 8 +- .../certificates.k8s.io/v1beta1/clients.go | 8 +- .../v1beta1/mocks/clients.go | 8 +- .../internal/k8s/core/v1/clients.go | 24 +- .../internal/k8s/core/v1/mocks/clients.go | 24 +- .../rbac.authorization.k8s.io/v1/clients.go | 32 +- .../v1/mocks/clients.go | 32 +- pkg/resource/mocks/client.go | 18 +- pkg/verifier/mocks/discovery.go | 15 + 36 files changed, 1413 insertions(+), 1011 deletions(-) diff --git a/codegen/templates/code/types/clients.gotmpl b/codegen/templates/code/types/clients.gotmpl index 723dbd101..58b31594e 100644 --- a/codegen/templates/code/types/clients.gotmpl +++ b/codegen/templates/code/types/clients.gotmpl @@ -129,10 +129,10 @@ type {{ $resource.Kind }}Writer interface { type {{ $resource.Kind }}StatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given {{ $resource.Kind }} object. - Update{{ $resource.Kind }}Status(ctx context.Context, obj *{{ $import_prefix }}{{ $resource.Kind }}, opts ...client.UpdateOption) error + Update{{ $resource.Kind }}Status(ctx context.Context, obj *{{ $import_prefix }}{{ $resource.Kind }}, opts ...client.SubResourceUpdateOption) error // Patch patches the given {{ $resource.Kind }} object's subresource. - Patch{{ $resource.Kind }}Status(ctx context.Context, obj *{{ $import_prefix }}{{ $resource.Kind }}, patch client.Patch, opts ...client.PatchOption) error + Patch{{ $resource.Kind }}Status(ctx context.Context, obj *{{ $import_prefix }}{{ $resource.Kind }}, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on {{ $resource.Kind }}s. @@ -224,11 +224,11 @@ func (c *{{ $kindLowerCamel }}Client) Upsert{{ $resource.Kind }}(ctx context.Con return err } -func (c *{{ $kindLowerCamel }}Client) Update{{ $resource.Kind }}Status(ctx context.Context, obj *{{ $import_prefix }}{{ $resource.Kind }}, opts ...client.UpdateOption) error { +func (c *{{ $kindLowerCamel }}Client) Update{{ $resource.Kind }}Status(ctx context.Context, obj *{{ $import_prefix }}{{ $resource.Kind }}, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *{{ $kindLowerCamel }}Client) Patch{{ $resource.Kind }}Status(ctx context.Context, obj *{{ $import_prefix }}{{ $resource.Kind }}, patch client.Patch, opts ...client.PatchOption) error { +func (c *{{ $kindLowerCamel }}Client) Patch{{ $resource.Kind }}Status(ctx context.Context, obj *{{ $import_prefix }}{{ $resource.Kind }}, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } diff --git a/codegen/test/api/things.test.io/v1/clients.go b/codegen/test/api/things.test.io/v1/clients.go index bd77f6b06..1f54aadb5 100644 --- a/codegen/test/api/things.test.io/v1/clients.go +++ b/codegen/test/api/things.test.io/v1/clients.go @@ -4,86 +4,89 @@ package v1 + + + import ( - "context" - - "github.com/solo-io/skv2/pkg/controllerutils" - "github.com/solo-io/skv2/pkg/multicluster" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" + "context" + + "github.com/solo-io/skv2/pkg/controllerutils" + "github.com/solo-io/skv2/pkg/multicluster" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" + "sigs.k8s.io/controller-runtime/pkg/client" ) // MulticlusterClientset for the things.test.io/v1 APIs type MulticlusterClientset interface { - // Cluster returns a Clientset for the given cluster - Cluster(cluster string) (Clientset, error) + // Cluster returns a Clientset for the given cluster + Cluster(cluster string) (Clientset, error) } type multiclusterClientset struct { - client multicluster.Client + client multicluster.Client } func NewMulticlusterClientset(client multicluster.Client) MulticlusterClientset { - return &multiclusterClientset{client: client} + return &multiclusterClientset{client: client} } func (m *multiclusterClientset) Cluster(cluster string) (Clientset, error) { - client, err := m.client.Cluster(cluster) - if err != nil { - return nil, err - } - return NewClientset(client), nil + client, err := m.client.Cluster(cluster) + if err != nil { + return nil, err + } + return NewClientset(client), nil } // clienset for the things.test.io/v1 APIs type Clientset interface { - // clienset for the things.test.io/v1/v1 APIs - Paints() PaintClient - // clienset for the things.test.io/v1/v1 APIs - ClusterResources() ClusterResourceClient + // clienset for the things.test.io/v1/v1 APIs + Paints() PaintClient + // clienset for the things.test.io/v1/v1 APIs + ClusterResources() ClusterResourceClient } type clientSet struct { - client client.Client + client client.Client } func NewClientsetFromConfig(cfg *rest.Config) (Clientset, error) { - scheme := scheme.Scheme - if err := SchemeBuilder.AddToScheme(scheme); err != nil { - return nil, err - } - client, err := client.New(cfg, client.Options{ - Scheme: scheme, - }) - if err != nil { - return nil, err - } - return NewClientset(client), nil + scheme := scheme.Scheme + if err := SchemeBuilder.AddToScheme(scheme); err != nil{ + return nil, err + } + client, err := client.New(cfg, client.Options{ + Scheme: scheme, + }) + if err != nil { + return nil, err + } + return NewClientset(client), nil } func NewClientset(client client.Client) Clientset { - return &clientSet{client: client} + return &clientSet{client: client} } // clienset for the things.test.io/v1/v1 APIs func (c *clientSet) Paints() PaintClient { - return NewPaintClient(c.client) + return NewPaintClient(c.client) } // clienset for the things.test.io/v1/v1 APIs func (c *clientSet) ClusterResources() ClusterResourceClient { - return NewClusterResourceClient(c.client) + return NewClusterResourceClient(c.client) } // Reader knows how to read and list Paints. type PaintReader interface { - // Get retrieves a Paint for the given object key - GetPaint(ctx context.Context, key client.ObjectKey) (*Paint, error) + // Get retrieves a Paint for the given object key + GetPaint(ctx context.Context, key client.ObjectKey) (*Paint, error) - // List retrieves list of Paints for a given namespace and list options. - ListPaint(ctx context.Context, opts ...client.ListOption) (*PaintList, error) + // List retrieves list of Paints for a given namespace and list options. + ListPaint(ctx context.Context, opts ...client.ListOption) (*PaintList, error) } // PaintTransitionFunction instructs the PaintWriter how to transition between an existing @@ -92,140 +95,142 @@ type PaintTransitionFunction func(existing, desired *Paint) error // Writer knows how to create, delete, and update Paints. type PaintWriter interface { - // Create saves the Paint object. - CreatePaint(ctx context.Context, obj *Paint, opts ...client.CreateOption) error + // Create saves the Paint object. + CreatePaint(ctx context.Context, obj *Paint, opts ...client.CreateOption) error - // Delete deletes the Paint object. - DeletePaint(ctx context.Context, key client.ObjectKey, opts ...client.DeleteOption) error + // Delete deletes the Paint object. + DeletePaint(ctx context.Context, key client.ObjectKey, opts ...client.DeleteOption) error - // Update updates the given Paint object. - UpdatePaint(ctx context.Context, obj *Paint, opts ...client.UpdateOption) error + // Update updates the given Paint object. + UpdatePaint(ctx context.Context, obj *Paint, opts ...client.UpdateOption) error - // Patch patches the given Paint object. - PatchPaint(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.PatchOption) error + // Patch patches the given Paint object. + PatchPaint(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.PatchOption) error - // DeleteAllOf deletes all Paint objects matching the given options. - DeleteAllOfPaint(ctx context.Context, opts ...client.DeleteAllOfOption) error + // DeleteAllOf deletes all Paint objects matching the given options. + DeleteAllOfPaint(ctx context.Context, opts ...client.DeleteAllOfOption) error - // Create or Update the Paint object. - UpsertPaint(ctx context.Context, obj *Paint, transitionFuncs ...PaintTransitionFunction) error + // Create or Update the Paint object. + UpsertPaint(ctx context.Context, obj *Paint, transitionFuncs ...PaintTransitionFunction) error } // StatusWriter knows how to update status subresource of a Paint object. type PaintStatusWriter interface { - // Update updates the fields corresponding to the status subresource for the - // given Paint object. - UpdatePaintStatus(ctx context.Context, obj *Paint, opts ...client.UpdateOption) error + // Update updates the fields corresponding to the status subresource for the + // given Paint object. + UpdatePaintStatus(ctx context.Context, obj *Paint, opts ...client.SubResourceUpdateOption) error - // Patch patches the given Paint object's subresource. - PatchPaintStatus(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.PatchOption) error + // Patch patches the given Paint object's subresource. + PatchPaintStatus(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on Paints. type PaintClient interface { - PaintReader - PaintWriter - PaintStatusWriter + PaintReader + PaintWriter + PaintStatusWriter } type paintClient struct { - client client.Client + client client.Client } func NewPaintClient(client client.Client) *paintClient { - return &paintClient{client: client} + return &paintClient{client: client} } + func (c *paintClient) GetPaint(ctx context.Context, key client.ObjectKey) (*Paint, error) { - obj := &Paint{} - if err := c.client.Get(ctx, key, obj); err != nil { - return nil, err - } - return obj, nil + obj := &Paint{} + if err := c.client.Get(ctx, key, obj); err != nil { + return nil, err + } + return obj, nil } func (c *paintClient) ListPaint(ctx context.Context, opts ...client.ListOption) (*PaintList, error) { - list := &PaintList{} - if err := c.client.List(ctx, list, opts...); err != nil { - return nil, err - } - return list, nil + list := &PaintList{} + if err := c.client.List(ctx, list, opts...); err != nil { + return nil, err + } + return list, nil } func (c *paintClient) CreatePaint(ctx context.Context, obj *Paint, opts ...client.CreateOption) error { - return c.client.Create(ctx, obj, opts...) + return c.client.Create(ctx, obj, opts...) } + func (c *paintClient) DeletePaint(ctx context.Context, key client.ObjectKey, opts ...client.DeleteOption) error { - obj := &Paint{} - obj.SetName(key.Name) - obj.SetNamespace(key.Namespace) - return c.client.Delete(ctx, obj, opts...) + obj := &Paint{} + obj.SetName(key.Name) + obj.SetNamespace(key.Namespace) + return c.client.Delete(ctx, obj, opts...) } func (c *paintClient) UpdatePaint(ctx context.Context, obj *Paint, opts ...client.UpdateOption) error { - return c.client.Update(ctx, obj, opts...) + return c.client.Update(ctx, obj, opts...) } func (c *paintClient) PatchPaint(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.PatchOption) error { - return c.client.Patch(ctx, obj, patch, opts...) + return c.client.Patch(ctx, obj, patch, opts...) } func (c *paintClient) DeleteAllOfPaint(ctx context.Context, opts ...client.DeleteAllOfOption) error { - obj := &Paint{} - return c.client.DeleteAllOf(ctx, obj, opts...) + obj := &Paint{} + return c.client.DeleteAllOf(ctx, obj, opts...) } func (c *paintClient) UpsertPaint(ctx context.Context, obj *Paint, transitionFuncs ...PaintTransitionFunction) error { - genericTxFunc := func(existing, desired runtime.Object) error { - for _, txFunc := range transitionFuncs { - if err := txFunc(existing.(*Paint), desired.(*Paint)); err != nil { - return err - } - } - return nil - } - _, err := controllerutils.Upsert(ctx, c.client, obj, genericTxFunc) - return err + genericTxFunc := func(existing, desired runtime.Object) error { + for _, txFunc := range transitionFuncs { + if err := txFunc(existing.(*Paint), desired.(*Paint)); err != nil { + return err + } + } + return nil + } + _, err := controllerutils.Upsert(ctx, c.client, obj, genericTxFunc) + return err } -func (c *paintClient) UpdatePaintStatus(ctx context.Context, obj *Paint, opts ...client.UpdateOption) error { - return c.client.Status().Update(ctx, obj, opts...) +func (c *paintClient) UpdatePaintStatus(ctx context.Context, obj *Paint, opts ...client.SubResourceUpdateOption) error { + return c.client.Status().Update(ctx, obj, opts...) } -func (c *paintClient) PatchPaintStatus(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.PatchOption) error { - return c.client.Status().Patch(ctx, obj, patch, opts...) +func (c *paintClient) PatchPaintStatus(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.SubResourcePatchOption) error { + return c.client.Status().Patch(ctx, obj, patch, opts...) } // Provides PaintClients for multiple clusters. type MulticlusterPaintClient interface { - // Cluster returns a PaintClient for the given cluster - Cluster(cluster string) (PaintClient, error) + // Cluster returns a PaintClient for the given cluster + Cluster(cluster string) (PaintClient, error) } type multiclusterPaintClient struct { - client multicluster.Client + client multicluster.Client } func NewMulticlusterPaintClient(client multicluster.Client) MulticlusterPaintClient { - return &multiclusterPaintClient{client: client} + return &multiclusterPaintClient{client: client} } func (m *multiclusterPaintClient) Cluster(cluster string) (PaintClient, error) { - client, err := m.client.Cluster(cluster) - if err != nil { - return nil, err - } - return NewPaintClient(client), nil + client, err := m.client.Cluster(cluster) + if err != nil { + return nil, err + } + return NewPaintClient(client), nil } // Reader knows how to read and list ClusterResources. type ClusterResourceReader interface { - // Get retrieves a ClusterResource for the given object key - GetClusterResource(ctx context.Context, name string) (*ClusterResource, error) + // Get retrieves a ClusterResource for the given object key + GetClusterResource(ctx context.Context, name string) (*ClusterResource, error) - // List retrieves list of ClusterResources for a given namespace and list options. - ListClusterResource(ctx context.Context, opts ...client.ListOption) (*ClusterResourceList, error) + // List retrieves list of ClusterResources for a given namespace and list options. + ListClusterResource(ctx context.Context, opts ...client.ListOption) (*ClusterResourceList, error) } // ClusterResourceTransitionFunction instructs the ClusterResourceWriter how to transition between an existing @@ -234,131 +239,133 @@ type ClusterResourceTransitionFunction func(existing, desired *ClusterResource) // Writer knows how to create, delete, and update ClusterResources. type ClusterResourceWriter interface { - // Create saves the ClusterResource object. - CreateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.CreateOption) error + // Create saves the ClusterResource object. + CreateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.CreateOption) error - // Delete deletes the ClusterResource object. - DeleteClusterResource(ctx context.Context, name string, opts ...client.DeleteOption) error + // Delete deletes the ClusterResource object. + DeleteClusterResource(ctx context.Context, name string, opts ...client.DeleteOption) error - // Update updates the given ClusterResource object. - UpdateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.UpdateOption) error + // Update updates the given ClusterResource object. + UpdateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.UpdateOption) error - // Patch patches the given ClusterResource object. - PatchClusterResource(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.PatchOption) error + // Patch patches the given ClusterResource object. + PatchClusterResource(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.PatchOption) error - // DeleteAllOf deletes all ClusterResource objects matching the given options. - DeleteAllOfClusterResource(ctx context.Context, opts ...client.DeleteAllOfOption) error + // DeleteAllOf deletes all ClusterResource objects matching the given options. + DeleteAllOfClusterResource(ctx context.Context, opts ...client.DeleteAllOfOption) error - // Create or Update the ClusterResource object. - UpsertClusterResource(ctx context.Context, obj *ClusterResource, transitionFuncs ...ClusterResourceTransitionFunction) error + // Create or Update the ClusterResource object. + UpsertClusterResource(ctx context.Context, obj *ClusterResource, transitionFuncs ...ClusterResourceTransitionFunction) error } // StatusWriter knows how to update status subresource of a ClusterResource object. type ClusterResourceStatusWriter interface { - // Update updates the fields corresponding to the status subresource for the - // given ClusterResource object. - UpdateClusterResourceStatus(ctx context.Context, obj *ClusterResource, opts ...client.UpdateOption) error + // Update updates the fields corresponding to the status subresource for the + // given ClusterResource object. + UpdateClusterResourceStatus(ctx context.Context, obj *ClusterResource, opts ...client.SubResourceUpdateOption) error - // Patch patches the given ClusterResource object's subresource. - PatchClusterResourceStatus(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.PatchOption) error + // Patch patches the given ClusterResource object's subresource. + PatchClusterResourceStatus(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on ClusterResources. type ClusterResourceClient interface { - ClusterResourceReader - ClusterResourceWriter - ClusterResourceStatusWriter + ClusterResourceReader + ClusterResourceWriter + ClusterResourceStatusWriter } type clusterResourceClient struct { - client client.Client + client client.Client } func NewClusterResourceClient(client client.Client) *clusterResourceClient { - return &clusterResourceClient{client: client} + return &clusterResourceClient{client: client} } + func (c *clusterResourceClient) GetClusterResource(ctx context.Context, name string) (*ClusterResource, error) { - obj := &ClusterResource{} - key := client.ObjectKey{ - Name: name, - } - if err := c.client.Get(ctx, key, obj); err != nil { - return nil, err - } - return obj, nil + obj := &ClusterResource{} + key := client.ObjectKey{ + Name: name, + } + if err := c.client.Get(ctx, key, obj); err != nil { + return nil, err + } + return obj, nil } func (c *clusterResourceClient) ListClusterResource(ctx context.Context, opts ...client.ListOption) (*ClusterResourceList, error) { - list := &ClusterResourceList{} - if err := c.client.List(ctx, list, opts...); err != nil { - return nil, err - } - return list, nil + list := &ClusterResourceList{} + if err := c.client.List(ctx, list, opts...); err != nil { + return nil, err + } + return list, nil } func (c *clusterResourceClient) CreateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.CreateOption) error { - return c.client.Create(ctx, obj, opts...) + return c.client.Create(ctx, obj, opts...) } + func (c *clusterResourceClient) DeleteClusterResource(ctx context.Context, name string, opts ...client.DeleteOption) error { - obj := &ClusterResource{} - obj.SetName(name) - return c.client.Delete(ctx, obj, opts...) + obj := &ClusterResource{} + obj.SetName(name) + return c.client.Delete(ctx, obj, opts...) } func (c *clusterResourceClient) UpdateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.UpdateOption) error { - return c.client.Update(ctx, obj, opts...) + return c.client.Update(ctx, obj, opts...) } func (c *clusterResourceClient) PatchClusterResource(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.PatchOption) error { - return c.client.Patch(ctx, obj, patch, opts...) + return c.client.Patch(ctx, obj, patch, opts...) } func (c *clusterResourceClient) DeleteAllOfClusterResource(ctx context.Context, opts ...client.DeleteAllOfOption) error { - obj := &ClusterResource{} - return c.client.DeleteAllOf(ctx, obj, opts...) + obj := &ClusterResource{} + return c.client.DeleteAllOf(ctx, obj, opts...) } func (c *clusterResourceClient) UpsertClusterResource(ctx context.Context, obj *ClusterResource, transitionFuncs ...ClusterResourceTransitionFunction) error { - genericTxFunc := func(existing, desired runtime.Object) error { - for _, txFunc := range transitionFuncs { - if err := txFunc(existing.(*ClusterResource), desired.(*ClusterResource)); err != nil { - return err - } - } - return nil - } - _, err := controllerutils.Upsert(ctx, c.client, obj, genericTxFunc) - return err + genericTxFunc := func(existing, desired runtime.Object) error { + for _, txFunc := range transitionFuncs { + if err := txFunc(existing.(*ClusterResource), desired.(*ClusterResource)); err != nil { + return err + } + } + return nil + } + _, err := controllerutils.Upsert(ctx, c.client, obj, genericTxFunc) + return err } -func (c *clusterResourceClient) UpdateClusterResourceStatus(ctx context.Context, obj *ClusterResource, opts ...client.UpdateOption) error { - return c.client.Status().Update(ctx, obj, opts...) +func (c *clusterResourceClient) UpdateClusterResourceStatus(ctx context.Context, obj *ClusterResource, opts ...client.SubResourceUpdateOption) error { + return c.client.Status().Update(ctx, obj, opts...) } -func (c *clusterResourceClient) PatchClusterResourceStatus(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.PatchOption) error { - return c.client.Status().Patch(ctx, obj, patch, opts...) +func (c *clusterResourceClient) PatchClusterResourceStatus(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.SubResourcePatchOption) error { + return c.client.Status().Patch(ctx, obj, patch, opts...) } // Provides ClusterResourceClients for multiple clusters. type MulticlusterClusterResourceClient interface { - // Cluster returns a ClusterResourceClient for the given cluster - Cluster(cluster string) (ClusterResourceClient, error) + // Cluster returns a ClusterResourceClient for the given cluster + Cluster(cluster string) (ClusterResourceClient, error) } type multiclusterClusterResourceClient struct { - client multicluster.Client + client multicluster.Client } func NewMulticlusterClusterResourceClient(client multicluster.Client) MulticlusterClusterResourceClient { - return &multiclusterClusterResourceClient{client: client} + return &multiclusterClusterResourceClient{client: client} } func (m *multiclusterClusterResourceClient) Cluster(cluster string) (ClusterResourceClient, error) { - client, err := m.client.Cluster(cluster) - if err != nil { - return nil, err - } - return NewClusterResourceClient(client), nil -} + client, err := m.client.Cluster(cluster) + if err != nil { + return nil, err + } + return NewClusterResourceClient(client), nil +} \ No newline at end of file diff --git a/codegen/test/api/things.test.io/v1/controller/event_handlers.go b/codegen/test/api/things.test.io/v1/controller/event_handlers.go index 3c52ed1f6..066691b25 100644 --- a/codegen/test/api/things.test.io/v1/controller/event_handlers.go +++ b/codegen/test/api/things.test.io/v1/controller/event_handlers.go @@ -8,225 +8,225 @@ package controller import ( "context" - things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" + things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" - "github.com/pkg/errors" - "github.com/solo-io/skv2/pkg/events" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/predicate" + "github.com/pkg/errors" + "github.com/solo-io/skv2/pkg/events" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/predicate" + "sigs.k8s.io/controller-runtime/pkg/client" ) // Handle events for the Paint Resource // DEPRECATED: Prefer reconciler pattern. type PaintEventHandler interface { - CreatePaint(obj *things_test_io_v1.Paint) error - UpdatePaint(old, new *things_test_io_v1.Paint) error - DeletePaint(obj *things_test_io_v1.Paint) error - GenericPaint(obj *things_test_io_v1.Paint) error + CreatePaint(obj *things_test_io_v1.Paint) error + UpdatePaint(old, new *things_test_io_v1.Paint) error + DeletePaint(obj *things_test_io_v1.Paint) error + GenericPaint(obj *things_test_io_v1.Paint) error } type PaintEventHandlerFuncs struct { - OnCreate func(obj *things_test_io_v1.Paint) error - OnUpdate func(old, new *things_test_io_v1.Paint) error - OnDelete func(obj *things_test_io_v1.Paint) error - OnGeneric func(obj *things_test_io_v1.Paint) error + OnCreate func(obj *things_test_io_v1.Paint) error + OnUpdate func(old, new *things_test_io_v1.Paint) error + OnDelete func(obj *things_test_io_v1.Paint) error + OnGeneric func(obj *things_test_io_v1.Paint) error } func (f *PaintEventHandlerFuncs) CreatePaint(obj *things_test_io_v1.Paint) error { - if f.OnCreate == nil { - return nil - } - return f.OnCreate(obj) + if f.OnCreate == nil { + return nil + } + return f.OnCreate(obj) } func (f *PaintEventHandlerFuncs) DeletePaint(obj *things_test_io_v1.Paint) error { - if f.OnDelete == nil { - return nil - } - return f.OnDelete(obj) + if f.OnDelete == nil { + return nil + } + return f.OnDelete(obj) } func (f *PaintEventHandlerFuncs) UpdatePaint(objOld, objNew *things_test_io_v1.Paint) error { - if f.OnUpdate == nil { - return nil - } - return f.OnUpdate(objOld, objNew) + if f.OnUpdate == nil { + return nil + } + return f.OnUpdate(objOld, objNew) } func (f *PaintEventHandlerFuncs) GenericPaint(obj *things_test_io_v1.Paint) error { - if f.OnGeneric == nil { - return nil - } - return f.OnGeneric(obj) + if f.OnGeneric == nil { + return nil + } + return f.OnGeneric(obj) } type PaintEventWatcher interface { - AddEventHandler(ctx context.Context, h PaintEventHandler, predicates ...predicate.Predicate) error + AddEventHandler(ctx context.Context, h PaintEventHandler, predicates ...predicate.Predicate) error } type paintEventWatcher struct { - watcher events.EventWatcher + watcher events.EventWatcher } func NewPaintEventWatcher(name string, mgr manager.Manager) PaintEventWatcher { - return &paintEventWatcher{ - watcher: events.NewWatcher(name, mgr, &things_test_io_v1.Paint{}), - } + return &paintEventWatcher{ + watcher: events.NewWatcher(name, mgr, &things_test_io_v1.Paint{}), + } } func (c *paintEventWatcher) AddEventHandler(ctx context.Context, h PaintEventHandler, predicates ...predicate.Predicate) error { handler := genericPaintHandler{handler: h} - if err := c.watcher.Watch(ctx, handler, predicates...); err != nil { - return err - } - return nil + if err := c.watcher.Watch(ctx, handler, predicates...); err != nil{ + return err + } + return nil } // genericPaintHandler implements a generic events.EventHandler type genericPaintHandler struct { - handler PaintEventHandler + handler PaintEventHandler } func (h genericPaintHandler) Create(object client.Object) error { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", object) - } - return h.handler.CreatePaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", object) + } + return h.handler.CreatePaint(obj) } func (h genericPaintHandler) Delete(object client.Object) error { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", object) - } - return h.handler.DeletePaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", object) + } + return h.handler.DeletePaint(obj) } func (h genericPaintHandler) Update(old, new client.Object) error { - objOld, ok := old.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", old) - } - objNew, ok := new.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", new) - } - return h.handler.UpdatePaint(objOld, objNew) + objOld, ok := old.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", old) + } + objNew, ok := new.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", new) + } + return h.handler.UpdatePaint(objOld, objNew) } func (h genericPaintHandler) Generic(object client.Object) error { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", object) - } - return h.handler.GenericPaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", object) + } + return h.handler.GenericPaint(obj) } // Handle events for the ClusterResource Resource // DEPRECATED: Prefer reconciler pattern. type ClusterResourceEventHandler interface { - CreateClusterResource(obj *things_test_io_v1.ClusterResource) error - UpdateClusterResource(old, new *things_test_io_v1.ClusterResource) error - DeleteClusterResource(obj *things_test_io_v1.ClusterResource) error - GenericClusterResource(obj *things_test_io_v1.ClusterResource) error + CreateClusterResource(obj *things_test_io_v1.ClusterResource) error + UpdateClusterResource(old, new *things_test_io_v1.ClusterResource) error + DeleteClusterResource(obj *things_test_io_v1.ClusterResource) error + GenericClusterResource(obj *things_test_io_v1.ClusterResource) error } type ClusterResourceEventHandlerFuncs struct { - OnCreate func(obj *things_test_io_v1.ClusterResource) error - OnUpdate func(old, new *things_test_io_v1.ClusterResource) error - OnDelete func(obj *things_test_io_v1.ClusterResource) error - OnGeneric func(obj *things_test_io_v1.ClusterResource) error + OnCreate func(obj *things_test_io_v1.ClusterResource) error + OnUpdate func(old, new *things_test_io_v1.ClusterResource) error + OnDelete func(obj *things_test_io_v1.ClusterResource) error + OnGeneric func(obj *things_test_io_v1.ClusterResource) error } func (f *ClusterResourceEventHandlerFuncs) CreateClusterResource(obj *things_test_io_v1.ClusterResource) error { - if f.OnCreate == nil { - return nil - } - return f.OnCreate(obj) + if f.OnCreate == nil { + return nil + } + return f.OnCreate(obj) } func (f *ClusterResourceEventHandlerFuncs) DeleteClusterResource(obj *things_test_io_v1.ClusterResource) error { - if f.OnDelete == nil { - return nil - } - return f.OnDelete(obj) + if f.OnDelete == nil { + return nil + } + return f.OnDelete(obj) } func (f *ClusterResourceEventHandlerFuncs) UpdateClusterResource(objOld, objNew *things_test_io_v1.ClusterResource) error { - if f.OnUpdate == nil { - return nil - } - return f.OnUpdate(objOld, objNew) + if f.OnUpdate == nil { + return nil + } + return f.OnUpdate(objOld, objNew) } func (f *ClusterResourceEventHandlerFuncs) GenericClusterResource(obj *things_test_io_v1.ClusterResource) error { - if f.OnGeneric == nil { - return nil - } - return f.OnGeneric(obj) + if f.OnGeneric == nil { + return nil + } + return f.OnGeneric(obj) } type ClusterResourceEventWatcher interface { - AddEventHandler(ctx context.Context, h ClusterResourceEventHandler, predicates ...predicate.Predicate) error + AddEventHandler(ctx context.Context, h ClusterResourceEventHandler, predicates ...predicate.Predicate) error } type clusterResourceEventWatcher struct { - watcher events.EventWatcher + watcher events.EventWatcher } func NewClusterResourceEventWatcher(name string, mgr manager.Manager) ClusterResourceEventWatcher { - return &clusterResourceEventWatcher{ - watcher: events.NewWatcher(name, mgr, &things_test_io_v1.ClusterResource{}), - } + return &clusterResourceEventWatcher{ + watcher: events.NewWatcher(name, mgr, &things_test_io_v1.ClusterResource{}), + } } func (c *clusterResourceEventWatcher) AddEventHandler(ctx context.Context, h ClusterResourceEventHandler, predicates ...predicate.Predicate) error { handler := genericClusterResourceHandler{handler: h} - if err := c.watcher.Watch(ctx, handler, predicates...); err != nil { - return err - } - return nil + if err := c.watcher.Watch(ctx, handler, predicates...); err != nil{ + return err + } + return nil } // genericClusterResourceHandler implements a generic events.EventHandler type genericClusterResourceHandler struct { - handler ClusterResourceEventHandler + handler ClusterResourceEventHandler } func (h genericClusterResourceHandler) Create(object client.Object) error { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return h.handler.CreateClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return h.handler.CreateClusterResource(obj) } func (h genericClusterResourceHandler) Delete(object client.Object) error { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return h.handler.DeleteClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return h.handler.DeleteClusterResource(obj) } func (h genericClusterResourceHandler) Update(old, new client.Object) error { - objOld, ok := old.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", old) - } - objNew, ok := new.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", new) - } - return h.handler.UpdateClusterResource(objOld, objNew) + objOld, ok := old.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", old) + } + objNew, ok := new.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", new) + } + return h.handler.UpdateClusterResource(objOld, objNew) } func (h genericClusterResourceHandler) Generic(object client.Object) error { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return h.handler.GenericClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return h.handler.GenericClusterResource(obj) } diff --git a/codegen/test/api/things.test.io/v1/controller/multicluster_reconcilers.go b/codegen/test/api/things.test.io/v1/controller/multicluster_reconcilers.go index fbfe2e86e..237ee95a0 100644 --- a/codegen/test/api/things.test.io/v1/controller/multicluster_reconcilers.go +++ b/codegen/test/api/things.test.io/v1/controller/multicluster_reconcilers.go @@ -5,6 +5,8 @@ // Definitions for the multicluster Kubernetes Controllers package controller + + import ( "context" diff --git a/codegen/test/api/things.test.io/v1/controller/reconcilers.go b/codegen/test/api/things.test.io/v1/controller/reconcilers.go index 355e61896..a04151fb4 100644 --- a/codegen/test/api/things.test.io/v1/controller/reconcilers.go +++ b/codegen/test/api/things.test.io/v1/controller/reconcilers.go @@ -5,22 +5,24 @@ // Definitions for the Kubernetes Controllers package controller + + import ( "context" - things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" + things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" - "github.com/pkg/errors" - "github.com/solo-io/skv2/pkg/ezkube" - "github.com/solo-io/skv2/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/predicate" + "github.com/pkg/errors" + "github.com/solo-io/skv2/pkg/ezkube" + "github.com/solo-io/skv2/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/predicate" ) // Reconcile Upsert events for the Paint Resource. // implemented by the user type PaintReconciler interface { - ReconcilePaint(obj *things_test_io_v1.Paint) (reconcile.Result, error) + ReconcilePaint(obj *things_test_io_v1.Paint) (reconcile.Result, error) } // Reconcile deletion events for the Paint Resource. @@ -28,116 +30,117 @@ type PaintReconciler interface { // before being deleted. // implemented by the user type PaintDeletionReconciler interface { - ReconcilePaintDeletion(req reconcile.Request) error + ReconcilePaintDeletion(req reconcile.Request) error } type PaintReconcilerFuncs struct { - OnReconcilePaint func(obj *things_test_io_v1.Paint) (reconcile.Result, error) - OnReconcilePaintDeletion func(req reconcile.Request) error + OnReconcilePaint func(obj *things_test_io_v1.Paint) (reconcile.Result, error) + OnReconcilePaintDeletion func(req reconcile.Request) error } func (f *PaintReconcilerFuncs) ReconcilePaint(obj *things_test_io_v1.Paint) (reconcile.Result, error) { - if f.OnReconcilePaint == nil { - return reconcile.Result{}, nil - } - return f.OnReconcilePaint(obj) + if f.OnReconcilePaint == nil { + return reconcile.Result{}, nil + } + return f.OnReconcilePaint(obj) } func (f *PaintReconcilerFuncs) ReconcilePaintDeletion(req reconcile.Request) error { - if f.OnReconcilePaintDeletion == nil { - return nil - } - return f.OnReconcilePaintDeletion(req) + if f.OnReconcilePaintDeletion == nil { + return nil + } + return f.OnReconcilePaintDeletion(req) } // Reconcile and finalize the Paint Resource // implemented by the user type PaintFinalizer interface { - PaintReconciler + PaintReconciler - // name of the finalizer used by this handler. - // finalizer names should be unique for a single task - PaintFinalizerName() string + // name of the finalizer used by this handler. + // finalizer names should be unique for a single task + PaintFinalizerName() string - // finalize the object before it is deleted. - // Watchers created with a finalizing handler will a - FinalizePaint(obj *things_test_io_v1.Paint) error + // finalize the object before it is deleted. + // Watchers created with a finalizing handler will a + FinalizePaint(obj *things_test_io_v1.Paint) error } type PaintReconcileLoop interface { - RunPaintReconciler(ctx context.Context, rec PaintReconciler, predicates ...predicate.Predicate) error + RunPaintReconciler(ctx context.Context, rec PaintReconciler, predicates ...predicate.Predicate) error } type paintReconcileLoop struct { - loop reconcile.Loop + loop reconcile.Loop } func NewPaintReconcileLoop(name string, mgr manager.Manager, options reconcile.Options) PaintReconcileLoop { - return &paintReconcileLoop{ - // empty cluster indicates this reconciler is built for the local cluster - loop: reconcile.NewLoop(name, "", mgr, &things_test_io_v1.Paint{}, options), - } + return &paintReconcileLoop{ + // empty cluster indicates this reconciler is built for the local cluster + loop: reconcile.NewLoop(name, "", mgr, &things_test_io_v1.Paint{}, options), + } } func (c *paintReconcileLoop) RunPaintReconciler(ctx context.Context, reconciler PaintReconciler, predicates ...predicate.Predicate) error { - genericReconciler := genericPaintReconciler{ - reconciler: reconciler, - } + genericReconciler := genericPaintReconciler{ + reconciler: reconciler, + } var reconcilerWrapper reconcile.Reconciler if finalizingReconciler, ok := reconciler.(PaintFinalizer); ok { - reconcilerWrapper = genericPaintFinalizer{ - genericPaintReconciler: genericReconciler, - finalizingReconciler: finalizingReconciler, - } - } else { - reconcilerWrapper = genericReconciler - } + reconcilerWrapper = genericPaintFinalizer{ + genericPaintReconciler: genericReconciler, + finalizingReconciler: finalizingReconciler, + } + } else { + reconcilerWrapper = genericReconciler + } return c.loop.RunReconciler(ctx, reconcilerWrapper, predicates...) } // genericPaintHandler implements a generic reconcile.Reconciler type genericPaintReconciler struct { - reconciler PaintReconciler + reconciler PaintReconciler } func (r genericPaintReconciler) Reconcile(object ezkube.Object) (reconcile.Result, error) { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return reconcile.Result{}, errors.Errorf("internal error: Paint handler received event for %T", object) - } - return r.reconciler.ReconcilePaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return reconcile.Result{}, errors.Errorf("internal error: Paint handler received event for %T", object) + } + return r.reconciler.ReconcilePaint(obj) } func (r genericPaintReconciler) ReconcileDeletion(request reconcile.Request) error { - if deletionReconciler, ok := r.reconciler.(PaintDeletionReconciler); ok { - return deletionReconciler.ReconcilePaintDeletion(request) - } - return nil + if deletionReconciler, ok := r.reconciler.(PaintDeletionReconciler); ok { + return deletionReconciler.ReconcilePaintDeletion(request) + } + return nil } // genericPaintFinalizer implements a generic reconcile.FinalizingReconciler type genericPaintFinalizer struct { - genericPaintReconciler - finalizingReconciler PaintFinalizer + genericPaintReconciler + finalizingReconciler PaintFinalizer } + func (r genericPaintFinalizer) FinalizerName() string { - return r.finalizingReconciler.PaintFinalizerName() + return r.finalizingReconciler.PaintFinalizerName() } func (r genericPaintFinalizer) Finalize(object ezkube.Object) error { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", object) - } - return r.finalizingReconciler.FinalizePaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", object) + } + return r.finalizingReconciler.FinalizePaint(obj) } // Reconcile Upsert events for the ClusterResource Resource. // implemented by the user type ClusterResourceReconciler interface { - ReconcileClusterResource(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) + ReconcileClusterResource(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) } // Reconcile deletion events for the ClusterResource Resource. @@ -145,108 +148,109 @@ type ClusterResourceReconciler interface { // before being deleted. // implemented by the user type ClusterResourceDeletionReconciler interface { - ReconcileClusterResourceDeletion(req reconcile.Request) error + ReconcileClusterResourceDeletion(req reconcile.Request) error } type ClusterResourceReconcilerFuncs struct { - OnReconcileClusterResource func(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) - OnReconcileClusterResourceDeletion func(req reconcile.Request) error + OnReconcileClusterResource func(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) + OnReconcileClusterResourceDeletion func(req reconcile.Request) error } func (f *ClusterResourceReconcilerFuncs) ReconcileClusterResource(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) { - if f.OnReconcileClusterResource == nil { - return reconcile.Result{}, nil - } - return f.OnReconcileClusterResource(obj) + if f.OnReconcileClusterResource == nil { + return reconcile.Result{}, nil + } + return f.OnReconcileClusterResource(obj) } func (f *ClusterResourceReconcilerFuncs) ReconcileClusterResourceDeletion(req reconcile.Request) error { - if f.OnReconcileClusterResourceDeletion == nil { - return nil - } - return f.OnReconcileClusterResourceDeletion(req) + if f.OnReconcileClusterResourceDeletion == nil { + return nil + } + return f.OnReconcileClusterResourceDeletion(req) } // Reconcile and finalize the ClusterResource Resource // implemented by the user type ClusterResourceFinalizer interface { - ClusterResourceReconciler + ClusterResourceReconciler - // name of the finalizer used by this handler. - // finalizer names should be unique for a single task - ClusterResourceFinalizerName() string + // name of the finalizer used by this handler. + // finalizer names should be unique for a single task + ClusterResourceFinalizerName() string - // finalize the object before it is deleted. - // Watchers created with a finalizing handler will a - FinalizeClusterResource(obj *things_test_io_v1.ClusterResource) error + // finalize the object before it is deleted. + // Watchers created with a finalizing handler will a + FinalizeClusterResource(obj *things_test_io_v1.ClusterResource) error } type ClusterResourceReconcileLoop interface { - RunClusterResourceReconciler(ctx context.Context, rec ClusterResourceReconciler, predicates ...predicate.Predicate) error + RunClusterResourceReconciler(ctx context.Context, rec ClusterResourceReconciler, predicates ...predicate.Predicate) error } type clusterResourceReconcileLoop struct { - loop reconcile.Loop + loop reconcile.Loop } func NewClusterResourceReconcileLoop(name string, mgr manager.Manager, options reconcile.Options) ClusterResourceReconcileLoop { - return &clusterResourceReconcileLoop{ - // empty cluster indicates this reconciler is built for the local cluster - loop: reconcile.NewLoop(name, "", mgr, &things_test_io_v1.ClusterResource{}, options), - } + return &clusterResourceReconcileLoop{ + // empty cluster indicates this reconciler is built for the local cluster + loop: reconcile.NewLoop(name, "", mgr, &things_test_io_v1.ClusterResource{}, options), + } } func (c *clusterResourceReconcileLoop) RunClusterResourceReconciler(ctx context.Context, reconciler ClusterResourceReconciler, predicates ...predicate.Predicate) error { - genericReconciler := genericClusterResourceReconciler{ - reconciler: reconciler, - } + genericReconciler := genericClusterResourceReconciler{ + reconciler: reconciler, + } var reconcilerWrapper reconcile.Reconciler if finalizingReconciler, ok := reconciler.(ClusterResourceFinalizer); ok { - reconcilerWrapper = genericClusterResourceFinalizer{ - genericClusterResourceReconciler: genericReconciler, - finalizingReconciler: finalizingReconciler, - } - } else { - reconcilerWrapper = genericReconciler - } + reconcilerWrapper = genericClusterResourceFinalizer{ + genericClusterResourceReconciler: genericReconciler, + finalizingReconciler: finalizingReconciler, + } + } else { + reconcilerWrapper = genericReconciler + } return c.loop.RunReconciler(ctx, reconcilerWrapper, predicates...) } // genericClusterResourceHandler implements a generic reconcile.Reconciler type genericClusterResourceReconciler struct { - reconciler ClusterResourceReconciler + reconciler ClusterResourceReconciler } func (r genericClusterResourceReconciler) Reconcile(object ezkube.Object) (reconcile.Result, error) { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return reconcile.Result{}, errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return r.reconciler.ReconcileClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return reconcile.Result{}, errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return r.reconciler.ReconcileClusterResource(obj) } func (r genericClusterResourceReconciler) ReconcileDeletion(request reconcile.Request) error { - if deletionReconciler, ok := r.reconciler.(ClusterResourceDeletionReconciler); ok { - return deletionReconciler.ReconcileClusterResourceDeletion(request) - } - return nil + if deletionReconciler, ok := r.reconciler.(ClusterResourceDeletionReconciler); ok { + return deletionReconciler.ReconcileClusterResourceDeletion(request) + } + return nil } // genericClusterResourceFinalizer implements a generic reconcile.FinalizingReconciler type genericClusterResourceFinalizer struct { - genericClusterResourceReconciler - finalizingReconciler ClusterResourceFinalizer + genericClusterResourceReconciler + finalizingReconciler ClusterResourceFinalizer } + func (r genericClusterResourceFinalizer) FinalizerName() string { - return r.finalizingReconciler.ClusterResourceFinalizerName() + return r.finalizingReconciler.ClusterResourceFinalizerName() } func (r genericClusterResourceFinalizer) Finalize(object ezkube.Object) error { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return r.finalizingReconciler.FinalizeClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return r.finalizingReconciler.FinalizeClusterResource(obj) } diff --git a/codegen/test/api/things.test.io/v1/json.gen.go b/codegen/test/api/things.test.io/v1/json.gen.go index d8b4c1b0b..d7582f228 100644 --- a/codegen/test/api/things.test.io/v1/json.gen.go +++ b/codegen/test/api/things.test.io/v1/json.gen.go @@ -5,13 +5,13 @@ package v1 import ( - bytes "bytes" - fmt "fmt" - math "math" + bytes "bytes" + fmt "fmt" + math "math" - jsonpb "github.com/golang/protobuf/jsonpb" - proto "github.com/golang/protobuf/proto" - skv2jsonpb "github.com/solo-io/skv2/pkg/kube_jsonpb" + skv2jsonpb "github.com/solo-io/skv2/pkg/kube_jsonpb" + jsonpb "github.com/golang/protobuf/jsonpb" + proto "github.com/golang/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. @@ -20,13 +20,12 @@ var _ = fmt.Errorf var _ = math.Inf var ( - marshaller = &skv2jsonpb.Marshaler{} + marshaller = &skv2jsonpb.Marshaler{} unmarshaller = &jsonpb.Unmarshaler{ AllowUnknownFields: true, } strictUnmarshaller = &jsonpb.Unmarshaler{} ) - // MarshalJSON is a custom marshaler for PaintSpec func (this *PaintSpec) MarshalJSON() ([]byte, error) { str, err := marshaller.MarshalToString(this) @@ -37,7 +36,6 @@ func (this *PaintSpec) MarshalJSON() ([]byte, error) { func (this *PaintSpec) UnmarshalJSON(b []byte) error { return unmarshaller.Unmarshal(bytes.NewReader(b), this) } - // MarshalJSON is a custom marshaler for PaintStatus func (this *PaintStatus) MarshalJSON() ([]byte, error) { str, err := marshaller.MarshalToString(this) @@ -48,7 +46,6 @@ func (this *PaintStatus) MarshalJSON() ([]byte, error) { func (this *PaintStatus) UnmarshalJSON(b []byte) error { return unmarshaller.Unmarshal(bytes.NewReader(b), this) } - // MarshalJSON is a custom marshaler for ClusterResourceSpec func (this *ClusterResourceSpec) MarshalJSON() ([]byte, error) { str, err := marshaller.MarshalToString(this) diff --git a/codegen/test/api/things.test.io/v1/mocks/clients.go b/codegen/test/api/things.test.io/v1/mocks/clients.go index 745975b4a..6461b35fb 100644 --- a/codegen/test/api/things.test.io/v1/mocks/clients.go +++ b/codegen/test/api/things.test.io/v1/mocks/clients.go @@ -321,7 +321,7 @@ func (m *MockPaintStatusWriter) EXPECT() *MockPaintStatusWriterMockRecorder { } // UpdatePaintStatus mocks base method -func (m *MockPaintStatusWriter) UpdatePaintStatus(ctx context.Context, obj *v1.Paint, opts ...client.UpdateOption) error { +func (m *MockPaintStatusWriter) UpdatePaintStatus(ctx context.Context, obj *v1.Paint, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -340,7 +340,7 @@ func (mr *MockPaintStatusWriterMockRecorder) UpdatePaintStatus(ctx, obj interfac } // PatchPaintStatus mocks base method -func (m *MockPaintStatusWriter) PatchPaintStatus(ctx context.Context, obj *v1.Paint, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockPaintStatusWriter) PatchPaintStatus(ctx context.Context, obj *v1.Paint, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -531,7 +531,7 @@ func (mr *MockPaintClientMockRecorder) UpsertPaint(ctx, obj interface{}, transit } // UpdatePaintStatus mocks base method -func (m *MockPaintClient) UpdatePaintStatus(ctx context.Context, obj *v1.Paint, opts ...client.UpdateOption) error { +func (m *MockPaintClient) UpdatePaintStatus(ctx context.Context, obj *v1.Paint, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -550,7 +550,7 @@ func (mr *MockPaintClientMockRecorder) UpdatePaintStatus(ctx, obj interface{}, o } // PatchPaintStatus mocks base method -func (m *MockPaintClient) PatchPaintStatus(ctx context.Context, obj *v1.Paint, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockPaintClient) PatchPaintStatus(ctx context.Context, obj *v1.Paint, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -825,7 +825,7 @@ func (m *MockClusterResourceStatusWriter) EXPECT() *MockClusterResourceStatusWri } // UpdateClusterResourceStatus mocks base method -func (m *MockClusterResourceStatusWriter) UpdateClusterResourceStatus(ctx context.Context, obj *v1.ClusterResource, opts ...client.UpdateOption) error { +func (m *MockClusterResourceStatusWriter) UpdateClusterResourceStatus(ctx context.Context, obj *v1.ClusterResource, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -844,7 +844,7 @@ func (mr *MockClusterResourceStatusWriterMockRecorder) UpdateClusterResourceStat } // PatchClusterResourceStatus mocks base method -func (m *MockClusterResourceStatusWriter) PatchClusterResourceStatus(ctx context.Context, obj *v1.ClusterResource, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockClusterResourceStatusWriter) PatchClusterResourceStatus(ctx context.Context, obj *v1.ClusterResource, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -1035,7 +1035,7 @@ func (mr *MockClusterResourceClientMockRecorder) UpsertClusterResource(ctx, obj } // UpdateClusterResourceStatus mocks base method -func (m *MockClusterResourceClient) UpdateClusterResourceStatus(ctx context.Context, obj *v1.ClusterResource, opts ...client.UpdateOption) error { +func (m *MockClusterResourceClient) UpdateClusterResourceStatus(ctx context.Context, obj *v1.ClusterResource, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -1054,7 +1054,7 @@ func (mr *MockClusterResourceClientMockRecorder) UpdateClusterResourceStatus(ctx } // PatchClusterResourceStatus mocks base method -func (m *MockClusterResourceClient) PatchClusterResourceStatus(ctx context.Context, obj *v1.ClusterResource, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockClusterResourceClient) PatchClusterResourceStatus(ctx context.Context, obj *v1.ClusterResource, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { diff --git a/codegen/test/api/things.test.io/v1/proto_deepcopy.go b/codegen/test/api/things.test.io/v1/proto_deepcopy.go index 7fe7a023f..30d4d08c0 100644 --- a/codegen/test/api/things.test.io/v1/proto_deepcopy.go +++ b/codegen/test/api/things.test.io/v1/proto_deepcopy.go @@ -5,39 +5,36 @@ package v1 import ( - proto "github.com/golang/protobuf/proto" + proto "github.com/golang/protobuf/proto" "github.com/solo-io/protoc-gen-ext/pkg/clone" ) - // DeepCopyInto for the Paint.Spec func (in *PaintSpec) DeepCopyInto(out *PaintSpec) { - var p *PaintSpec - if h, ok := interface{}(in).(clone.Cloner); ok { - p = h.Clone().(*PaintSpec) - } else { - p = proto.Clone(in).(*PaintSpec) - } - *out = *p + var p *PaintSpec + if h, ok := interface{}(in).(clone.Cloner); ok { + p = h.Clone().(*PaintSpec) + } else { + p = proto.Clone(in).(*PaintSpec) + } + *out = *p } - // DeepCopyInto for the Paint.Status func (in *PaintStatus) DeepCopyInto(out *PaintStatus) { - var p *PaintStatus - if h, ok := interface{}(in).(clone.Cloner); ok { - p = h.Clone().(*PaintStatus) - } else { - p = proto.Clone(in).(*PaintStatus) - } - *out = *p + var p *PaintStatus + if h, ok := interface{}(in).(clone.Cloner); ok { + p = h.Clone().(*PaintStatus) + } else { + p = proto.Clone(in).(*PaintStatus) + } + *out = *p } - // DeepCopyInto for the ClusterResource.Spec func (in *ClusterResourceSpec) DeepCopyInto(out *ClusterResourceSpec) { - var p *ClusterResourceSpec - if h, ok := interface{}(in).(clone.Cloner); ok { - p = h.Clone().(*ClusterResourceSpec) - } else { - p = proto.Clone(in).(*ClusterResourceSpec) - } - *out = *p + var p *ClusterResourceSpec + if h, ok := interface{}(in).(clone.Cloner); ok { + p = h.Clone().(*ClusterResourceSpec) + } else { + p = proto.Clone(in).(*ClusterResourceSpec) + } + *out = *p } diff --git a/codegen/test/api/things.test.io/v1/providers/client_providers.go b/codegen/test/api/things.test.io/v1/providers/client_providers.go index ea1c91a28..53570c869 100644 --- a/codegen/test/api/things.test.io/v1/providers/client_providers.go +++ b/codegen/test/api/things.test.io/v1/providers/client_providers.go @@ -2,11 +2,13 @@ package v1 + + import ( - things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" + things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" + "k8s.io/client-go/rest" + "sigs.k8s.io/controller-runtime/pkg/client" ) /* @@ -19,56 +21,56 @@ import ( // Provider for PaintClient from Clientset func PaintClientFromClientsetProvider(clients things_test_io_v1.Clientset) things_test_io_v1.PaintClient { - return clients.Paints() + return clients.Paints() } // Provider for Paint Client from Client func PaintClientProvider(client client.Client) things_test_io_v1.PaintClient { - return things_test_io_v1.NewPaintClient(client) + return things_test_io_v1.NewPaintClient(client) } type PaintClientFactory func(client client.Client) things_test_io_v1.PaintClient func PaintClientFactoryProvider() PaintClientFactory { - return PaintClientProvider + return PaintClientProvider } type PaintClientFromConfigFactory func(cfg *rest.Config) (things_test_io_v1.PaintClient, error) func PaintClientFromConfigFactoryProvider() PaintClientFromConfigFactory { - return func(cfg *rest.Config) (things_test_io_v1.PaintClient, error) { - clients, err := things_test_io_v1.NewClientsetFromConfig(cfg) - if err != nil { - return nil, err - } - return clients.Paints(), nil - } + return func(cfg *rest.Config) (things_test_io_v1.PaintClient, error) { + clients, err := things_test_io_v1.NewClientsetFromConfig(cfg) + if err != nil { + return nil, err + } + return clients.Paints(), nil + } } // Provider for ClusterResourceClient from Clientset func ClusterResourceClientFromClientsetProvider(clients things_test_io_v1.Clientset) things_test_io_v1.ClusterResourceClient { - return clients.ClusterResources() + return clients.ClusterResources() } // Provider for ClusterResource Client from Client func ClusterResourceClientProvider(client client.Client) things_test_io_v1.ClusterResourceClient { - return things_test_io_v1.NewClusterResourceClient(client) + return things_test_io_v1.NewClusterResourceClient(client) } type ClusterResourceClientFactory func(client client.Client) things_test_io_v1.ClusterResourceClient func ClusterResourceClientFactoryProvider() ClusterResourceClientFactory { - return ClusterResourceClientProvider + return ClusterResourceClientProvider } type ClusterResourceClientFromConfigFactory func(cfg *rest.Config) (things_test_io_v1.ClusterResourceClient, error) func ClusterResourceClientFromConfigFactoryProvider() ClusterResourceClientFromConfigFactory { - return func(cfg *rest.Config) (things_test_io_v1.ClusterResourceClient, error) { - clients, err := things_test_io_v1.NewClientsetFromConfig(cfg) - if err != nil { - return nil, err - } - return clients.ClusterResources(), nil - } -} + return func(cfg *rest.Config) (things_test_io_v1.ClusterResourceClient, error) { + clients, err := things_test_io_v1.NewClientsetFromConfig(cfg) + if err != nil { + return nil, err + } + return clients.ClusterResources(), nil + } +} \ No newline at end of file diff --git a/codegen/test/api/things.test.io/v1/register.go b/codegen/test/api/things.test.io/v1/register.go index 38bbf15c1..99e1def72 100644 --- a/codegen/test/api/things.test.io/v1/register.go +++ b/codegen/test/api/things.test.io/v1/register.go @@ -6,9 +6,9 @@ package v1 import ( - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "sigs.k8s.io/controller-runtime/pkg/scheme" + "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/scheme" + "k8s.io/apimachinery/pkg/runtime" ) // AddToSchemes may be used to add all resources defined in the project to a Scheme @@ -16,18 +16,19 @@ import ( // AddToScheme adds all Resources to the Scheme var ( - // SchemeGroupVersion is group version used to register these objects - SchemeGroupVersion = schema.GroupVersion{Group: "things.test.io", Version: "v1"} + // SchemeGroupVersion is group version used to register these objects + SchemeGroupVersion = schema.GroupVersion{Group: "things.test.io", Version: "v1"} + + // SchemeBuilder is used to add go types to the GroupVersionKind scheme + SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} - // SchemeBuilder is used to add go types to the GroupVersionKind scheme - SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} ) // Resource takes an unqualified resource and returns a Group qualified GroupResource func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() + return SchemeGroupVersion.WithResource(resource).GroupResource() } func AddToScheme(s *runtime.Scheme) error { - return SchemeBuilder.AddToScheme(s) + return SchemeBuilder.AddToScheme(s) } diff --git a/codegen/test/api/things.test.io/v1/sets/sets.go b/codegen/test/api/things.test.io/v1/sets/sets.go index 404ed6d66..1eba93e4e 100644 --- a/codegen/test/api/things.test.io/v1/sets/sets.go +++ b/codegen/test/api/things.test.io/v1/sets/sets.go @@ -4,227 +4,230 @@ package v1sets + + import ( - things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" + things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" - "github.com/rotisserie/eris" - sksets "github.com/solo-io/skv2/contrib/pkg/sets" - "github.com/solo-io/skv2/pkg/ezkube" - "k8s.io/apimachinery/pkg/util/sets" + "github.com/rotisserie/eris" + sksets "github.com/solo-io/skv2/contrib/pkg/sets" + "github.com/solo-io/skv2/pkg/ezkube" + "k8s.io/apimachinery/pkg/util/sets" ) type PaintSet interface { // Get the set stored keys - Keys() sets.String - // List of resources stored in the set. Pass an optional filter function to filter on the list. - List(filterResource ...func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint - // Unsorted list of resources stored in the set. Pass an optional filter function to filter on the list. - UnsortedList(filterResource ...func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint - // Return the Set as a map of key to resource. - Map() map[string]*things_test_io_v1.Paint - // Insert a resource into the set. - Insert(paint ...*things_test_io_v1.Paint) - // Compare the equality of the keys in two sets (not the resources themselves) - Equal(paintSet PaintSet) bool - // Check if the set contains a key matching the resource (not the resource itself) - Has(paint ezkube.ResourceId) bool - // Delete the key matching the resource - Delete(paint ezkube.ResourceId) - // Return the union with the provided set - Union(set PaintSet) PaintSet - // Return the difference with the provided set - Difference(set PaintSet) PaintSet - // Return the intersection with the provided set - Intersection(set PaintSet) PaintSet - // Find the resource with the given ID - Find(id ezkube.ResourceId) (*things_test_io_v1.Paint, error) - // Get the length of the set - Length() int - // returns the generic implementation of the set - Generic() sksets.ResourceSet - // returns the delta between this and and another PaintSet - Delta(newSet PaintSet) sksets.ResourceDelta - // Create a deep copy of the current PaintSet - Clone() PaintSet + Keys() sets.String + // List of resources stored in the set. Pass an optional filter function to filter on the list. + List(filterResource ... func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint + // Unsorted list of resources stored in the set. Pass an optional filter function to filter on the list. + UnsortedList(filterResource ... func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint + // Return the Set as a map of key to resource. + Map() map[string]*things_test_io_v1.Paint + // Insert a resource into the set. + Insert(paint ...*things_test_io_v1.Paint) + // Compare the equality of the keys in two sets (not the resources themselves) + Equal(paintSet PaintSet) bool + // Check if the set contains a key matching the resource (not the resource itself) + Has(paint ezkube.ResourceId) bool + // Delete the key matching the resource + Delete(paint ezkube.ResourceId) + // Return the union with the provided set + Union(set PaintSet) PaintSet + // Return the difference with the provided set + Difference(set PaintSet) PaintSet + // Return the intersection with the provided set + Intersection(set PaintSet) PaintSet + // Find the resource with the given ID + Find(id ezkube.ResourceId) (*things_test_io_v1.Paint, error) + // Get the length of the set + Length() int + // returns the generic implementation of the set + Generic() sksets.ResourceSet + // returns the delta between this and and another PaintSet + Delta(newSet PaintSet) sksets.ResourceDelta + // Create a deep copy of the current PaintSet + Clone() PaintSet } func makeGenericPaintSet(paintList []*things_test_io_v1.Paint) sksets.ResourceSet { - var genericResources []ezkube.ResourceId - for _, obj := range paintList { - genericResources = append(genericResources, obj) - } - return sksets.NewResourceSet(genericResources...) + var genericResources []ezkube.ResourceId + for _, obj := range paintList { + genericResources = append(genericResources, obj) + } + return sksets.NewResourceSet(genericResources...) } type paintSet struct { - set sksets.ResourceSet + set sksets.ResourceSet } func NewPaintSet(paintList ...*things_test_io_v1.Paint) PaintSet { - return &paintSet{set: makeGenericPaintSet(paintList)} + return &paintSet{set: makeGenericPaintSet(paintList)} } func NewPaintSetFromList(paintList *things_test_io_v1.PaintList) PaintSet { - list := make([]*things_test_io_v1.Paint, 0, len(paintList.Items)) - for idx := range paintList.Items { - list = append(list, &paintList.Items[idx]) - } - return &paintSet{set: makeGenericPaintSet(list)} + list := make([]*things_test_io_v1.Paint, 0, len(paintList.Items)) + for idx := range paintList.Items { + list = append(list, &paintList.Items[idx]) + } + return &paintSet{set: makeGenericPaintSet(list)} } func (s *paintSet) Keys() sets.String { if s == nil { return sets.String{} - } - return s.Generic().Keys() -} - -func (s *paintSet) List(filterResource ...func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint { - if s == nil { - return nil - } - var genericFilters []func(ezkube.ResourceId) bool - for _, filter := range filterResource { - filter := filter - genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { - return filter(obj.(*things_test_io_v1.Paint)) - }) - } - - objs := s.Generic().List(genericFilters...) - paintList := make([]*things_test_io_v1.Paint, 0, len(objs)) - for _, obj := range objs { - paintList = append(paintList, obj.(*things_test_io_v1.Paint)) - } - return paintList -} - -func (s *paintSet) UnsortedList(filterResource ...func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint { - if s == nil { - return nil - } - var genericFilters []func(ezkube.ResourceId) bool - for _, filter := range filterResource { - filter := filter - genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { - return filter(obj.(*things_test_io_v1.Paint)) - }) - } - - var paintList []*things_test_io_v1.Paint - for _, obj := range s.Generic().UnsortedList(genericFilters...) { - paintList = append(paintList, obj.(*things_test_io_v1.Paint)) - } - return paintList + } + return s.Generic().Keys() +} + +func (s *paintSet) List(filterResource ... func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint { + if s == nil { + return nil + } + var genericFilters []func(ezkube.ResourceId) bool + for _, filter := range filterResource { + filter := filter + genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { + return filter(obj.(*things_test_io_v1.Paint)) + }) + } + + objs := s.Generic().List(genericFilters...) + paintList := make([]*things_test_io_v1.Paint, 0, len(objs)) + for _, obj := range objs { + paintList = append(paintList, obj.(*things_test_io_v1.Paint)) + } + return paintList +} + +func (s *paintSet) UnsortedList(filterResource ... func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint { + if s == nil { + return nil + } + var genericFilters []func(ezkube.ResourceId) bool + for _, filter := range filterResource { + filter := filter + genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { + return filter(obj.(*things_test_io_v1.Paint)) + }) + } + + var paintList []*things_test_io_v1.Paint + for _, obj := range s.Generic().UnsortedList(genericFilters...) { + paintList = append(paintList, obj.(*things_test_io_v1.Paint)) + } + return paintList } func (s *paintSet) Map() map[string]*things_test_io_v1.Paint { - if s == nil { - return nil - } + if s == nil { + return nil + } - newMap := map[string]*things_test_io_v1.Paint{} - for k, v := range s.Generic().Map() { - newMap[k] = v.(*things_test_io_v1.Paint) - } - return newMap + newMap := map[string]*things_test_io_v1.Paint{} + for k, v := range s.Generic().Map() { + newMap[k] = v.(*things_test_io_v1.Paint) + } + return newMap } func (s *paintSet) Insert( - paintList ...*things_test_io_v1.Paint, + paintList ...*things_test_io_v1.Paint, ) { - if s == nil { - panic("cannot insert into nil set") - } + if s == nil { + panic("cannot insert into nil set") + } - for _, obj := range paintList { - s.Generic().Insert(obj) - } + for _, obj := range paintList { + s.Generic().Insert(obj) + } } func (s *paintSet) Has(paint ezkube.ResourceId) bool { - if s == nil { - return false - } - return s.Generic().Has(paint) + if s == nil { + return false + } + return s.Generic().Has(paint) } func (s *paintSet) Equal( - paintSet PaintSet, + paintSet PaintSet, ) bool { - if s == nil { - return paintSet == nil - } - return s.Generic().Equal(paintSet.Generic()) + if s == nil { + return paintSet == nil + } + return s.Generic().Equal(paintSet.Generic()) } func (s *paintSet) Delete(Paint ezkube.ResourceId) { - if s == nil { - return - } - s.Generic().Delete(Paint) + if s == nil { + return + } + s.Generic().Delete(Paint) } func (s *paintSet) Union(set PaintSet) PaintSet { - if s == nil { - return set - } - return NewPaintSet(append(s.List(), set.List()...)...) + if s == nil { + return set + } + return NewPaintSet(append(s.List(), set.List()...)...) } func (s *paintSet) Difference(set PaintSet) PaintSet { - if s == nil { - return set - } - newSet := s.Generic().Difference(set.Generic()) - return &paintSet{set: newSet} + if s == nil { + return set + } + newSet := s.Generic().Difference(set.Generic()) + return &paintSet{set: newSet} } func (s *paintSet) Intersection(set PaintSet) PaintSet { - if s == nil { - return nil - } - newSet := s.Generic().Intersection(set.Generic()) - var paintList []*things_test_io_v1.Paint - for _, obj := range newSet.List() { - paintList = append(paintList, obj.(*things_test_io_v1.Paint)) - } - return NewPaintSet(paintList...) + if s == nil { + return nil + } + newSet := s.Generic().Intersection(set.Generic()) + var paintList []*things_test_io_v1.Paint + for _, obj := range newSet.List() { + paintList = append(paintList, obj.(*things_test_io_v1.Paint)) + } + return NewPaintSet(paintList...) } + func (s *paintSet) Find(id ezkube.ResourceId) (*things_test_io_v1.Paint, error) { - if s == nil { - return nil, eris.Errorf("empty set, cannot find Paint %v", sksets.Key(id)) - } + if s == nil { + return nil, eris.Errorf("empty set, cannot find Paint %v", sksets.Key(id)) + } obj, err := s.Generic().Find(&things_test_io_v1.Paint{}, id) if err != nil { return nil, err - } + } - return obj.(*things_test_io_v1.Paint), nil + return obj.(*things_test_io_v1.Paint), nil } func (s *paintSet) Length() int { - if s == nil { - return 0 - } - return s.Generic().Length() + if s == nil { + return 0 + } + return s.Generic().Length() } func (s *paintSet) Generic() sksets.ResourceSet { - if s == nil { - return nil - } - return s.set + if s == nil { + return nil + } + return s.set } func (s *paintSet) Delta(newSet PaintSet) sksets.ResourceDelta { - if s == nil { - return sksets.ResourceDelta{ - Inserted: newSet.Generic(), - } - } - return s.Generic().Delta(newSet.Generic()) + if s == nil { + return sksets.ResourceDelta{ + Inserted: newSet.Generic(), + } + } + return s.Generic().Delta(newSet.Generic()) } func (s *paintSet) Clone() PaintSet { @@ -236,216 +239,217 @@ func (s *paintSet) Clone() PaintSet { type ClusterResourceSet interface { // Get the set stored keys - Keys() sets.String - // List of resources stored in the set. Pass an optional filter function to filter on the list. - List(filterResource ...func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource - // Unsorted list of resources stored in the set. Pass an optional filter function to filter on the list. - UnsortedList(filterResource ...func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource - // Return the Set as a map of key to resource. - Map() map[string]*things_test_io_v1.ClusterResource - // Insert a resource into the set. - Insert(clusterResource ...*things_test_io_v1.ClusterResource) - // Compare the equality of the keys in two sets (not the resources themselves) - Equal(clusterResourceSet ClusterResourceSet) bool - // Check if the set contains a key matching the resource (not the resource itself) - Has(clusterResource ezkube.ResourceId) bool - // Delete the key matching the resource - Delete(clusterResource ezkube.ResourceId) - // Return the union with the provided set - Union(set ClusterResourceSet) ClusterResourceSet - // Return the difference with the provided set - Difference(set ClusterResourceSet) ClusterResourceSet - // Return the intersection with the provided set - Intersection(set ClusterResourceSet) ClusterResourceSet - // Find the resource with the given ID - Find(id ezkube.ResourceId) (*things_test_io_v1.ClusterResource, error) - // Get the length of the set - Length() int - // returns the generic implementation of the set - Generic() sksets.ResourceSet - // returns the delta between this and and another ClusterResourceSet - Delta(newSet ClusterResourceSet) sksets.ResourceDelta - // Create a deep copy of the current ClusterResourceSet - Clone() ClusterResourceSet + Keys() sets.String + // List of resources stored in the set. Pass an optional filter function to filter on the list. + List(filterResource ... func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource + // Unsorted list of resources stored in the set. Pass an optional filter function to filter on the list. + UnsortedList(filterResource ... func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource + // Return the Set as a map of key to resource. + Map() map[string]*things_test_io_v1.ClusterResource + // Insert a resource into the set. + Insert(clusterResource ...*things_test_io_v1.ClusterResource) + // Compare the equality of the keys in two sets (not the resources themselves) + Equal(clusterResourceSet ClusterResourceSet) bool + // Check if the set contains a key matching the resource (not the resource itself) + Has(clusterResource ezkube.ResourceId) bool + // Delete the key matching the resource + Delete(clusterResource ezkube.ResourceId) + // Return the union with the provided set + Union(set ClusterResourceSet) ClusterResourceSet + // Return the difference with the provided set + Difference(set ClusterResourceSet) ClusterResourceSet + // Return the intersection with the provided set + Intersection(set ClusterResourceSet) ClusterResourceSet + // Find the resource with the given ID + Find(id ezkube.ResourceId) (*things_test_io_v1.ClusterResource, error) + // Get the length of the set + Length() int + // returns the generic implementation of the set + Generic() sksets.ResourceSet + // returns the delta between this and and another ClusterResourceSet + Delta(newSet ClusterResourceSet) sksets.ResourceDelta + // Create a deep copy of the current ClusterResourceSet + Clone() ClusterResourceSet } func makeGenericClusterResourceSet(clusterResourceList []*things_test_io_v1.ClusterResource) sksets.ResourceSet { - var genericResources []ezkube.ResourceId - for _, obj := range clusterResourceList { - genericResources = append(genericResources, obj) - } - return sksets.NewResourceSet(genericResources...) + var genericResources []ezkube.ResourceId + for _, obj := range clusterResourceList { + genericResources = append(genericResources, obj) + } + return sksets.NewResourceSet(genericResources...) } type clusterResourceSet struct { - set sksets.ResourceSet + set sksets.ResourceSet } func NewClusterResourceSet(clusterResourceList ...*things_test_io_v1.ClusterResource) ClusterResourceSet { - return &clusterResourceSet{set: makeGenericClusterResourceSet(clusterResourceList)} + return &clusterResourceSet{set: makeGenericClusterResourceSet(clusterResourceList)} } func NewClusterResourceSetFromList(clusterResourceList *things_test_io_v1.ClusterResourceList) ClusterResourceSet { - list := make([]*things_test_io_v1.ClusterResource, 0, len(clusterResourceList.Items)) - for idx := range clusterResourceList.Items { - list = append(list, &clusterResourceList.Items[idx]) - } - return &clusterResourceSet{set: makeGenericClusterResourceSet(list)} + list := make([]*things_test_io_v1.ClusterResource, 0, len(clusterResourceList.Items)) + for idx := range clusterResourceList.Items { + list = append(list, &clusterResourceList.Items[idx]) + } + return &clusterResourceSet{set: makeGenericClusterResourceSet(list)} } func (s *clusterResourceSet) Keys() sets.String { if s == nil { return sets.String{} - } - return s.Generic().Keys() -} - -func (s *clusterResourceSet) List(filterResource ...func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource { - if s == nil { - return nil - } - var genericFilters []func(ezkube.ResourceId) bool - for _, filter := range filterResource { - filter := filter - genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { - return filter(obj.(*things_test_io_v1.ClusterResource)) - }) - } - - objs := s.Generic().List(genericFilters...) - clusterResourceList := make([]*things_test_io_v1.ClusterResource, 0, len(objs)) - for _, obj := range objs { - clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) - } - return clusterResourceList -} - -func (s *clusterResourceSet) UnsortedList(filterResource ...func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource { - if s == nil { - return nil - } - var genericFilters []func(ezkube.ResourceId) bool - for _, filter := range filterResource { - filter := filter - genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { - return filter(obj.(*things_test_io_v1.ClusterResource)) - }) - } - - var clusterResourceList []*things_test_io_v1.ClusterResource - for _, obj := range s.Generic().UnsortedList(genericFilters...) { - clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) - } - return clusterResourceList + } + return s.Generic().Keys() +} + +func (s *clusterResourceSet) List(filterResource ... func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource { + if s == nil { + return nil + } + var genericFilters []func(ezkube.ResourceId) bool + for _, filter := range filterResource { + filter := filter + genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { + return filter(obj.(*things_test_io_v1.ClusterResource)) + }) + } + + objs := s.Generic().List(genericFilters...) + clusterResourceList := make([]*things_test_io_v1.ClusterResource, 0, len(objs)) + for _, obj := range objs { + clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) + } + return clusterResourceList +} + +func (s *clusterResourceSet) UnsortedList(filterResource ... func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource { + if s == nil { + return nil + } + var genericFilters []func(ezkube.ResourceId) bool + for _, filter := range filterResource { + filter := filter + genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { + return filter(obj.(*things_test_io_v1.ClusterResource)) + }) + } + + var clusterResourceList []*things_test_io_v1.ClusterResource + for _, obj := range s.Generic().UnsortedList(genericFilters...) { + clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) + } + return clusterResourceList } func (s *clusterResourceSet) Map() map[string]*things_test_io_v1.ClusterResource { - if s == nil { - return nil - } + if s == nil { + return nil + } - newMap := map[string]*things_test_io_v1.ClusterResource{} - for k, v := range s.Generic().Map() { - newMap[k] = v.(*things_test_io_v1.ClusterResource) - } - return newMap + newMap := map[string]*things_test_io_v1.ClusterResource{} + for k, v := range s.Generic().Map() { + newMap[k] = v.(*things_test_io_v1.ClusterResource) + } + return newMap } func (s *clusterResourceSet) Insert( - clusterResourceList ...*things_test_io_v1.ClusterResource, + clusterResourceList ...*things_test_io_v1.ClusterResource, ) { - if s == nil { - panic("cannot insert into nil set") - } + if s == nil { + panic("cannot insert into nil set") + } - for _, obj := range clusterResourceList { - s.Generic().Insert(obj) - } + for _, obj := range clusterResourceList { + s.Generic().Insert(obj) + } } func (s *clusterResourceSet) Has(clusterResource ezkube.ResourceId) bool { - if s == nil { - return false - } - return s.Generic().Has(clusterResource) + if s == nil { + return false + } + return s.Generic().Has(clusterResource) } func (s *clusterResourceSet) Equal( - clusterResourceSet ClusterResourceSet, + clusterResourceSet ClusterResourceSet, ) bool { - if s == nil { - return clusterResourceSet == nil - } - return s.Generic().Equal(clusterResourceSet.Generic()) + if s == nil { + return clusterResourceSet == nil + } + return s.Generic().Equal(clusterResourceSet.Generic()) } func (s *clusterResourceSet) Delete(ClusterResource ezkube.ResourceId) { - if s == nil { - return - } - s.Generic().Delete(ClusterResource) + if s == nil { + return + } + s.Generic().Delete(ClusterResource) } func (s *clusterResourceSet) Union(set ClusterResourceSet) ClusterResourceSet { - if s == nil { - return set - } - return NewClusterResourceSet(append(s.List(), set.List()...)...) + if s == nil { + return set + } + return NewClusterResourceSet(append(s.List(), set.List()...)...) } func (s *clusterResourceSet) Difference(set ClusterResourceSet) ClusterResourceSet { - if s == nil { - return set - } - newSet := s.Generic().Difference(set.Generic()) - return &clusterResourceSet{set: newSet} + if s == nil { + return set + } + newSet := s.Generic().Difference(set.Generic()) + return &clusterResourceSet{set: newSet} } func (s *clusterResourceSet) Intersection(set ClusterResourceSet) ClusterResourceSet { - if s == nil { - return nil - } - newSet := s.Generic().Intersection(set.Generic()) - var clusterResourceList []*things_test_io_v1.ClusterResource - for _, obj := range newSet.List() { - clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) - } - return NewClusterResourceSet(clusterResourceList...) + if s == nil { + return nil + } + newSet := s.Generic().Intersection(set.Generic()) + var clusterResourceList []*things_test_io_v1.ClusterResource + for _, obj := range newSet.List() { + clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) + } + return NewClusterResourceSet(clusterResourceList...) } + func (s *clusterResourceSet) Find(id ezkube.ResourceId) (*things_test_io_v1.ClusterResource, error) { - if s == nil { - return nil, eris.Errorf("empty set, cannot find ClusterResource %v", sksets.Key(id)) - } + if s == nil { + return nil, eris.Errorf("empty set, cannot find ClusterResource %v", sksets.Key(id)) + } obj, err := s.Generic().Find(&things_test_io_v1.ClusterResource{}, id) if err != nil { return nil, err - } + } - return obj.(*things_test_io_v1.ClusterResource), nil + return obj.(*things_test_io_v1.ClusterResource), nil } func (s *clusterResourceSet) Length() int { - if s == nil { - return 0 - } - return s.Generic().Length() + if s == nil { + return 0 + } + return s.Generic().Length() } func (s *clusterResourceSet) Generic() sksets.ResourceSet { - if s == nil { - return nil - } - return s.set + if s == nil { + return nil + } + return s.set } func (s *clusterResourceSet) Delta(newSet ClusterResourceSet) sksets.ResourceDelta { - if s == nil { - return sksets.ResourceDelta{ - Inserted: newSet.Generic(), - } - } - return s.Generic().Delta(newSet.Generic()) + if s == nil { + return sksets.ResourceDelta{ + Inserted: newSet.Generic(), + } + } + return s.Generic().Delta(newSet.Generic()) } func (s *clusterResourceSet) Clone() ClusterResourceSet { diff --git a/codegen/test/api/things.test.io/v1/test_api.pb.go b/codegen/test/api/things.test.io/v1/test_api.pb.go index b937c23bc..fa79410fd 100644 --- a/codegen/test/api/things.test.io/v1/test_api.pb.go +++ b/codegen/test/api/things.test.io/v1/test_api.pb.go @@ -7,15 +7,14 @@ package v1 import ( - reflect "reflect" - sync "sync" - 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/cue/encoding/protobuf/cue" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -81,6 +80,7 @@ type PaintSpec struct { Color *PaintColor `protobuf:"bytes,1,opt,name=color,proto3" json:"color,omitempty"` // Types that are assignable to PaintType: + // // *PaintSpec_Acrylic // *PaintSpec_Oil PaintType isPaintSpec_PaintType `protobuf_oneof:"paintType"` @@ -288,6 +288,7 @@ type OilType struct { WaterMixable bool `protobuf:"varint,1,opt,name=waterMixable,proto3" json:"waterMixable,omitempty"` // Types that are assignable to PigmentType: + // // *OilType_Powder // *OilType_Fluid PigmentType isOilType_PigmentType `protobuf_oneof:"pigmentType"` diff --git a/codegen/test/api/things.test.io/v1/type_helpers.go b/codegen/test/api/things.test.io/v1/type_helpers.go index 4133a8e21..2d04a4fd1 100644 --- a/codegen/test/api/things.test.io/v1/type_helpers.go +++ b/codegen/test/api/things.test.io/v1/type_helpers.go @@ -3,6 +3,9 @@ // Definitions for the Kubernetes types package v1 +import ( +) + // PaintSlice represents a slice of *Paint type PaintSlice []*Paint diff --git a/codegen/test/api/things.test.io/v1/types.go b/codegen/test/api/things.test.io/v1/types.go index f153a3983..3f3fc59e2 100644 --- a/codegen/test/api/things.test.io/v1/types.go +++ b/codegen/test/api/things.test.io/v1/types.go @@ -4,9 +4,8 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime/schema" -) + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema") // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -15,22 +14,22 @@ import ( // GroupVersionKind for Paint var PaintGVK = schema.GroupVersionKind{ - Group: "things.test.io", - Version: "v1", - Kind: "Paint", + Group: "things.test.io", + Version: "v1", + Kind: "Paint", } // Paint is the Schema for the paint API type Paint struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` - Spec PaintSpec `json:"spec,omitempty"` - Status PaintStatus `json:"status,omitempty"` + Spec PaintSpec `json:"spec,omitempty"` + Status PaintStatus `json:"status,omitempty"` } // GVK returns the GroupVersionKind associated with the resource type. -func (Paint) GVK() schema.GroupVersionKind { +func (Paint) GVK() schema.GroupVersionKind { return PaintGVK } @@ -38,9 +37,9 @@ func (Paint) GVK() schema.GroupVersionKind { // PaintList contains a list of Paint type PaintList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []Paint `json:"items"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Paint `json:"items"` } // +genclient @@ -50,21 +49,21 @@ type PaintList struct { // GroupVersionKind for ClusterResource var ClusterResourceGVK = schema.GroupVersionKind{ - Group: "things.test.io", - Version: "v1", - Kind: "ClusterResource", + Group: "things.test.io", + Version: "v1", + Kind: "ClusterResource", } // ClusterResource is the Schema for the clusterResource API type ClusterResource struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` - Spec ClusterResourceSpec `json:"spec,omitempty"` + Spec ClusterResourceSpec `json:"spec,omitempty"` } // GVK returns the GroupVersionKind associated with the resource type. -func (ClusterResource) GVK() schema.GroupVersionKind { +func (ClusterResource) GVK() schema.GroupVersionKind { return ClusterResourceGVK } @@ -72,12 +71,12 @@ func (ClusterResource) GVK() schema.GroupVersionKind { // ClusterResourceList contains a list of ClusterResource type ClusterResourceList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []ClusterResource `json:"items"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterResource `json:"items"` } func init() { - SchemeBuilder.Register(&Paint{}, &PaintList{}) - SchemeBuilder.Register(&ClusterResource{}, &ClusterResourceList{}) + SchemeBuilder.Register(&Paint{}, &PaintList{}) + SchemeBuilder.Register(&ClusterResource{}, &ClusterResourceList{}) } diff --git a/codegen/test/api/things.test.io/v1/zz_generated.deepcopy.go b/codegen/test/api/things.test.io/v1/zz_generated.deepcopy.go index 4203de9bf..8939012a9 100644 --- a/codegen/test/api/things.test.io/v1/zz_generated.deepcopy.go +++ b/codegen/test/api/things.test.io/v1/zz_generated.deepcopy.go @@ -5,123 +5,124 @@ package v1 import ( - runtime "k8s.io/apimachinery/pkg/runtime" + runtime "k8s.io/apimachinery/pkg/runtime" ) // Generated Deepcopy methods for Paint func (in *Paint) DeepCopyInto(out *Paint) { - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - // deepcopy spec - in.Spec.DeepCopyInto(&out.Spec) - // deepcopy status - in.Status.DeepCopyInto(&out.Status) + // deepcopy spec + in.Spec.DeepCopyInto(&out.Spec) + // deepcopy status + in.Status.DeepCopyInto(&out.Status) - return + return } func (in *Paint) DeepCopy() *Paint { - if in == nil { - return nil - } - out := new(Paint) - in.DeepCopyInto(out) - return out + if in == nil { + return nil + } + out := new(Paint) + in.DeepCopyInto(out) + return out } func (in *Paint) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil + if c := in.DeepCopy(); c != nil { + return c + } + return nil } func (in *PaintList) DeepCopyInto(out *PaintList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Paint, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Paint, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return } func (in *PaintList) DeepCopy() *PaintList { - if in == nil { - return nil - } - out := new(PaintList) - in.DeepCopyInto(out) - return out + if in == nil { + return nil + } + out := new(PaintList) + in.DeepCopyInto(out) + return out } func (in *PaintList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil + if c := in.DeepCopy(); c != nil { + return c + } + return nil } // Generated Deepcopy methods for ClusterResource func (in *ClusterResource) DeepCopyInto(out *ClusterResource) { - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - // deepcopy spec - in.Spec.DeepCopyInto(&out.Spec) + // deepcopy spec + in.Spec.DeepCopyInto(&out.Spec) - return + return } func (in *ClusterResource) DeepCopy() *ClusterResource { - if in == nil { - return nil - } - out := new(ClusterResource) - in.DeepCopyInto(out) - return out + if in == nil { + return nil + } + out := new(ClusterResource) + in.DeepCopyInto(out) + return out } func (in *ClusterResource) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil + if c := in.DeepCopy(); c != nil { + return c + } + return nil } func (in *ClusterResourceList) DeepCopyInto(out *ClusterResourceList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterResource, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ClusterResource, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return } func (in *ClusterResourceList) DeepCopy() *ClusterResourceList { - if in == nil { - return nil - } - out := new(ClusterResourceList) - in.DeepCopyInto(out) - return out + if in == nil { + return nil + } + out := new(ClusterResourceList) + in.DeepCopyInto(out) + return out } func (in *ClusterResourceList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil + if c := in.DeepCopy(); c != nil { + return c + } + return nil } + diff --git a/codegen/test/chart-no-desc/values.schema.json b/codegen/test/chart-no-desc/values.schema.json index 57f7b41ea..3bee4cfc0 100644 --- a/codegen/test/chart-no-desc/values.schema.json +++ b/codegen/test/chart-no-desc/values.schema.json @@ -203,6 +203,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -560,6 +578,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -2718,6 +2754,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -2792,6 +2846,16 @@ }, "name": { "type": "string" + }, + "namespace": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -3143,6 +3207,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -4387,6 +4469,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -5631,6 +5731,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -8076,6 +8194,67 @@ "type": "null" } ] + }, + "schedulingGates": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] + }, + "resourceClaims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + }, + "source": { + "properties": { + "resourceClaimName": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ] + }, + "resourceClaimTemplateName": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ] + } + }, + "type": "object" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" diff --git a/codegen/test/chart/values.schema.json b/codegen/test/chart/values.schema.json index 57f7b41ea..3bee4cfc0 100644 --- a/codegen/test/chart/values.schema.json +++ b/codegen/test/chart/values.schema.json @@ -203,6 +203,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -560,6 +578,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -2718,6 +2754,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -2792,6 +2846,16 @@ }, "name": { "type": "string" + }, + "namespace": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -3143,6 +3207,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -4387,6 +4469,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -5631,6 +5731,24 @@ "type": "null" } ] + }, + "claims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" @@ -8076,6 +8194,67 @@ "type": "null" } ] + }, + "schedulingGates": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] + }, + "resourceClaims": { + "anyOf": [ + { + "items": { + "properties": { + "name": { + "type": "string" + }, + "source": { + "properties": { + "resourceClaimName": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ] + }, + "resourceClaimTemplateName": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ] + } + }, + "type": "object" + } + }, + "type": "object" + }, + "type": "array" + }, + { + "type": "null" + } + ] } }, "type": "object" diff --git a/pkg/api/core.skv2.solo.io/v1/core.pb.go b/pkg/api/core.skv2.solo.io/v1/core.pb.go index 4e46bd8f8..2762173b5 100644 --- a/pkg/api/core.skv2.solo.io/v1/core.pb.go +++ b/pkg/api/core.skv2.solo.io/v1/core.pb.go @@ -7,14 +7,13 @@ package v1 import ( - reflect "reflect" - sync "sync" - timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( diff --git a/pkg/api/multicluster.solo.io/v1alpha1/clients.go b/pkg/api/multicluster.solo.io/v1alpha1/clients.go index 96d05d43d..930a55070 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/clients.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/clients.go @@ -108,10 +108,10 @@ type KubernetesClusterWriter interface { type KubernetesClusterStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given KubernetesCluster object. - UpdateKubernetesClusterStatus(ctx context.Context, obj *KubernetesCluster, opts ...client.UpdateOption) error + UpdateKubernetesClusterStatus(ctx context.Context, obj *KubernetesCluster, opts ...client.SubResourceUpdateOption) error // Patch patches the given KubernetesCluster object's subresource. - PatchKubernetesClusterStatus(ctx context.Context, obj *KubernetesCluster, patch client.Patch, opts ...client.PatchOption) error + PatchKubernetesClusterStatus(ctx context.Context, obj *KubernetesCluster, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on KubernetesClusters. @@ -182,11 +182,11 @@ func (c *kubernetesClusterClient) UpsertKubernetesCluster(ctx context.Context, o return err } -func (c *kubernetesClusterClient) UpdateKubernetesClusterStatus(ctx context.Context, obj *KubernetesCluster, opts ...client.UpdateOption) error { +func (c *kubernetesClusterClient) UpdateKubernetesClusterStatus(ctx context.Context, obj *KubernetesCluster, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *kubernetesClusterClient) PatchKubernetesClusterStatus(ctx context.Context, obj *KubernetesCluster, patch client.Patch, opts ...client.PatchOption) error { +func (c *kubernetesClusterClient) PatchKubernetesClusterStatus(ctx context.Context, obj *KubernetesCluster, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } diff --git a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go index cb5acb2cc..729adf049 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go @@ -7,13 +7,12 @@ package v1alpha1 import ( - reflect "reflect" - sync "sync" - _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -23,8 +22,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// -//Representation of a Kubernetes cluster that has been registered. +// Representation of a Kubernetes cluster that has been registered. type KubernetesClusterSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -160,11 +158,10 @@ func (x *KubernetesClusterStatus) GetPolicyRules() []*PolicyRule { return nil } -// -//Copy pasted from the official kubernetes definition: -//https://github.com/kubernetes/api/blob/697df40f2d58d7d48b180b83d7b9b2b5ff812923/rbac/v1alpha1/generated.proto#L98 -//PolicyRule holds information that describes a policy rule, but does not contain information -//about who the rule applies to or which namespace the rule applies to. +// Copy pasted from the official kubernetes definition: +// https://github.com/kubernetes/api/blob/697df40f2d58d7d48b180b83d7b9b2b5ff812923/rbac/v1alpha1/generated.proto#L98 +// PolicyRule holds information that describes a policy rule, but does not contain information +// about who the rule applies to or which namespace the rule applies to. type PolicyRule struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -265,6 +262,7 @@ type KubernetesClusterSpec_ProviderInfo struct { // Metadata specific to a cloud provider. // // Types that are assignable to ProviderInfoType: + // // *KubernetesClusterSpec_ProviderInfo_Eks ProviderInfoType isKubernetesClusterSpec_ProviderInfo_ProviderInfoType `protobuf_oneof:"provider_info_type"` } diff --git a/pkg/api/multicluster.solo.io/v1alpha1/mocks/clients.go b/pkg/api/multicluster.solo.io/v1alpha1/mocks/clients.go index f2a7d68d8..21945d4f7 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/mocks/clients.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/mocks/clients.go @@ -307,7 +307,7 @@ func (m *MockKubernetesClusterStatusWriter) EXPECT() *MockKubernetesClusterStatu } // UpdateKubernetesClusterStatus mocks base method -func (m *MockKubernetesClusterStatusWriter) UpdateKubernetesClusterStatus(ctx context.Context, obj *v1alpha1.KubernetesCluster, opts ...client.UpdateOption) error { +func (m *MockKubernetesClusterStatusWriter) UpdateKubernetesClusterStatus(ctx context.Context, obj *v1alpha1.KubernetesCluster, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -326,7 +326,7 @@ func (mr *MockKubernetesClusterStatusWriterMockRecorder) UpdateKubernetesCluster } // PatchKubernetesClusterStatus mocks base method -func (m *MockKubernetesClusterStatusWriter) PatchKubernetesClusterStatus(ctx context.Context, obj *v1alpha1.KubernetesCluster, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockKubernetesClusterStatusWriter) PatchKubernetesClusterStatus(ctx context.Context, obj *v1alpha1.KubernetesCluster, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -517,7 +517,7 @@ func (mr *MockKubernetesClusterClientMockRecorder) UpsertKubernetesCluster(ctx, } // UpdateKubernetesClusterStatus mocks base method -func (m *MockKubernetesClusterClient) UpdateKubernetesClusterStatus(ctx context.Context, obj *v1alpha1.KubernetesCluster, opts ...client.UpdateOption) error { +func (m *MockKubernetesClusterClient) UpdateKubernetesClusterStatus(ctx context.Context, obj *v1alpha1.KubernetesCluster, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -536,7 +536,7 @@ func (mr *MockKubernetesClusterClientMockRecorder) UpdateKubernetesClusterStatus } // PatchKubernetesClusterStatus mocks base method -func (m *MockKubernetesClusterClient) PatchKubernetesClusterStatus(ctx context.Context, obj *v1alpha1.KubernetesCluster, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockKubernetesClusterClient) PatchKubernetesClusterStatus(ctx context.Context, obj *v1alpha1.KubernetesCluster, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { diff --git a/pkg/client/client.go b/pkg/client/client.go index 2a5192d4a..fd75e5ef0 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -58,12 +58,12 @@ type StatusWriter[T client.Object] interface { // Update updates the fields corresponding to the status subresource for the // given obj. obj must be a struct pointer so that obj can be updated // with the content returned by the Server. - Update(ctx context.Context, obj T, opts ...client.UpdateOption) error + Update(ctx context.Context, obj T, opts ...client.SubResourceUpdateOption) error // Patch patches the given object's subresource. obj must be a struct // pointer so that obj can be updated with the content returned by the // Server. - Patch(ctx context.Context, obj T, patch client.Patch, opts ...client.PatchOption) error + Patch(ctx context.Context, obj T, patch client.Patch, opts ...client.SubResourcePatchOption) error } type GenericClient[T client.Object, L client.ObjectList] interface { @@ -174,10 +174,10 @@ type statusWriter[T client.Object] struct { statusWriter client.StatusWriter } -func (s *statusWriter[T]) Update(ctx context.Context, obj T, opts ...client.UpdateOption) error { +func (s *statusWriter[T]) Update(ctx context.Context, obj T, opts ...client.SubResourceUpdateOption) error { return s.statusWriter.Update(ctx, obj, opts...) } -func (s *statusWriter[T]) Patch(ctx context.Context, obj T, patch client.Patch, opts ...client.PatchOption) error { +func (s *statusWriter[T]) Patch(ctx context.Context, obj T, patch client.Patch, opts ...client.SubResourcePatchOption) error { return s.statusWriter.Patch(ctx, obj, patch, opts...) } diff --git a/pkg/multicluster/internal/k8s/admissionregistration.k8s.io/v1/clients.go b/pkg/multicluster/internal/k8s/admissionregistration.k8s.io/v1/clients.go index 89bddf457..1b1ed2dce 100644 --- a/pkg/multicluster/internal/k8s/admissionregistration.k8s.io/v1/clients.go +++ b/pkg/multicluster/internal/k8s/admissionregistration.k8s.io/v1/clients.go @@ -109,10 +109,10 @@ type ValidatingWebhookConfigurationWriter interface { type ValidatingWebhookConfigurationStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given ValidatingWebhookConfiguration object. - UpdateValidatingWebhookConfigurationStatus(ctx context.Context, obj *admissionregistration_k8s_io_v1.ValidatingWebhookConfiguration, opts ...client.UpdateOption) error + UpdateValidatingWebhookConfigurationStatus(ctx context.Context, obj *admissionregistration_k8s_io_v1.ValidatingWebhookConfiguration, opts ...client.SubResourceUpdateOption) error // Patch patches the given ValidatingWebhookConfiguration object's subresource. - PatchValidatingWebhookConfigurationStatus(ctx context.Context, obj *admissionregistration_k8s_io_v1.ValidatingWebhookConfiguration, patch client.Patch, opts ...client.PatchOption) error + PatchValidatingWebhookConfigurationStatus(ctx context.Context, obj *admissionregistration_k8s_io_v1.ValidatingWebhookConfiguration, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on ValidatingWebhookConfigurations. @@ -183,11 +183,11 @@ func (c *validatingWebhookConfigurationClient) UpsertValidatingWebhookConfigurat return err } -func (c *validatingWebhookConfigurationClient) UpdateValidatingWebhookConfigurationStatus(ctx context.Context, obj *admissionregistration_k8s_io_v1.ValidatingWebhookConfiguration, opts ...client.UpdateOption) error { +func (c *validatingWebhookConfigurationClient) UpdateValidatingWebhookConfigurationStatus(ctx context.Context, obj *admissionregistration_k8s_io_v1.ValidatingWebhookConfiguration, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *validatingWebhookConfigurationClient) PatchValidatingWebhookConfigurationStatus(ctx context.Context, obj *admissionregistration_k8s_io_v1.ValidatingWebhookConfiguration, patch client.Patch, opts ...client.PatchOption) error { +func (c *validatingWebhookConfigurationClient) PatchValidatingWebhookConfigurationStatus(ctx context.Context, obj *admissionregistration_k8s_io_v1.ValidatingWebhookConfiguration, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } diff --git a/pkg/multicluster/internal/k8s/admissionregistration.k8s.io/v1/mocks/clients.go b/pkg/multicluster/internal/k8s/admissionregistration.k8s.io/v1/mocks/clients.go index 302eb783e..ab1f513d8 100644 --- a/pkg/multicluster/internal/k8s/admissionregistration.k8s.io/v1/mocks/clients.go +++ b/pkg/multicluster/internal/k8s/admissionregistration.k8s.io/v1/mocks/clients.go @@ -308,7 +308,7 @@ func (m *MockValidatingWebhookConfigurationStatusWriter) EXPECT() *MockValidatin } // UpdateValidatingWebhookConfigurationStatus mocks base method -func (m *MockValidatingWebhookConfigurationStatusWriter) UpdateValidatingWebhookConfigurationStatus(ctx context.Context, obj *v10.ValidatingWebhookConfiguration, opts ...client.UpdateOption) error { +func (m *MockValidatingWebhookConfigurationStatusWriter) UpdateValidatingWebhookConfigurationStatus(ctx context.Context, obj *v10.ValidatingWebhookConfiguration, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -327,7 +327,7 @@ func (mr *MockValidatingWebhookConfigurationStatusWriterMockRecorder) UpdateVali } // PatchValidatingWebhookConfigurationStatus mocks base method -func (m *MockValidatingWebhookConfigurationStatusWriter) PatchValidatingWebhookConfigurationStatus(ctx context.Context, obj *v10.ValidatingWebhookConfiguration, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockValidatingWebhookConfigurationStatusWriter) PatchValidatingWebhookConfigurationStatus(ctx context.Context, obj *v10.ValidatingWebhookConfiguration, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -518,7 +518,7 @@ func (mr *MockValidatingWebhookConfigurationClientMockRecorder) UpsertValidating } // UpdateValidatingWebhookConfigurationStatus mocks base method -func (m *MockValidatingWebhookConfigurationClient) UpdateValidatingWebhookConfigurationStatus(ctx context.Context, obj *v10.ValidatingWebhookConfiguration, opts ...client.UpdateOption) error { +func (m *MockValidatingWebhookConfigurationClient) UpdateValidatingWebhookConfigurationStatus(ctx context.Context, obj *v10.ValidatingWebhookConfiguration, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -537,7 +537,7 @@ func (mr *MockValidatingWebhookConfigurationClientMockRecorder) UpdateValidating } // PatchValidatingWebhookConfigurationStatus mocks base method -func (m *MockValidatingWebhookConfigurationClient) PatchValidatingWebhookConfigurationStatus(ctx context.Context, obj *v10.ValidatingWebhookConfiguration, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockValidatingWebhookConfigurationClient) PatchValidatingWebhookConfigurationStatus(ctx context.Context, obj *v10.ValidatingWebhookConfiguration, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { diff --git a/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1/clients.go b/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1/clients.go index b1a229867..e4b7602df 100644 --- a/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1/clients.go +++ b/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1/clients.go @@ -109,10 +109,10 @@ type CustomResourceDefinitionWriter interface { type CustomResourceDefinitionStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given CustomResourceDefinition object. - UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1.CustomResourceDefinition, opts ...client.UpdateOption) error + UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1.CustomResourceDefinition, opts ...client.SubResourceUpdateOption) error // Patch patches the given CustomResourceDefinition object's subresource. - PatchCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1.CustomResourceDefinition, patch client.Patch, opts ...client.PatchOption) error + PatchCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1.CustomResourceDefinition, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on CustomResourceDefinitions. @@ -185,11 +185,11 @@ func (c *customResourceDefinitionClient) UpsertCustomResourceDefinition(ctx cont return err } -func (c *customResourceDefinitionClient) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1.CustomResourceDefinition, opts ...client.UpdateOption) error { +func (c *customResourceDefinitionClient) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1.CustomResourceDefinition, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *customResourceDefinitionClient) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1.CustomResourceDefinition, patch client.Patch, opts ...client.PatchOption) error { +func (c *customResourceDefinitionClient) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1.CustomResourceDefinition, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } diff --git a/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1/mocks/clients.go b/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1/mocks/clients.go index f12481f2b..1be59eb34 100644 --- a/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1/mocks/clients.go +++ b/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1/mocks/clients.go @@ -308,7 +308,7 @@ func (m *MockCustomResourceDefinitionStatusWriter) EXPECT() *MockCustomResourceD } // UpdateCustomResourceDefinitionStatus mocks base method -func (m *MockCustomResourceDefinitionStatusWriter) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *v10.CustomResourceDefinition, opts ...client.UpdateOption) error { +func (m *MockCustomResourceDefinitionStatusWriter) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *v10.CustomResourceDefinition, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -327,7 +327,7 @@ func (mr *MockCustomResourceDefinitionStatusWriterMockRecorder) UpdateCustomReso } // PatchCustomResourceDefinitionStatus mocks base method -func (m *MockCustomResourceDefinitionStatusWriter) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *v10.CustomResourceDefinition, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockCustomResourceDefinitionStatusWriter) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *v10.CustomResourceDefinition, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -518,7 +518,7 @@ func (mr *MockCustomResourceDefinitionClientMockRecorder) UpsertCustomResourceDe } // UpdateCustomResourceDefinitionStatus mocks base method -func (m *MockCustomResourceDefinitionClient) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *v10.CustomResourceDefinition, opts ...client.UpdateOption) error { +func (m *MockCustomResourceDefinitionClient) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *v10.CustomResourceDefinition, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -537,7 +537,7 @@ func (mr *MockCustomResourceDefinitionClientMockRecorder) UpdateCustomResourceDe } // PatchCustomResourceDefinitionStatus mocks base method -func (m *MockCustomResourceDefinitionClient) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *v10.CustomResourceDefinition, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockCustomResourceDefinitionClient) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *v10.CustomResourceDefinition, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { diff --git a/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1beta1/clients.go b/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1beta1/clients.go index 2831c5f08..f4c0d30a1 100644 --- a/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1beta1/clients.go +++ b/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1beta1/clients.go @@ -109,10 +109,10 @@ type CustomResourceDefinitionWriter interface { type CustomResourceDefinitionStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given CustomResourceDefinition object. - UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1beta1.CustomResourceDefinition, opts ...client.UpdateOption) error + UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1beta1.CustomResourceDefinition, opts ...client.SubResourceUpdateOption) error // Patch patches the given CustomResourceDefinition object's subresource. - PatchCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1beta1.CustomResourceDefinition, patch client.Patch, opts ...client.PatchOption) error + PatchCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1beta1.CustomResourceDefinition, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on CustomResourceDefinitions. @@ -185,11 +185,11 @@ func (c *customResourceDefinitionClient) UpsertCustomResourceDefinition(ctx cont return err } -func (c *customResourceDefinitionClient) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1beta1.CustomResourceDefinition, opts ...client.UpdateOption) error { +func (c *customResourceDefinitionClient) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1beta1.CustomResourceDefinition, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *customResourceDefinitionClient) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1beta1.CustomResourceDefinition, patch client.Patch, opts ...client.PatchOption) error { +func (c *customResourceDefinitionClient) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *apiextensions_k8s_io_v1beta1.CustomResourceDefinition, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } diff --git a/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1beta1/mocks/clients.go b/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1beta1/mocks/clients.go index db5b57dfc..6d7dccd3a 100644 --- a/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1beta1/mocks/clients.go +++ b/pkg/multicluster/internal/k8s/apiextensions.k8s.io/v1beta1/mocks/clients.go @@ -308,7 +308,7 @@ func (m *MockCustomResourceDefinitionStatusWriter) EXPECT() *MockCustomResourceD } // UpdateCustomResourceDefinitionStatus mocks base method -func (m *MockCustomResourceDefinitionStatusWriter) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *v1.CustomResourceDefinition, opts ...client.UpdateOption) error { +func (m *MockCustomResourceDefinitionStatusWriter) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *v1.CustomResourceDefinition, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -327,7 +327,7 @@ func (mr *MockCustomResourceDefinitionStatusWriterMockRecorder) UpdateCustomReso } // PatchCustomResourceDefinitionStatus mocks base method -func (m *MockCustomResourceDefinitionStatusWriter) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *v1.CustomResourceDefinition, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockCustomResourceDefinitionStatusWriter) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *v1.CustomResourceDefinition, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -518,7 +518,7 @@ func (mr *MockCustomResourceDefinitionClientMockRecorder) UpsertCustomResourceDe } // UpdateCustomResourceDefinitionStatus mocks base method -func (m *MockCustomResourceDefinitionClient) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *v1.CustomResourceDefinition, opts ...client.UpdateOption) error { +func (m *MockCustomResourceDefinitionClient) UpdateCustomResourceDefinitionStatus(ctx context.Context, obj *v1.CustomResourceDefinition, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -537,7 +537,7 @@ func (mr *MockCustomResourceDefinitionClientMockRecorder) UpdateCustomResourceDe } // PatchCustomResourceDefinitionStatus mocks base method -func (m *MockCustomResourceDefinitionClient) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *v1.CustomResourceDefinition, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockCustomResourceDefinitionClient) PatchCustomResourceDefinitionStatus(ctx context.Context, obj *v1.CustomResourceDefinition, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { diff --git a/pkg/multicluster/internal/k8s/certificates.k8s.io/v1beta1/clients.go b/pkg/multicluster/internal/k8s/certificates.k8s.io/v1beta1/clients.go index 44a161a31..e6974d02f 100644 --- a/pkg/multicluster/internal/k8s/certificates.k8s.io/v1beta1/clients.go +++ b/pkg/multicluster/internal/k8s/certificates.k8s.io/v1beta1/clients.go @@ -109,10 +109,10 @@ type CertificateSigningRequestWriter interface { type CertificateSigningRequestStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given CertificateSigningRequest object. - UpdateCertificateSigningRequestStatus(ctx context.Context, obj *certificates_k8s_io_v1beta1.CertificateSigningRequest, opts ...client.UpdateOption) error + UpdateCertificateSigningRequestStatus(ctx context.Context, obj *certificates_k8s_io_v1beta1.CertificateSigningRequest, opts ...client.SubResourceUpdateOption) error // Patch patches the given CertificateSigningRequest object's subresource. - PatchCertificateSigningRequestStatus(ctx context.Context, obj *certificates_k8s_io_v1beta1.CertificateSigningRequest, patch client.Patch, opts ...client.PatchOption) error + PatchCertificateSigningRequestStatus(ctx context.Context, obj *certificates_k8s_io_v1beta1.CertificateSigningRequest, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on CertificateSigningRequests. @@ -183,11 +183,11 @@ func (c *certificateSigningRequestClient) UpsertCertificateSigningRequest(ctx co return err } -func (c *certificateSigningRequestClient) UpdateCertificateSigningRequestStatus(ctx context.Context, obj *certificates_k8s_io_v1beta1.CertificateSigningRequest, opts ...client.UpdateOption) error { +func (c *certificateSigningRequestClient) UpdateCertificateSigningRequestStatus(ctx context.Context, obj *certificates_k8s_io_v1beta1.CertificateSigningRequest, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *certificateSigningRequestClient) PatchCertificateSigningRequestStatus(ctx context.Context, obj *certificates_k8s_io_v1beta1.CertificateSigningRequest, patch client.Patch, opts ...client.PatchOption) error { +func (c *certificateSigningRequestClient) PatchCertificateSigningRequestStatus(ctx context.Context, obj *certificates_k8s_io_v1beta1.CertificateSigningRequest, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } diff --git a/pkg/multicluster/internal/k8s/certificates.k8s.io/v1beta1/mocks/clients.go b/pkg/multicluster/internal/k8s/certificates.k8s.io/v1beta1/mocks/clients.go index da18232a3..356e37374 100644 --- a/pkg/multicluster/internal/k8s/certificates.k8s.io/v1beta1/mocks/clients.go +++ b/pkg/multicluster/internal/k8s/certificates.k8s.io/v1beta1/mocks/clients.go @@ -308,7 +308,7 @@ func (m *MockCertificateSigningRequestStatusWriter) EXPECT() *MockCertificateSig } // UpdateCertificateSigningRequestStatus mocks base method -func (m *MockCertificateSigningRequestStatusWriter) UpdateCertificateSigningRequestStatus(ctx context.Context, obj *v1beta10.CertificateSigningRequest, opts ...client.UpdateOption) error { +func (m *MockCertificateSigningRequestStatusWriter) UpdateCertificateSigningRequestStatus(ctx context.Context, obj *v1beta10.CertificateSigningRequest, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -327,7 +327,7 @@ func (mr *MockCertificateSigningRequestStatusWriterMockRecorder) UpdateCertifica } // PatchCertificateSigningRequestStatus mocks base method -func (m *MockCertificateSigningRequestStatusWriter) PatchCertificateSigningRequestStatus(ctx context.Context, obj *v1beta10.CertificateSigningRequest, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockCertificateSigningRequestStatusWriter) PatchCertificateSigningRequestStatus(ctx context.Context, obj *v1beta10.CertificateSigningRequest, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -518,7 +518,7 @@ func (mr *MockCertificateSigningRequestClientMockRecorder) UpsertCertificateSign } // UpdateCertificateSigningRequestStatus mocks base method -func (m *MockCertificateSigningRequestClient) UpdateCertificateSigningRequestStatus(ctx context.Context, obj *v1beta10.CertificateSigningRequest, opts ...client.UpdateOption) error { +func (m *MockCertificateSigningRequestClient) UpdateCertificateSigningRequestStatus(ctx context.Context, obj *v1beta10.CertificateSigningRequest, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -537,7 +537,7 @@ func (mr *MockCertificateSigningRequestClientMockRecorder) UpdateCertificateSign } // PatchCertificateSigningRequestStatus mocks base method -func (m *MockCertificateSigningRequestClient) PatchCertificateSigningRequestStatus(ctx context.Context, obj *v1beta10.CertificateSigningRequest, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockCertificateSigningRequestClient) PatchCertificateSigningRequestStatus(ctx context.Context, obj *v1beta10.CertificateSigningRequest, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { diff --git a/pkg/multicluster/internal/k8s/core/v1/clients.go b/pkg/multicluster/internal/k8s/core/v1/clients.go index e1ad39e7d..ea5ea77b2 100644 --- a/pkg/multicluster/internal/k8s/core/v1/clients.go +++ b/pkg/multicluster/internal/k8s/core/v1/clients.go @@ -123,10 +123,10 @@ type SecretWriter interface { type SecretStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given Secret object. - UpdateSecretStatus(ctx context.Context, obj *v1.Secret, opts ...client.UpdateOption) error + UpdateSecretStatus(ctx context.Context, obj *v1.Secret, opts ...client.SubResourceUpdateOption) error // Patch patches the given Secret object's subresource. - PatchSecretStatus(ctx context.Context, obj *v1.Secret, patch client.Patch, opts ...client.PatchOption) error + PatchSecretStatus(ctx context.Context, obj *v1.Secret, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on Secrets. @@ -197,11 +197,11 @@ func (c *secretClient) UpsertSecret(ctx context.Context, obj *v1.Secret, transit return err } -func (c *secretClient) UpdateSecretStatus(ctx context.Context, obj *v1.Secret, opts ...client.UpdateOption) error { +func (c *secretClient) UpdateSecretStatus(ctx context.Context, obj *v1.Secret, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *secretClient) PatchSecretStatus(ctx context.Context, obj *v1.Secret, patch client.Patch, opts ...client.PatchOption) error { +func (c *secretClient) PatchSecretStatus(ctx context.Context, obj *v1.Secret, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } @@ -265,10 +265,10 @@ type ServiceAccountWriter interface { type ServiceAccountStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given ServiceAccount object. - UpdateServiceAccountStatus(ctx context.Context, obj *v1.ServiceAccount, opts ...client.UpdateOption) error + UpdateServiceAccountStatus(ctx context.Context, obj *v1.ServiceAccount, opts ...client.SubResourceUpdateOption) error // Patch patches the given ServiceAccount object's subresource. - PatchServiceAccountStatus(ctx context.Context, obj *v1.ServiceAccount, patch client.Patch, opts ...client.PatchOption) error + PatchServiceAccountStatus(ctx context.Context, obj *v1.ServiceAccount, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on ServiceAccounts. @@ -339,11 +339,11 @@ func (c *serviceAccountClient) UpsertServiceAccount(ctx context.Context, obj *v1 return err } -func (c *serviceAccountClient) UpdateServiceAccountStatus(ctx context.Context, obj *v1.ServiceAccount, opts ...client.UpdateOption) error { +func (c *serviceAccountClient) UpdateServiceAccountStatus(ctx context.Context, obj *v1.ServiceAccount, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *serviceAccountClient) PatchServiceAccountStatus(ctx context.Context, obj *v1.ServiceAccount, patch client.Patch, opts ...client.PatchOption) error { +func (c *serviceAccountClient) PatchServiceAccountStatus(ctx context.Context, obj *v1.ServiceAccount, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } @@ -407,10 +407,10 @@ type NamespaceWriter interface { type NamespaceStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given Namespace object. - UpdateNamespaceStatus(ctx context.Context, obj *v1.Namespace, opts ...client.UpdateOption) error + UpdateNamespaceStatus(ctx context.Context, obj *v1.Namespace, opts ...client.SubResourceUpdateOption) error // Patch patches the given Namespace object's subresource. - PatchNamespaceStatus(ctx context.Context, obj *v1.Namespace, patch client.Patch, opts ...client.PatchOption) error + PatchNamespaceStatus(ctx context.Context, obj *v1.Namespace, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on Namespaces. @@ -483,11 +483,11 @@ func (c *namespaceClient) UpsertNamespace(ctx context.Context, obj *v1.Namespace return err } -func (c *namespaceClient) UpdateNamespaceStatus(ctx context.Context, obj *v1.Namespace, opts ...client.UpdateOption) error { +func (c *namespaceClient) UpdateNamespaceStatus(ctx context.Context, obj *v1.Namespace, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *namespaceClient) PatchNamespaceStatus(ctx context.Context, obj *v1.Namespace, patch client.Patch, opts ...client.PatchOption) error { +func (c *namespaceClient) PatchNamespaceStatus(ctx context.Context, obj *v1.Namespace, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } diff --git a/pkg/multicluster/internal/k8s/core/v1/mocks/clients.go b/pkg/multicluster/internal/k8s/core/v1/mocks/clients.go index 5f7261dac..637ee2203 100644 --- a/pkg/multicluster/internal/k8s/core/v1/mocks/clients.go +++ b/pkg/multicluster/internal/k8s/core/v1/mocks/clients.go @@ -336,7 +336,7 @@ func (m *MockSecretStatusWriter) EXPECT() *MockSecretStatusWriterMockRecorder { } // UpdateSecretStatus mocks base method -func (m *MockSecretStatusWriter) UpdateSecretStatus(ctx context.Context, obj *v10.Secret, opts ...client.UpdateOption) error { +func (m *MockSecretStatusWriter) UpdateSecretStatus(ctx context.Context, obj *v10.Secret, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -355,7 +355,7 @@ func (mr *MockSecretStatusWriterMockRecorder) UpdateSecretStatus(ctx, obj interf } // PatchSecretStatus mocks base method -func (m *MockSecretStatusWriter) PatchSecretStatus(ctx context.Context, obj *v10.Secret, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockSecretStatusWriter) PatchSecretStatus(ctx context.Context, obj *v10.Secret, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -546,7 +546,7 @@ func (mr *MockSecretClientMockRecorder) UpsertSecret(ctx, obj interface{}, trans } // UpdateSecretStatus mocks base method -func (m *MockSecretClient) UpdateSecretStatus(ctx context.Context, obj *v10.Secret, opts ...client.UpdateOption) error { +func (m *MockSecretClient) UpdateSecretStatus(ctx context.Context, obj *v10.Secret, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -565,7 +565,7 @@ func (mr *MockSecretClientMockRecorder) UpdateSecretStatus(ctx, obj interface{}, } // PatchSecretStatus mocks base method -func (m *MockSecretClient) PatchSecretStatus(ctx context.Context, obj *v10.Secret, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockSecretClient) PatchSecretStatus(ctx context.Context, obj *v10.Secret, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -840,7 +840,7 @@ func (m *MockServiceAccountStatusWriter) EXPECT() *MockServiceAccountStatusWrite } // UpdateServiceAccountStatus mocks base method -func (m *MockServiceAccountStatusWriter) UpdateServiceAccountStatus(ctx context.Context, obj *v10.ServiceAccount, opts ...client.UpdateOption) error { +func (m *MockServiceAccountStatusWriter) UpdateServiceAccountStatus(ctx context.Context, obj *v10.ServiceAccount, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -859,7 +859,7 @@ func (mr *MockServiceAccountStatusWriterMockRecorder) UpdateServiceAccountStatus } // PatchServiceAccountStatus mocks base method -func (m *MockServiceAccountStatusWriter) PatchServiceAccountStatus(ctx context.Context, obj *v10.ServiceAccount, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockServiceAccountStatusWriter) PatchServiceAccountStatus(ctx context.Context, obj *v10.ServiceAccount, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -1050,7 +1050,7 @@ func (mr *MockServiceAccountClientMockRecorder) UpsertServiceAccount(ctx, obj in } // UpdateServiceAccountStatus mocks base method -func (m *MockServiceAccountClient) UpdateServiceAccountStatus(ctx context.Context, obj *v10.ServiceAccount, opts ...client.UpdateOption) error { +func (m *MockServiceAccountClient) UpdateServiceAccountStatus(ctx context.Context, obj *v10.ServiceAccount, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -1069,7 +1069,7 @@ func (mr *MockServiceAccountClientMockRecorder) UpdateServiceAccountStatus(ctx, } // PatchServiceAccountStatus mocks base method -func (m *MockServiceAccountClient) PatchServiceAccountStatus(ctx context.Context, obj *v10.ServiceAccount, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockServiceAccountClient) PatchServiceAccountStatus(ctx context.Context, obj *v10.ServiceAccount, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -1344,7 +1344,7 @@ func (m *MockNamespaceStatusWriter) EXPECT() *MockNamespaceStatusWriterMockRecor } // UpdateNamespaceStatus mocks base method -func (m *MockNamespaceStatusWriter) UpdateNamespaceStatus(ctx context.Context, obj *v10.Namespace, opts ...client.UpdateOption) error { +func (m *MockNamespaceStatusWriter) UpdateNamespaceStatus(ctx context.Context, obj *v10.Namespace, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -1363,7 +1363,7 @@ func (mr *MockNamespaceStatusWriterMockRecorder) UpdateNamespaceStatus(ctx, obj } // PatchNamespaceStatus mocks base method -func (m *MockNamespaceStatusWriter) PatchNamespaceStatus(ctx context.Context, obj *v10.Namespace, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockNamespaceStatusWriter) PatchNamespaceStatus(ctx context.Context, obj *v10.Namespace, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -1554,7 +1554,7 @@ func (mr *MockNamespaceClientMockRecorder) UpsertNamespace(ctx, obj interface{}, } // UpdateNamespaceStatus mocks base method -func (m *MockNamespaceClient) UpdateNamespaceStatus(ctx context.Context, obj *v10.Namespace, opts ...client.UpdateOption) error { +func (m *MockNamespaceClient) UpdateNamespaceStatus(ctx context.Context, obj *v10.Namespace, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -1573,7 +1573,7 @@ func (mr *MockNamespaceClientMockRecorder) UpdateNamespaceStatus(ctx, obj interf } // PatchNamespaceStatus mocks base method -func (m *MockNamespaceClient) PatchNamespaceStatus(ctx context.Context, obj *v10.Namespace, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockNamespaceClient) PatchNamespaceStatus(ctx context.Context, obj *v10.Namespace, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { diff --git a/pkg/multicluster/internal/k8s/rbac.authorization.k8s.io/v1/clients.go b/pkg/multicluster/internal/k8s/rbac.authorization.k8s.io/v1/clients.go index 111392a61..10b0b9aec 100644 --- a/pkg/multicluster/internal/k8s/rbac.authorization.k8s.io/v1/clients.go +++ b/pkg/multicluster/internal/k8s/rbac.authorization.k8s.io/v1/clients.go @@ -130,10 +130,10 @@ type RoleWriter interface { type RoleStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given Role object. - UpdateRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.Role, opts ...client.UpdateOption) error + UpdateRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.Role, opts ...client.SubResourceUpdateOption) error // Patch patches the given Role object's subresource. - PatchRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.Role, patch client.Patch, opts ...client.PatchOption) error + PatchRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.Role, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on Roles. @@ -204,11 +204,11 @@ func (c *roleClient) UpsertRole(ctx context.Context, obj *rbac_authorization_k8s return err } -func (c *roleClient) UpdateRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.Role, opts ...client.UpdateOption) error { +func (c *roleClient) UpdateRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.Role, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *roleClient) PatchRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.Role, patch client.Patch, opts ...client.PatchOption) error { +func (c *roleClient) PatchRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.Role, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } @@ -272,10 +272,10 @@ type RoleBindingWriter interface { type RoleBindingStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given RoleBinding object. - UpdateRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.RoleBinding, opts ...client.UpdateOption) error + UpdateRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.RoleBinding, opts ...client.SubResourceUpdateOption) error // Patch patches the given RoleBinding object's subresource. - PatchRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.RoleBinding, patch client.Patch, opts ...client.PatchOption) error + PatchRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.RoleBinding, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on RoleBindings. @@ -346,11 +346,11 @@ func (c *roleBindingClient) UpsertRoleBinding(ctx context.Context, obj *rbac_aut return err } -func (c *roleBindingClient) UpdateRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.RoleBinding, opts ...client.UpdateOption) error { +func (c *roleBindingClient) UpdateRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.RoleBinding, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *roleBindingClient) PatchRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.RoleBinding, patch client.Patch, opts ...client.PatchOption) error { +func (c *roleBindingClient) PatchRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.RoleBinding, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } @@ -414,10 +414,10 @@ type ClusterRoleWriter interface { type ClusterRoleStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given ClusterRole object. - UpdateClusterRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRole, opts ...client.UpdateOption) error + UpdateClusterRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRole, opts ...client.SubResourceUpdateOption) error // Patch patches the given ClusterRole object's subresource. - PatchClusterRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRole, patch client.Patch, opts ...client.PatchOption) error + PatchClusterRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRole, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on ClusterRoles. @@ -490,11 +490,11 @@ func (c *clusterRoleClient) UpsertClusterRole(ctx context.Context, obj *rbac_aut return err } -func (c *clusterRoleClient) UpdateClusterRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRole, opts ...client.UpdateOption) error { +func (c *clusterRoleClient) UpdateClusterRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRole, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *clusterRoleClient) PatchClusterRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRole, patch client.Patch, opts ...client.PatchOption) error { +func (c *clusterRoleClient) PatchClusterRoleStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRole, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } @@ -558,10 +558,10 @@ type ClusterRoleBindingWriter interface { type ClusterRoleBindingStatusWriter interface { // Update updates the fields corresponding to the status subresource for the // given ClusterRoleBinding object. - UpdateClusterRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRoleBinding, opts ...client.UpdateOption) error + UpdateClusterRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRoleBinding, opts ...client.SubResourceUpdateOption) error // Patch patches the given ClusterRoleBinding object's subresource. - PatchClusterRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRoleBinding, patch client.Patch, opts ...client.PatchOption) error + PatchClusterRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRoleBinding, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on ClusterRoleBindings. @@ -634,11 +634,11 @@ func (c *clusterRoleBindingClient) UpsertClusterRoleBinding(ctx context.Context, return err } -func (c *clusterRoleBindingClient) UpdateClusterRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRoleBinding, opts ...client.UpdateOption) error { +func (c *clusterRoleBindingClient) UpdateClusterRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRoleBinding, opts ...client.SubResourceUpdateOption) error { return c.client.Status().Update(ctx, obj, opts...) } -func (c *clusterRoleBindingClient) PatchClusterRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRoleBinding, patch client.Patch, opts ...client.PatchOption) error { +func (c *clusterRoleBindingClient) PatchClusterRoleBindingStatus(ctx context.Context, obj *rbac_authorization_k8s_io_v1.ClusterRoleBinding, patch client.Patch, opts ...client.SubResourcePatchOption) error { return c.client.Status().Patch(ctx, obj, patch, opts...) } diff --git a/pkg/multicluster/internal/k8s/rbac.authorization.k8s.io/v1/mocks/clients.go b/pkg/multicluster/internal/k8s/rbac.authorization.k8s.io/v1/mocks/clients.go index 249ac6a76..8233c4d9f 100644 --- a/pkg/multicluster/internal/k8s/rbac.authorization.k8s.io/v1/mocks/clients.go +++ b/pkg/multicluster/internal/k8s/rbac.authorization.k8s.io/v1/mocks/clients.go @@ -350,7 +350,7 @@ func (m *MockRoleStatusWriter) EXPECT() *MockRoleStatusWriterMockRecorder { } // UpdateRoleStatus mocks base method -func (m *MockRoleStatusWriter) UpdateRoleStatus(ctx context.Context, obj *v10.Role, opts ...client.UpdateOption) error { +func (m *MockRoleStatusWriter) UpdateRoleStatus(ctx context.Context, obj *v10.Role, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -369,7 +369,7 @@ func (mr *MockRoleStatusWriterMockRecorder) UpdateRoleStatus(ctx, obj interface{ } // PatchRoleStatus mocks base method -func (m *MockRoleStatusWriter) PatchRoleStatus(ctx context.Context, obj *v10.Role, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockRoleStatusWriter) PatchRoleStatus(ctx context.Context, obj *v10.Role, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -560,7 +560,7 @@ func (mr *MockRoleClientMockRecorder) UpsertRole(ctx, obj interface{}, transitio } // UpdateRoleStatus mocks base method -func (m *MockRoleClient) UpdateRoleStatus(ctx context.Context, obj *v10.Role, opts ...client.UpdateOption) error { +func (m *MockRoleClient) UpdateRoleStatus(ctx context.Context, obj *v10.Role, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -579,7 +579,7 @@ func (mr *MockRoleClientMockRecorder) UpdateRoleStatus(ctx, obj interface{}, opt } // PatchRoleStatus mocks base method -func (m *MockRoleClient) PatchRoleStatus(ctx context.Context, obj *v10.Role, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockRoleClient) PatchRoleStatus(ctx context.Context, obj *v10.Role, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -854,7 +854,7 @@ func (m *MockRoleBindingStatusWriter) EXPECT() *MockRoleBindingStatusWriterMockR } // UpdateRoleBindingStatus mocks base method -func (m *MockRoleBindingStatusWriter) UpdateRoleBindingStatus(ctx context.Context, obj *v10.RoleBinding, opts ...client.UpdateOption) error { +func (m *MockRoleBindingStatusWriter) UpdateRoleBindingStatus(ctx context.Context, obj *v10.RoleBinding, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -873,7 +873,7 @@ func (mr *MockRoleBindingStatusWriterMockRecorder) UpdateRoleBindingStatus(ctx, } // PatchRoleBindingStatus mocks base method -func (m *MockRoleBindingStatusWriter) PatchRoleBindingStatus(ctx context.Context, obj *v10.RoleBinding, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockRoleBindingStatusWriter) PatchRoleBindingStatus(ctx context.Context, obj *v10.RoleBinding, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -1064,7 +1064,7 @@ func (mr *MockRoleBindingClientMockRecorder) UpsertRoleBinding(ctx, obj interfac } // UpdateRoleBindingStatus mocks base method -func (m *MockRoleBindingClient) UpdateRoleBindingStatus(ctx context.Context, obj *v10.RoleBinding, opts ...client.UpdateOption) error { +func (m *MockRoleBindingClient) UpdateRoleBindingStatus(ctx context.Context, obj *v10.RoleBinding, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -1083,7 +1083,7 @@ func (mr *MockRoleBindingClientMockRecorder) UpdateRoleBindingStatus(ctx, obj in } // PatchRoleBindingStatus mocks base method -func (m *MockRoleBindingClient) PatchRoleBindingStatus(ctx context.Context, obj *v10.RoleBinding, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockRoleBindingClient) PatchRoleBindingStatus(ctx context.Context, obj *v10.RoleBinding, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -1358,7 +1358,7 @@ func (m *MockClusterRoleStatusWriter) EXPECT() *MockClusterRoleStatusWriterMockR } // UpdateClusterRoleStatus mocks base method -func (m *MockClusterRoleStatusWriter) UpdateClusterRoleStatus(ctx context.Context, obj *v10.ClusterRole, opts ...client.UpdateOption) error { +func (m *MockClusterRoleStatusWriter) UpdateClusterRoleStatus(ctx context.Context, obj *v10.ClusterRole, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -1377,7 +1377,7 @@ func (mr *MockClusterRoleStatusWriterMockRecorder) UpdateClusterRoleStatus(ctx, } // PatchClusterRoleStatus mocks base method -func (m *MockClusterRoleStatusWriter) PatchClusterRoleStatus(ctx context.Context, obj *v10.ClusterRole, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockClusterRoleStatusWriter) PatchClusterRoleStatus(ctx context.Context, obj *v10.ClusterRole, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -1568,7 +1568,7 @@ func (mr *MockClusterRoleClientMockRecorder) UpsertClusterRole(ctx, obj interfac } // UpdateClusterRoleStatus mocks base method -func (m *MockClusterRoleClient) UpdateClusterRoleStatus(ctx context.Context, obj *v10.ClusterRole, opts ...client.UpdateOption) error { +func (m *MockClusterRoleClient) UpdateClusterRoleStatus(ctx context.Context, obj *v10.ClusterRole, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -1587,7 +1587,7 @@ func (mr *MockClusterRoleClientMockRecorder) UpdateClusterRoleStatus(ctx, obj in } // PatchClusterRoleStatus mocks base method -func (m *MockClusterRoleClient) PatchClusterRoleStatus(ctx context.Context, obj *v10.ClusterRole, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockClusterRoleClient) PatchClusterRoleStatus(ctx context.Context, obj *v10.ClusterRole, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -1862,7 +1862,7 @@ func (m *MockClusterRoleBindingStatusWriter) EXPECT() *MockClusterRoleBindingSta } // UpdateClusterRoleBindingStatus mocks base method -func (m *MockClusterRoleBindingStatusWriter) UpdateClusterRoleBindingStatus(ctx context.Context, obj *v10.ClusterRoleBinding, opts ...client.UpdateOption) error { +func (m *MockClusterRoleBindingStatusWriter) UpdateClusterRoleBindingStatus(ctx context.Context, obj *v10.ClusterRoleBinding, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -1881,7 +1881,7 @@ func (mr *MockClusterRoleBindingStatusWriterMockRecorder) UpdateClusterRoleBindi } // PatchClusterRoleBindingStatus mocks base method -func (m *MockClusterRoleBindingStatusWriter) PatchClusterRoleBindingStatus(ctx context.Context, obj *v10.ClusterRoleBinding, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockClusterRoleBindingStatusWriter) PatchClusterRoleBindingStatus(ctx context.Context, obj *v10.ClusterRoleBinding, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { @@ -2072,7 +2072,7 @@ func (mr *MockClusterRoleBindingClientMockRecorder) UpsertClusterRoleBinding(ctx } // UpdateClusterRoleBindingStatus mocks base method -func (m *MockClusterRoleBindingClient) UpdateClusterRoleBindingStatus(ctx context.Context, obj *v10.ClusterRoleBinding, opts ...client.UpdateOption) error { +func (m *MockClusterRoleBindingClient) UpdateClusterRoleBindingStatus(ctx context.Context, obj *v10.ClusterRoleBinding, opts ...client.SubResourceUpdateOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj} for _, a := range opts { @@ -2091,7 +2091,7 @@ func (mr *MockClusterRoleBindingClientMockRecorder) UpdateClusterRoleBindingStat } // PatchClusterRoleBindingStatus mocks base method -func (m *MockClusterRoleBindingClient) PatchClusterRoleBindingStatus(ctx context.Context, obj *v10.ClusterRoleBinding, patch client.Patch, opts ...client.PatchOption) error { +func (m *MockClusterRoleBindingClient) PatchClusterRoleBindingStatus(ctx context.Context, obj *v10.ClusterRoleBinding, patch client.Patch, opts ...client.SubResourcePatchOption) error { m.ctrl.T.Helper() varargs := []interface{}{ctx, obj, patch} for _, a := range opts { diff --git a/pkg/resource/mocks/client.go b/pkg/resource/mocks/client.go index 621022612..44cad5d31 100644 --- a/pkg/resource/mocks/client.go +++ b/pkg/resource/mocks/client.go @@ -171,10 +171,10 @@ func (mr *MockClientMockRecorder) DeleteAllOf(ctx, obj interface{}, opts ...inte } // Status mocks base method -func (m *MockClient) Status() client.StatusWriter { +func (m *MockClient) Status() client.SubResourceWriter { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Status") - ret0, _ := ret[0].(client.StatusWriter) + ret0, _ := ret[0].(client.SubResourceWriter) return ret0 } @@ -184,6 +184,20 @@ func (mr *MockClientMockRecorder) Status() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Status", reflect.TypeOf((*MockClient)(nil).Status)) } +// SubResource mocks base method +func (m *MockClient) SubResource(subResource string) client.SubResourceClient { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SubResource", subResource) + ret0, _ := ret[0].(client.SubResourceClient) + return ret0 +} + +// SubResource indicates an expected call of SubResource +func (mr *MockClientMockRecorder) SubResource(subResource interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubResource", reflect.TypeOf((*MockClient)(nil).SubResource), subResource) +} + // Scheme mocks base method func (m *MockClient) Scheme() *runtime.Scheme { m.ctrl.T.Helper() diff --git a/pkg/verifier/mocks/discovery.go b/pkg/verifier/mocks/discovery.go index 2c9330dd7..203dffb6a 100644 --- a/pkg/verifier/mocks/discovery.go +++ b/pkg/verifier/mocks/discovery.go @@ -11,6 +11,7 @@ import ( openapi_v2 "github.com/google/gnostic/openapiv2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" version "k8s.io/apimachinery/pkg/version" + discovery "k8s.io/client-go/discovery" openapi "k8s.io/client-go/openapi" rest "k8s.io/client-go/rest" ) @@ -171,3 +172,17 @@ func (mr *MockDiscoveryInterfaceMockRecorder) ServerVersion() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ServerVersion", reflect.TypeOf((*MockDiscoveryInterface)(nil).ServerVersion)) } + +// WithLegacy mocks base method +func (m *MockDiscoveryInterface) WithLegacy() discovery.DiscoveryInterface { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "WithLegacy") + ret0, _ := ret[0].(discovery.DiscoveryInterface) + return ret0 +} + +// WithLegacy indicates an expected call of WithLegacy +func (mr *MockDiscoveryInterfaceMockRecorder) WithLegacy() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithLegacy", reflect.TypeOf((*MockDiscoveryInterface)(nil).WithLegacy)) +} From efc21490dc334359fdeba6165669d2b27265584d Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Tue, 21 Feb 2023 20:47:09 +0000 Subject: [PATCH 03/17] syntax error fix --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1b3f04cd6..1cbe1e237 100644 --- a/Makefile +++ b/Makefile @@ -31,10 +31,10 @@ install-protoc: if [ $(shell ${DEPSGOBIN}/protoc --version | grep -c ${PROTOC_VERSION}) -ne 0 ]; then \ echo expected protoc version ${PROTOC_VERSION} already installed ;\ else \ - if [ "$(shell uname)" == "Darwin" ]; then \ + if [ "$(shell uname)" = "Darwin" ]; then \ echo "downloading protoc for osx" ;\ wget $(PROTOC_URL)-osx-x86_64.zip -O $(DEPSGOBIN)/protoc-${PROTOC_VERSION}.zip ;\ - elif [ "$(shell uname -m)" == "aarch64" ]; then \ + elif [ "$(shell uname -m)" = "aarch64" ]; then \ echo "downloading protoc for linux aarch64" ;\ wget $(PROTOC_URL)-linux-aarch_64.zip -O $(DEPSGOBIN)/protoc-${PROTOC_VERSION}.zip ;\ else \ From 259f109c108cac47d0275041256ceb8e61a9e940 Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Tue, 21 Feb 2023 20:53:50 +0000 Subject: [PATCH 04/17] changelog --- changelog/v0.28.0/update-controller-runtime.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 changelog/v0.28.0/update-controller-runtime.yaml diff --git a/changelog/v0.28.0/update-controller-runtime.yaml b/changelog/v0.28.0/update-controller-runtime.yaml new file mode 100644 index 000000000..84f3c7612 --- /dev/null +++ b/changelog/v0.28.0/update-controller-runtime.yaml @@ -0,0 +1,8 @@ +changelog: + - type: BREAKING_CHANGE + description: Update Status API signature to comply with controller-runtime v0.14.x API breakage + issueLink: https://github.com/solo-io/skv2/issues/419 + - type: DEPENDENCY_BUMP + description: Bump controller-runtime to v0.14.x, and associated dependencies. + issueLink: https://github.com/solo-io/skv2/issues/419 + From d30fb5bdd447cc2081d308e9f1c1ef33b3b93966 Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Tue, 21 Feb 2023 20:59:15 +0000 Subject: [PATCH 05/17] undo go 1.19 fmt changes --- codegen/test/api/things.test.io/v1/clients.go | 349 +++++----- .../v1/controller/event_handlers.go | 244 +++---- .../v1/controller/multicluster_reconcilers.go | 2 - .../v1/controller/reconcilers.go | 228 ++++--- .../test/api/things.test.io/v1/json.gen.go | 17 +- .../api/things.test.io/v1/proto_deepcopy.go | 47 +- .../v1/providers/client_providers.go | 50 +- .../test/api/things.test.io/v1/register.go | 19 +- .../test/api/things.test.io/v1/sets/sets.go | 610 +++++++++--------- .../test/api/things.test.io/v1/test_api.pb.go | 5 +- .../api/things.test.io/v1/type_helpers.go | 3 - codegen/test/api/things.test.io/v1/types.go | 51 +- .../v1/zz_generated.deepcopy.go | 151 +++-- pkg/api/core.skv2.solo.io/v1/core.pb.go | 5 +- .../v1alpha1/cluster.pb.go | 5 +- 15 files changed, 886 insertions(+), 900 deletions(-) diff --git a/codegen/test/api/things.test.io/v1/clients.go b/codegen/test/api/things.test.io/v1/clients.go index 1f54aadb5..9f7c889c8 100644 --- a/codegen/test/api/things.test.io/v1/clients.go +++ b/codegen/test/api/things.test.io/v1/clients.go @@ -4,89 +4,86 @@ package v1 - - - import ( - "context" - - "github.com/solo-io/skv2/pkg/controllerutils" - "github.com/solo-io/skv2/pkg/multicluster" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" + "context" + + "github.com/solo-io/skv2/pkg/controllerutils" + "github.com/solo-io/skv2/pkg/multicluster" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" + "sigs.k8s.io/controller-runtime/pkg/client" ) // MulticlusterClientset for the things.test.io/v1 APIs type MulticlusterClientset interface { - // Cluster returns a Clientset for the given cluster - Cluster(cluster string) (Clientset, error) + // Cluster returns a Clientset for the given cluster + Cluster(cluster string) (Clientset, error) } type multiclusterClientset struct { - client multicluster.Client + client multicluster.Client } func NewMulticlusterClientset(client multicluster.Client) MulticlusterClientset { - return &multiclusterClientset{client: client} + return &multiclusterClientset{client: client} } func (m *multiclusterClientset) Cluster(cluster string) (Clientset, error) { - client, err := m.client.Cluster(cluster) - if err != nil { - return nil, err - } - return NewClientset(client), nil + client, err := m.client.Cluster(cluster) + if err != nil { + return nil, err + } + return NewClientset(client), nil } // clienset for the things.test.io/v1 APIs type Clientset interface { - // clienset for the things.test.io/v1/v1 APIs - Paints() PaintClient - // clienset for the things.test.io/v1/v1 APIs - ClusterResources() ClusterResourceClient + // clienset for the things.test.io/v1/v1 APIs + Paints() PaintClient + // clienset for the things.test.io/v1/v1 APIs + ClusterResources() ClusterResourceClient } type clientSet struct { - client client.Client + client client.Client } func NewClientsetFromConfig(cfg *rest.Config) (Clientset, error) { - scheme := scheme.Scheme - if err := SchemeBuilder.AddToScheme(scheme); err != nil{ - return nil, err - } - client, err := client.New(cfg, client.Options{ - Scheme: scheme, - }) - if err != nil { - return nil, err - } - return NewClientset(client), nil + scheme := scheme.Scheme + if err := SchemeBuilder.AddToScheme(scheme); err != nil { + return nil, err + } + client, err := client.New(cfg, client.Options{ + Scheme: scheme, + }) + if err != nil { + return nil, err + } + return NewClientset(client), nil } func NewClientset(client client.Client) Clientset { - return &clientSet{client: client} + return &clientSet{client: client} } // clienset for the things.test.io/v1/v1 APIs func (c *clientSet) Paints() PaintClient { - return NewPaintClient(c.client) + return NewPaintClient(c.client) } // clienset for the things.test.io/v1/v1 APIs func (c *clientSet) ClusterResources() ClusterResourceClient { - return NewClusterResourceClient(c.client) + return NewClusterResourceClient(c.client) } // Reader knows how to read and list Paints. type PaintReader interface { - // Get retrieves a Paint for the given object key - GetPaint(ctx context.Context, key client.ObjectKey) (*Paint, error) + // Get retrieves a Paint for the given object key + GetPaint(ctx context.Context, key client.ObjectKey) (*Paint, error) - // List retrieves list of Paints for a given namespace and list options. - ListPaint(ctx context.Context, opts ...client.ListOption) (*PaintList, error) + // List retrieves list of Paints for a given namespace and list options. + ListPaint(ctx context.Context, opts ...client.ListOption) (*PaintList, error) } // PaintTransitionFunction instructs the PaintWriter how to transition between an existing @@ -95,142 +92,140 @@ type PaintTransitionFunction func(existing, desired *Paint) error // Writer knows how to create, delete, and update Paints. type PaintWriter interface { - // Create saves the Paint object. - CreatePaint(ctx context.Context, obj *Paint, opts ...client.CreateOption) error + // Create saves the Paint object. + CreatePaint(ctx context.Context, obj *Paint, opts ...client.CreateOption) error - // Delete deletes the Paint object. - DeletePaint(ctx context.Context, key client.ObjectKey, opts ...client.DeleteOption) error + // Delete deletes the Paint object. + DeletePaint(ctx context.Context, key client.ObjectKey, opts ...client.DeleteOption) error - // Update updates the given Paint object. - UpdatePaint(ctx context.Context, obj *Paint, opts ...client.UpdateOption) error + // Update updates the given Paint object. + UpdatePaint(ctx context.Context, obj *Paint, opts ...client.UpdateOption) error - // Patch patches the given Paint object. - PatchPaint(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.PatchOption) error + // Patch patches the given Paint object. + PatchPaint(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.PatchOption) error - // DeleteAllOf deletes all Paint objects matching the given options. - DeleteAllOfPaint(ctx context.Context, opts ...client.DeleteAllOfOption) error + // DeleteAllOf deletes all Paint objects matching the given options. + DeleteAllOfPaint(ctx context.Context, opts ...client.DeleteAllOfOption) error - // Create or Update the Paint object. - UpsertPaint(ctx context.Context, obj *Paint, transitionFuncs ...PaintTransitionFunction) error + // Create or Update the Paint object. + UpsertPaint(ctx context.Context, obj *Paint, transitionFuncs ...PaintTransitionFunction) error } // StatusWriter knows how to update status subresource of a Paint object. type PaintStatusWriter interface { - // Update updates the fields corresponding to the status subresource for the - // given Paint object. - UpdatePaintStatus(ctx context.Context, obj *Paint, opts ...client.SubResourceUpdateOption) error + // Update updates the fields corresponding to the status subresource for the + // given Paint object. + UpdatePaintStatus(ctx context.Context, obj *Paint, opts ...client.SubResourceUpdateOption) error - // Patch patches the given Paint object's subresource. - PatchPaintStatus(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.SubResourcePatchOption) error + // Patch patches the given Paint object's subresource. + PatchPaintStatus(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on Paints. type PaintClient interface { - PaintReader - PaintWriter - PaintStatusWriter + PaintReader + PaintWriter + PaintStatusWriter } type paintClient struct { - client client.Client + client client.Client } func NewPaintClient(client client.Client) *paintClient { - return &paintClient{client: client} + return &paintClient{client: client} } - func (c *paintClient) GetPaint(ctx context.Context, key client.ObjectKey) (*Paint, error) { - obj := &Paint{} - if err := c.client.Get(ctx, key, obj); err != nil { - return nil, err - } - return obj, nil + obj := &Paint{} + if err := c.client.Get(ctx, key, obj); err != nil { + return nil, err + } + return obj, nil } func (c *paintClient) ListPaint(ctx context.Context, opts ...client.ListOption) (*PaintList, error) { - list := &PaintList{} - if err := c.client.List(ctx, list, opts...); err != nil { - return nil, err - } - return list, nil + list := &PaintList{} + if err := c.client.List(ctx, list, opts...); err != nil { + return nil, err + } + return list, nil } func (c *paintClient) CreatePaint(ctx context.Context, obj *Paint, opts ...client.CreateOption) error { - return c.client.Create(ctx, obj, opts...) + return c.client.Create(ctx, obj, opts...) } - func (c *paintClient) DeletePaint(ctx context.Context, key client.ObjectKey, opts ...client.DeleteOption) error { - obj := &Paint{} - obj.SetName(key.Name) - obj.SetNamespace(key.Namespace) - return c.client.Delete(ctx, obj, opts...) + obj := &Paint{} + obj.SetName(key.Name) + obj.SetNamespace(key.Namespace) + return c.client.Delete(ctx, obj, opts...) } func (c *paintClient) UpdatePaint(ctx context.Context, obj *Paint, opts ...client.UpdateOption) error { - return c.client.Update(ctx, obj, opts...) + return c.client.Update(ctx, obj, opts...) } func (c *paintClient) PatchPaint(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.PatchOption) error { - return c.client.Patch(ctx, obj, patch, opts...) + return c.client.Patch(ctx, obj, patch, opts...) } func (c *paintClient) DeleteAllOfPaint(ctx context.Context, opts ...client.DeleteAllOfOption) error { - obj := &Paint{} - return c.client.DeleteAllOf(ctx, obj, opts...) + obj := &Paint{} + return c.client.DeleteAllOf(ctx, obj, opts...) } func (c *paintClient) UpsertPaint(ctx context.Context, obj *Paint, transitionFuncs ...PaintTransitionFunction) error { - genericTxFunc := func(existing, desired runtime.Object) error { - for _, txFunc := range transitionFuncs { - if err := txFunc(existing.(*Paint), desired.(*Paint)); err != nil { - return err - } - } - return nil - } - _, err := controllerutils.Upsert(ctx, c.client, obj, genericTxFunc) - return err + genericTxFunc := func(existing, desired runtime.Object) error { + for _, txFunc := range transitionFuncs { + if err := txFunc(existing.(*Paint), desired.(*Paint)); err != nil { + return err + } + } + return nil + } + _, err := controllerutils.Upsert(ctx, c.client, obj, genericTxFunc) + return err } func (c *paintClient) UpdatePaintStatus(ctx context.Context, obj *Paint, opts ...client.SubResourceUpdateOption) error { - return c.client.Status().Update(ctx, obj, opts...) + return c.client.Status().Update(ctx, obj, opts...) } func (c *paintClient) PatchPaintStatus(ctx context.Context, obj *Paint, patch client.Patch, opts ...client.SubResourcePatchOption) error { - return c.client.Status().Patch(ctx, obj, patch, opts...) + return c.client.Status().Patch(ctx, obj, patch, opts...) } // Provides PaintClients for multiple clusters. type MulticlusterPaintClient interface { - // Cluster returns a PaintClient for the given cluster - Cluster(cluster string) (PaintClient, error) + // Cluster returns a PaintClient for the given cluster + Cluster(cluster string) (PaintClient, error) } type multiclusterPaintClient struct { - client multicluster.Client + client multicluster.Client } func NewMulticlusterPaintClient(client multicluster.Client) MulticlusterPaintClient { - return &multiclusterPaintClient{client: client} + return &multiclusterPaintClient{client: client} } func (m *multiclusterPaintClient) Cluster(cluster string) (PaintClient, error) { - client, err := m.client.Cluster(cluster) - if err != nil { - return nil, err - } - return NewPaintClient(client), nil + client, err := m.client.Cluster(cluster) + if err != nil { + return nil, err + } + return NewPaintClient(client), nil } // Reader knows how to read and list ClusterResources. type ClusterResourceReader interface { - // Get retrieves a ClusterResource for the given object key - GetClusterResource(ctx context.Context, name string) (*ClusterResource, error) + // Get retrieves a ClusterResource for the given object key + GetClusterResource(ctx context.Context, name string) (*ClusterResource, error) - // List retrieves list of ClusterResources for a given namespace and list options. - ListClusterResource(ctx context.Context, opts ...client.ListOption) (*ClusterResourceList, error) + // List retrieves list of ClusterResources for a given namespace and list options. + ListClusterResource(ctx context.Context, opts ...client.ListOption) (*ClusterResourceList, error) } // ClusterResourceTransitionFunction instructs the ClusterResourceWriter how to transition between an existing @@ -239,133 +234,131 @@ type ClusterResourceTransitionFunction func(existing, desired *ClusterResource) // Writer knows how to create, delete, and update ClusterResources. type ClusterResourceWriter interface { - // Create saves the ClusterResource object. - CreateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.CreateOption) error + // Create saves the ClusterResource object. + CreateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.CreateOption) error - // Delete deletes the ClusterResource object. - DeleteClusterResource(ctx context.Context, name string, opts ...client.DeleteOption) error + // Delete deletes the ClusterResource object. + DeleteClusterResource(ctx context.Context, name string, opts ...client.DeleteOption) error - // Update updates the given ClusterResource object. - UpdateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.UpdateOption) error + // Update updates the given ClusterResource object. + UpdateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.UpdateOption) error - // Patch patches the given ClusterResource object. - PatchClusterResource(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.PatchOption) error + // Patch patches the given ClusterResource object. + PatchClusterResource(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.PatchOption) error - // DeleteAllOf deletes all ClusterResource objects matching the given options. - DeleteAllOfClusterResource(ctx context.Context, opts ...client.DeleteAllOfOption) error + // DeleteAllOf deletes all ClusterResource objects matching the given options. + DeleteAllOfClusterResource(ctx context.Context, opts ...client.DeleteAllOfOption) error - // Create or Update the ClusterResource object. - UpsertClusterResource(ctx context.Context, obj *ClusterResource, transitionFuncs ...ClusterResourceTransitionFunction) error + // Create or Update the ClusterResource object. + UpsertClusterResource(ctx context.Context, obj *ClusterResource, transitionFuncs ...ClusterResourceTransitionFunction) error } // StatusWriter knows how to update status subresource of a ClusterResource object. type ClusterResourceStatusWriter interface { - // Update updates the fields corresponding to the status subresource for the - // given ClusterResource object. - UpdateClusterResourceStatus(ctx context.Context, obj *ClusterResource, opts ...client.SubResourceUpdateOption) error + // Update updates the fields corresponding to the status subresource for the + // given ClusterResource object. + UpdateClusterResourceStatus(ctx context.Context, obj *ClusterResource, opts ...client.SubResourceUpdateOption) error - // Patch patches the given ClusterResource object's subresource. - PatchClusterResourceStatus(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.SubResourcePatchOption) error + // Patch patches the given ClusterResource object's subresource. + PatchClusterResourceStatus(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.SubResourcePatchOption) error } // Client knows how to perform CRUD operations on ClusterResources. type ClusterResourceClient interface { - ClusterResourceReader - ClusterResourceWriter - ClusterResourceStatusWriter + ClusterResourceReader + ClusterResourceWriter + ClusterResourceStatusWriter } type clusterResourceClient struct { - client client.Client + client client.Client } func NewClusterResourceClient(client client.Client) *clusterResourceClient { - return &clusterResourceClient{client: client} + return &clusterResourceClient{client: client} } - func (c *clusterResourceClient) GetClusterResource(ctx context.Context, name string) (*ClusterResource, error) { - obj := &ClusterResource{} - key := client.ObjectKey{ - Name: name, - } - if err := c.client.Get(ctx, key, obj); err != nil { - return nil, err - } - return obj, nil + obj := &ClusterResource{} + key := client.ObjectKey{ + Name: name, + } + if err := c.client.Get(ctx, key, obj); err != nil { + return nil, err + } + return obj, nil } func (c *clusterResourceClient) ListClusterResource(ctx context.Context, opts ...client.ListOption) (*ClusterResourceList, error) { - list := &ClusterResourceList{} - if err := c.client.List(ctx, list, opts...); err != nil { - return nil, err - } - return list, nil + list := &ClusterResourceList{} + if err := c.client.List(ctx, list, opts...); err != nil { + return nil, err + } + return list, nil } func (c *clusterResourceClient) CreateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.CreateOption) error { - return c.client.Create(ctx, obj, opts...) + return c.client.Create(ctx, obj, opts...) } - func (c *clusterResourceClient) DeleteClusterResource(ctx context.Context, name string, opts ...client.DeleteOption) error { - obj := &ClusterResource{} - obj.SetName(name) - return c.client.Delete(ctx, obj, opts...) + obj := &ClusterResource{} + obj.SetName(name) + return c.client.Delete(ctx, obj, opts...) } func (c *clusterResourceClient) UpdateClusterResource(ctx context.Context, obj *ClusterResource, opts ...client.UpdateOption) error { - return c.client.Update(ctx, obj, opts...) + return c.client.Update(ctx, obj, opts...) } func (c *clusterResourceClient) PatchClusterResource(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.PatchOption) error { - return c.client.Patch(ctx, obj, patch, opts...) + return c.client.Patch(ctx, obj, patch, opts...) } func (c *clusterResourceClient) DeleteAllOfClusterResource(ctx context.Context, opts ...client.DeleteAllOfOption) error { - obj := &ClusterResource{} - return c.client.DeleteAllOf(ctx, obj, opts...) + obj := &ClusterResource{} + return c.client.DeleteAllOf(ctx, obj, opts...) } func (c *clusterResourceClient) UpsertClusterResource(ctx context.Context, obj *ClusterResource, transitionFuncs ...ClusterResourceTransitionFunction) error { - genericTxFunc := func(existing, desired runtime.Object) error { - for _, txFunc := range transitionFuncs { - if err := txFunc(existing.(*ClusterResource), desired.(*ClusterResource)); err != nil { - return err - } - } - return nil - } - _, err := controllerutils.Upsert(ctx, c.client, obj, genericTxFunc) - return err + genericTxFunc := func(existing, desired runtime.Object) error { + for _, txFunc := range transitionFuncs { + if err := txFunc(existing.(*ClusterResource), desired.(*ClusterResource)); err != nil { + return err + } + } + return nil + } + _, err := controllerutils.Upsert(ctx, c.client, obj, genericTxFunc) + return err } func (c *clusterResourceClient) UpdateClusterResourceStatus(ctx context.Context, obj *ClusterResource, opts ...client.SubResourceUpdateOption) error { - return c.client.Status().Update(ctx, obj, opts...) + return c.client.Status().Update(ctx, obj, opts...) } func (c *clusterResourceClient) PatchClusterResourceStatus(ctx context.Context, obj *ClusterResource, patch client.Patch, opts ...client.SubResourcePatchOption) error { - return c.client.Status().Patch(ctx, obj, patch, opts...) + return c.client.Status().Patch(ctx, obj, patch, opts...) } // Provides ClusterResourceClients for multiple clusters. type MulticlusterClusterResourceClient interface { - // Cluster returns a ClusterResourceClient for the given cluster - Cluster(cluster string) (ClusterResourceClient, error) + // Cluster returns a ClusterResourceClient for the given cluster + Cluster(cluster string) (ClusterResourceClient, error) } type multiclusterClusterResourceClient struct { - client multicluster.Client + client multicluster.Client } func NewMulticlusterClusterResourceClient(client multicluster.Client) MulticlusterClusterResourceClient { - return &multiclusterClusterResourceClient{client: client} + return &multiclusterClusterResourceClient{client: client} } func (m *multiclusterClusterResourceClient) Cluster(cluster string) (ClusterResourceClient, error) { - client, err := m.client.Cluster(cluster) - if err != nil { - return nil, err - } - return NewClusterResourceClient(client), nil -} \ No newline at end of file + client, err := m.client.Cluster(cluster) + if err != nil { + return nil, err + } + return NewClusterResourceClient(client), nil +} diff --git a/codegen/test/api/things.test.io/v1/controller/event_handlers.go b/codegen/test/api/things.test.io/v1/controller/event_handlers.go index 066691b25..3c52ed1f6 100644 --- a/codegen/test/api/things.test.io/v1/controller/event_handlers.go +++ b/codegen/test/api/things.test.io/v1/controller/event_handlers.go @@ -8,225 +8,225 @@ package controller import ( "context" - things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" + things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" - "github.com/pkg/errors" - "github.com/solo-io/skv2/pkg/events" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/predicate" - "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/pkg/errors" + "github.com/solo-io/skv2/pkg/events" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/predicate" ) // Handle events for the Paint Resource // DEPRECATED: Prefer reconciler pattern. type PaintEventHandler interface { - CreatePaint(obj *things_test_io_v1.Paint) error - UpdatePaint(old, new *things_test_io_v1.Paint) error - DeletePaint(obj *things_test_io_v1.Paint) error - GenericPaint(obj *things_test_io_v1.Paint) error + CreatePaint(obj *things_test_io_v1.Paint) error + UpdatePaint(old, new *things_test_io_v1.Paint) error + DeletePaint(obj *things_test_io_v1.Paint) error + GenericPaint(obj *things_test_io_v1.Paint) error } type PaintEventHandlerFuncs struct { - OnCreate func(obj *things_test_io_v1.Paint) error - OnUpdate func(old, new *things_test_io_v1.Paint) error - OnDelete func(obj *things_test_io_v1.Paint) error - OnGeneric func(obj *things_test_io_v1.Paint) error + OnCreate func(obj *things_test_io_v1.Paint) error + OnUpdate func(old, new *things_test_io_v1.Paint) error + OnDelete func(obj *things_test_io_v1.Paint) error + OnGeneric func(obj *things_test_io_v1.Paint) error } func (f *PaintEventHandlerFuncs) CreatePaint(obj *things_test_io_v1.Paint) error { - if f.OnCreate == nil { - return nil - } - return f.OnCreate(obj) + if f.OnCreate == nil { + return nil + } + return f.OnCreate(obj) } func (f *PaintEventHandlerFuncs) DeletePaint(obj *things_test_io_v1.Paint) error { - if f.OnDelete == nil { - return nil - } - return f.OnDelete(obj) + if f.OnDelete == nil { + return nil + } + return f.OnDelete(obj) } func (f *PaintEventHandlerFuncs) UpdatePaint(objOld, objNew *things_test_io_v1.Paint) error { - if f.OnUpdate == nil { - return nil - } - return f.OnUpdate(objOld, objNew) + if f.OnUpdate == nil { + return nil + } + return f.OnUpdate(objOld, objNew) } func (f *PaintEventHandlerFuncs) GenericPaint(obj *things_test_io_v1.Paint) error { - if f.OnGeneric == nil { - return nil - } - return f.OnGeneric(obj) + if f.OnGeneric == nil { + return nil + } + return f.OnGeneric(obj) } type PaintEventWatcher interface { - AddEventHandler(ctx context.Context, h PaintEventHandler, predicates ...predicate.Predicate) error + AddEventHandler(ctx context.Context, h PaintEventHandler, predicates ...predicate.Predicate) error } type paintEventWatcher struct { - watcher events.EventWatcher + watcher events.EventWatcher } func NewPaintEventWatcher(name string, mgr manager.Manager) PaintEventWatcher { - return &paintEventWatcher{ - watcher: events.NewWatcher(name, mgr, &things_test_io_v1.Paint{}), - } + return &paintEventWatcher{ + watcher: events.NewWatcher(name, mgr, &things_test_io_v1.Paint{}), + } } func (c *paintEventWatcher) AddEventHandler(ctx context.Context, h PaintEventHandler, predicates ...predicate.Predicate) error { handler := genericPaintHandler{handler: h} - if err := c.watcher.Watch(ctx, handler, predicates...); err != nil{ - return err - } - return nil + if err := c.watcher.Watch(ctx, handler, predicates...); err != nil { + return err + } + return nil } // genericPaintHandler implements a generic events.EventHandler type genericPaintHandler struct { - handler PaintEventHandler + handler PaintEventHandler } func (h genericPaintHandler) Create(object client.Object) error { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", object) - } - return h.handler.CreatePaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", object) + } + return h.handler.CreatePaint(obj) } func (h genericPaintHandler) Delete(object client.Object) error { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", object) - } - return h.handler.DeletePaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", object) + } + return h.handler.DeletePaint(obj) } func (h genericPaintHandler) Update(old, new client.Object) error { - objOld, ok := old.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", old) - } - objNew, ok := new.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", new) - } - return h.handler.UpdatePaint(objOld, objNew) + objOld, ok := old.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", old) + } + objNew, ok := new.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", new) + } + return h.handler.UpdatePaint(objOld, objNew) } func (h genericPaintHandler) Generic(object client.Object) error { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", object) - } - return h.handler.GenericPaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", object) + } + return h.handler.GenericPaint(obj) } // Handle events for the ClusterResource Resource // DEPRECATED: Prefer reconciler pattern. type ClusterResourceEventHandler interface { - CreateClusterResource(obj *things_test_io_v1.ClusterResource) error - UpdateClusterResource(old, new *things_test_io_v1.ClusterResource) error - DeleteClusterResource(obj *things_test_io_v1.ClusterResource) error - GenericClusterResource(obj *things_test_io_v1.ClusterResource) error + CreateClusterResource(obj *things_test_io_v1.ClusterResource) error + UpdateClusterResource(old, new *things_test_io_v1.ClusterResource) error + DeleteClusterResource(obj *things_test_io_v1.ClusterResource) error + GenericClusterResource(obj *things_test_io_v1.ClusterResource) error } type ClusterResourceEventHandlerFuncs struct { - OnCreate func(obj *things_test_io_v1.ClusterResource) error - OnUpdate func(old, new *things_test_io_v1.ClusterResource) error - OnDelete func(obj *things_test_io_v1.ClusterResource) error - OnGeneric func(obj *things_test_io_v1.ClusterResource) error + OnCreate func(obj *things_test_io_v1.ClusterResource) error + OnUpdate func(old, new *things_test_io_v1.ClusterResource) error + OnDelete func(obj *things_test_io_v1.ClusterResource) error + OnGeneric func(obj *things_test_io_v1.ClusterResource) error } func (f *ClusterResourceEventHandlerFuncs) CreateClusterResource(obj *things_test_io_v1.ClusterResource) error { - if f.OnCreate == nil { - return nil - } - return f.OnCreate(obj) + if f.OnCreate == nil { + return nil + } + return f.OnCreate(obj) } func (f *ClusterResourceEventHandlerFuncs) DeleteClusterResource(obj *things_test_io_v1.ClusterResource) error { - if f.OnDelete == nil { - return nil - } - return f.OnDelete(obj) + if f.OnDelete == nil { + return nil + } + return f.OnDelete(obj) } func (f *ClusterResourceEventHandlerFuncs) UpdateClusterResource(objOld, objNew *things_test_io_v1.ClusterResource) error { - if f.OnUpdate == nil { - return nil - } - return f.OnUpdate(objOld, objNew) + if f.OnUpdate == nil { + return nil + } + return f.OnUpdate(objOld, objNew) } func (f *ClusterResourceEventHandlerFuncs) GenericClusterResource(obj *things_test_io_v1.ClusterResource) error { - if f.OnGeneric == nil { - return nil - } - return f.OnGeneric(obj) + if f.OnGeneric == nil { + return nil + } + return f.OnGeneric(obj) } type ClusterResourceEventWatcher interface { - AddEventHandler(ctx context.Context, h ClusterResourceEventHandler, predicates ...predicate.Predicate) error + AddEventHandler(ctx context.Context, h ClusterResourceEventHandler, predicates ...predicate.Predicate) error } type clusterResourceEventWatcher struct { - watcher events.EventWatcher + watcher events.EventWatcher } func NewClusterResourceEventWatcher(name string, mgr manager.Manager) ClusterResourceEventWatcher { - return &clusterResourceEventWatcher{ - watcher: events.NewWatcher(name, mgr, &things_test_io_v1.ClusterResource{}), - } + return &clusterResourceEventWatcher{ + watcher: events.NewWatcher(name, mgr, &things_test_io_v1.ClusterResource{}), + } } func (c *clusterResourceEventWatcher) AddEventHandler(ctx context.Context, h ClusterResourceEventHandler, predicates ...predicate.Predicate) error { handler := genericClusterResourceHandler{handler: h} - if err := c.watcher.Watch(ctx, handler, predicates...); err != nil{ - return err - } - return nil + if err := c.watcher.Watch(ctx, handler, predicates...); err != nil { + return err + } + return nil } // genericClusterResourceHandler implements a generic events.EventHandler type genericClusterResourceHandler struct { - handler ClusterResourceEventHandler + handler ClusterResourceEventHandler } func (h genericClusterResourceHandler) Create(object client.Object) error { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return h.handler.CreateClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return h.handler.CreateClusterResource(obj) } func (h genericClusterResourceHandler) Delete(object client.Object) error { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return h.handler.DeleteClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return h.handler.DeleteClusterResource(obj) } func (h genericClusterResourceHandler) Update(old, new client.Object) error { - objOld, ok := old.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", old) - } - objNew, ok := new.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", new) - } - return h.handler.UpdateClusterResource(objOld, objNew) + objOld, ok := old.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", old) + } + objNew, ok := new.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", new) + } + return h.handler.UpdateClusterResource(objOld, objNew) } func (h genericClusterResourceHandler) Generic(object client.Object) error { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return h.handler.GenericClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return h.handler.GenericClusterResource(obj) } diff --git a/codegen/test/api/things.test.io/v1/controller/multicluster_reconcilers.go b/codegen/test/api/things.test.io/v1/controller/multicluster_reconcilers.go index 237ee95a0..fbfe2e86e 100644 --- a/codegen/test/api/things.test.io/v1/controller/multicluster_reconcilers.go +++ b/codegen/test/api/things.test.io/v1/controller/multicluster_reconcilers.go @@ -5,8 +5,6 @@ // Definitions for the multicluster Kubernetes Controllers package controller - - import ( "context" diff --git a/codegen/test/api/things.test.io/v1/controller/reconcilers.go b/codegen/test/api/things.test.io/v1/controller/reconcilers.go index a04151fb4..355e61896 100644 --- a/codegen/test/api/things.test.io/v1/controller/reconcilers.go +++ b/codegen/test/api/things.test.io/v1/controller/reconcilers.go @@ -5,24 +5,22 @@ // Definitions for the Kubernetes Controllers package controller - - import ( "context" - things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" + things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" - "github.com/pkg/errors" - "github.com/solo-io/skv2/pkg/ezkube" - "github.com/solo-io/skv2/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/predicate" + "github.com/pkg/errors" + "github.com/solo-io/skv2/pkg/ezkube" + "github.com/solo-io/skv2/pkg/reconcile" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/controller-runtime/pkg/predicate" ) // Reconcile Upsert events for the Paint Resource. // implemented by the user type PaintReconciler interface { - ReconcilePaint(obj *things_test_io_v1.Paint) (reconcile.Result, error) + ReconcilePaint(obj *things_test_io_v1.Paint) (reconcile.Result, error) } // Reconcile deletion events for the Paint Resource. @@ -30,117 +28,116 @@ type PaintReconciler interface { // before being deleted. // implemented by the user type PaintDeletionReconciler interface { - ReconcilePaintDeletion(req reconcile.Request) error + ReconcilePaintDeletion(req reconcile.Request) error } type PaintReconcilerFuncs struct { - OnReconcilePaint func(obj *things_test_io_v1.Paint) (reconcile.Result, error) - OnReconcilePaintDeletion func(req reconcile.Request) error + OnReconcilePaint func(obj *things_test_io_v1.Paint) (reconcile.Result, error) + OnReconcilePaintDeletion func(req reconcile.Request) error } func (f *PaintReconcilerFuncs) ReconcilePaint(obj *things_test_io_v1.Paint) (reconcile.Result, error) { - if f.OnReconcilePaint == nil { - return reconcile.Result{}, nil - } - return f.OnReconcilePaint(obj) + if f.OnReconcilePaint == nil { + return reconcile.Result{}, nil + } + return f.OnReconcilePaint(obj) } func (f *PaintReconcilerFuncs) ReconcilePaintDeletion(req reconcile.Request) error { - if f.OnReconcilePaintDeletion == nil { - return nil - } - return f.OnReconcilePaintDeletion(req) + if f.OnReconcilePaintDeletion == nil { + return nil + } + return f.OnReconcilePaintDeletion(req) } // Reconcile and finalize the Paint Resource // implemented by the user type PaintFinalizer interface { - PaintReconciler + PaintReconciler - // name of the finalizer used by this handler. - // finalizer names should be unique for a single task - PaintFinalizerName() string + // name of the finalizer used by this handler. + // finalizer names should be unique for a single task + PaintFinalizerName() string - // finalize the object before it is deleted. - // Watchers created with a finalizing handler will a - FinalizePaint(obj *things_test_io_v1.Paint) error + // finalize the object before it is deleted. + // Watchers created with a finalizing handler will a + FinalizePaint(obj *things_test_io_v1.Paint) error } type PaintReconcileLoop interface { - RunPaintReconciler(ctx context.Context, rec PaintReconciler, predicates ...predicate.Predicate) error + RunPaintReconciler(ctx context.Context, rec PaintReconciler, predicates ...predicate.Predicate) error } type paintReconcileLoop struct { - loop reconcile.Loop + loop reconcile.Loop } func NewPaintReconcileLoop(name string, mgr manager.Manager, options reconcile.Options) PaintReconcileLoop { - return &paintReconcileLoop{ - // empty cluster indicates this reconciler is built for the local cluster - loop: reconcile.NewLoop(name, "", mgr, &things_test_io_v1.Paint{}, options), - } + return &paintReconcileLoop{ + // empty cluster indicates this reconciler is built for the local cluster + loop: reconcile.NewLoop(name, "", mgr, &things_test_io_v1.Paint{}, options), + } } func (c *paintReconcileLoop) RunPaintReconciler(ctx context.Context, reconciler PaintReconciler, predicates ...predicate.Predicate) error { - genericReconciler := genericPaintReconciler{ - reconciler: reconciler, - } + genericReconciler := genericPaintReconciler{ + reconciler: reconciler, + } var reconcilerWrapper reconcile.Reconciler if finalizingReconciler, ok := reconciler.(PaintFinalizer); ok { - reconcilerWrapper = genericPaintFinalizer{ - genericPaintReconciler: genericReconciler, - finalizingReconciler: finalizingReconciler, - } - } else { - reconcilerWrapper = genericReconciler - } + reconcilerWrapper = genericPaintFinalizer{ + genericPaintReconciler: genericReconciler, + finalizingReconciler: finalizingReconciler, + } + } else { + reconcilerWrapper = genericReconciler + } return c.loop.RunReconciler(ctx, reconcilerWrapper, predicates...) } // genericPaintHandler implements a generic reconcile.Reconciler type genericPaintReconciler struct { - reconciler PaintReconciler + reconciler PaintReconciler } func (r genericPaintReconciler) Reconcile(object ezkube.Object) (reconcile.Result, error) { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return reconcile.Result{}, errors.Errorf("internal error: Paint handler received event for %T", object) - } - return r.reconciler.ReconcilePaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return reconcile.Result{}, errors.Errorf("internal error: Paint handler received event for %T", object) + } + return r.reconciler.ReconcilePaint(obj) } func (r genericPaintReconciler) ReconcileDeletion(request reconcile.Request) error { - if deletionReconciler, ok := r.reconciler.(PaintDeletionReconciler); ok { - return deletionReconciler.ReconcilePaintDeletion(request) - } - return nil + if deletionReconciler, ok := r.reconciler.(PaintDeletionReconciler); ok { + return deletionReconciler.ReconcilePaintDeletion(request) + } + return nil } // genericPaintFinalizer implements a generic reconcile.FinalizingReconciler type genericPaintFinalizer struct { - genericPaintReconciler - finalizingReconciler PaintFinalizer + genericPaintReconciler + finalizingReconciler PaintFinalizer } - func (r genericPaintFinalizer) FinalizerName() string { - return r.finalizingReconciler.PaintFinalizerName() + return r.finalizingReconciler.PaintFinalizerName() } func (r genericPaintFinalizer) Finalize(object ezkube.Object) error { - obj, ok := object.(*things_test_io_v1.Paint) - if !ok { - return errors.Errorf("internal error: Paint handler received event for %T", object) - } - return r.finalizingReconciler.FinalizePaint(obj) + obj, ok := object.(*things_test_io_v1.Paint) + if !ok { + return errors.Errorf("internal error: Paint handler received event for %T", object) + } + return r.finalizingReconciler.FinalizePaint(obj) } // Reconcile Upsert events for the ClusterResource Resource. // implemented by the user type ClusterResourceReconciler interface { - ReconcileClusterResource(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) + ReconcileClusterResource(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) } // Reconcile deletion events for the ClusterResource Resource. @@ -148,109 +145,108 @@ type ClusterResourceReconciler interface { // before being deleted. // implemented by the user type ClusterResourceDeletionReconciler interface { - ReconcileClusterResourceDeletion(req reconcile.Request) error + ReconcileClusterResourceDeletion(req reconcile.Request) error } type ClusterResourceReconcilerFuncs struct { - OnReconcileClusterResource func(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) - OnReconcileClusterResourceDeletion func(req reconcile.Request) error + OnReconcileClusterResource func(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) + OnReconcileClusterResourceDeletion func(req reconcile.Request) error } func (f *ClusterResourceReconcilerFuncs) ReconcileClusterResource(obj *things_test_io_v1.ClusterResource) (reconcile.Result, error) { - if f.OnReconcileClusterResource == nil { - return reconcile.Result{}, nil - } - return f.OnReconcileClusterResource(obj) + if f.OnReconcileClusterResource == nil { + return reconcile.Result{}, nil + } + return f.OnReconcileClusterResource(obj) } func (f *ClusterResourceReconcilerFuncs) ReconcileClusterResourceDeletion(req reconcile.Request) error { - if f.OnReconcileClusterResourceDeletion == nil { - return nil - } - return f.OnReconcileClusterResourceDeletion(req) + if f.OnReconcileClusterResourceDeletion == nil { + return nil + } + return f.OnReconcileClusterResourceDeletion(req) } // Reconcile and finalize the ClusterResource Resource // implemented by the user type ClusterResourceFinalizer interface { - ClusterResourceReconciler + ClusterResourceReconciler - // name of the finalizer used by this handler. - // finalizer names should be unique for a single task - ClusterResourceFinalizerName() string + // name of the finalizer used by this handler. + // finalizer names should be unique for a single task + ClusterResourceFinalizerName() string - // finalize the object before it is deleted. - // Watchers created with a finalizing handler will a - FinalizeClusterResource(obj *things_test_io_v1.ClusterResource) error + // finalize the object before it is deleted. + // Watchers created with a finalizing handler will a + FinalizeClusterResource(obj *things_test_io_v1.ClusterResource) error } type ClusterResourceReconcileLoop interface { - RunClusterResourceReconciler(ctx context.Context, rec ClusterResourceReconciler, predicates ...predicate.Predicate) error + RunClusterResourceReconciler(ctx context.Context, rec ClusterResourceReconciler, predicates ...predicate.Predicate) error } type clusterResourceReconcileLoop struct { - loop reconcile.Loop + loop reconcile.Loop } func NewClusterResourceReconcileLoop(name string, mgr manager.Manager, options reconcile.Options) ClusterResourceReconcileLoop { - return &clusterResourceReconcileLoop{ - // empty cluster indicates this reconciler is built for the local cluster - loop: reconcile.NewLoop(name, "", mgr, &things_test_io_v1.ClusterResource{}, options), - } + return &clusterResourceReconcileLoop{ + // empty cluster indicates this reconciler is built for the local cluster + loop: reconcile.NewLoop(name, "", mgr, &things_test_io_v1.ClusterResource{}, options), + } } func (c *clusterResourceReconcileLoop) RunClusterResourceReconciler(ctx context.Context, reconciler ClusterResourceReconciler, predicates ...predicate.Predicate) error { - genericReconciler := genericClusterResourceReconciler{ - reconciler: reconciler, - } + genericReconciler := genericClusterResourceReconciler{ + reconciler: reconciler, + } var reconcilerWrapper reconcile.Reconciler if finalizingReconciler, ok := reconciler.(ClusterResourceFinalizer); ok { - reconcilerWrapper = genericClusterResourceFinalizer{ - genericClusterResourceReconciler: genericReconciler, - finalizingReconciler: finalizingReconciler, - } - } else { - reconcilerWrapper = genericReconciler - } + reconcilerWrapper = genericClusterResourceFinalizer{ + genericClusterResourceReconciler: genericReconciler, + finalizingReconciler: finalizingReconciler, + } + } else { + reconcilerWrapper = genericReconciler + } return c.loop.RunReconciler(ctx, reconcilerWrapper, predicates...) } // genericClusterResourceHandler implements a generic reconcile.Reconciler type genericClusterResourceReconciler struct { - reconciler ClusterResourceReconciler + reconciler ClusterResourceReconciler } func (r genericClusterResourceReconciler) Reconcile(object ezkube.Object) (reconcile.Result, error) { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return reconcile.Result{}, errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return r.reconciler.ReconcileClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return reconcile.Result{}, errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return r.reconciler.ReconcileClusterResource(obj) } func (r genericClusterResourceReconciler) ReconcileDeletion(request reconcile.Request) error { - if deletionReconciler, ok := r.reconciler.(ClusterResourceDeletionReconciler); ok { - return deletionReconciler.ReconcileClusterResourceDeletion(request) - } - return nil + if deletionReconciler, ok := r.reconciler.(ClusterResourceDeletionReconciler); ok { + return deletionReconciler.ReconcileClusterResourceDeletion(request) + } + return nil } // genericClusterResourceFinalizer implements a generic reconcile.FinalizingReconciler type genericClusterResourceFinalizer struct { - genericClusterResourceReconciler - finalizingReconciler ClusterResourceFinalizer + genericClusterResourceReconciler + finalizingReconciler ClusterResourceFinalizer } - func (r genericClusterResourceFinalizer) FinalizerName() string { - return r.finalizingReconciler.ClusterResourceFinalizerName() + return r.finalizingReconciler.ClusterResourceFinalizerName() } func (r genericClusterResourceFinalizer) Finalize(object ezkube.Object) error { - obj, ok := object.(*things_test_io_v1.ClusterResource) - if !ok { - return errors.Errorf("internal error: ClusterResource handler received event for %T", object) - } - return r.finalizingReconciler.FinalizeClusterResource(obj) + obj, ok := object.(*things_test_io_v1.ClusterResource) + if !ok { + return errors.Errorf("internal error: ClusterResource handler received event for %T", object) + } + return r.finalizingReconciler.FinalizeClusterResource(obj) } diff --git a/codegen/test/api/things.test.io/v1/json.gen.go b/codegen/test/api/things.test.io/v1/json.gen.go index d7582f228..d8b4c1b0b 100644 --- a/codegen/test/api/things.test.io/v1/json.gen.go +++ b/codegen/test/api/things.test.io/v1/json.gen.go @@ -5,13 +5,13 @@ package v1 import ( - bytes "bytes" - fmt "fmt" - math "math" + bytes "bytes" + fmt "fmt" + math "math" - skv2jsonpb "github.com/solo-io/skv2/pkg/kube_jsonpb" - jsonpb "github.com/golang/protobuf/jsonpb" - proto "github.com/golang/protobuf/proto" + jsonpb "github.com/golang/protobuf/jsonpb" + proto "github.com/golang/protobuf/proto" + skv2jsonpb "github.com/solo-io/skv2/pkg/kube_jsonpb" ) // Reference imports to suppress errors if they are not otherwise used. @@ -20,12 +20,13 @@ var _ = fmt.Errorf var _ = math.Inf var ( - marshaller = &skv2jsonpb.Marshaler{} + marshaller = &skv2jsonpb.Marshaler{} unmarshaller = &jsonpb.Unmarshaler{ AllowUnknownFields: true, } strictUnmarshaller = &jsonpb.Unmarshaler{} ) + // MarshalJSON is a custom marshaler for PaintSpec func (this *PaintSpec) MarshalJSON() ([]byte, error) { str, err := marshaller.MarshalToString(this) @@ -36,6 +37,7 @@ func (this *PaintSpec) MarshalJSON() ([]byte, error) { func (this *PaintSpec) UnmarshalJSON(b []byte) error { return unmarshaller.Unmarshal(bytes.NewReader(b), this) } + // MarshalJSON is a custom marshaler for PaintStatus func (this *PaintStatus) MarshalJSON() ([]byte, error) { str, err := marshaller.MarshalToString(this) @@ -46,6 +48,7 @@ func (this *PaintStatus) MarshalJSON() ([]byte, error) { func (this *PaintStatus) UnmarshalJSON(b []byte) error { return unmarshaller.Unmarshal(bytes.NewReader(b), this) } + // MarshalJSON is a custom marshaler for ClusterResourceSpec func (this *ClusterResourceSpec) MarshalJSON() ([]byte, error) { str, err := marshaller.MarshalToString(this) diff --git a/codegen/test/api/things.test.io/v1/proto_deepcopy.go b/codegen/test/api/things.test.io/v1/proto_deepcopy.go index 30d4d08c0..7fe7a023f 100644 --- a/codegen/test/api/things.test.io/v1/proto_deepcopy.go +++ b/codegen/test/api/things.test.io/v1/proto_deepcopy.go @@ -5,36 +5,39 @@ package v1 import ( - proto "github.com/golang/protobuf/proto" + proto "github.com/golang/protobuf/proto" "github.com/solo-io/protoc-gen-ext/pkg/clone" ) + // DeepCopyInto for the Paint.Spec func (in *PaintSpec) DeepCopyInto(out *PaintSpec) { - var p *PaintSpec - if h, ok := interface{}(in).(clone.Cloner); ok { - p = h.Clone().(*PaintSpec) - } else { - p = proto.Clone(in).(*PaintSpec) - } - *out = *p + var p *PaintSpec + if h, ok := interface{}(in).(clone.Cloner); ok { + p = h.Clone().(*PaintSpec) + } else { + p = proto.Clone(in).(*PaintSpec) + } + *out = *p } + // DeepCopyInto for the Paint.Status func (in *PaintStatus) DeepCopyInto(out *PaintStatus) { - var p *PaintStatus - if h, ok := interface{}(in).(clone.Cloner); ok { - p = h.Clone().(*PaintStatus) - } else { - p = proto.Clone(in).(*PaintStatus) - } - *out = *p + var p *PaintStatus + if h, ok := interface{}(in).(clone.Cloner); ok { + p = h.Clone().(*PaintStatus) + } else { + p = proto.Clone(in).(*PaintStatus) + } + *out = *p } + // DeepCopyInto for the ClusterResource.Spec func (in *ClusterResourceSpec) DeepCopyInto(out *ClusterResourceSpec) { - var p *ClusterResourceSpec - if h, ok := interface{}(in).(clone.Cloner); ok { - p = h.Clone().(*ClusterResourceSpec) - } else { - p = proto.Clone(in).(*ClusterResourceSpec) - } - *out = *p + var p *ClusterResourceSpec + if h, ok := interface{}(in).(clone.Cloner); ok { + p = h.Clone().(*ClusterResourceSpec) + } else { + p = proto.Clone(in).(*ClusterResourceSpec) + } + *out = *p } diff --git a/codegen/test/api/things.test.io/v1/providers/client_providers.go b/codegen/test/api/things.test.io/v1/providers/client_providers.go index 53570c869..ea1c91a28 100644 --- a/codegen/test/api/things.test.io/v1/providers/client_providers.go +++ b/codegen/test/api/things.test.io/v1/providers/client_providers.go @@ -2,13 +2,11 @@ package v1 - - import ( - things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" + things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" + "k8s.io/client-go/rest" + "sigs.k8s.io/controller-runtime/pkg/client" ) /* @@ -21,56 +19,56 @@ import ( // Provider for PaintClient from Clientset func PaintClientFromClientsetProvider(clients things_test_io_v1.Clientset) things_test_io_v1.PaintClient { - return clients.Paints() + return clients.Paints() } // Provider for Paint Client from Client func PaintClientProvider(client client.Client) things_test_io_v1.PaintClient { - return things_test_io_v1.NewPaintClient(client) + return things_test_io_v1.NewPaintClient(client) } type PaintClientFactory func(client client.Client) things_test_io_v1.PaintClient func PaintClientFactoryProvider() PaintClientFactory { - return PaintClientProvider + return PaintClientProvider } type PaintClientFromConfigFactory func(cfg *rest.Config) (things_test_io_v1.PaintClient, error) func PaintClientFromConfigFactoryProvider() PaintClientFromConfigFactory { - return func(cfg *rest.Config) (things_test_io_v1.PaintClient, error) { - clients, err := things_test_io_v1.NewClientsetFromConfig(cfg) - if err != nil { - return nil, err - } - return clients.Paints(), nil - } + return func(cfg *rest.Config) (things_test_io_v1.PaintClient, error) { + clients, err := things_test_io_v1.NewClientsetFromConfig(cfg) + if err != nil { + return nil, err + } + return clients.Paints(), nil + } } // Provider for ClusterResourceClient from Clientset func ClusterResourceClientFromClientsetProvider(clients things_test_io_v1.Clientset) things_test_io_v1.ClusterResourceClient { - return clients.ClusterResources() + return clients.ClusterResources() } // Provider for ClusterResource Client from Client func ClusterResourceClientProvider(client client.Client) things_test_io_v1.ClusterResourceClient { - return things_test_io_v1.NewClusterResourceClient(client) + return things_test_io_v1.NewClusterResourceClient(client) } type ClusterResourceClientFactory func(client client.Client) things_test_io_v1.ClusterResourceClient func ClusterResourceClientFactoryProvider() ClusterResourceClientFactory { - return ClusterResourceClientProvider + return ClusterResourceClientProvider } type ClusterResourceClientFromConfigFactory func(cfg *rest.Config) (things_test_io_v1.ClusterResourceClient, error) func ClusterResourceClientFromConfigFactoryProvider() ClusterResourceClientFromConfigFactory { - return func(cfg *rest.Config) (things_test_io_v1.ClusterResourceClient, error) { - clients, err := things_test_io_v1.NewClientsetFromConfig(cfg) - if err != nil { - return nil, err - } - return clients.ClusterResources(), nil - } -} \ No newline at end of file + return func(cfg *rest.Config) (things_test_io_v1.ClusterResourceClient, error) { + clients, err := things_test_io_v1.NewClientsetFromConfig(cfg) + if err != nil { + return nil, err + } + return clients.ClusterResources(), nil + } +} diff --git a/codegen/test/api/things.test.io/v1/register.go b/codegen/test/api/things.test.io/v1/register.go index 99e1def72..38bbf15c1 100644 --- a/codegen/test/api/things.test.io/v1/register.go +++ b/codegen/test/api/things.test.io/v1/register.go @@ -6,9 +6,9 @@ package v1 import ( - "k8s.io/apimachinery/pkg/runtime/schema" - "sigs.k8s.io/controller-runtime/pkg/scheme" - "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/scheme" ) // AddToSchemes may be used to add all resources defined in the project to a Scheme @@ -16,19 +16,18 @@ import ( // AddToScheme adds all Resources to the Scheme var ( - // SchemeGroupVersion is group version used to register these objects - SchemeGroupVersion = schema.GroupVersion{Group: "things.test.io", Version: "v1"} - - // SchemeBuilder is used to add go types to the GroupVersionKind scheme - SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} + // SchemeGroupVersion is group version used to register these objects + SchemeGroupVersion = schema.GroupVersion{Group: "things.test.io", Version: "v1"} + // SchemeBuilder is used to add go types to the GroupVersionKind scheme + SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} ) // Resource takes an unqualified resource and returns a Group qualified GroupResource func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() + return SchemeGroupVersion.WithResource(resource).GroupResource() } func AddToScheme(s *runtime.Scheme) error { - return SchemeBuilder.AddToScheme(s) + return SchemeBuilder.AddToScheme(s) } diff --git a/codegen/test/api/things.test.io/v1/sets/sets.go b/codegen/test/api/things.test.io/v1/sets/sets.go index 1eba93e4e..404ed6d66 100644 --- a/codegen/test/api/things.test.io/v1/sets/sets.go +++ b/codegen/test/api/things.test.io/v1/sets/sets.go @@ -4,230 +4,227 @@ package v1sets - - import ( - things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" + things_test_io_v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1" - "github.com/rotisserie/eris" - sksets "github.com/solo-io/skv2/contrib/pkg/sets" - "github.com/solo-io/skv2/pkg/ezkube" - "k8s.io/apimachinery/pkg/util/sets" + "github.com/rotisserie/eris" + sksets "github.com/solo-io/skv2/contrib/pkg/sets" + "github.com/solo-io/skv2/pkg/ezkube" + "k8s.io/apimachinery/pkg/util/sets" ) type PaintSet interface { // Get the set stored keys - Keys() sets.String - // List of resources stored in the set. Pass an optional filter function to filter on the list. - List(filterResource ... func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint - // Unsorted list of resources stored in the set. Pass an optional filter function to filter on the list. - UnsortedList(filterResource ... func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint - // Return the Set as a map of key to resource. - Map() map[string]*things_test_io_v1.Paint - // Insert a resource into the set. - Insert(paint ...*things_test_io_v1.Paint) - // Compare the equality of the keys in two sets (not the resources themselves) - Equal(paintSet PaintSet) bool - // Check if the set contains a key matching the resource (not the resource itself) - Has(paint ezkube.ResourceId) bool - // Delete the key matching the resource - Delete(paint ezkube.ResourceId) - // Return the union with the provided set - Union(set PaintSet) PaintSet - // Return the difference with the provided set - Difference(set PaintSet) PaintSet - // Return the intersection with the provided set - Intersection(set PaintSet) PaintSet - // Find the resource with the given ID - Find(id ezkube.ResourceId) (*things_test_io_v1.Paint, error) - // Get the length of the set - Length() int - // returns the generic implementation of the set - Generic() sksets.ResourceSet - // returns the delta between this and and another PaintSet - Delta(newSet PaintSet) sksets.ResourceDelta - // Create a deep copy of the current PaintSet - Clone() PaintSet + Keys() sets.String + // List of resources stored in the set. Pass an optional filter function to filter on the list. + List(filterResource ...func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint + // Unsorted list of resources stored in the set. Pass an optional filter function to filter on the list. + UnsortedList(filterResource ...func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint + // Return the Set as a map of key to resource. + Map() map[string]*things_test_io_v1.Paint + // Insert a resource into the set. + Insert(paint ...*things_test_io_v1.Paint) + // Compare the equality of the keys in two sets (not the resources themselves) + Equal(paintSet PaintSet) bool + // Check if the set contains a key matching the resource (not the resource itself) + Has(paint ezkube.ResourceId) bool + // Delete the key matching the resource + Delete(paint ezkube.ResourceId) + // Return the union with the provided set + Union(set PaintSet) PaintSet + // Return the difference with the provided set + Difference(set PaintSet) PaintSet + // Return the intersection with the provided set + Intersection(set PaintSet) PaintSet + // Find the resource with the given ID + Find(id ezkube.ResourceId) (*things_test_io_v1.Paint, error) + // Get the length of the set + Length() int + // returns the generic implementation of the set + Generic() sksets.ResourceSet + // returns the delta between this and and another PaintSet + Delta(newSet PaintSet) sksets.ResourceDelta + // Create a deep copy of the current PaintSet + Clone() PaintSet } func makeGenericPaintSet(paintList []*things_test_io_v1.Paint) sksets.ResourceSet { - var genericResources []ezkube.ResourceId - for _, obj := range paintList { - genericResources = append(genericResources, obj) - } - return sksets.NewResourceSet(genericResources...) + var genericResources []ezkube.ResourceId + for _, obj := range paintList { + genericResources = append(genericResources, obj) + } + return sksets.NewResourceSet(genericResources...) } type paintSet struct { - set sksets.ResourceSet + set sksets.ResourceSet } func NewPaintSet(paintList ...*things_test_io_v1.Paint) PaintSet { - return &paintSet{set: makeGenericPaintSet(paintList)} + return &paintSet{set: makeGenericPaintSet(paintList)} } func NewPaintSetFromList(paintList *things_test_io_v1.PaintList) PaintSet { - list := make([]*things_test_io_v1.Paint, 0, len(paintList.Items)) - for idx := range paintList.Items { - list = append(list, &paintList.Items[idx]) - } - return &paintSet{set: makeGenericPaintSet(list)} + list := make([]*things_test_io_v1.Paint, 0, len(paintList.Items)) + for idx := range paintList.Items { + list = append(list, &paintList.Items[idx]) + } + return &paintSet{set: makeGenericPaintSet(list)} } func (s *paintSet) Keys() sets.String { if s == nil { return sets.String{} - } - return s.Generic().Keys() -} - -func (s *paintSet) List(filterResource ... func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint { - if s == nil { - return nil - } - var genericFilters []func(ezkube.ResourceId) bool - for _, filter := range filterResource { - filter := filter - genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { - return filter(obj.(*things_test_io_v1.Paint)) - }) - } - - objs := s.Generic().List(genericFilters...) - paintList := make([]*things_test_io_v1.Paint, 0, len(objs)) - for _, obj := range objs { - paintList = append(paintList, obj.(*things_test_io_v1.Paint)) - } - return paintList -} - -func (s *paintSet) UnsortedList(filterResource ... func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint { - if s == nil { - return nil - } - var genericFilters []func(ezkube.ResourceId) bool - for _, filter := range filterResource { - filter := filter - genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { - return filter(obj.(*things_test_io_v1.Paint)) - }) - } - - var paintList []*things_test_io_v1.Paint - for _, obj := range s.Generic().UnsortedList(genericFilters...) { - paintList = append(paintList, obj.(*things_test_io_v1.Paint)) - } - return paintList + } + return s.Generic().Keys() +} + +func (s *paintSet) List(filterResource ...func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint { + if s == nil { + return nil + } + var genericFilters []func(ezkube.ResourceId) bool + for _, filter := range filterResource { + filter := filter + genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { + return filter(obj.(*things_test_io_v1.Paint)) + }) + } + + objs := s.Generic().List(genericFilters...) + paintList := make([]*things_test_io_v1.Paint, 0, len(objs)) + for _, obj := range objs { + paintList = append(paintList, obj.(*things_test_io_v1.Paint)) + } + return paintList +} + +func (s *paintSet) UnsortedList(filterResource ...func(*things_test_io_v1.Paint) bool) []*things_test_io_v1.Paint { + if s == nil { + return nil + } + var genericFilters []func(ezkube.ResourceId) bool + for _, filter := range filterResource { + filter := filter + genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { + return filter(obj.(*things_test_io_v1.Paint)) + }) + } + + var paintList []*things_test_io_v1.Paint + for _, obj := range s.Generic().UnsortedList(genericFilters...) { + paintList = append(paintList, obj.(*things_test_io_v1.Paint)) + } + return paintList } func (s *paintSet) Map() map[string]*things_test_io_v1.Paint { - if s == nil { - return nil - } + if s == nil { + return nil + } - newMap := map[string]*things_test_io_v1.Paint{} - for k, v := range s.Generic().Map() { - newMap[k] = v.(*things_test_io_v1.Paint) - } - return newMap + newMap := map[string]*things_test_io_v1.Paint{} + for k, v := range s.Generic().Map() { + newMap[k] = v.(*things_test_io_v1.Paint) + } + return newMap } func (s *paintSet) Insert( - paintList ...*things_test_io_v1.Paint, + paintList ...*things_test_io_v1.Paint, ) { - if s == nil { - panic("cannot insert into nil set") - } + if s == nil { + panic("cannot insert into nil set") + } - for _, obj := range paintList { - s.Generic().Insert(obj) - } + for _, obj := range paintList { + s.Generic().Insert(obj) + } } func (s *paintSet) Has(paint ezkube.ResourceId) bool { - if s == nil { - return false - } - return s.Generic().Has(paint) + if s == nil { + return false + } + return s.Generic().Has(paint) } func (s *paintSet) Equal( - paintSet PaintSet, + paintSet PaintSet, ) bool { - if s == nil { - return paintSet == nil - } - return s.Generic().Equal(paintSet.Generic()) + if s == nil { + return paintSet == nil + } + return s.Generic().Equal(paintSet.Generic()) } func (s *paintSet) Delete(Paint ezkube.ResourceId) { - if s == nil { - return - } - s.Generic().Delete(Paint) + if s == nil { + return + } + s.Generic().Delete(Paint) } func (s *paintSet) Union(set PaintSet) PaintSet { - if s == nil { - return set - } - return NewPaintSet(append(s.List(), set.List()...)...) + if s == nil { + return set + } + return NewPaintSet(append(s.List(), set.List()...)...) } func (s *paintSet) Difference(set PaintSet) PaintSet { - if s == nil { - return set - } - newSet := s.Generic().Difference(set.Generic()) - return &paintSet{set: newSet} + if s == nil { + return set + } + newSet := s.Generic().Difference(set.Generic()) + return &paintSet{set: newSet} } func (s *paintSet) Intersection(set PaintSet) PaintSet { - if s == nil { - return nil - } - newSet := s.Generic().Intersection(set.Generic()) - var paintList []*things_test_io_v1.Paint - for _, obj := range newSet.List() { - paintList = append(paintList, obj.(*things_test_io_v1.Paint)) - } - return NewPaintSet(paintList...) + if s == nil { + return nil + } + newSet := s.Generic().Intersection(set.Generic()) + var paintList []*things_test_io_v1.Paint + for _, obj := range newSet.List() { + paintList = append(paintList, obj.(*things_test_io_v1.Paint)) + } + return NewPaintSet(paintList...) } - func (s *paintSet) Find(id ezkube.ResourceId) (*things_test_io_v1.Paint, error) { - if s == nil { - return nil, eris.Errorf("empty set, cannot find Paint %v", sksets.Key(id)) - } + if s == nil { + return nil, eris.Errorf("empty set, cannot find Paint %v", sksets.Key(id)) + } obj, err := s.Generic().Find(&things_test_io_v1.Paint{}, id) if err != nil { return nil, err - } + } - return obj.(*things_test_io_v1.Paint), nil + return obj.(*things_test_io_v1.Paint), nil } func (s *paintSet) Length() int { - if s == nil { - return 0 - } - return s.Generic().Length() + if s == nil { + return 0 + } + return s.Generic().Length() } func (s *paintSet) Generic() sksets.ResourceSet { - if s == nil { - return nil - } - return s.set + if s == nil { + return nil + } + return s.set } func (s *paintSet) Delta(newSet PaintSet) sksets.ResourceDelta { - if s == nil { - return sksets.ResourceDelta{ - Inserted: newSet.Generic(), - } - } - return s.Generic().Delta(newSet.Generic()) + if s == nil { + return sksets.ResourceDelta{ + Inserted: newSet.Generic(), + } + } + return s.Generic().Delta(newSet.Generic()) } func (s *paintSet) Clone() PaintSet { @@ -239,217 +236,216 @@ func (s *paintSet) Clone() PaintSet { type ClusterResourceSet interface { // Get the set stored keys - Keys() sets.String - // List of resources stored in the set. Pass an optional filter function to filter on the list. - List(filterResource ... func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource - // Unsorted list of resources stored in the set. Pass an optional filter function to filter on the list. - UnsortedList(filterResource ... func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource - // Return the Set as a map of key to resource. - Map() map[string]*things_test_io_v1.ClusterResource - // Insert a resource into the set. - Insert(clusterResource ...*things_test_io_v1.ClusterResource) - // Compare the equality of the keys in two sets (not the resources themselves) - Equal(clusterResourceSet ClusterResourceSet) bool - // Check if the set contains a key matching the resource (not the resource itself) - Has(clusterResource ezkube.ResourceId) bool - // Delete the key matching the resource - Delete(clusterResource ezkube.ResourceId) - // Return the union with the provided set - Union(set ClusterResourceSet) ClusterResourceSet - // Return the difference with the provided set - Difference(set ClusterResourceSet) ClusterResourceSet - // Return the intersection with the provided set - Intersection(set ClusterResourceSet) ClusterResourceSet - // Find the resource with the given ID - Find(id ezkube.ResourceId) (*things_test_io_v1.ClusterResource, error) - // Get the length of the set - Length() int - // returns the generic implementation of the set - Generic() sksets.ResourceSet - // returns the delta between this and and another ClusterResourceSet - Delta(newSet ClusterResourceSet) sksets.ResourceDelta - // Create a deep copy of the current ClusterResourceSet - Clone() ClusterResourceSet + Keys() sets.String + // List of resources stored in the set. Pass an optional filter function to filter on the list. + List(filterResource ...func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource + // Unsorted list of resources stored in the set. Pass an optional filter function to filter on the list. + UnsortedList(filterResource ...func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource + // Return the Set as a map of key to resource. + Map() map[string]*things_test_io_v1.ClusterResource + // Insert a resource into the set. + Insert(clusterResource ...*things_test_io_v1.ClusterResource) + // Compare the equality of the keys in two sets (not the resources themselves) + Equal(clusterResourceSet ClusterResourceSet) bool + // Check if the set contains a key matching the resource (not the resource itself) + Has(clusterResource ezkube.ResourceId) bool + // Delete the key matching the resource + Delete(clusterResource ezkube.ResourceId) + // Return the union with the provided set + Union(set ClusterResourceSet) ClusterResourceSet + // Return the difference with the provided set + Difference(set ClusterResourceSet) ClusterResourceSet + // Return the intersection with the provided set + Intersection(set ClusterResourceSet) ClusterResourceSet + // Find the resource with the given ID + Find(id ezkube.ResourceId) (*things_test_io_v1.ClusterResource, error) + // Get the length of the set + Length() int + // returns the generic implementation of the set + Generic() sksets.ResourceSet + // returns the delta between this and and another ClusterResourceSet + Delta(newSet ClusterResourceSet) sksets.ResourceDelta + // Create a deep copy of the current ClusterResourceSet + Clone() ClusterResourceSet } func makeGenericClusterResourceSet(clusterResourceList []*things_test_io_v1.ClusterResource) sksets.ResourceSet { - var genericResources []ezkube.ResourceId - for _, obj := range clusterResourceList { - genericResources = append(genericResources, obj) - } - return sksets.NewResourceSet(genericResources...) + var genericResources []ezkube.ResourceId + for _, obj := range clusterResourceList { + genericResources = append(genericResources, obj) + } + return sksets.NewResourceSet(genericResources...) } type clusterResourceSet struct { - set sksets.ResourceSet + set sksets.ResourceSet } func NewClusterResourceSet(clusterResourceList ...*things_test_io_v1.ClusterResource) ClusterResourceSet { - return &clusterResourceSet{set: makeGenericClusterResourceSet(clusterResourceList)} + return &clusterResourceSet{set: makeGenericClusterResourceSet(clusterResourceList)} } func NewClusterResourceSetFromList(clusterResourceList *things_test_io_v1.ClusterResourceList) ClusterResourceSet { - list := make([]*things_test_io_v1.ClusterResource, 0, len(clusterResourceList.Items)) - for idx := range clusterResourceList.Items { - list = append(list, &clusterResourceList.Items[idx]) - } - return &clusterResourceSet{set: makeGenericClusterResourceSet(list)} + list := make([]*things_test_io_v1.ClusterResource, 0, len(clusterResourceList.Items)) + for idx := range clusterResourceList.Items { + list = append(list, &clusterResourceList.Items[idx]) + } + return &clusterResourceSet{set: makeGenericClusterResourceSet(list)} } func (s *clusterResourceSet) Keys() sets.String { if s == nil { return sets.String{} - } - return s.Generic().Keys() -} - -func (s *clusterResourceSet) List(filterResource ... func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource { - if s == nil { - return nil - } - var genericFilters []func(ezkube.ResourceId) bool - for _, filter := range filterResource { - filter := filter - genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { - return filter(obj.(*things_test_io_v1.ClusterResource)) - }) - } - - objs := s.Generic().List(genericFilters...) - clusterResourceList := make([]*things_test_io_v1.ClusterResource, 0, len(objs)) - for _, obj := range objs { - clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) - } - return clusterResourceList -} - -func (s *clusterResourceSet) UnsortedList(filterResource ... func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource { - if s == nil { - return nil - } - var genericFilters []func(ezkube.ResourceId) bool - for _, filter := range filterResource { - filter := filter - genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { - return filter(obj.(*things_test_io_v1.ClusterResource)) - }) - } - - var clusterResourceList []*things_test_io_v1.ClusterResource - for _, obj := range s.Generic().UnsortedList(genericFilters...) { - clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) - } - return clusterResourceList + } + return s.Generic().Keys() +} + +func (s *clusterResourceSet) List(filterResource ...func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource { + if s == nil { + return nil + } + var genericFilters []func(ezkube.ResourceId) bool + for _, filter := range filterResource { + filter := filter + genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { + return filter(obj.(*things_test_io_v1.ClusterResource)) + }) + } + + objs := s.Generic().List(genericFilters...) + clusterResourceList := make([]*things_test_io_v1.ClusterResource, 0, len(objs)) + for _, obj := range objs { + clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) + } + return clusterResourceList +} + +func (s *clusterResourceSet) UnsortedList(filterResource ...func(*things_test_io_v1.ClusterResource) bool) []*things_test_io_v1.ClusterResource { + if s == nil { + return nil + } + var genericFilters []func(ezkube.ResourceId) bool + for _, filter := range filterResource { + filter := filter + genericFilters = append(genericFilters, func(obj ezkube.ResourceId) bool { + return filter(obj.(*things_test_io_v1.ClusterResource)) + }) + } + + var clusterResourceList []*things_test_io_v1.ClusterResource + for _, obj := range s.Generic().UnsortedList(genericFilters...) { + clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) + } + return clusterResourceList } func (s *clusterResourceSet) Map() map[string]*things_test_io_v1.ClusterResource { - if s == nil { - return nil - } + if s == nil { + return nil + } - newMap := map[string]*things_test_io_v1.ClusterResource{} - for k, v := range s.Generic().Map() { - newMap[k] = v.(*things_test_io_v1.ClusterResource) - } - return newMap + newMap := map[string]*things_test_io_v1.ClusterResource{} + for k, v := range s.Generic().Map() { + newMap[k] = v.(*things_test_io_v1.ClusterResource) + } + return newMap } func (s *clusterResourceSet) Insert( - clusterResourceList ...*things_test_io_v1.ClusterResource, + clusterResourceList ...*things_test_io_v1.ClusterResource, ) { - if s == nil { - panic("cannot insert into nil set") - } + if s == nil { + panic("cannot insert into nil set") + } - for _, obj := range clusterResourceList { - s.Generic().Insert(obj) - } + for _, obj := range clusterResourceList { + s.Generic().Insert(obj) + } } func (s *clusterResourceSet) Has(clusterResource ezkube.ResourceId) bool { - if s == nil { - return false - } - return s.Generic().Has(clusterResource) + if s == nil { + return false + } + return s.Generic().Has(clusterResource) } func (s *clusterResourceSet) Equal( - clusterResourceSet ClusterResourceSet, + clusterResourceSet ClusterResourceSet, ) bool { - if s == nil { - return clusterResourceSet == nil - } - return s.Generic().Equal(clusterResourceSet.Generic()) + if s == nil { + return clusterResourceSet == nil + } + return s.Generic().Equal(clusterResourceSet.Generic()) } func (s *clusterResourceSet) Delete(ClusterResource ezkube.ResourceId) { - if s == nil { - return - } - s.Generic().Delete(ClusterResource) + if s == nil { + return + } + s.Generic().Delete(ClusterResource) } func (s *clusterResourceSet) Union(set ClusterResourceSet) ClusterResourceSet { - if s == nil { - return set - } - return NewClusterResourceSet(append(s.List(), set.List()...)...) + if s == nil { + return set + } + return NewClusterResourceSet(append(s.List(), set.List()...)...) } func (s *clusterResourceSet) Difference(set ClusterResourceSet) ClusterResourceSet { - if s == nil { - return set - } - newSet := s.Generic().Difference(set.Generic()) - return &clusterResourceSet{set: newSet} + if s == nil { + return set + } + newSet := s.Generic().Difference(set.Generic()) + return &clusterResourceSet{set: newSet} } func (s *clusterResourceSet) Intersection(set ClusterResourceSet) ClusterResourceSet { - if s == nil { - return nil - } - newSet := s.Generic().Intersection(set.Generic()) - var clusterResourceList []*things_test_io_v1.ClusterResource - for _, obj := range newSet.List() { - clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) - } - return NewClusterResourceSet(clusterResourceList...) + if s == nil { + return nil + } + newSet := s.Generic().Intersection(set.Generic()) + var clusterResourceList []*things_test_io_v1.ClusterResource + for _, obj := range newSet.List() { + clusterResourceList = append(clusterResourceList, obj.(*things_test_io_v1.ClusterResource)) + } + return NewClusterResourceSet(clusterResourceList...) } - func (s *clusterResourceSet) Find(id ezkube.ResourceId) (*things_test_io_v1.ClusterResource, error) { - if s == nil { - return nil, eris.Errorf("empty set, cannot find ClusterResource %v", sksets.Key(id)) - } + if s == nil { + return nil, eris.Errorf("empty set, cannot find ClusterResource %v", sksets.Key(id)) + } obj, err := s.Generic().Find(&things_test_io_v1.ClusterResource{}, id) if err != nil { return nil, err - } + } - return obj.(*things_test_io_v1.ClusterResource), nil + return obj.(*things_test_io_v1.ClusterResource), nil } func (s *clusterResourceSet) Length() int { - if s == nil { - return 0 - } - return s.Generic().Length() + if s == nil { + return 0 + } + return s.Generic().Length() } func (s *clusterResourceSet) Generic() sksets.ResourceSet { - if s == nil { - return nil - } - return s.set + if s == nil { + return nil + } + return s.set } func (s *clusterResourceSet) Delta(newSet ClusterResourceSet) sksets.ResourceDelta { - if s == nil { - return sksets.ResourceDelta{ - Inserted: newSet.Generic(), - } - } - return s.Generic().Delta(newSet.Generic()) + if s == nil { + return sksets.ResourceDelta{ + Inserted: newSet.Generic(), + } + } + return s.Generic().Delta(newSet.Generic()) } func (s *clusterResourceSet) Clone() ClusterResourceSet { diff --git a/codegen/test/api/things.test.io/v1/test_api.pb.go b/codegen/test/api/things.test.io/v1/test_api.pb.go index fa79410fd..53e16624d 100644 --- a/codegen/test/api/things.test.io/v1/test_api.pb.go +++ b/codegen/test/api/things.test.io/v1/test_api.pb.go @@ -7,14 +7,15 @@ package v1 import ( + reflect "reflect" + sync "sync" + 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/cue/encoding/protobuf/cue" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/codegen/test/api/things.test.io/v1/type_helpers.go b/codegen/test/api/things.test.io/v1/type_helpers.go index 2d04a4fd1..4133a8e21 100644 --- a/codegen/test/api/things.test.io/v1/type_helpers.go +++ b/codegen/test/api/things.test.io/v1/type_helpers.go @@ -3,9 +3,6 @@ // Definitions for the Kubernetes types package v1 -import ( -) - // PaintSlice represents a slice of *Paint type PaintSlice []*Paint diff --git a/codegen/test/api/things.test.io/v1/types.go b/codegen/test/api/things.test.io/v1/types.go index 3f3fc59e2..f153a3983 100644 --- a/codegen/test/api/things.test.io/v1/types.go +++ b/codegen/test/api/things.test.io/v1/types.go @@ -4,8 +4,9 @@ package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime/schema") + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" +) // +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -14,22 +15,22 @@ import ( // GroupVersionKind for Paint var PaintGVK = schema.GroupVersionKind{ - Group: "things.test.io", - Version: "v1", - Kind: "Paint", + Group: "things.test.io", + Version: "v1", + Kind: "Paint", } // Paint is the Schema for the paint API type Paint struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` - Spec PaintSpec `json:"spec,omitempty"` - Status PaintStatus `json:"status,omitempty"` + Spec PaintSpec `json:"spec,omitempty"` + Status PaintStatus `json:"status,omitempty"` } // GVK returns the GroupVersionKind associated with the resource type. -func (Paint) GVK() schema.GroupVersionKind { +func (Paint) GVK() schema.GroupVersionKind { return PaintGVK } @@ -37,9 +38,9 @@ func (Paint) GVK() schema.GroupVersionKind { // PaintList contains a list of Paint type PaintList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []Paint `json:"items"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []Paint `json:"items"` } // +genclient @@ -49,21 +50,21 @@ type PaintList struct { // GroupVersionKind for ClusterResource var ClusterResourceGVK = schema.GroupVersionKind{ - Group: "things.test.io", - Version: "v1", - Kind: "ClusterResource", + Group: "things.test.io", + Version: "v1", + Kind: "ClusterResource", } // ClusterResource is the Schema for the clusterResource API type ClusterResource struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` - Spec ClusterResourceSpec `json:"spec,omitempty"` + Spec ClusterResourceSpec `json:"spec,omitempty"` } // GVK returns the GroupVersionKind associated with the resource type. -func (ClusterResource) GVK() schema.GroupVersionKind { +func (ClusterResource) GVK() schema.GroupVersionKind { return ClusterResourceGVK } @@ -71,12 +72,12 @@ func (ClusterResource) GVK() schema.GroupVersionKind { // ClusterResourceList contains a list of ClusterResource type ClusterResourceList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []ClusterResource `json:"items"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []ClusterResource `json:"items"` } func init() { - SchemeBuilder.Register(&Paint{}, &PaintList{}) - SchemeBuilder.Register(&ClusterResource{}, &ClusterResourceList{}) + SchemeBuilder.Register(&Paint{}, &PaintList{}) + SchemeBuilder.Register(&ClusterResource{}, &ClusterResourceList{}) } diff --git a/codegen/test/api/things.test.io/v1/zz_generated.deepcopy.go b/codegen/test/api/things.test.io/v1/zz_generated.deepcopy.go index 8939012a9..4203de9bf 100644 --- a/codegen/test/api/things.test.io/v1/zz_generated.deepcopy.go +++ b/codegen/test/api/things.test.io/v1/zz_generated.deepcopy.go @@ -5,124 +5,123 @@ package v1 import ( - runtime "k8s.io/apimachinery/pkg/runtime" + runtime "k8s.io/apimachinery/pkg/runtime" ) // Generated Deepcopy methods for Paint func (in *Paint) DeepCopyInto(out *Paint) { - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - // deepcopy spec - in.Spec.DeepCopyInto(&out.Spec) - // deepcopy status - in.Status.DeepCopyInto(&out.Status) + // deepcopy spec + in.Spec.DeepCopyInto(&out.Spec) + // deepcopy status + in.Status.DeepCopyInto(&out.Status) - return + return } func (in *Paint) DeepCopy() *Paint { - if in == nil { - return nil - } - out := new(Paint) - in.DeepCopyInto(out) - return out + if in == nil { + return nil + } + out := new(Paint) + in.DeepCopyInto(out) + return out } func (in *Paint) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil + if c := in.DeepCopy(); c != nil { + return c + } + return nil } func (in *PaintList) DeepCopyInto(out *PaintList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Paint, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Paint, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return } func (in *PaintList) DeepCopy() *PaintList { - if in == nil { - return nil - } - out := new(PaintList) - in.DeepCopyInto(out) - return out + if in == nil { + return nil + } + out := new(PaintList) + in.DeepCopyInto(out) + return out } func (in *PaintList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil + if c := in.DeepCopy(); c != nil { + return c + } + return nil } // Generated Deepcopy methods for ClusterResource func (in *ClusterResource) DeepCopyInto(out *ClusterResource) { - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - // deepcopy spec - in.Spec.DeepCopyInto(&out.Spec) + // deepcopy spec + in.Spec.DeepCopyInto(&out.Spec) - return + return } func (in *ClusterResource) DeepCopy() *ClusterResource { - if in == nil { - return nil - } - out := new(ClusterResource) - in.DeepCopyInto(out) - return out + if in == nil { + return nil + } + out := new(ClusterResource) + in.DeepCopyInto(out) + return out } func (in *ClusterResource) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil + if c := in.DeepCopy(); c != nil { + return c + } + return nil } func (in *ClusterResourceList) DeepCopyInto(out *ClusterResourceList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterResource, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } - return + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ClusterResource, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return } func (in *ClusterResourceList) DeepCopy() *ClusterResourceList { - if in == nil { - return nil - } - out := new(ClusterResourceList) - in.DeepCopyInto(out) - return out + if in == nil { + return nil + } + out := new(ClusterResourceList) + in.DeepCopyInto(out) + return out } func (in *ClusterResourceList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil + if c := in.DeepCopy(); c != nil { + return c + } + return nil } - diff --git a/pkg/api/core.skv2.solo.io/v1/core.pb.go b/pkg/api/core.skv2.solo.io/v1/core.pb.go index 2762173b5..4e46bd8f8 100644 --- a/pkg/api/core.skv2.solo.io/v1/core.pb.go +++ b/pkg/api/core.skv2.solo.io/v1/core.pb.go @@ -7,13 +7,14 @@ package v1 import ( + reflect "reflect" + sync "sync" + timestamp "github.com/golang/protobuf/ptypes/timestamp" wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/solo-io/protoc-gen-ext/extproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( diff --git a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go index 729adf049..6012226be 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go @@ -7,12 +7,13 @@ package v1alpha1 import ( + reflect "reflect" + sync "sync" + _ "github.com/solo-io/protoc-gen-ext/extproto" v1 "github.com/solo-io/skv2/pkg/api/core.skv2.solo.io/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" ) const ( From 217be7573baa3c52a66c1bbb37bd7d44ca8e145b Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Tue, 21 Feb 2023 21:06:07 +0000 Subject: [PATCH 06/17] less changelog red tape --- changelog/v0.28.0/update-controller-runtime.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/changelog/v0.28.0/update-controller-runtime.yaml b/changelog/v0.28.0/update-controller-runtime.yaml index 84f3c7612..aecc755ec 100644 --- a/changelog/v0.28.0/update-controller-runtime.yaml +++ b/changelog/v0.28.0/update-controller-runtime.yaml @@ -2,7 +2,4 @@ changelog: - type: BREAKING_CHANGE description: Update Status API signature to comply with controller-runtime v0.14.x API breakage issueLink: https://github.com/solo-io/skv2/issues/419 - - type: DEPENDENCY_BUMP - description: Bump controller-runtime to v0.14.x, and associated dependencies. - issueLink: https://github.com/solo-io/skv2/issues/419 From 6c12ab8a657ba18c966f8a993afde87423c00ffd Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Tue, 21 Feb 2023 21:38:00 +0000 Subject: [PATCH 07/17] codegen? --- codegen/test/api/things.test.io/v1/test_api.pb.go | 2 -- pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/codegen/test/api/things.test.io/v1/test_api.pb.go b/codegen/test/api/things.test.io/v1/test_api.pb.go index 53e16624d..b937c23bc 100644 --- a/codegen/test/api/things.test.io/v1/test_api.pb.go +++ b/codegen/test/api/things.test.io/v1/test_api.pb.go @@ -81,7 +81,6 @@ type PaintSpec struct { Color *PaintColor `protobuf:"bytes,1,opt,name=color,proto3" json:"color,omitempty"` // Types that are assignable to PaintType: - // // *PaintSpec_Acrylic // *PaintSpec_Oil PaintType isPaintSpec_PaintType `protobuf_oneof:"paintType"` @@ -289,7 +288,6 @@ type OilType struct { WaterMixable bool `protobuf:"varint,1,opt,name=waterMixable,proto3" json:"waterMixable,omitempty"` // Types that are assignable to PigmentType: - // // *OilType_Powder // *OilType_Fluid PigmentType isOilType_PigmentType `protobuf_oneof:"pigmentType"` diff --git a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go index 6012226be..b155fb739 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go @@ -23,7 +23,8 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// Representation of a Kubernetes cluster that has been registered. +// +//Representation of a Kubernetes cluster that has been registered. type KubernetesClusterSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -159,10 +160,10 @@ func (x *KubernetesClusterStatus) GetPolicyRules() []*PolicyRule { return nil } -// Copy pasted from the official kubernetes definition: -// https://github.com/kubernetes/api/blob/697df40f2d58d7d48b180b83d7b9b2b5ff812923/rbac/v1alpha1/generated.proto#L98 -// PolicyRule holds information that describes a policy rule, but does not contain information -// about who the rule applies to or which namespace the rule applies to. +//Copy pasted from the official kubernetes definition: +//https://github.com/kubernetes/api/blob/697df40f2d58d7d48b180b83d7b9b2b5ff812923/rbac/v1alpha1/generated.proto#L98 +//PolicyRule holds information that describes a policy rule, but does not contain information +//about who the rule applies to or which namespace the rule applies to. type PolicyRule struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -263,7 +264,6 @@ type KubernetesClusterSpec_ProviderInfo struct { // Metadata specific to a cloud provider. // // Types that are assignable to ProviderInfoType: - // // *KubernetesClusterSpec_ProviderInfo_Eks ProviderInfoType isKubernetesClusterSpec_ProviderInfo_ProviderInfoType `protobuf_oneof:"provider_info_type"` } From 519ccfb5cab92441d02879470fa3befe8719da02 Mon Sep 17 00:00:00 2001 From: Ashley Wang Date: Mon, 13 Mar 2023 13:32:55 -0400 Subject: [PATCH 08/17] Re-add updates --- go.mod | 60 ++++++------- go.sum | 261 ++++++++++++++------------------------------------------- 2 files changed, 87 insertions(+), 234 deletions(-) diff --git a/go.mod b/go.mod index 2fc5aa759..37a51e2bc 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/onsi/gomega v1.26.0 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.12.2 + github.com/prometheus/client_golang v1.14.0 github.com/pseudomuto/protoc-gen-doc v1.4.1 github.com/rogpeppe/go-internal v1.8.0 github.com/rotisserie/eris v0.1.1 @@ -39,55 +39,45 @@ require ( github.com/solo-io/k8s-utils v0.0.1 github.com/solo-io/protoc-gen-ext v0.0.18 github.com/spf13/pflag v1.0.5 - go.uber.org/zap v1.21.0 + go.uber.org/zap v1.24.0 golang.org/x/exp v0.0.0-20220921164117-439092de6870 golang.org/x/tools v0.6.0 - google.golang.org/protobuf v1.28.0 + google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.25.4 - k8s.io/apiextensions-apiserver v0.25.4 - k8s.io/apimachinery v0.25.4 - k8s.io/client-go v0.25.4 - k8s.io/code-generator v0.25.4 - k8s.io/klog/v2 v2.70.1 - k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed - sigs.k8s.io/controller-runtime v0.13.1 + k8s.io/api v0.26.1 + k8s.io/apiextensions-apiserver v0.26.1 + k8s.io/apimachinery v0.26.1 + k8s.io/client-go v0.26.1 + k8s.io/code-generator v0.26.1 + k8s.io/klog/v2 v2.80.1 + k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 + sigs.k8s.io/controller-runtime v0.14.4 sigs.k8s.io/yaml v1.3.0 ) require ( - cloud.google.com/go v0.97.0 // indirect - github.com/Azure/go-autorest v14.2.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.11.27 // indirect - github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect - github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect - github.com/Azure/go-autorest/logger v0.2.1 // indirect - github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/Masterminds/goutils v1.1.0 // indirect github.com/Masterminds/semver/v3 v3.1.0 // indirect github.com/Masterminds/sprig v2.15.0+incompatible // indirect - github.com/PuerkitoBio/purell v1.1.1 // indirect - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/aokoli/goutils v1.0.1 // indirect github.com/avast/retry-go v2.2.0+incompatible // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cockroachdb/apd/v2 v2.0.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful/v3 v3.8.0 // indirect + github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/emicklei/proto v1.6.15 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.6.0 // indirect - github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/swag v0.19.14 // indirect github.com/gobuffalo/envy v1.8.1 // indirect github.com/gobuffalo/packd v0.3.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v4 v4.2.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.1.0 // indirect @@ -95,7 +85,7 @@ require ( github.com/hashicorp/errwrap v1.0.0 // indirect github.com/huandu/xstrings v1.3.1 // indirect github.com/imdario/mergo v0.3.12 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/joho/godotenv v1.3.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -105,7 +95,7 @@ require ( github.com/mattn/go-colorable v0.1.7 // indirect github.com/mattn/go-isatty v0.0.12 // indirect github.com/mattn/go-zglob v0.0.3 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect github.com/mitchellh/copystructure v1.0.0 // indirect github.com/mitchellh/reflectwalk v1.0.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -113,33 +103,33 @@ require ( github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.37.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect github.com/pseudomuto/protokit v0.2.0 // indirect github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.3.1 // indirect - github.com/spf13/cobra v1.4.0 // indirect + github.com/spf13/cobra v1.6.0 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/crypto v0.1.0 // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/mod v0.8.0 // indirect golang.org/x/net v0.6.0 // indirect - golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect + golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.5.0 // indirect golang.org/x/term v0.5.0 // indirect golang.org/x/text v0.7.0 // indirect - golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - k8s.io/component-base v0.25.4 // indirect - k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect - k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect + k8s.io/component-base v0.26.1 // indirect + k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect + k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) diff --git a/go.sum b/go.sum index 313f6060c..3753854bf 100644 --- a/go.sum +++ b/go.sum @@ -15,19 +15,6 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0 h1:3DXvAyifywvq64LfkKaMOmkWPS1CikIQdMe2lY9vxU8= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -52,29 +39,13 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= -github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= -github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg= -github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= -github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= -github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= -github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= -github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -104,10 +75,8 @@ github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b/go.mod h1:oX5x61 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= @@ -173,10 +142,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= @@ -209,7 +176,7 @@ github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= @@ -248,8 +215,8 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.11.1+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= -github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= +github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/proto v1.6.15 h1:XbpwxmuOPrdES97FrSfpyy67SSCV/wBIKXqgJzh6hNw= github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= @@ -257,10 +224,7 @@ github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.3.0-java/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= @@ -280,8 +244,8 @@ github.com/fgrosse/zaptest v1.1.0/go.mod h1:vMnRSul6kW7kIUXZgnZZcDwyTn8k49ODfAUL github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= -github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gertd/go-pluralize v0.1.1 h1:fQhql/WRRwr4TVp+TCw12s2esCacvEVBdkTUUwNqF/Q= @@ -306,9 +270,11 @@ github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -339,8 +305,8 @@ github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3Hfo github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= +github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= @@ -395,9 +361,6 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU= -github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= 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= @@ -416,7 +379,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -435,10 +397,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= 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.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= 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.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= @@ -453,8 +413,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -469,8 +427,6 @@ github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -478,13 +434,6 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -494,7 +443,6 @@ github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= @@ -555,15 +503,15 @@ github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334/go.mod h1:SK73t github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw= github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/invopop/jsonschema v0.7.0 h1:2vgQcBz1n256N+FpX3Jq7Y17AjYt46Ig3zIWyy770So= github.com/invopop/jsonschema v0.7.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= @@ -658,8 +606,8 @@ github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO github.com/mattn/go-zglob v0.0.3 h1:6Ry4EYsScDyt5di4OI6xw1bYhOqfE5S33Z1OPy+d+To= github.com/mattn/go-zglob v0.0.3/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= +github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -700,8 +648,8 @@ github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= @@ -713,8 +661,8 @@ github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.10.1/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 h1:mFwc4LvZ0xpSvDZ3E+k8Yte0hLOMxXUlP+yXtJqkYfQ= 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/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -764,14 +712,16 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= -github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= @@ -780,8 +730,9 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -791,8 +742,9 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= 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= @@ -869,8 +821,8 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI= +github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -945,15 +897,12 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= @@ -961,8 +910,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= goji.io v2.0.0+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= goji.io v2.0.2+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -990,8 +939,6 @@ golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1020,7 +967,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= @@ -1034,8 +980,6 @@ golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hM golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -1081,18 +1025,13 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1100,18 +1039,9 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1181,35 +1111,25 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1218,17 +1138,17 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= -golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1287,18 +1207,9 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1327,18 +1238,6 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1381,32 +1280,7 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 h1:hrbNEivu7Zn1pxvHk6MBrq9iE22woVILTHqexqBxe6I= google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -1424,21 +1298,9 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1452,8 +1314,9 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= @@ -1509,61 +1372,61 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= -k8s.io/api v0.25.4 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= -k8s.io/api v0.25.4/go.mod h1:IG2+RzyPQLllQxnhzD8KQNEu4c4YvyDTpSMztf4A0OQ= +k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ= +k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg= k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF+aOdIWDOZxgo= k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= -k8s.io/apiextensions-apiserver v0.25.4 h1:7hu9pF+xikxQuQZ7/30z/qxIPZc2J1lFElPtr7f+B6U= -k8s.io/apiextensions-apiserver v0.25.4/go.mod h1:bkSGki5YBoZWdn5pWtNIdGvDrrsRWlmnvl9a+tAw5vQ= +k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI= +k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.25.4 h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc= -k8s.io/apimachinery v0.25.4/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= +k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ= +k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw= k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= k8s.io/cli-runtime v0.18.0/go.mod h1:1eXfmBsIJosjn9LjEBUd2WVPoPAY9XGTqTFcPMIBsUQ= k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8= k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q= -k8s.io/client-go v0.25.4 h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8= -k8s.io/client-go v0.25.4/go.mod h1:8trHCAC83XKY0wsBIpbirZU4NTUpbuhc2JnI7OruGZw= +k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU= +k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE= k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/code-generator v0.25.4 h1:tjQ7/+9eN7UOiU2DP+0v4ntTI4JZLi2c1N0WllpFhTc= -k8s.io/code-generator v0.25.4/go.mod h1:9F5fuVZOMWRme7MYj2YT3L9ropPWPokd9VRhVyD3+0w= +k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo= +k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I= k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c= k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= -k8s.io/component-base v0.25.4 h1:n1bjg9Yt+G1C0WnIDJmg2fo6wbEU1UGMRiQSjmj7hNQ= -k8s.io/component-base v0.25.4/go.mod h1:nnZJU8OP13PJEm6/p5V2ztgX2oyteIaAGKGMYb2L2cY= +k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= +k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= -k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= +k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= -k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= -k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/kubectl v0.18.0/go.mod h1:LOkWx9Z5DXMEg5KtOjHhRiC1fqJPLyCr3KtQgEolCkU= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/metrics v0.18.0/go.mod h1:8aYTW18koXqjLVKL7Ds05RPMX9ipJZI3mywYvBOxXd4= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/letsencrypt v0.0.1/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= sigs.k8s.io/controller-runtime v0.6.2/go.mod h1:vhcq/rlnENJ09SIRp3EveTaZ0yqH526hjf9iJdbUJ/E= -sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg= -sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI= +sigs.k8s.io/controller-runtime v0.14.4 h1:Kd/Qgx5pd2XUL08eOV2vwIq3L9GhIbJ5Nxengbd4/0M= +sigs.k8s.io/controller-runtime v0.14.4/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= From 4933c7dcc0731b7675a0a817f0bc1fb7916f40b8 Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Mon, 13 Mar 2023 21:36:03 +0000 Subject: [PATCH 09/17] codegen --- ci/oss_compliance/osa_provided.md | 42 +++++++++---------- .../v1alpha1/cluster.pb.go | 1 + 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/ci/oss_compliance/osa_provided.md b/ci/oss_compliance/osa_provided.md index 58ee0dedc..0a7dc1686 100644 --- a/ci/oss_compliance/osa_provided.md +++ b/ci/oss_compliance/osa_provided.md @@ -1,16 +1,14 @@ Name|Version|License ---|---|--- -[PuerkitoBio/purell](https://github.com/PuerkitoBio/purell)|v1.1.1|BSD 3-clause "New" or "Revised" License -[PuerkitoBio/urlesc](https://github.com/PuerkitoBio/urlesc)|v0.0.0-20170810143723-de5bf2ad4578|BSD 3-clause "New" or "Revised" License [perks/quantile](https://github.com/beorn7/perks)|v1.0.1|MIT License [xxhash/v2](https://github.com/cespare/xxhash)|v2.1.2|MIT License [go-spew/spew](https://github.com/davecgh/go-spew)|v1.1.1|ISC License -[v3/log](https://github.com/emicklei/go-restful)|v3.8.0|MIT License +[v3/log](https://github.com/emicklei/go-restful)|v3.9.0|MIT License [json-patch/v5](https://github.com/evanphx/json-patch)|v5.6.0|BSD 3-clause "New" or "Revised" License -[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.5.4|BSD 3-clause "New" or "Revised" License +[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.6.0|BSD 3-clause "New" or "Revised" License [go-logr/logr](https://github.com/go-logr/logr)|v1.2.3|Apache License 2.0 [go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.19.5|Apache License 2.0 -[go-openapi/jsonreference](https://github.com/go-openapi/jsonreference)|v0.19.5|Apache License 2.0 +[jsonreference/internal](https://github.com/go-openapi/jsonreference)|v0.20.0|Apache License 2.0 [go-openapi/swag](https://github.com/go-openapi/swag)|v0.19.14|Apache License 2.0 [gogo/protobuf](https://github.com/gogo/protobuf)|v1.3.2|BSD 3-clause "New" or "Revised" License [groupcache/lru](https://github.com/golang/groupcache)|v0.0.0-20210331224755-41bb18bfe9da|Apache License 2.0 @@ -22,38 +20,38 @@ Name|Version|License [josharian/intern](https://github.com/josharian/intern)|v1.0.0|MIT License [json-iterator/go](https://github.com/json-iterator/go)|v1.1.12|MIT License [mailru/easyjson](https://github.com/mailru/easyjson)|v0.7.6|MIT License -[golang_protobuf_extensions/pbutil](https://github.com/matttproud/golang_protobuf_extensions)|v1.0.2-0.20181231171920-c182affec369|Apache License 2.0 +[golang_protobuf_extensions/pbutil](https://github.com/matttproud/golang_protobuf_extensions)|v1.0.2|Apache License 2.0 [modern-go/concurrent](https://github.com/modern-go/concurrent)|v0.0.0-20180306012644-bacd9c7ef1dd|Apache License 2.0 [modern-go/reflect2](https://github.com/modern-go/reflect2)|v1.0.2|Apache License 2.0 [munnerz/goautoneg](https://github.com/munnerz/goautoneg)|v0.0.0-20191010083416-a7dc8b61c822|BSD 3-clause "New" or "Revised" License [pkg/errors](https://github.com/pkg/errors)|v0.9.1|BSD 2-clause "Simplified" License -[client_golang/prometheus](https://github.com/prometheus/client_golang)|v1.12.2|Apache License 2.0 -[client_model/go](https://github.com/prometheus/client_model)|v0.2.0|Apache License 2.0 -[prometheus/common](https://github.com/prometheus/common)|v0.32.1|Apache License 2.0 -[procfs/internal](https://github.com/prometheus/procfs)|v0.7.3|Apache License 2.0 +[client_golang/prometheus](https://github.com/prometheus/client_golang)|v1.14.0|Apache License 2.0 +[client_model/go](https://github.com/prometheus/client_model)|v0.3.0|Apache License 2.0 +[prometheus/common](https://github.com/prometheus/common)|v0.37.0|Apache License 2.0 +[procfs/internal](https://github.com/prometheus/procfs)|v0.8.0|Apache License 2.0 [rotisserie/eris](https://github.com/rotisserie/eris)|v0.1.1|MIT License [go.uber.org/atomic](https://go.uber.org/atomic)|v1.7.0|MIT License [go.uber.org/multierr](https://go.uber.org/multierr)|v1.6.0|MIT License -[go.uber.org/zap](https://go.uber.org/zap)|v1.21.0|MIT License +[go.uber.org/zap](https://go.uber.org/zap)|v1.24.0|MIT License [exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20220921164117-439092de6870|BSD 3-clause "New" or "Revised" License [x/net](https://golang.org/x/net)|v0.6.0|BSD 3-clause "New" or "Revised" License -[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.0.0-20211104180415-d3ed0bb246c8|BSD 3-clause "New" or "Revised" License +[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.0.0-20220223155221-ee480838109b|BSD 3-clause "New" or "Revised" License [x/term](https://golang.org/x/term)|v0.5.0|BSD 3-clause "New" or "Revised" License [x/text](https://golang.org/x/text)|v0.7.0|BSD 3-clause "New" or "Revised" License -[time/rate](https://golang.org/x/time/rate)|v0.0.0-20220609170525-579cf78fd858|BSD 3-clause "New" or "Revised" License +[time/rate](https://golang.org/x/time/rate)|v0.3.0|BSD 3-clause "New" or "Revised" License [jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.2.0|Apache License 2.0 -[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.28.0|BSD 3-clause "New" or "Revised" License +[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.28.1|BSD 3-clause "New" or "Revised" License [gopkg.in/inf.v0](https://gopkg.in/inf.v0)|v0.9.1|BSD 3-clause "New" or "Revised" License [gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)|v2.4.0|Apache License 2.0 [gopkg.in/yaml.v3](https://gopkg.in/yaml.v3)|v3.0.1|MIT License -[k8s.io/api](https://k8s.io/api)|v0.25.4|Apache License 2.0 -[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.25.4|Apache License 2.0 -[k8s.io/client-go](https://k8s.io/client-go)|v0.25.4|Apache License 2.0 -[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.25.4|Apache License 2.0 -[v2/internal](https://k8s.io/klog/v2/internal)|v2.70.1|Apache License 2.0 -[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20220803162953-67bda5d908f1|Apache License 2.0 -[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20220728103510-ee6ede2d64ed|Apache License 2.0 -[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.13.1|Apache License 2.0 +[k8s.io/api](https://k8s.io/api)|v0.26.1|Apache License 2.0 +[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.26.1|Apache License 2.0 +[k8s.io/client-go](https://k8s.io/client-go)|v0.26.1|Apache License 2.0 +[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.26.1|Apache License 2.0 +[v2/internal](https://k8s.io/klog/v2/internal)|v2.80.1|Apache License 2.0 +[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20221012153701-172d655c2280|Apache License 2.0 +[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20221128185143-99ec85e7a448|Apache License 2.0 +[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.14.4|Apache License 2.0 [encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20220713155537-f223a00ba0e2|Apache License 2.0 [structured-merge-diff/v4](https://sigs.k8s.io/structured-merge-diff/v4)|v4.2.3|Apache License 2.0 [sigs.k8s.io/yaml](https://sigs.k8s.io/yaml)|v1.3.0|MIT License diff --git a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go index b155fb739..cb5acb2cc 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go @@ -160,6 +160,7 @@ func (x *KubernetesClusterStatus) GetPolicyRules() []*PolicyRule { return nil } +// //Copy pasted from the official kubernetes definition: //https://github.com/kubernetes/api/blob/697df40f2d58d7d48b180b83d7b9b2b5ff812923/rbac/v1alpha1/generated.proto#L98 //PolicyRule holds information that describes a policy rule, but does not contain information From 25c0574e3ae9a6956fd914febeff466dac0c0f33 Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Mon, 13 Mar 2023 21:39:35 +0000 Subject: [PATCH 10/17] move changelog --- changelog/{v0.28.0 => v0.30.0}/update-controller-runtime.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{v0.28.0 => v0.30.0}/update-controller-runtime.yaml (100%) diff --git a/changelog/v0.28.0/update-controller-runtime.yaml b/changelog/v0.30.0/update-controller-runtime.yaml similarity index 100% rename from changelog/v0.28.0/update-controller-runtime.yaml rename to changelog/v0.30.0/update-controller-runtime.yaml From f8a7c6ed98e043f1c257a4f4181e799edbd2ad8a Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Tue, 14 Mar 2023 00:30:36 +0000 Subject: [PATCH 11/17] add dependency bump info for k8s.io/api and controller-runtime --- changelog/v0.30.0/update-controller-runtime.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/changelog/v0.30.0/update-controller-runtime.yaml b/changelog/v0.30.0/update-controller-runtime.yaml index aecc755ec..1b86936e6 100644 --- a/changelog/v0.30.0/update-controller-runtime.yaml +++ b/changelog/v0.30.0/update-controller-runtime.yaml @@ -2,4 +2,13 @@ changelog: - type: BREAKING_CHANGE description: Update Status API signature to comply with controller-runtime v0.14.x API breakage issueLink: https://github.com/solo-io/skv2/issues/419 - + - type: DEPENDENCY_BUMP + dependencyOwner: sigs.k8s.io + dependencyRepo: controller-runtime + dependencyTag: v0.14.4 + description: Contains breaking API changes from controller-runtile v0.13 + - type: DEPENDENCY_BUMP + dependencyOwner: k8s.io + dependencyRepo: api + dependencyTag: v0.26.1 + description: pulled in by sigs.k8s.io/sontroller-runtime From d61cf67bfb1ed71bebf45ccabf734645172e3be8 Mon Sep 17 00:00:00 2001 From: Trevor Edris Date: Fri, 21 Apr 2023 11:37:15 -0400 Subject: [PATCH 12/17] Use v0.26.4; update changelog --- .../v0.30.0/update-controller-runtime.yaml | 17 ++++++++++- go.mod | 14 +++++----- go.sum | 28 +++++++++---------- 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/changelog/v0.30.0/update-controller-runtime.yaml b/changelog/v0.30.0/update-controller-runtime.yaml index 1b86936e6..5e4c8f78b 100644 --- a/changelog/v0.30.0/update-controller-runtime.yaml +++ b/changelog/v0.30.0/update-controller-runtime.yaml @@ -10,5 +10,20 @@ changelog: - type: DEPENDENCY_BUMP dependencyOwner: k8s.io dependencyRepo: api - dependencyTag: v0.26.1 + dependencyTag: v0.26.4 + description: pulled in by sigs.k8s.io/sontroller-runtime + - type: DEPENDENCY_BUMP + dependencyOwner: k8s.io + dependencyRepo: apiextensions-apiserver + dependencyTag: v0.26.4 + description: pulled in by sigs.k8s.io/sontroller-runtime + - type: DEPENDENCY_BUMP + dependencyOwner: k8s.io + dependencyRepo: client-go + dependencyTag: v0.26.4 + description: pulled in by sigs.k8s.io/sontroller-runtime + - type: DEPENDENCY_BUMP + dependencyOwner: k8s.io + dependencyRepo: code-generator + dependencyTag: v0.26.4 description: pulled in by sigs.k8s.io/sontroller-runtime diff --git a/go.mod b/go.mod index 55b12bed8..d5159a3f0 100644 --- a/go.mod +++ b/go.mod @@ -45,11 +45,11 @@ require ( google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.26.1 - k8s.io/apiextensions-apiserver v0.26.1 - k8s.io/apimachinery v0.26.1 - k8s.io/client-go v0.26.1 - k8s.io/code-generator v0.26.1 + k8s.io/api v0.26.4 + k8s.io/apiextensions-apiserver v0.26.4 + k8s.io/apimachinery v0.26.4 + k8s.io/client-go v0.26.4 + k8s.io/code-generator v0.26.4 k8s.io/klog/v2 v2.80.1 k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 sigs.k8s.io/controller-runtime v0.14.4 @@ -115,7 +115,7 @@ require ( golang.org/x/crypto v0.1.0 // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/mod v0.8.0 // indirect - golang.org/x/net v0.6.0 // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.5.0 // indirect @@ -127,7 +127,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - k8s.io/component-base v0.26.1 // indirect + k8s.io/component-base v0.26.4 // indirect k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/go.sum b/go.sum index 2e781d029..d627edaf9 100644 --- a/go.sum +++ b/go.sum @@ -1032,8 +1032,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1372,31 +1372,31 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= -k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ= -k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg= +k8s.io/api v0.26.4 h1:qSG2PmtcD23BkYiWfoYAcak870eF/hE7NNYBYavTT94= +k8s.io/api v0.26.4/go.mod h1:WwKEXU3R1rgCZ77AYa7DFksd9/BAIKyOmRlbVxgvjCk= k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF+aOdIWDOZxgo= k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= -k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI= -k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= +k8s.io/apiextensions-apiserver v0.26.4 h1:9D2RTxYGxrG5uYg6D7QZRcykXvavBvcA59j5kTaedQI= +k8s.io/apiextensions-apiserver v0.26.4/go.mod h1:cd4uGFGIgzEqUghWpRsr9KE8j2KNTjY8Ji8pnMMazyw= k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ= -k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= +k8s.io/apimachinery v0.26.4 h1:rZccKdBLg9vP6J09JD+z8Yr99Ce8gk3Lbi9TCx05Jzs= +k8s.io/apimachinery v0.26.4/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw= k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= k8s.io/cli-runtime v0.18.0/go.mod h1:1eXfmBsIJosjn9LjEBUd2WVPoPAY9XGTqTFcPMIBsUQ= k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8= k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q= -k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU= -k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE= +k8s.io/client-go v0.26.4 h1:/7P/IbGBuT73A+G97trf44NTPSNqvuBREpOfdLbHvD4= +k8s.io/client-go v0.26.4/go.mod h1:6qOItWm3EwxJdl/8p5t7FWtWUOwyMdA8N9ekbW4idpI= k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo= -k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I= +k8s.io/code-generator v0.26.4 h1:zgDD0qX13p/jtrAoYRRiYeQ5ibnriwmo2cMkMZAtJxc= +k8s.io/code-generator v0.26.4/go.mod h1:ryaiIKwfxEJEaywEzx3dhWOydpVctKYbqLajJf0O8dI= k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c= k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= -k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= -k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= +k8s.io/component-base v0.26.4 h1:Bg2xzyXNKL3eAuiTEu3XE198d6z22ENgFgGQv2GGOUk= +k8s.io/component-base v0.26.4/go.mod h1:lTuWL1Xz/a4e80gmIC3YZG2JCO4xNwtKWHJWeJmsq20= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= From 291bb614e0d664a57274033b8ba16a0a04605031 Mon Sep 17 00:00:00 2001 From: Trevor Edris Date: Fri, 21 Apr 2023 11:38:34 -0400 Subject: [PATCH 13/17] make generated-code --- ci/oss_compliance/osa_provided.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/oss_compliance/osa_provided.md b/ci/oss_compliance/osa_provided.md index 0a7dc1686..579323173 100644 --- a/ci/oss_compliance/osa_provided.md +++ b/ci/oss_compliance/osa_provided.md @@ -34,7 +34,7 @@ Name|Version|License [go.uber.org/multierr](https://go.uber.org/multierr)|v1.6.0|MIT License [go.uber.org/zap](https://go.uber.org/zap)|v1.24.0|MIT License [exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20220921164117-439092de6870|BSD 3-clause "New" or "Revised" License -[x/net](https://golang.org/x/net)|v0.6.0|BSD 3-clause "New" or "Revised" License +[x/net](https://golang.org/x/net)|v0.7.0|BSD 3-clause "New" or "Revised" License [oauth2/internal](https://golang.org/x/oauth2/internal)|v0.0.0-20220223155221-ee480838109b|BSD 3-clause "New" or "Revised" License [x/term](https://golang.org/x/term)|v0.5.0|BSD 3-clause "New" or "Revised" License [x/text](https://golang.org/x/text)|v0.7.0|BSD 3-clause "New" or "Revised" License @@ -44,10 +44,10 @@ Name|Version|License [gopkg.in/inf.v0](https://gopkg.in/inf.v0)|v0.9.1|BSD 3-clause "New" or "Revised" License [gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)|v2.4.0|Apache License 2.0 [gopkg.in/yaml.v3](https://gopkg.in/yaml.v3)|v3.0.1|MIT License -[k8s.io/api](https://k8s.io/api)|v0.26.1|Apache License 2.0 -[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.26.1|Apache License 2.0 -[k8s.io/client-go](https://k8s.io/client-go)|v0.26.1|Apache License 2.0 -[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.26.1|Apache License 2.0 +[k8s.io/api](https://k8s.io/api)|v0.26.4|Apache License 2.0 +[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.26.4|Apache License 2.0 +[k8s.io/client-go](https://k8s.io/client-go)|v0.26.4|Apache License 2.0 +[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.26.4|Apache License 2.0 [v2/internal](https://k8s.io/klog/v2/internal)|v2.80.1|Apache License 2.0 [kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20221012153701-172d655c2280|Apache License 2.0 [k8s.io/utils](https://k8s.io/utils)|v0.0.0-20221128185143-99ec85e7a448|Apache License 2.0 From 06b9cc8ec4c69b492e825f07a778b5636a27781c Mon Sep 17 00:00:00 2001 From: Trevor Edris Date: Fri, 21 Apr 2023 11:40:39 -0400 Subject: [PATCH 14/17] Move changelog from v0.30.0 to v0.29.6 --- changelog/{v0.30.0 => v0.29.6}/update-controller-runtime.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{v0.30.0 => v0.29.6}/update-controller-runtime.yaml (100%) diff --git a/changelog/v0.30.0/update-controller-runtime.yaml b/changelog/v0.29.6/update-controller-runtime.yaml similarity index 100% rename from changelog/v0.30.0/update-controller-runtime.yaml rename to changelog/v0.29.6/update-controller-runtime.yaml From f386abf81eaacde0825f8ef239c07b66068fb1c5 Mon Sep 17 00:00:00 2001 From: Trevor Edris Date: Fri, 21 Apr 2023 11:57:11 -0400 Subject: [PATCH 15/17] Move changelog back to v0.30.0 --- changelog/{v0.29.6 => v0.30.0}/update-controller-runtime.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{v0.29.6 => v0.30.0}/update-controller-runtime.yaml (100%) diff --git a/changelog/v0.29.6/update-controller-runtime.yaml b/changelog/v0.30.0/update-controller-runtime.yaml similarity index 100% rename from changelog/v0.29.6/update-controller-runtime.yaml rename to changelog/v0.30.0/update-controller-runtime.yaml From 4dcfdf2207ec292c9357157a890b49ee6f8cc52a Mon Sep 17 00:00:00 2001 From: Trevor Edris Date: Fri, 21 Apr 2023 12:24:39 -0400 Subject: [PATCH 16/17] Update from go 1.18 to go 1.20 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d5159a3f0..221e17926 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/solo-io/skv2 -go 1.18 +go 1.20 require ( github.com/BurntSushi/toml v0.3.1 From ade07ab8429a6b241a7237d63e09b28857c43f93 Mon Sep 17 00:00:00 2001 From: Trevor Edris Date: Fri, 21 Apr 2023 12:36:00 -0400 Subject: [PATCH 17/17] make generated-code --- codegen/test/api/things.test.io/v1/test_api.pb.go | 2 ++ pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go | 13 ++++++------- pkg/multicluster/watch/watcher.go | 11 ++++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/codegen/test/api/things.test.io/v1/test_api.pb.go b/codegen/test/api/things.test.io/v1/test_api.pb.go index b937c23bc..53e16624d 100644 --- a/codegen/test/api/things.test.io/v1/test_api.pb.go +++ b/codegen/test/api/things.test.io/v1/test_api.pb.go @@ -81,6 +81,7 @@ type PaintSpec struct { Color *PaintColor `protobuf:"bytes,1,opt,name=color,proto3" json:"color,omitempty"` // Types that are assignable to PaintType: + // // *PaintSpec_Acrylic // *PaintSpec_Oil PaintType isPaintSpec_PaintType `protobuf_oneof:"paintType"` @@ -288,6 +289,7 @@ type OilType struct { WaterMixable bool `protobuf:"varint,1,opt,name=waterMixable,proto3" json:"waterMixable,omitempty"` // Types that are assignable to PigmentType: + // // *OilType_Powder // *OilType_Fluid PigmentType isOilType_PigmentType `protobuf_oneof:"pigmentType"` diff --git a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go index cb5acb2cc..6012226be 100644 --- a/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go +++ b/pkg/api/multicluster.solo.io/v1alpha1/cluster.pb.go @@ -23,8 +23,7 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// -//Representation of a Kubernetes cluster that has been registered. +// Representation of a Kubernetes cluster that has been registered. type KubernetesClusterSpec struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -160,11 +159,10 @@ func (x *KubernetesClusterStatus) GetPolicyRules() []*PolicyRule { return nil } -// -//Copy pasted from the official kubernetes definition: -//https://github.com/kubernetes/api/blob/697df40f2d58d7d48b180b83d7b9b2b5ff812923/rbac/v1alpha1/generated.proto#L98 -//PolicyRule holds information that describes a policy rule, but does not contain information -//about who the rule applies to or which namespace the rule applies to. +// Copy pasted from the official kubernetes definition: +// https://github.com/kubernetes/api/blob/697df40f2d58d7d48b180b83d7b9b2b5ff812923/rbac/v1alpha1/generated.proto#L98 +// PolicyRule holds information that describes a policy rule, but does not contain information +// about who the rule applies to or which namespace the rule applies to. type PolicyRule struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -265,6 +263,7 @@ type KubernetesClusterSpec_ProviderInfo struct { // Metadata specific to a cloud provider. // // Types that are assignable to ProviderInfoType: + // // *KubernetesClusterSpec_ProviderInfo_Eks ProviderInfoType isKubernetesClusterSpec_ProviderInfo_ProviderInfoType `protobuf_oneof:"provider_info_type"` } diff --git a/pkg/multicluster/watch/watcher.go b/pkg/multicluster/watch/watcher.go index 0c08e5362..bae3b68a4 100644 --- a/pkg/multicluster/watch/watcher.go +++ b/pkg/multicluster/watch/watcher.go @@ -67,11 +67,12 @@ var _ multicluster.Interface = &clusterWatcher{} // NewClusterWatcher returns a *clusterWatcher, which watches for changes to kubeconfig secrets // (which contain kubeconfigs for remote clusters). -// - When ctx is cancelled, all cluster managers started by the clusterWatcher are stopped. -// - Provided manager.Options are applied to all managers started by the clusterWatcher. -// - RetryOptions specify how to retry manager creation if it fails. Any fields not explicitly provided -// in the retry options will take on the default values. -// - If watchNamespaces is not empty, only secrets in the given namespaces will be watched. If empty, secrets in +// - When ctx is cancelled, all cluster managers started by the clusterWatcher are stopped. +// - Provided manager.Options are applied to all managers started by the clusterWatcher. +// - RetryOptions specify how to retry manager creation if it fails. Any fields not explicitly provided +// in the retry options will take on the default values. +// - If watchNamespaces is not empty, only secrets in the given namespaces will be watched. If empty, secrets in +// // all namespaces will be watched. func NewClusterWatcher(ctx context.Context, managerOptions manager.Options,