Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: grpc-ecosystem/grpc-gateway
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.16.2
Choose a base ref
...
head repository: grpc-ecosystem/grpc-gateway
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.17.0
Choose a head ref

Commits on Jul 28, 2023

  1. Copy the full SHA
    734616c View commit details
  2. Copy the full SHA
    9135487 View commit details
  3. Copy the full SHA
    3b865b6 View commit details

Commits on Jul 31, 2023

  1. Copy the full SHA
    0e3bfeb View commit details
  2. Copy the full SHA
    f29729e View commit details
  3. Copy the full SHA
    e29a581 View commit details

Commits on Aug 1, 2023

  1. Copy the full SHA
    cb5d708 View commit details
  2. Copy the full SHA
    1595117 View commit details
  3. Copy the full SHA
    a37ccf8 View commit details

Commits on Aug 2, 2023

  1. Copy the full SHA
    67786af View commit details
  2. Copy the full SHA
    e41d3fc View commit details
  3. Copy the full SHA
    fe8184d View commit details

Commits on Aug 3, 2023

  1. Copy the full SHA
    d471b64 View commit details
  2. Copy the full SHA
    48bd12a View commit details
  3. Copy the full SHA
    e321e60 View commit details
  4. Copy the full SHA
    e4c40e6 View commit details
  5. Copy the full SHA
    ccac724 View commit details
  6. Copy the full SHA
    a4d9483 View commit details
  7. Copy the full SHA
    5b143fd View commit details

Commits on Aug 4, 2023

  1. Copy the full SHA
    9668db7 View commit details
  2. Copy the full SHA
    ae81c83 View commit details
  3. Copy the full SHA
    0a72c44 View commit details
  4. Copy the full SHA
    3768161 View commit details
  5. Copy the full SHA
    3e49727 View commit details

Commits on Aug 5, 2023

  1. Copy the full SHA
    021a24f View commit details
  2. Copy the full SHA
    d45f981 View commit details

Commits on Aug 7, 2023

  1. Copy the full SHA
    af65f69 View commit details
  2. Copy the full SHA
    2d16f51 View commit details
  3. Copy the full SHA
    f5cf8fc View commit details

Commits on Aug 8, 2023

  1. Copy the full SHA
    432dc52 View commit details
  2. Copy the full SHA
    2bf3a98 View commit details
  3. Copy the full SHA
    ae2edc7 View commit details
  4. Copy the full SHA
    732f66e View commit details
  5. Copy the full SHA
    0acacd9 View commit details
  6. Copy the full SHA
    ecc3f73 View commit details

Commits on Aug 9, 2023

  1. Copy the full SHA
    5af78e3 View commit details
  2. Copy the full SHA
    4ae1e79 View commit details
  3. Copy the full SHA
    7855b14 View commit details
  4. Copy the full SHA
    141f907 View commit details
  5. Copy the full SHA
    684352a View commit details

Commits on Aug 10, 2023

  1. Copy the full SHA
    8c93f83 View commit details
  2. Copy the full SHA
    f662473 View commit details
  3. Copy the full SHA
    a09ee28 View commit details

Commits on Aug 11, 2023

  1. Copy the full SHA
    d61820f View commit details
  2. Copy the full SHA
    a30671b View commit details
  3. Copy the full SHA
    06ec170 View commit details
  4. Copy the full SHA
    cdcf0ba View commit details

Commits on Aug 14, 2023

  1. Copy the full SHA
    c2d12cd View commit details
  2. Copy the full SHA
    790d61d View commit details

Commits on Aug 15, 2023

  1. Copy the full SHA
    9e39f17 View commit details
