Skip to content

Commit

Permalink
chore(deps): Bump google.golang.org/grpc from 1.58.2 to 1.60.1 (#345)
Browse files Browse the repository at this point in the history
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from
1.58.2 to 1.60.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/grpc/grpc-go/releases">google.golang.org/grpc's
releases</a>.</em></p>
<blockquote>
<h2>Release v1.60.1</h2>
<h1>Bug Fixes</h1>
<ul>
<li>server: fix two bugs that could lead to panics at shutdown when
using <a
href="https://pkg.go.dev/google.golang.org/grpc#NumStreamWorkers">NumStreamWorkers</a>
(experimental feature).</li>
</ul>
<h2>Release 1.60.0</h2>
<h1>Security</h1>
<ul>
<li>credentials/tls: if not set, set TLS MinVersion to 1.2 and
CipherSuites according to supported suites not forbidden by RFC7540.
<ul>
<li>This is a behavior change to bring us into better alignment with RFC
7540.</li>
</ul>
</li>
</ul>
<h1>API Changes</h1>
<ul>
<li>resolver: remove deprecated and experimental
<code>ClientConn.NewServiceConfig</code> (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6784">#6784</a>)</li>
<li>client: remove deprecated <code>grpc.WithServiceConfig</code>
<code>DialOption</code> (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6800">#6800</a>)</li>
</ul>
<h1>Bug Fixes</h1>
<ul>
<li>client: fix race that could cause a deadlock while entering idle
mode and receiving a name resolver update (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6804">#6804</a>)</li>
<li>client: always enable TCP keepalives with OS defaults (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6834">#6834</a>)</li>
<li>credentials/alts: fix a bug preventing ALTS from connecting to the
metadata server if the default scheme is overridden (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6686">#6686</a>)
<ul>
<li>Special Thanks: <a
href="https://github.com/mjamaloney"><code>@​mjamaloney</code></a></li>
</ul>
</li>
</ul>
<h1>Behavior Changes</h1>
<ul>
<li>server: Do not return from Stop() or GracefulStop() until all
resources are released (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6489">#6489</a>)
<ul>
<li>Special Thanks: <a
href="https://github.com/fho"><code>@​fho</code></a></li>
</ul>
</li>
</ul>
<h1>Documentation</h1>
<ul>
<li>codes: clarify that only codes defined by this package are valid and
that users should not cast other values to <code>codes.Code</code> (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6701">#6701</a>)</li>
</ul>
<h2>Release 1.58.3</h2>
<h1>Security</h1>
<ul>
<li>
<p>server: prohibit more than MaxConcurrentStreams handlers from running
at once (CVE-2023-44487)</p>
<p>In addition to this change, applications should ensure they do not
leave running tasks behind related to the RPC before returning from
method handlers, or should enforce appropriate limits on any such
work.</p>
</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/grpc/grpc-go/commit/dbbcf59957fec0bd58063224cbf105b3b3698d4e"><code>dbbcf59</code></a>
Update version.go to 1.60.1 (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6865">#6865</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/6e384cfd437a759b6c21af9496c4e32bd890af2e"><code>6e384cf</code></a>
Cherry-pick <a
href="https://redirect.github.com/grpc/grpc-go/issues/6856">#6856</a> to
v1.60.x release branch (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6864">#6864</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/6430548ff97b036ffaea26b9381252b46352d385"><code>6430548</code></a>
Change version to 1.60.1-dev (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6793">#6793</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/297d8ddeb0d5834b47f40a5bd624aa0c2cfb9c7a"><code>297d8dd</code></a>
Cherry-pick <a
href="https://redirect.github.com/grpc/grpc-go/issues/6841">#6841</a> to
v1.60.x release branch (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6847">#6847</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/3580447e0cc2b9fb1c2f005b182d172c673fc0c6"><code>3580447</code></a>
Change version to 1.60.0 (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6792">#6792</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/71e67a93f46639f053cc83cd29e74d2a0248468e"><code>71e67a9</code></a>
Cherry-pick <a
href="https://redirect.github.com/grpc/grpc-go/issues/6834">#6834</a> to
v1.60.x release branch (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6839">#6839</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/cb6581dd1a407e1679498e9b304ae2000da7dd92"><code>cb6581d</code></a>
Cherry-pick <a
href="https://redirect.github.com/grpc/grpc-go/issues/6804">#6804</a>
and dependencies to v1.60.x release branch (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6838">#6838</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/dd39cdbddcfbc1ad1cf04910d8fba2b7201469ec"><code>dd39cdb</code></a>
credentials: if not set, restrict to TLS v1.2+ and CipherSuites per
RFC7540 (...</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/8645f95509d6c5d17a54621407f3ca717d4f8620"><code>8645f95</code></a>
resolver: remove ClientConn.NewServiceConfig (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6784">#6784</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/8b17a4dbc328e8ef7f9e5094ab5fe8a78efccbb8"><code>8b17a4d</code></a>
vet: various cleanups (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6780">#6780</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/grpc/grpc-go/compare/v1.58.2...v1.60.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=google.golang.org/grpc&package-manager=go_modules&previous-version=1.58.2&new-version=1.60.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: ThibaultFy <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ThibaultFy <[email protected]>
  • Loading branch information
dependabot[bot] and ThibaultFy authored Jan 12, 2024
1 parent 82f4a8f commit e8e2a60
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 553 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/golintci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.18.x
go-version: 1.21.x
- name: Cache Go modules
uses: actions/cache@v3
with:
Expand All @@ -36,16 +36,16 @@ jobs:
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protoc-3.14.0-linux-x86_64.zip
unzip protoc-3.14.0-linux-x86_64.zip -d $HOME/.local
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Install non-module tools
- name: Install go tools
run: |
cd /tmp
go install google.golang.org/protobuf/cmd/[email protected]
go install google.golang.org/grpc/cmd/[email protected]
go install github.com/vektra/mockery/v2@v2.13.1
go install github.com/vektra/mockery/v2@v2.36.0
- name: Build
run: make codegen mocks
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.46.2
version: v1.55.2
skip-pkg-cache: true
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ linters-settings:
"commonserv": github.com/substra/orchestrator/server/common
"sq": github.com/Masterminds/squirrel
"e2erequire": github.com/substra/orchestrator/e2e/require
revive:
severity: error
44 changes: 4 additions & 40 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ replace github.com/hyperledger/fabric-sdk-go => github.com/owkin/fabric-sdk-go v
require (
github.com/Masterminds/squirrel v1.5.4
github.com/go-ozzo/ozzo-validation/v4 v4.3.0
github.com/golang/protobuf v1.5.3
github.com/google/uuid v1.4.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/jackc/pgconn v1.14.1
Expand All @@ -20,73 +19,38 @@ require (
github.com/rs/zerolog v1.31.0
github.com/stretchr/testify v1.8.4
golang.org/x/sync v0.4.0
google.golang.org/grpc v1.58.2
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cloudflare/cfssl v1.4.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-kit/kit v0.10.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/spec v0.20.8 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/gobuffalo/envy v1.10.1 // indirect
github.com/gobuffalo/packd v1.0.1 // indirect
github.com/gobuffalo/packr v1.30.1 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/google/certificate-transparency-go v1.0.21 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hyperledger/fabric-config v0.0.5 // indirect
github.com/hyperledger/fabric-lib-go v1.0.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/puddle v1.3.0 // indirect
github.com/joho/godotenv v1.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.3.2 // indirect
github.com/onsi/gomega v1.10.4 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.4.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/weppos/publicsuffix-go v0.5.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e // indirect
github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit e8e2a60

Please sign in to comment.