deps: Upgrade google.golang.org/{genproto, grpc} #13593

abhinav · 2023-07-26T18:10:10Z

Updates to the latest versions of
google.golang.org/genproto and google.golang.org/grpc
in all submodules in the repository.

This is necessary because in a recent change,
genproto split out some of its subpackages into independent submodules.
(googleapis/go-genproto#1015)

As a result of this, some users may see the error:

google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules:
    google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status)
    google.golang.org/genproto/googleapis/rpc v0.0.0-20230725213213-b022f6e96895

Because pu/pu is using 20230410155749,
which has googleapis/rpc as a subpackage,
but another dependency references the independent submodule (20230725213213),
so the system doesn't know which module to use for the import path,
google.golang.org/genproto/googleapis/rpc/status.

This is a problem for codegen tests and ProgramTest-based tests
for Pulumi Go programs that do not have a go.mod in the test directory.
This issue was encountered by @thomas11 while attempting to upgrade
dependencies in pulumi-docker (pulumi/pulumi-docker#700).

The grpc upgrade is necessary because the current version of grpc
also pulls the outdated version of genproto.

pulumi-bot · 2023-07-26T18:11:10Z

Changelog

[uncommitted] (2023-07-27)

Miscellaneous

[sdk/go] Bump the minimum required versions of google.golang.org/genproto and google.golang.org/grpc.
#13593

The regression test for #13301 needs an intentionally bad go.mod file. This file was excluded from `make tidy`, allowing it to remain invalid, but this doesn't protect it from bulk commands like the following used in #13593 ```bash find . -name go.mod -exec dirname '{}' ';' | while read R; do (cd "$R" && ... && go mod tidy) done ``` In fact, #13593 accidentally tidied this go.mod file (removing the extraneous dependencies critical to the regression test) and failed in CI. To prevent issues like this, rename the go.mod to go.mod.bad, and rename it back to go.mod in the test environment at test time. This also lets us revert the `make tidy` exclusion support in tidy.sh.

abhinav · 2023-07-26T19:26:20Z

bors merge

13593: deps: Upgrade google.golang.org/genproto r=abhinav a=abhinav Updates to the latest version of google.golang.org/genproto in all submodules in the repository. This is necessary because in a recent change, genproto split out some of its subpackages into independent submodules. (googleapis/go-genproto#1015) As a result of this, some users may see the error: ``` google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules: google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status) google.golang.org/genproto/googleapis/rpc v0.0.0-20230725213213-b022f6e96895 ``` Because pu/pu is using 20230410155749, which has googleapis/rpc as a subpackage, but another dependency references the independent submodule (20230725213213), so the system doesn't know which module to use for the import path, google.golang.org/genproto/googleapis/rpc/status. This is specifically a problem for ProgramTest-based tests for Pulumi Go programs that do not have a go.mod in the test directory. This issue was encountered by `@thomas11` while attempting to upgrade dependencies in pulumi-docker (pulumi/pulumi-docker#700). --- The contents of this commit were generated with the following command: ``` find . -name go.mod -exec dirname '{}' ';' | while read R; do (echo "--- $R" && cd "$R" && go get google.golang.org/genproto@latest && go mod tidy) || break done ``` This failed for tests/integration/go/go-build-target which had an old `go 1.17` directive. This was changed to `go 1.20`. This also accidentally tidied up go/regress-13301 which was reverted. PR #13596 aims to prevent mistakes like this in the future. Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>

The regression test for #13301 needs an intentionally bad go.mod file. This file was excluded from `make tidy`, allowing it to remain invalid, but this doesn't protect it from bulk commands like the following used in #13593 ```bash find . -name go.mod -exec dirname '{}' ';' | while read R; do (cd "$R" && ... && go mod tidy) done ``` In fact, #13593 accidentally tidied this go.mod file (removing the extraneous dependencies critical to the regression test) and failed in CI. To prevent issues like this, rename the go.mod to go.mod.bad, and rename it back to go.mod in the test environment at test time. This also lets us revert the `make tidy` exclusion support in tidy.sh.

abhinav · 2023-07-26T20:06:11Z

bors cancel

bors · 2023-07-26T20:06:13Z

Canceled.

abhinav · 2023-07-26T20:08:44Z

bors merge

13593: deps: Upgrade google.golang.org/genproto r=abhinav a=abhinav Updates to the latest version of google.golang.org/genproto in all submodules in the repository. This is necessary because in a recent change, genproto split out some of its subpackages into independent submodules. (googleapis/go-genproto#1015) As a result of this, some users may see the error: ``` google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules: google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status) google.golang.org/genproto/googleapis/rpc v0.0.0-20230725213213-b022f6e96895 ``` Because pu/pu is using 20230410155749, which has googleapis/rpc as a subpackage, but another dependency references the independent submodule (20230725213213), so the system doesn't know which module to use for the import path, google.golang.org/genproto/googleapis/rpc/status. This is specifically a problem for ProgramTest-based tests for Pulumi Go programs that do not have a go.mod in the test directory. This issue was encountered by `@thomas11` while attempting to upgrade dependencies in pulumi-docker (pulumi/pulumi-docker#700). --- The contents of this commit were generated with the following command: ``` find . -name go.mod -exec dirname '{}' ';' | while read R; do (echo "--- $R" && cd "$R" && go get google.golang.org/genproto@latest && go mod tidy) || break done ``` This failed for tests/integration/go/go-build-target which had an old `go 1.17` directive. This was changed to `go 1.20`. This also accidentally tidied up go/regress-13301 which was reverted. PR #13596 aims to prevent mistakes like this in the future. 13598: Changelog and go.mod updates for v3.76.1 r=pulumi-bot a=pulumi-bot bors merge Co-authored-by: Abhinav Gupta <abhinav@pulumi.com> Co-authored-by: github-actions <github-actions@github.com>

bors · 2023-07-26T21:23:32Z

Build failed (retrying...):

bors-ok

13584: [sdkgen/python] SDKgen on external enums r=dixler a=dixler  # Description  Fixes #12695 Python SDKGen was not correctly referencing external enum types which needed an import alias. ## Checklist - [x] I have run `make tidy` to update any new dependencies - [x] I have run `make lint` to verify my code passes the lint check - [x] I have formatted my code using `gofumpt`  - [x] I have added tests that prove my fix is effective or that my feature works  - [x] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change  - [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Cloud API version  13596: test(regress-13301): Avoid accidental tidying r=abhinav a=abhinav The regression test for #13301 needs an intentionally bad go.mod file. This file was excluded from `make tidy`, allowing it to remain invalid, but this doesn't protect it from bulk commands like the following used in #13593 ```bash find . -name go.mod -exec dirname '{}' ';' | while read R; do (cd "$R" && ... && go mod tidy) done ``` In fact, #13593 accidentally tidied this go.mod file (removing the extraneous dependencies critical to the regression test) and failed in CI. To prevent issues like this, rename the go.mod to go.mod.bad, and rename it back to go.mod in the test environment at test time. This also lets us revert the `make tidy` exclusion support in tidy.sh. Co-authored-by: Kyle Dixler <kyle@pulumi.com> Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>

abhinav · 2023-07-26T21:40:38Z

bors cancel

bors · 2023-07-26T21:40:40Z

Canceled.

abhinav · 2023-07-26T21:45:08Z

Something is off about those failures. These tests all pass locally for me.

abhinav · 2023-07-26T21:45:29Z

Current dependencies on/for this PR:

master
- PR deps: Upgrade google.golang.org/{genproto, grpc} #13593 👈

This comment was auto-generated by Graphite.

abhinav · 2023-07-26T22:40:08Z

bors merge

13593: deps: Upgrade google.golang.org/genproto r=abhinav a=abhinav Updates to the latest version of google.golang.org/genproto in all submodules in the repository. This is necessary because in a recent change, genproto split out some of its subpackages into independent submodules. (googleapis/go-genproto#1015) As a result of this, some users may see the error: ``` google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules: google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status) google.golang.org/genproto/googleapis/rpc v0.0.0-20230725213213-b022f6e96895 ``` Because pu/pu is using 20230410155749, which has googleapis/rpc as a subpackage, but another dependency references the independent submodule (20230725213213), so the system doesn't know which module to use for the import path, google.golang.org/genproto/googleapis/rpc/status. This is specifically a problem for ProgramTest-based tests for Pulumi Go programs that do not have a go.mod in the test directory. This issue was encountered by `@thomas11` while attempting to upgrade dependencies in pulumi-docker (pulumi/pulumi-docker#700). --- The contents of this commit were generated with the following command: ``` find . -name go.mod -exec dirname '{}' ';' | while read R; do (echo "--- $R" && cd "$R" && go get google.golang.org/genproto@latest && go mod tidy) || break done ``` This failed for tests/integration/go/go-build-target which had an old `go 1.17` directive. This was changed to `go 1.20`. This also accidentally tidied up go/regress-13301 which was reverted. PR #13596 aims to prevent mistakes like this in the future. 13596: test(regress-13301): Avoid accidental tidying r=abhinav a=abhinav The regression test for #13301 needs an intentionally bad go.mod file. This file was excluded from `make tidy`, allowing it to remain invalid, but this doesn't protect it from bulk commands like the following used in #13593 ```bash find . -name go.mod -exec dirname '{}' ';' | while read R; do (cd "$R" && ... && go mod tidy) done ``` In fact, #13593 accidentally tidied this go.mod file (removing the extraneous dependencies critical to the regression test) and failed in CI. To prevent issues like this, rename the go.mod to go.mod.bad, and rename it back to go.mod in the test environment at test time. This also lets us revert the `make tidy` exclusion support in tidy.sh. Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>

bors · 2023-07-27T00:20:22Z

Build failed (retrying...):

bors-ok

13593: deps: Upgrade google.golang.org/genproto r=abhinav a=abhinav Updates to the latest version of google.golang.org/genproto in all submodules in the repository. This is necessary because in a recent change, genproto split out some of its subpackages into independent submodules. (googleapis/go-genproto#1015) As a result of this, some users may see the error: ``` google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules: google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status) google.golang.org/genproto/googleapis/rpc v0.0.0-20230725213213-b022f6e96895 ``` Because pu/pu is using 20230410155749, which has googleapis/rpc as a subpackage, but another dependency references the independent submodule (20230725213213), so the system doesn't know which module to use for the import path, google.golang.org/genproto/googleapis/rpc/status. This is specifically a problem for ProgramTest-based tests for Pulumi Go programs that do not have a go.mod in the test directory. This issue was encountered by `@thomas11` while attempting to upgrade dependencies in pulumi-docker (pulumi/pulumi-docker#700). --- The contents of this commit were generated with the following command: ``` find . -name go.mod -exec dirname '{}' ';' | while read R; do (echo "--- $R" && cd "$R" && go get google.golang.org/genproto@latest && go mod tidy) || break done ``` This failed for tests/integration/go/go-build-target which had an old `go 1.17` directive. This was changed to `go 1.20`. This also accidentally tidied up go/regress-13301 which was reverted. PR #13596 aims to prevent mistakes like this in the future. Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>

bors · 2023-07-27T02:08:22Z

Build failed:

bors-ok

13596: test(regress-13301): Avoid accidental tidying r=abhinav a=abhinav The regression test for #13301 needs an intentionally bad go.mod file. This file was excluded from `make tidy`, allowing it to remain invalid, but this doesn't protect it from bulk commands like the following used in #13593 ```bash find . -name go.mod -exec dirname '{}' ';' | while read R; do (cd "$R" && ... && go mod tidy) done ``` In fact, #13593 accidentally tidied this go.mod file (removing the extraneous dependencies critical to the regression test) and failed in CI. To prevent issues like this, rename the go.mod to go.mod.bad, and rename it back to go.mod in the test environment at test time. This also lets us revert the `make tidy` exclusion support in tidy.sh. Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>

abhinav · 2023-07-27T15:46:13Z

bors retry

13593: deps: Upgrade google.golang.org/genproto r=abhinav a=abhinav Updates to the latest version of google.golang.org/genproto in all submodules in the repository. This is necessary because in a recent change, genproto split out some of its subpackages into independent submodules. (googleapis/go-genproto#1015) As a result of this, some users may see the error: ``` google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules: google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status) google.golang.org/genproto/googleapis/rpc v0.0.0-20230725213213-b022f6e96895 ``` Because pu/pu is using 20230410155749, which has googleapis/rpc as a subpackage, but another dependency references the independent submodule (20230725213213), so the system doesn't know which module to use for the import path, google.golang.org/genproto/googleapis/rpc/status. This is specifically a problem for ProgramTest-based tests for Pulumi Go programs that do not have a go.mod in the test directory. This issue was encountered by `@thomas11` while attempting to upgrade dependencies in pulumi-docker (pulumi/pulumi-docker#700). --- The contents of this commit were generated with the following command: ``` find . -name go.mod -exec dirname '{}' ';' | while read R; do (echo "--- $R" && cd "$R" && go get google.golang.org/genproto@latest && go mod tidy) || break done ``` This failed for tests/integration/go/go-build-target which had an old `go 1.17` directive. This was changed to `go 1.20`. This also accidentally tidied up go/regress-13301 which was reverted. PR #13596 aims to prevent mistakes like this in the future. 13596: test(regress-13301): Avoid accidental tidying r=abhinav a=abhinav The regression test for #13301 needs an intentionally bad go.mod file. This file was excluded from `make tidy`, allowing it to remain invalid, but this doesn't protect it from bulk commands like the following used in #13593 ```bash find . -name go.mod -exec dirname '{}' ';' | while read R; do (cd "$R" && ... && go mod tidy) done ``` In fact, #13593 accidentally tidied this go.mod file (removing the extraneous dependencies critical to the regression test) and failed in CI. To prevent issues like this, rename the go.mod to go.mod.bad, and rename it back to go.mod in the test environment at test time. This also lets us revert the `make tidy` exclusion support in tidy.sh. Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>

bors · 2023-07-27T16:15:18Z

Build failed (retrying...):

bors-ok

13593: deps: Upgrade google.golang.org/genproto r=abhinav a=abhinav Updates to the latest version of google.golang.org/genproto in all submodules in the repository. This is necessary because in a recent change, genproto split out some of its subpackages into independent submodules. (googleapis/go-genproto#1015) As a result of this, some users may see the error: ``` google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules: google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status) google.golang.org/genproto/googleapis/rpc v0.0.0-20230725213213-b022f6e96895 ``` Because pu/pu is using 20230410155749, which has googleapis/rpc as a subpackage, but another dependency references the independent submodule (20230725213213), so the system doesn't know which module to use for the import path, google.golang.org/genproto/googleapis/rpc/status. This is specifically a problem for ProgramTest-based tests for Pulumi Go programs that do not have a go.mod in the test directory. This issue was encountered by `@thomas11` while attempting to upgrade dependencies in pulumi-docker (pulumi/pulumi-docker#700). --- The contents of this commit were generated with the following command: ``` find . -name go.mod -exec dirname '{}' ';' | while read R; do (echo "--- $R" && cd "$R" && go get google.golang.org/genproto@latest && go mod tidy) || break done ``` This failed for tests/integration/go/go-build-target which had an old `go 1.17` directive. This was changed to `go 1.20`. This also accidentally tidied up go/regress-13301 which was reverted. PR #13596 aims to prevent mistakes like this in the future. Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>

abhinav · 2023-07-27T16:19:09Z

bors cancel

bors · 2023-07-27T16:19:11Z

Canceled.

abhinav · 2023-07-27T16:20:22Z

The failures suggest that this is still broken:

        internal-dependencies-go/example imports
        	github.com/pulumi/pulumi/sdk/v3/go/pulumi imports
        	github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin imports
        	google.golang.org/grpc/status imports
        	google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules:
        	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status)
        	google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 (/home/runner/go/pkg/mod/google.golang.org/genproto/googleapis/rpc@v0.0.0-20230706204954-ccb25ca9f130/status)
        internal-dependencies-go/example imports
        	github.com/pulumi/pulumi/sdk/v3/go/pulumi imports
        	github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin imports
        	google.golang.org/grpc/codes tested by
        	google.golang.org/grpc/codes.test imports
        	google.golang.org/genproto/googleapis/rpc/code: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/code in multiple modules:
        	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/code)
        	google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 (/home/runner/go/pkg/mod/google.golang.org/genproto/googleapis/rpc@v0.0.0-20230706204954-ccb25ca9f130/code)
        internal-dependencies-go/example imports
        	github.com/pulumi/pulumi/sdk/v3/go/pulumi imports
        	github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin imports
        	google.golang.org/grpc/status tested by
        	google.golang.org/grpc/status.test imports
        	google.golang.org/genproto/googleapis/rpc/errdetails: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/errdetails in multiple modules:
        	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/errdetails)
        	google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 (/home/runner/go/pkg/mod/google.golang.org/genproto/googleapis/rpc@v0.0.0-20230706204954-ccb25ca9f130/errdetails)

The tests passed locally when I tried them last. Will dig in more later. Converting to Draft for now.

13588: A few fixes for `pulumi logs` r=lukehoban a=lukehoban While many of the most fundamental limitations of `pulumi logs` are still dependent on moving this code out of pulumi/pulumi and into pulumi/pulumi-aws and other resource providers (#608), this PR implements a few more tactical fixes which improve some common scenarios. Unfortunately, this whole area of the code is largely untested, in part because we didn't want to add a dependency on AWS in this layer (yet another reason we really want to do #608). We could choose to further violate this layering and add tests here that use `pulumi-aws` to deploy Pulumi resources and then test them against this AWS operations provider. In the meantime, I have manually validated fixes for the following issues. Fixes #2665. Fixes #1926. Fixes #3947. Fixes #1828. 13596: test(regress-13301): Avoid accidental tidying r=abhinav a=abhinav The regression test for #13301 needs an intentionally bad go.mod file. This file was excluded from `make tidy`, allowing it to remain invalid, but this doesn't protect it from bulk commands like the following used in #13593 ```bash find . -name go.mod -exec dirname '{}' ';' | while read R; do (cd "$R" && ... && go mod tidy) done ``` In fact, #13593 accidentally tidied this go.mod file (removing the extraneous dependencies critical to the regression test) and failed in CI. To prevent issues like this, rename the go.mod to go.mod.bad, and rename it back to go.mod in the test environment at test time. This also lets us revert the `make tidy` exclusion support in tidy.sh. Co-authored-by: Luke Hoban <lukehoban@gmail.com> Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>

abhinav · 2023-07-27T20:15:29Z

bors try

bors · 2023-07-27T21:05:49Z

try

Build failed:

bors-ok

abhinav · 2023-07-27T21:59:49Z

I'm really confused. CI fails consistently. The test runs fine on Linux and macOS.

=== RUN   TestGeneratePackage
=== PAUSE TestGeneratePackage
=== CONT  TestGeneratePackage
=== RUN   TestGeneratePackage/internal-dependencies-go
=== PAUSE TestGeneratePackage/internal-dependencies-go
=== CONT  TestGeneratePackage/internal-dependencies-go
    sdk_driver.go:457: Emit Go internal dependencies
=== RUN   TestGeneratePackage/internal-dependencies-go/go/compile
    gen_test.go:110: Found an existing go.mod, leaving as is
    command.go:34: **** Invoke '/usr/lib/go/bin/go mod tidy' in '/Users/abg/src/pulumi/pulumi/pkg/codegen/testing/test/testdata/internal-dependencies-go/go'
    command.go:106: Command completed without output
    command.go:34: **** Invoke '/usr/lib/go/bin/go build -v all' in '/Users/abg/src/pulumi/pulumi/pkg/codegen/testing/test/testdata/internal-dependencies-go/go'
    command.go:106: Command completed without output
=== RUN   TestGeneratePackage/internal-dependencies-go/go/test
    command.go:34: **** Invoke '/usr/lib/go/bin/go test internal-dependencies-go/...' in '/Users/abg/src/pulumi/pulumi/pkg/codegen/testing/test/testdata/internal-dependencies-go/go'
    command.go:106: Command completed without output
--- PASS: TestGeneratePackage (0.00s)
    --- PASS: TestGeneratePackage/internal-dependencies-go (4.09s)
        --- PASS: TestGeneratePackage/internal-dependencies-go/go/compile (3.43s)
        --- PASS: TestGeneratePackage/internal-dependencies-go/go/test (0.65s)
PASS
ok      github.com/pulumi/pulumi/pkg/v3/codegen/go      4.125s

abhinav · 2023-07-27T22:04:12Z

Okay, so the local checkout had the generated go.mod files sitting around, which is why it's been passing locally

abhinav · 2023-07-27T22:43:19Z

Okay, so the old version of grpc was pulling in the old version of genproto, which was causing that issue for tests. Upgrading that too.

abhinav · 2023-07-27T23:16:21Z

bors try

@thomas11

Updates to the latest versions of google.golang.org/genproto and google.golang.org/grpc in all submodules in the repository. This is necessary because in a recent change, genproto split out some of its subpackages into independent submodules. (googleapis/go-genproto#1015) As a result of this, some users may see the error: ``` google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules: google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status) google.golang.org/genproto/googleapis/rpc v0.0.0-20230725213213-b022f6e96895 ``` Because pu/pu is using 20230410155749, which has googleapis/rpc as a subpackage, but another dependency references the independent submodule (20230725213213), so the system doesn't know which module to use for the import path, google.golang.org/genproto/googleapis/rpc/status. This is a problem for codegen tests and ProgramTest-based tests for Pulumi Go programs that do not have a go.mod in the test directory. This issue was encountered by @thomas11 while attempting to upgrade dependencies in pulumi-docker (pulumi/pulumi-docker#700). The grpc upgrade is necessary because the current version of grpc also pulls the outdated version of genproto.

abhinav · 2023-07-27T23:24:54Z

bors cancel

abhinav · 2023-07-27T23:25:23Z

bors try

bors · 2023-07-27T23:25:26Z

try

Already running a review

bors · 2023-07-27T23:25:48Z

try

Build failed:

bors-ok

abhinav · 2023-07-28T00:27:58Z

bors merge

13593: deps: Upgrade google.golang.org/{genproto, grpc} r=abhinav a=abhinav Updates to the latest versions of google.golang.org/genproto and google.golang.org/grpc in all submodules in the repository. This is necessary because in a recent change, genproto split out some of its subpackages into independent submodules. (googleapis/go-genproto#1015) As a result of this, some users may see the error: ``` google.golang.org/genproto/googleapis/rpc/status: ambiguous import: found package google.golang.org/genproto/googleapis/rpc/status in multiple modules: google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 (/home/runner/go/pkg/mod/google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1/googleapis/rpc/status) google.golang.org/genproto/googleapis/rpc v0.0.0-20230725213213-b022f6e96895 ``` Because pu/pu is using 20230410155749, which has googleapis/rpc as a subpackage, but another dependency references the independent submodule (20230725213213), so the system doesn't know which module to use for the import path, google.golang.org/genproto/googleapis/rpc/status. This is a problem for codegen tests and ProgramTest-based tests for Pulumi Go programs that do not have a go.mod in the test directory. This issue was encountered by `@thomas11` while attempting to upgrade dependencies in pulumi-docker (pulumi/pulumi-docker#700). The grpc upgrade is necessary because the current version of grpc also pulls the outdated version of genproto. Co-authored-by: Abhinav Gupta <abhinav@pulumi.com>

bors · 2023-07-28T01:12:58Z

Build failed:

bors-ok

abhinav · 2023-07-28T04:31:32Z

bors merge

bors · 2023-07-28T05:03:12Z

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

bors-ok

abhinav requested a review from a team July 26, 2023 18:10

abhinav force-pushed the abhinav/upgrade-genproto branch from be958ec to fbda919 Compare July 26, 2023 18:58

abhinav mentioned this pull request Jul 26, 2023

test(regress-13301): Avoid accidental tidying #13596

Merged

thomas11 approved these changes Jul 26, 2023

View reviewed changes

abhinav force-pushed the abhinav/upgrade-genproto branch from fbda919 to 66c642c Compare July 26, 2023 21:45

abhinav marked this pull request as draft July 27, 2023 16:20

bors bot added a commit that referenced this pull request Jul 27, 2023

Try #13593:

2b6eccb

abhinav force-pushed the abhinav/upgrade-genproto branch from 66c642c to 3df67d5 Compare July 27, 2023 22:46

bors bot added a commit that referenced this pull request Jul 27, 2023

Try #13593:

dfd1677

abhinav marked this pull request as ready for review July 27, 2023 23:21

abhinav changed the title ~~deps: Upgrade google.golang.org/genproto~~ deps: Upgrade google.golang.org/{genproto, grpc} Jul 27, 2023

abhinav force-pushed the abhinav/upgrade-genproto branch from 3df67d5 to 91a0798 Compare July 27, 2023 23:24

bors bot merged commit 6728c87 into master Jul 28, 2023
52 checks passed

bors bot deleted the abhinav/upgrade-genproto branch July 28, 2023 05:03

abhinav mentioned this pull request Aug 3, 2023

Failing test on master: --- FAIL: TestGenerateProgram/regress-11176 #13644

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

deps: Upgrade google.golang.org/{genproto, grpc} #13593

deps: Upgrade google.golang.org/{genproto, grpc} #13593

abhinav commented Jul 26, 2023 •

edited

pulumi-bot commented Jul 26, 2023 •

edited

abhinav commented Jul 26, 2023

abhinav commented Jul 26, 2023

bors bot commented Jul 26, 2023

abhinav commented Jul 26, 2023

bors bot commented Jul 26, 2023

abhinav commented Jul 26, 2023

bors bot commented Jul 26, 2023

abhinav commented Jul 26, 2023

abhinav commented Jul 26, 2023

abhinav commented Jul 26, 2023

bors bot commented Jul 27, 2023

bors bot commented Jul 27, 2023

abhinav commented Jul 27, 2023

bors bot commented Jul 27, 2023

abhinav commented Jul 27, 2023

bors bot commented Jul 27, 2023

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

bors bot commented Jul 27, 2023

abhinav commented Jul 27, 2023 •

edited

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

bors bot commented Jul 27, 2023

bors bot commented Jul 27, 2023

abhinav commented Jul 28, 2023

bors bot commented Jul 28, 2023

abhinav commented Jul 28, 2023

bors bot commented Jul 28, 2023

deps: Upgrade google.golang.org/{genproto, grpc} #13593

deps: Upgrade google.golang.org/{genproto, grpc} #13593

Conversation

abhinav commented Jul 26, 2023 • edited

pulumi-bot commented Jul 26, 2023 • edited

Changelog

[uncommitted] (2023-07-27)

Miscellaneous

abhinav commented Jul 26, 2023

abhinav commented Jul 26, 2023

bors bot commented Jul 26, 2023

abhinav commented Jul 26, 2023

bors bot commented Jul 26, 2023

abhinav commented Jul 26, 2023

bors bot commented Jul 26, 2023

abhinav commented Jul 26, 2023

abhinav commented Jul 26, 2023

abhinav commented Jul 26, 2023

bors bot commented Jul 27, 2023

bors bot commented Jul 27, 2023

abhinav commented Jul 27, 2023

bors bot commented Jul 27, 2023

abhinav commented Jul 27, 2023

bors bot commented Jul 27, 2023

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

bors bot commented Jul 27, 2023

try

abhinav commented Jul 27, 2023 • edited

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

abhinav commented Jul 27, 2023

bors bot commented Jul 27, 2023

try

bors bot commented Jul 27, 2023

try

abhinav commented Jul 28, 2023

bors bot commented Jul 28, 2023

abhinav commented Jul 28, 2023

bors bot commented Jul 28, 2023

abhinav commented Jul 26, 2023 •

edited

pulumi-bot commented Jul 26, 2023 •

edited

abhinav commented Jul 27, 2023 •

edited