11 changes: 2 additions & 9 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
startup --output_base /home/vscode/.cache/_grpc_gateway_bazel
build --test_output errors
build --features race
# Protobuf v3.22.0+ requires C++14
build --repo_env=BAZEL_CXXOPTS=-std=c++14
# Workaround https://github.com/bazelbuild/bazel/issues/3645
# See https://docs.bazel.build/versions/0.23.0/command-line-reference.html
build --local_ram_resources=7168 # Github runners have 7G of memory
build --local_cpu_resources=2 # Github runners have 2 vCPU
build --cxxopt=-std=c++14 --host_cxxopt=-std=c++14
build --test_output=errors
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.3.0
6.3.2
2 changes: 1 addition & 1 deletion .github/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.6
FROM golang:1.21.0

ENV NVM_DIR="/usr/local/share/nvm"
ENV NVM_SYMLINK_CURRENT=true \
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -11,15 +11,15 @@ jobs:
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- run: go build ./...
test:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
with:
check-latest: true
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
@@ -28,10 +28,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3
- uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
with:
node-version: 10
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
with:
check-latest: true
- run: >
@@ -94,16 +94,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
with:
go-version: 1.19
check-latest: true
- run: go run golang.org/x/exp/cmd/gorelease@latest -base=v2.16.1
- run: go run golang.org/x/exp/cmd/gorelease@latest -base=v2.16.2
proto_lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
with:
check-latest: true
- run: make install
@@ -117,7 +117,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- uses: golangci/golangci-lint-action@639cd343e1d3b897ff35927a75193d57cfcba299 # v3
- uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3
with:
version: v1.52.2
args: --enable goimports
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
with:
fetch-depth: 0
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
with:
check-latest: true
- name: Generate goreleaser args
@@ -32,7 +32,7 @@ jobs:
args+=' --snapshot'
fi
echo "args=$args" >> $GITHUB_OUTPUT
- uses: goreleaser/goreleaser-action@336e29918d653399e599bfca99fadc1d7ffbc9f7 # v4
- uses: goreleaser/goreleaser-action@3fa32b8bb5620a2c1afe798654bbad59f9da4906 # v4
id: run-goreleaser
with:
args: ${{ steps.args.outputs.args }}
@@ -53,7 +53,7 @@ jobs:
actions: read # To read the workflow path.
id-token: write # To sign the provenance.
contents: write # To add assets to a release.
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.7.0
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.8.0
with:
compile-generator: true # Workaround for https://github.com/slsa-framework/slsa-github-generator/issues/1163
base64-subjects: "${{ needs.goreleaser.outputs.hashes }}"
10 changes: 4 additions & 6 deletions .github/workflows/renovate.yml
Original file line number Diff line number Diff line change
@@ -25,13 +25,11 @@ jobs:
key: v1-bazel-cache-${{ hashFiles('repositories.bzl') }}
restore-keys: v1-bazel-cache-
- name: Configure bazel
run: |
cat > .bazelrc << EOF
run:
| # put .bazelrc in $HOME so that it's read before project's .bazelrc
cat > /home/vscode/.bazelrc << EOF
startup --output_base /home/vscode/.cache/_grpc_gateway_bazel
build --test_output errors
build --features race
# Protobuf v3.22.0+ requires C++14
build --repo_env=BAZEL_CXXOPTS=-std=c++14
build --@io_bazel_rules_go//go/config:race
# Workaround https://github.com/bazelbuild/bazel/issues/3645
# See https://docs.bazel.build/versions/0.23.0/command-line-reference.html
build --local_ram_resources=7168 # Github runners have 7G of memory
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ docker run -itv $(pwd):/grpc-gateway -w /grpc-gateway --entrypoint /bin/bash --r
ghcr.io/grpc-ecosystem/grpc-gateway/build-env:1.19 -c '\
bazel run :gazelle -- update-repos -from_file=go.mod -to_macro=repositories.bzl%go_repositories && \
bazel run :gazelle && \
BAZEL_CXXOPTS="-std=c++14" bazel run :buildifier'
bazel run :buildifier'
```

You may need to authenticate with GitHub to pull `docker.pkg.github.com/grpc-ecosystem/grpc-gateway/build-env`.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -467,27 +467,27 @@ plugin generation looks like this:
```yaml
version: v1
plugins:
- remote: buf.build/library/plugins/go:v1.27.1-1
- plugin: buf.build/protocolbuffers/go:v1.31.0
out: gen/go
opt:
- paths=source_relative
- remote: buf.build/library/plugins/go-grpc:v1.1.0-2
- plugin: buf.build/grpc/go:v1.3.0
out: gen/go
opt:
- paths=source_relative
- remote: buf.build/grpc-ecosystem/plugins/grpc-gateway:v2.6.0-1
- plugin: buf.build/grpc-ecosystem/gateway:v2.16.2
out: gen/go
opt:
- paths=source_relative
- remote: buf.build/grpc-ecosystem/plugins/openapiv2:v2.6.0-1
- plugin: buf.build/grpc-ecosystem/openapiv2:v2.16.2
out: gen/openapiv2
```

This requires no local installation of any plugins. Be careful to use the same
version of the generator as the runtime library, i.e. if using `v2.6.0-1`, run
version of the generator as the runtime library, i.e. if using `v2.16.2`, run

```shell
$ go get github.com/grpc-ecosystem/grpc-gateway/v2@v2.6.0
$ go get github.com/grpc-ecosystem/grpc-gateway/v2@v2.16.2
```

To get the same version of the runtime in your `go.mod`.
24 changes: 12 additions & 12 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -5,25 +5,25 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

http_archive(
name = "com_google_googletest",
sha256 = "ffa17fbc5953900994e2deec164bb8949879ea09b411e07f215bfbb1f87f4632",
strip_prefix = "googletest-1.13.0",
urls = ["https://github.com/google/googletest/archive/v1.13.0.zip"],
sha256 = "1f357c27ca988c3f7c6b4bf68a9395005ac6761f034046e9dde0896e3aba00e4",
strip_prefix = "googletest-1.14.0",
urls = ["https://github.com/google/googletest/archive/v1.14.0.zip"],
)

# Define before rules_proto, otherwise we receive the version of com_google_protobuf from there
http_archive(
name = "com_google_protobuf",
sha256 = "a700a49470d301f1190a487a923b5095bf60f08f4ae4cac9f5f7c36883d17971",
strip_prefix = "protobuf-23.4",
urls = ["https://github.com/protocolbuffers/protobuf/archive/v23.4.tar.gz"],
sha256 = "0930b1a6eb840a2295dfcb13bb5736d1292c3e0d61a90391181399327be7d8f1",
strip_prefix = "protobuf-24.1",
urls = ["https://github.com/protocolbuffers/protobuf/archive/v24.1.tar.gz"],
)

http_archive(
name = "googleapis",
sha256 = "b656ed8405d82c29d98ab4495970f3ae49dbee7ec7c2a9f6981ab1175464cdf4",
strip_prefix = "googleapis-3db8b015f79d0d2b495c40ad6f0320e9d88c5275",
sha256 = "8441c56dda8a1c3c4237138bd608d5ff5eb5d3400d70e7a1306e34ac11a02a24",
strip_prefix = "googleapis-788f947c15a9595f26dcaf7c6c181503e06a3245",
urls = [
"https://github.com/googleapis/googleapis/archive/3db8b015f79d0d2b495c40ad6f0320e9d88c5275.zip",
"https://github.com/googleapis/googleapis/archive/788f947c15a9595f26dcaf7c6c181503e06a3245.zip",
],
)

@@ -104,9 +104,9 @@ protobuf_deps()

http_archive(
name = "com_github_bazelbuild_buildtools",
sha256 = "977a0bd4593c8d4c8f45e056d181c35e48aa01ad4f8090bdb84f78dca42f47dc",
strip_prefix = "buildtools-6.1.2",
urls = ["https://github.com/bazelbuild/buildtools/archive/v6.1.2.tar.gz"],
sha256 = "b7187e0856280feb0658ab9d629c244e638022819ded8243fb02e0c1d4db8f1c",
strip_prefix = "buildtools-6.3.2",
urls = ["https://github.com/bazelbuild/buildtools/archive/v6.3.2.tar.gz"],
)

load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
Loading