Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade pulumi/pulumi/pkg/v3 from 3.49.0 to 3.54.0 #972

Merged
merged 5 commits into from
Feb 13, 2023
Merged

Upgrade pulumi/pulumi/pkg/v3 from 3.49.0 to 3.54.0 #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
428f4dc
Bump github.com/pulumi/pulumi/pkg/v3 from 3.49.0 to 3.54.0 in /pkg
dependabot[bot] Feb 10, 2023
6d2cc7f
Merge branch 'main' into dependabot/go_modules/pkg/github.com/pulumi/…
abhinav Feb 13, 2023
0b29a1b
gen_test: ignore provider-type-schema and simplified-invokes
abhinav Feb 13, 2023
3d2f375
Regenerate test cases
abhinav Feb 13, 2023
d515eed
gofmt
abhinav Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/codegen/java/gen_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,14 @@ func adaptTest(t *test.SDKTest, keyDeps map[string]string) generatePackageTestCo
t.Skip = codegen.NewStringSet("java/any") // TODO
case "simple-methods-schema":
t.Skip = codegen.NewStringSet("java/any") // TODO
case "provider-type-schema":
t.Skip = codegen.NewStringSet("java/any") // TODO
case "provider-config-schema":
t.Skip = codegen.NewStringSet("java/any") // TODO
case "simple-methods-schema-single-value-returns":
t.Skip = codegen.NewStringSet("java/any") // TODO
case "simplified-invokes":
t.Skip = codegen.NewStringSet("java/any") // TODO
case "hyphen-url":
t.Skip = codegen.NewStringSet("java/any") // TODO
case "plain-object-defaults":
Expand Down Expand Up @@ -174,7 +178,8 @@ func TestGeneratePackage(t *testing.T) {
test.TestSDKCodegen(t, &test.SDKCodegenOptions{
GenPackage: func(tool string,
pkg *schema.Package,
extraFiles map[string][]byte) (map[string][]byte, error) {
extraFiles map[string][]byte,
) (map[string][]byte, error) {
pkg.Description = "test description"
pkg.Repository = "https://github.com/pulumi/pulumi-java"
pkg.Language = map[string]interface{}{
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/output-funcs/java/codegen-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"src/main/java/com/pulumi/mypkg/outputs/FuncWithAllOptionalInputsResult.java",
"src/main/java/com/pulumi/mypkg/outputs/FuncWithDefaultValueResult.java",
"src/main/java/com/pulumi/mypkg/outputs/FuncWithDictParamResult.java",
"src/main/java/com/pulumi/mypkg/outputs/FuncWithEmptyOutputsResult.java",
"src/main/java/com/pulumi/mypkg/outputs/FuncWithListParamResult.java",
"src/main/java/com/pulumi/mypkg/outputs/GetBastionShareableLinkResult.java",
"src/main/java/com/pulumi/mypkg/outputs/GetClientConfigResult.java",
Expand Down
13 changes: 6 additions & 7 deletions ...esting/test/testdata/output-funcs/java/src/main/java/com/pulumi/mypkg/MypkgFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.pulumi.mypkg.outputs.FuncWithAllOptionalInputsResult;
import com.pulumi.mypkg.outputs.FuncWithDefaultValueResult;
import com.pulumi.mypkg.outputs.FuncWithDictParamResult;
import com.pulumi.mypkg.outputs.FuncWithEmptyOutputsResult;
import com.pulumi.mypkg.outputs.FuncWithListParamResult;
import com.pulumi.mypkg.outputs.GetBastionShareableLinkResult;
import com.pulumi.mypkg.outputs.GetClientConfigResult;
Expand Down Expand Up @@ -198,29 +197,29 @@ public static CompletableFuture<FuncWithDictParamResult> funcWithDictParamPlain(
* n/a
*
*/
public static Output<FuncWithEmptyOutputsResult> funcWithEmptyOutputs(FuncWithEmptyOutputsArgs args) {
public static Output<Void> funcWithEmptyOutputs(FuncWithEmptyOutputsArgs args) {
return funcWithEmptyOutputs(args, InvokeOptions.Empty);
}
/**
* n/a
*
*/
public static CompletableFuture<FuncWithEmptyOutputsResult> funcWithEmptyOutputsPlain(FuncWithEmptyOutputsPlainArgs args) {
public static CompletableFuture<Void> funcWithEmptyOutputsPlain(FuncWithEmptyOutputsPlainArgs args) {
return funcWithEmptyOutputsPlain(args, InvokeOptions.Empty);
}
/**
* n/a
*
*/
public static Output<FuncWithEmptyOutputsResult> funcWithEmptyOutputs(FuncWithEmptyOutputsArgs args, InvokeOptions options) {
return Deployment.getInstance().invoke("mypkg::funcWithEmptyOutputs", TypeShape.of(FuncWithEmptyOutputsResult.class), args, Utilities.withVersion(options));
public static Output<Void> funcWithEmptyOutputs(FuncWithEmptyOutputsArgs args, InvokeOptions options) {
return Deployment.getInstance().invoke("mypkg::funcWithEmptyOutputs", TypeShape.of(Void.class), args, Utilities.withVersion(options));
}
/**
* n/a
*
*/
public static CompletableFuture<FuncWithEmptyOutputsResult> funcWithEmptyOutputsPlain(FuncWithEmptyOutputsPlainArgs args, InvokeOptions options) {
return Deployment.getInstance().invokeAsync("mypkg::funcWithEmptyOutputs", TypeShape.of(FuncWithEmptyOutputsResult.class), args, Utilities.withVersion(options));
public static CompletableFuture<Void> funcWithEmptyOutputsPlain(FuncWithEmptyOutputsPlainArgs args, InvokeOptions options) {
return Deployment.getInstance().invokeAsync("mypkg::funcWithEmptyOutputs", TypeShape.of(Void.class), args, Utilities.withVersion(options));
}
/**
* Check codegen of functions with a List parameter.
Expand Down
32 changes: 0 additions & 32 deletions .../output-funcs/java/src/main/java/com/pulumi/mypkg/outputs/FuncWithEmptyOutputsResult.java
View file
Open in desktop

This file was deleted.

58 changes: 39 additions & 19 deletions pkg/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require (
github.com/golang/protobuf v1.5.2
github.com/hashicorp/hcl/v2 v2.16.0
github.com/pkg/errors v0.9.1
github.com/pulumi/pulumi/pkg/v3 v3.49.0
github.com/pulumi/pulumi/sdk/v3 v3.49.0
github.com/pulumi/pulumi/pkg/v3 v3.54.0
github.com/pulumi/pulumi/sdk/v3 v3.54.0
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.1
github.com/zclconf/go-cty v1.12.1
Expand Down Expand Up @@ -47,22 +47,23 @@ require (
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/armon/go-metrics v0.4.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.44.68 // indirect
github.com/aws/aws-sdk-go-v2 v1.17.1 // indirect
github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/config v1.15.15 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.10 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.9 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.19 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.16 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.3 // indirect
Expand All @@ -73,19 +74,21 @@ require (
github.com/aws/aws-sdk-go-v2/service/s3 v1.27.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.13 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.16.10 // indirect
github.com/aws/smithy-go v1.13.4 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/cloudflare/circl v1.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/djherbis/times v1.5.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.1 // indirect
github.com/go-git/go-git/v5 v5.4.2 // indirect
github.com/go-git/go-git/v5 v5.5.1 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
Expand All @@ -103,20 +106,31 @@ require (
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // 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
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.4.5 // indirect
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/vault/api v1.1.1 // indirect
github.com/hashicorp/vault/sdk v0.2.1 // indirect
github.com/hashicorp/vault/api v1.8.2 // indirect
github.com/hashicorp/vault/sdk v0.6.1 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v1.1.0 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
Expand All @@ -125,40 +139,47 @@ require (
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/natefinch/atomic v1.0.1 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/opentracing/basictracer-go v1.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pjbgf/sha1cd v0.2.3 // indirect
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 // indirect
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
github.com/segmentio/asm v1.1.3 // indirect
github.com/segmentio/encoding v0.3.5 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/skeema/knownhosts v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/xanzy/ssh-agent v0.3.2 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
gocloud.dev v0.27.0 // indirect
gocloud.dev/secrets/hashivault v0.24.0 // indirect
golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 // indirect
gocloud.dev/secrets/hashivault v0.27.0 // indirect
golang.org/x/crypto v0.3.0 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sync v0.1.0 // indirect
Expand All @@ -172,7 +193,6 @@ require (
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
lukechampine.com/frand v1.4.2 // indirect
sourcegraph.com/sourcegraph/appdash v0.0.0-20211028080628-e2786a622600 // indirect
)