From e4be012b7d09723f83f77d0a354c76d222245fce Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Tue, 10 Oct 2023 21:32:48 +0100 Subject: [PATCH 1/2] Relax mandatory FluentD's key and cert (#948) There are cases where the upstream service uses other CA certificates and shares it with other components. When this happens, it's not possible to configure fluentd to use mTLS. This commit relaxes the mandatory cert-key usage for fluentD. Signed-off-by: Tiago Silva --- event-handler/cli.go | 4 ++-- event-handler/fluentd_client.go | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/event-handler/cli.go b/event-handler/cli.go index cef83a807..3fa48a9bf 100644 --- a/event-handler/cli.go +++ b/event-handler/cli.go @@ -38,10 +38,10 @@ type FluentdConfig struct { FluentdSessionURL string `help:"fluentd session url" required:"true" env:"FDFWD_FLUENTD_SESSION_URL"` // FluentdCert is a path to fluentd cert - FluentdCert string `help:"fluentd TLS certificate file" required:"true" type:"existingfile" env:"FDWRD_FLUENTD_CERT"` + FluentdCert string `help:"fluentd TLS certificate file" type:"existingfile" env:"FDWRD_FLUENTD_CERT"` // FluentdKey is a path to fluentd key - FluentdKey string `help:"fluentd TLS key file" required:"true" type:"existingfile" env:"FDWRD_FLUENTD_KEY"` + FluentdKey string `help:"fluentd TLS key file" type:"existingfile" env:"FDWRD_FLUENTD_KEY"` // FluentdCA is a path to fluentd CA FluentdCA string `help:"fluentd TLS CA file" type:"existingfile" env:"FDWRD_FLUENTD_CA"` diff --git a/event-handler/fluentd_client.go b/event-handler/fluentd_client.go index 8f8dfd067..e1a8c6703 100644 --- a/event-handler/fluentd_client.go +++ b/event-handler/fluentd_client.go @@ -43,9 +43,15 @@ type FluentdClient struct { // NewFluentdClient creates new FluentdClient func NewFluentdClient(c *FluentdConfig) (*FluentdClient, error) { - cert, err := tls.LoadX509KeyPair(c.FluentdCert, c.FluentdKey) - if err != nil { - return nil, trace.Wrap(err) + var certs []tls.Certificate + if c.FluentdCert != "" && c.FluentdKey != "" { + cert, err := tls.LoadX509KeyPair(c.FluentdCert, c.FluentdKey) + if err != nil { + return nil, trace.Wrap(err) + } + certs = append(certs, cert) + } else if c.FluentdCert != "" || c.FluentdKey != "" { + return nil, trace.BadParameter("both fluentd_cert and fluentd_key should be specified") } ca, err := getCertPool(c) @@ -57,7 +63,7 @@ func NewFluentdClient(c *FluentdConfig) (*FluentdClient, error) { Transport: &http.Transport{ TLSClientConfig: &tls.Config{ RootCAs: ca, - Certificates: []tls.Certificate{cert}, + Certificates: certs, }, }, Timeout: httpTimeout, From 87a709e2344ced5ae5032dfd3388477c90f67fd1 Mon Sep 17 00:00:00 2001 From: Reed Loden Date: Tue, 10 Oct 2023 14:01:21 -0700 Subject: [PATCH 2/2] chore: Bump Go to v1.21.3 (#947) Update Go to the latest patch. * https://groups.google.com/g/golang-announce/c/iNNxDTCjZvo/m/UDd7VKQuAAAJ --- .drone.yml | 18 ++++++------- .github/workflows/lint.yaml | 4 +-- .github/workflows/terraform-tests.yaml | 2 +- .github/workflows/unit-tests.yaml | 2 +- access/discord/Makefile | 2 +- access/email/Makefile | 2 +- access/jira/Makefile | 2 +- access/mattermost/Makefile | 2 +- access/msteams/Makefile | 2 +- access/pagerduty/Makefile | 2 +- access/slack/Makefile | 2 +- docker/Makefile | 2 +- docker/plugins/Dockerfile | 2 +- event-handler/Makefile | 2 +- event-handler/build.assets/Makefile | 6 ++--- go.mod | 16 ++++++------ go.sum | 36 +++++++++++++------------- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3807dcca1..e2664e940 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - make lint - name: Run tests - image: golang:1.21.2 + image: golang:1.21.3 environment: RUNNER_TEMP: /tmp TELEPORT_ENTERPRISE_LICENSE: @@ -66,7 +66,7 @@ workspace: steps: - name: Build artifacts - image: golang:1.21.2 + image: golang:1.21.3 commands: - make build-all @@ -97,7 +97,7 @@ workspace: steps: - name: Build artifacts - image: golang:1.21.2 + image: golang:1.21.3 commands: - mkdir -p build/ - export PLUGIN_TYPE=$(echo ${DRONE_TAG} | cut -d- -f2) @@ -311,7 +311,7 @@ workspace: steps: - name: Build artifacts - image: golang:1.21.2 + image: golang:1.21.3 commands: - mkdir -p build/ - go install github.com/konoui/lipo@latest @@ -384,7 +384,7 @@ workspace: steps: - name: Build artifacts - image: golang:1.21.2 + image: golang:1.21.3 commands: - mkdir -p build/ - make OS=linux ARCH=amd64 release/event-handler @@ -927,7 +927,7 @@ concurrency: steps: - name: Upload terraform provider to staging registry - image: golang:1.21.2 + image: golang:1.21.3 commands: - cd tooling - | @@ -985,7 +985,7 @@ concurrency: steps: - name: Upload terraform provider to staging registry - image: golang:1.21.2 + image: golang:1.21.3 commands: - cd tooling - | @@ -1043,7 +1043,7 @@ concurrency: steps: - name: Promote terraform provider to public registry - image: golang:1.21.2 + image: golang:1.21.3 commands: - cd tooling - | @@ -1081,6 +1081,6 @@ steps: from_secret: PRODUCTION_TERRAFORM_REGISTRY_SIGNING_KEY --- kind: signature -hmac: 00f66e92faf100b63e28b7a6465b3a1668bc4a1143017c060fb6e20c4007554d +hmac: 7329d41f2acd4c65f990204ced4435154add3fed15634bc7bcab06791dec41a1 ... diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index b3b5e3232..08587b924 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -18,10 +18,10 @@ jobs: - name: Checkout Teleport Plugins uses: actions/checkout@v3 - - name: Setup Go 1.21.2 + - name: Setup Go 1.21.3 uses: actions/setup-go@v3 with: - go-version: '1.21.2' + go-version: '1.21.3' - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/.github/workflows/terraform-tests.yaml b/.github/workflows/terraform-tests.yaml index d79718586..35500062f 100644 --- a/.github/workflows/terraform-tests.yaml +++ b/.github/workflows/terraform-tests.yaml @@ -25,7 +25,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: '1.21.2' + go-version: '1.21.3' - name: Setup Terraform uses: hashicorp/setup-terraform@v2 diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index dd2fa4432..36156481c 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -25,7 +25,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: '1.21.2' + go-version: '1.21.3' - name: Install Teleport uses: teleport-actions/setup@v1 diff --git a/access/discord/Makefile b/access/discord/Makefile index 53f70a839..c36b35111 100644 --- a/access/discord/Makefile +++ b/access/discord/Makefile @@ -1,5 +1,5 @@ VERSION=14.0.1 -GO_VERSION=1.21.2 +GO_VERSION=1.21.3 BUILDDIR ?= build BINARY = $(BUILDDIR)/teleport-discord diff --git a/access/email/Makefile b/access/email/Makefile index 0497f1c15..272a98ce4 100644 --- a/access/email/Makefile +++ b/access/email/Makefile @@ -1,5 +1,5 @@ VERSION=14.0.1 -GO_VERSION=1.21.2 +GO_VERSION=1.21.3 BUILDDIR ?= build BINARY = $(BUILDDIR)/teleport-email diff --git a/access/jira/Makefile b/access/jira/Makefile index 6077cbf18..596d95b4b 100644 --- a/access/jira/Makefile +++ b/access/jira/Makefile @@ -1,5 +1,5 @@ VERSION=14.0.1 -GO_VERSION=1.21.2 +GO_VERSION=1.21.3 BUILDDIR ?= build BINARY = $(BUILDDIR)/teleport-jira diff --git a/access/mattermost/Makefile b/access/mattermost/Makefile index d4a829102..85e1cd693 100644 --- a/access/mattermost/Makefile +++ b/access/mattermost/Makefile @@ -1,5 +1,5 @@ VERSION=14.0.1 -GO_VERSION=1.21.2 +GO_VERSION=1.21.3 BUILDDIR ?= build BINARY = $(BUILDDIR)/teleport-mattermost diff --git a/access/msteams/Makefile b/access/msteams/Makefile index f3a061297..b3fd687d4 100644 --- a/access/msteams/Makefile +++ b/access/msteams/Makefile @@ -1,5 +1,5 @@ VERSION=14.0.1 -GO_VERSION=1.21.2 +GO_VERSION=1.21.3 BUILDDIR ?= build BINARY = $(BUILDDIR)/teleport-msteams diff --git a/access/pagerduty/Makefile b/access/pagerduty/Makefile index 8d42551ea..4fc5779b9 100644 --- a/access/pagerduty/Makefile +++ b/access/pagerduty/Makefile @@ -1,5 +1,5 @@ VERSION=14.0.1 -GO_VERSION=1.21.2 +GO_VERSION=1.21.3 BUILDDIR ?= build BINARY = $(BUILDDIR)/teleport-pagerduty diff --git a/access/slack/Makefile b/access/slack/Makefile index 20300dd3d..5fac90aad 100644 --- a/access/slack/Makefile +++ b/access/slack/Makefile @@ -1,5 +1,5 @@ VERSION=14.0.1 -GO_VERSION=1.21.2 +GO_VERSION=1.21.3 BUILDDIR ?= build BINARY = $(BUILDDIR)/teleport-slack diff --git a/docker/Makefile b/docker/Makefile index 10eef3633..3ea7490a2 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -10,7 +10,7 @@ MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) # enterprise version, but has to be available on cdn.teleport.dev RELEASE ?= teleport-ent-v14.0.0-linux-amd64-bin -RUNTIME ?= go1.21.2 +RUNTIME ?= go1.21.3 BBOX ?= public.ecr.aws/gravitational/teleport-buildbox:$(RUNTIME) # Teleport CLI and plugins CLI flags to pass to them on start diff --git a/docker/plugins/Dockerfile b/docker/plugins/Dockerfile index df4c55ab5..c283d9efd 100644 --- a/docker/plugins/Dockerfile +++ b/docker/plugins/Dockerfile @@ -1,5 +1,5 @@ # Defines Teleport Slack image, based on Teleport OSS image. -ARG RUNTIME="go1.21.1" +ARG RUNTIME="go1.21.3" ARG BBOX="public.ecr.aws/gravitational/teleport-buildbox" FROM $BBOX:$RUNTIME diff --git a/event-handler/Makefile b/event-handler/Makefile index 7eea7760d..8727a8cbc 100644 --- a/event-handler/Makefile +++ b/event-handler/Makefile @@ -1,5 +1,5 @@ VERSION=14.0.1 -GO_VERSION=1.21.2 +GO_VERSION=1.21.3 GITTAG=v$(VERSION) diff --git a/event-handler/build.assets/Makefile b/event-handler/build.assets/Makefile index b4d264e16..41e05e2ee 100644 --- a/event-handler/build.assets/Makefile +++ b/event-handler/build.assets/Makefile @@ -1,7 +1,8 @@ +VERSION=0.0.1 +GO_VERSION=1.21.3 LOCALDIR := $(dir $(CURDIR)/$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) -GO_VERSION=1.21.2 +TOP ?= $(abspath $(LOCALDIR)/../..) SRCDIR=/go/src/github.com/gravitational/teleport-plugins/event-handler -VERSION=0.0.1 CGOFLAG ?= CGO_ENABLED=0 BUILDDIR=$(TOP)/build OS ?= $(shell go env GOOS) @@ -22,7 +23,6 @@ BUILDFORHOST := -e OS=$(OS) \ -e CGOFLAG=$(CGOFLAG) DOCKERPULLFLAGS ?= --pull -GO_VERSION = 1.21.1 NOROOT=-u $$(id -u):$$(id -g) BINDIR=/usr/local/bin diff --git a/go.mod b/go.mod index 4b2866120..a185f1cdf 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/gravitational/teleport-plugins go 1.21 -toolchain go1.21.1 +toolchain go1.21.3 require ( github.com/DanielTitkov/go-adaptive-cards v0.2.2 @@ -30,9 +30,9 @@ require ( github.com/stretchr/testify v1.8.4 github.com/tidwall/gjson v1.14.4 golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb - golang.org/x/net v0.14.0 + golang.org/x/net v0.17.0 golang.org/x/sync v0.3.0 - google.golang.org/grpc v1.57.0 + google.golang.org/grpc v1.58.3 google.golang.org/protobuf v1.31.0 gopkg.in/mail.v2 v2.3.1 ) @@ -117,13 +117,13 @@ require ( go.opentelemetry.io/otel/sdk v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect - golang.org/x/crypto v0.12.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 71e5ae107..3ed173bdf 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8= -github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= +github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= @@ -646,8 +646,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= 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= @@ -725,8 +725,8 @@ golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= 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= @@ -802,14 +802,14 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.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/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= 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= @@ -820,8 +820,8 @@ 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/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= 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= @@ -929,12 +929,12 @@ google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1m google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200711021454-869866162049/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= +google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0= +google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 h1:wukfNtZmZUurLN/atp2hiIeTKn7QJWIQdHzqmsOnAOk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c h1:jHkCUWkseRf+W+edG5hMzr/Uh1xkDREY4caybAq4dpY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -952,8 +952,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= +google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= 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=