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: cockroachdb/cockroach
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: tbg/cockroach
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: grpc-prepare-bump
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 20 files changed
  • 2 contributors

Commits on Dec 4, 2024

  1. *: silence deprecation warnings

    These will fire after the gRPC bump in the subsequent commits.
    tbg committed Dec 4, 2024
    Copy the full SHA
    6a0f64e View commit details
  2. go.mod: upgrade gRPC to v.1.68.0

    from v1.56.3 to v1.68.0.
    
    TODO: changelog
    tbg committed Dec 4, 2024
    Copy the full SHA
    0b26ead View commit details
  3. BUILD.bazel: different package path for annotations pkg

    Similar but different error:
    
    ```
    link: package conflict error: google.golang.org/genproto/googleapis/cloud/location: package imports google.golang.org/genproto/googleapis/api/annotations
    	  was compiled with: @org_golang_google_genproto//googleapis/api/annotations:annotations
    	but was linked with: @org_golang_google_genproto_googleapis_api//annotations:annotations
    ```
    
    Compare with the original:
    
    ```
    link: package conflict error: cloud.google.com/go/pubsub/apiv1/pubsubpb: package imports google.golang.org/genproto/googleapis/api/annotations
    	  was compiled with: @org_golang_google_genproto_googleapis_api//annotations:annotations
    	but was linked with: @org_golang_google_genproto//googleapis/api/annotations:annotations
    ```
    tbg committed Dec 4, 2024
    Copy the full SHA
    7ae6475 View commit details
  4. also replace annotation refs in patch files

    Error unchanged from last commit. I did remember to `./dev gen bazel`.
    
    ```
    link: package conflict error: google.golang.org/genproto/googleapis/cloud/location: package imports google.golang.org/genproto/googleapis/api/annotations
              was compiled with: @org_golang_google_genproto//googleapis/api/annotations:annotations
            but was linked with: @org_golang_google_genproto_googleapis_api//annotations:annotations
    ```
    tbg committed Dec 4, 2024
    Copy the full SHA
    9393132 View commit details
  5. go.mod: go get google.golang.org/genproto@v0.0.0-20230526161137-0005a…

    …f68ea54
    
    See googleapis/go-genproto#1015.
    
    Sadly grpc-gateway is incompatible with this version of `genproto`:
    
    ```
    ERROR: no such package '@@org_golang_google_genproto//googleapis/api/httpbody': BUILD file not found in directory 'googleapis/api/httpbody' of external repository @@org_golang_google_genproto. Add a BUILD file to a directory to mark it as a package.
    ERROR: /private/var/tmp/_bazel_tbg/b1346cddcc70d57afdaa90f7f09f9b2c/external/com_github_grpc_ecosystem_grpc_gateway/runtime/BUILD.bazel:5:11: no such package '@@org_golang_google_genproto//googleapis/api/httpbody': BUILD file not found in directory 'googleapis/api/httpbody' of external repository @@org_golang_google_genproto. Add a BUILD file to a directory to mark it as a package. and referenced by '@@com_github_grpc_ecosystem_grpc_gateway//runtime:go_default_library'
    ```
    
    Since we are on the final `grpc-gateway/v1` version already[^1], we'll
    have to make the leap to v2 to fix this.
    
    [^1]: https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v1.16.0
    tbg committed Dec 4, 2024
    Copy the full SHA
    c4a9e55 View commit details
  6. build: update patches to be consistent with new version of pkgs

    This also adds the bytestream and rpc packages from genproto
    which are required.
    
    Epic: none
    Release note: None
    rickystewart authored and tbg committed Dec 4, 2024
    Copy the full SHA
    43d8eff View commit details
  7. go mod tidy

    tbg committed Dec 4, 2024
    Copy the full SHA
    1159327 View commit details
  8. DEPS: downgrade gRPC to v1.56.3

    This matches the version at the beginning of the PR.
    tbg committed Dec 4, 2024
    Copy the full SHA
    5a85d77 View commit details
Loading