Skip to content

Commit

Permalink
Merge #13593 #13598
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
3 people committed Jul 26, 2023
3 parents e02a83c + fbda919 + ffaf165 commit f14f177
Show file tree
Hide file tree
Showing 130 changed files with 1,291 additions and 1,312 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# Changelog

## 3.76.1 (2023-07-25)


### Bug Fixes

- [engine] Fix --target-dependents from targeting all resources with default providers.
[#13560](https://github.com/pulumi/pulumi/pull/13560)

- [engine] Fix a panic when trying to construct a remote component with an explicit provider configured with unknown values during preview.
[#13579](https://github.com/pulumi/pulumi/pull/13579)

- [programgen/go] Fix conflicting imports generated when two imported packages have the same name.
[#13289](https://github.com/pulumi/pulumi/pull/13289)

- [programgen/nodejs] Fixes issue with javascript program generation where enums would incorrectly reference the package rather than the import alias.
[#13546](https://github.com/pulumi/pulumi/pull/13546)

## 3.76.0 (2023-07-20)


Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
changes:
- type: chore
scope: sdk/go
description: Bump the minimum required version of google.golang.org/genproto.
31 changes: 17 additions & 14 deletions pkg/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ replace github.com/xanzy/ssh-agent => github.com/pulumi/ssh-agent v0.5.1

require (
cloud.google.com/go/logging v1.7.0
cloud.google.com/go/storage v1.28.1
cloud.google.com/go/storage v1.30.1
github.com/aws/aws-sdk-go v1.44.122
github.com/blang/semver v3.5.1+incompatible
github.com/davecgh/go-spew v1.1.1
Expand All @@ -36,7 +36,7 @@ require (
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d
github.com/opentracing/opentracing-go v1.2.0
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386
github.com/pulumi/pulumi/sdk/v3 v3.76.0
github.com/pulumi/pulumi/sdk/v3 v3.76.1
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0
github.com/sergi/go-diff v1.3.1
github.com/spf13/cobra v1.7.0
Expand All @@ -48,13 +48,13 @@ require (
// DO NOT UPDATE gocloud.dev until https://github.com/pulumi/pulumi/issues/11986 is resolved
gocloud.dev v0.27.0
gocloud.dev/secrets/hashivault v0.27.0
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/net v0.10.0
golang.org/x/oauth2 v0.7.0
golang.org/x/oauth2 v0.8.0
golang.org/x/sync v0.2.0
google.golang.org/api v0.114.0
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
google.golang.org/grpc v1.56.1
google.golang.org/api v0.126.0
google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e
google.golang.org/grpc v1.56.2
gopkg.in/yaml.v3 v3.0.1
pgregory.net/rapid v0.6.1
sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600
Expand Down Expand Up @@ -88,16 +88,16 @@ require (
github.com/spf13/afero v1.9.5
golang.org/x/mod v0.10.0
golang.org/x/term v0.8.0
google.golang.org/protobuf v1.30.0
google.golang.org/protobuf v1.31.0
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.19.1 // indirect
cloud.google.com/go v0.110.4 // indirect
cloud.google.com/go/compute v1.20.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/kms v1.10.1 // indirect
cloud.google.com/go/longrunning v0.4.1 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/kms v1.12.1 // indirect
cloud.google.com/go/longrunning v0.5.1 // indirect
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0 // indirect
Expand Down Expand Up @@ -155,11 +155,12 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/wire v0.5.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.2.2 // indirect
Expand Down Expand Up @@ -232,6 +233,8 @@ require (
golang.org/x/tools v0.9.3 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
lukechampine.com/frand v1.4.2 // indirect
Expand Down

0 comments on commit f14f177

Please sign in to comment.