Skip to content

Commit

Permalink
Upgrade pulumi-java to v0.11.0 (#16159)
Browse files Browse the repository at this point in the history
Upgrade pulumi-java to the latest version:

### Bug Fixes

* Escape javadoc special characters in generated code.
* Fail fast rather than emitting `PANIC`s when attempting to generate
code for ill-formed programs.
  • Loading branch information
justinvp committed May 10, 2024
1 parent 2d63e0a commit 1ea602d
Show file tree
Hide file tree
Showing 69 changed files with 152 additions and 70 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
changes:
- type: chore
scope: pkg
description: Upgrade pulumi-java to v0.11.0
4 changes: 2 additions & 2 deletions pkg/codegen/docs/constructor_syntax_generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,15 @@ properties: {}

assert.Equal(t, expectedResources, len(constructorSyntax.java.resources))
equalPrograms(constructorSyntax.java, "test:index:First", `
var firstResource = new First("firstResource", FirstArgs.builder()
var firstResource = new First("firstResource", FirstArgs.builder()
.fooBool(false)
.fooInt(0)
.fooString("string")
.build());
`)

equalPrograms(constructorSyntax.java, "test:index:Second", `
var secondResource = new Second("secondResource", SecondArgs.builder()
var secondResource = new Second("secondResource", SecondArgs.builder()
.barString("string")
.build());
`)
Expand Down
2 changes: 1 addition & 1 deletion pkg/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231
github.com/pulumi/esc v0.6.2
github.com/pulumi/pulumi-java/pkg v0.10.0
github.com/pulumi/pulumi-java/pkg v0.11.0
github.com/pulumi/pulumi-yaml v1.7.0
github.com/segmentio/encoding v0.3.5
github.com/shirou/gopsutil/v3 v3.22.3
Expand Down
4 changes: 2 additions & 2 deletions pkg/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1577,8 +1577,8 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
github.com/pulumi/esc v0.6.2 h1:+z+l8cuwIauLSwXQS0uoI3rqB+YG4SzsZYtHfNoXBvw=
github.com/pulumi/esc v0.6.2/go.mod h1:jNnYNjzsOgVTjCp0LL24NsCk8ZJxq4IoLQdCT0X7l8k=
github.com/pulumi/pulumi-java/pkg v0.10.0 h1:D1i5MiiNrxYr2uJ1szcj1aQwF9DYv7TTsPmajB9dKSw=
github.com/pulumi/pulumi-java/pkg v0.10.0/go.mod h1:xu6UgYtQm+xXOo1/DZNa2CWVPytu+RMkZVTtI7w7ffY=
github.com/pulumi/pulumi-java/pkg v0.11.0 h1:Jw9gBvyfmfOMq/EkYDm9+zGPxsDAA8jfeMpHmtZ+1oA=
github.com/pulumi/pulumi-java/pkg v0.11.0/go.mod h1:sXAk25P47AQVQL6ilAbFmRNgZykC7og/+87ihnqzFTc=
github.com/pulumi/pulumi-yaml v1.7.0 h1:SbFSaqkH8UiMEy0ZSH9sHLQlmV8so0iCLfvLbPtVP7s=
github.com/pulumi/pulumi-yaml v1.7.0/go.mod h1:pCfYHSRmdl+5dM/7eT2uDQS528YOhAhiqbn9pwRzW20=
github.com/pulumi/ssh-agent v0.5.1 h1:7DT4FcZNHWBAp9BFI+k0+HeBYGWbJvilJ29ra/4FlRM=
Expand Down
80 changes: 79 additions & 1 deletion tests/go.sum

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ example, err := example.NewResourceWithAssets(ctx, "resourceWithAssetsResource",
<pulumi-choosable type="language" values="java">

```java
var resourceWithAssetsResource = new ResourceWithAssets("resourceWithAssetsResource", ResourceWithAssetsArgs.builder()
var resourceWithAssetsResource = new ResourceWithAssets("resourceWithAssetsResource", ResourceWithAssetsArgs.builder()
.source(new StringAsset("content"))
.archive(new FileArchive("./path/to/archive"))
.nested(TypeWithAssetsArgs.builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ example, err := submodule1.NewModuleResource(ctx, "moduleResourceResource", &sub
<pulumi-choosable type="language" values="java">

```java
var moduleResourceResource = new ModuleResource("moduleResourceResource", ModuleResourceArgs.builder()
var moduleResourceResource = new ModuleResource("moduleResourceResource", ModuleResourceArgs.builder()
.thing(TopLevelArgs.builder()
.buzz("string")
.build())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ Sizes: treev1.TreeSizeMap{
<pulumi-choosable type="language" values="java">

```java
var nurseryResource = new Nursery("nurseryResource", NurseryArgs.builder()
var nurseryResource = new Nursery("nurseryResource", NurseryArgs.builder()
.varieties("Burgundy")
.sizes(Map.of("string", "small"))
.build());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ Coming soon!
<pulumi-choosable type="language" values="java">

```java
var rubberTreeResource = new RubberTree("rubberTreeResource", RubberTreeArgs.builder()
var rubberTreeResource = new RubberTree("rubberTreeResource", RubberTreeArgs.builder()
.diameter("sixinch")
.type("Burgundy")
.container(ContainerArgs.builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ Sizes: treev1.TreeSizeMap{
<pulumi-choosable type="language" values="java">

```java
var nurseryResource = new Nursery("nurseryResource", NurseryArgs.builder()
var nurseryResource = new Nursery("nurseryResource", NurseryArgs.builder()
.varieties("Burgundy")
.sizes(Map.of("string", "small"))
.build());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ Coming soon!
<pulumi-choosable type="language" values="java">

```java
var rubberTreeResource = new RubberTree("rubberTreeResource", RubberTreeArgs.builder()
var rubberTreeResource = new RubberTree("rubberTreeResource", RubberTreeArgs.builder()
.diameter("sixinch")
.type("Burgundy")
.container(ContainerArgs.builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := overlay.NewOverlay(ctx, "exampleOverlayResource", &overlay.Overl
<pulumi-choosable type="language" values="java">

```java
var exampleOverlayResource = new Overlay("exampleOverlayResource", OverlayArgs.builder()
var exampleOverlayResource = new Overlay("exampleOverlayResource", OverlayArgs.builder()
.bar("string")
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := example.NewOverlay(ctx, "overlayResource", &example.OverlayArgs{
<pulumi-choosable type="language" values="java">

```java
var overlayResource = new Overlay("overlayResource", OverlayArgs.builder()
var overlayResource = new Overlay("overlayResource", OverlayArgs.builder()
.bar("string")
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4106,7 +4106,7 @@ example, err := foo.NewComponent(ctx, "componentResource", &foo.ComponentArgs{
<pulumi-choosable type="language" values="java">

```java
var componentResource = new Component("componentResource", ComponentArgs.builder()
var componentResource = new Component("componentResource", ComponentArgs.builder()
.eniConfig(Map.of("string", Map.ofEntries(
Map.entry("securityGroups", "string"),
Map.entry("subnet", "string")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ example, err := myModule.NewIamResource(ctx, "iamResourceResource", &myModule.Ia
<pulumi-choosable type="language" values="java">

```java
var iamResourceResource = new IamResource("iamResourceResource", IamResourceArgs.builder()
var iamResourceResource = new IamResource("iamResourceResource", IamResourceArgs.builder()
.config(AuditConfigArgs.builder()
.auditLogConfigs(AuditLogConfigArgs.builder()
.exemptedMembers("string")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ Coming soon!
<pulumi-choosable type="language" values="java">

```java
var componentResource = new Component("componentResource", ComponentArgs.builder()
var componentResource = new Component("componentResource", ComponentArgs.builder()
.localEnum("pi")
.remoteEnum("MANAGEMENT_UNSPECIFIED")
.build());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ example, err := example.NewCat(ctx, "catResource", &example.CatArgs{
<pulumi-choosable type="language" values="java">

```java
var catResource = new Cat("catResource", CatArgs.builder()
var catResource = new Cat("catResource", CatArgs.builder()
.age(0)
.pet(PetArgs.builder()
.requiredName(randomPet)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ example, err := example.NewComponent(ctx, "componentResource", &example.Componen
<pulumi-choosable type="language" values="java">

```java
var componentResource = new Component("componentResource", ComponentArgs.builder()
var componentResource = new Component("componentResource", ComponentArgs.builder()
.requiredMetadata(ObjectMetaArgs.builder()
.annotations(Map.of("string", "string"))
.clusterName("string")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := registrygeoreplication.NewRegistryGeoReplication(ctx, "registryG
<pulumi-choosable type="language" values="java">

```java
var registryGeoReplicationResource = new RegistryGeoReplication("registryGeoReplicationResource", RegistryGeoReplicationArgs.builder()
var registryGeoReplicationResource = new RegistryGeoReplication("registryGeoReplicationResource", RegistryGeoReplicationArgs.builder()
.resourceGroup(resourceGroup)
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ Uid: pulumi.String("string"),
<pulumi-choosable type="language" values="java">

```java
var configMapResource = new ConfigMap("configMapResource", ConfigMapArgs.builder()
var configMapResource = new ConfigMap("configMapResource", ConfigMapArgs.builder()
.apiVersion("string")
.binaryData(Map.of("string", "string"))
.data(Map.of("string", "string"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ SelfLink: pulumi.String("string"),
<pulumi-choosable type="language" values="java">

```java
var configMapListResource = new ConfigMapList("configMapListResource", ConfigMapListArgs.builder()
var configMapListResource = new ConfigMapList("configMapListResource", ConfigMapListArgs.builder()
.items(ConfigMapArgs.builder()
.apiVersion("v1")
.binaryData(Map.of("string", "string"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ Values: pulumi.Map{
<pulumi-choosable type="language" values="java">

```java
var releaseResource = new Release("releaseResource", ReleaseArgs.builder()
var releaseResource = new Release("releaseResource", ReleaseArgs.builder()
.chart("string")
.valueYamlFiles(new StringAsset("content"))
.values(Map.of("string", "any"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ Yaml: pulumi.Any("string"),
<pulumi-choosable type="language" values="java">

```java
var kubernetesConfigGroupResource = new ConfigGroup("kubernetesConfigGroupResource", ConfigGroupArgs.builder()
var kubernetesConfigGroupResource = new ConfigGroup("kubernetesConfigGroupResource", ConfigGroupArgs.builder()
.files("string")
.objs(null)
.resourcePrefix("string")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ Yaml: pulumi.Any("string"),
<pulumi-choosable type="language" values="java">

```java
var configGroupResource = new ConfigGroup("configGroupResource", ConfigGroupArgs.builder()
var configGroupResource = new ConfigGroup("configGroupResource", ConfigGroupArgs.builder()
.files("string")
.objs(null)
.resourcePrefix("string")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ example, err := legacy_names.Newexample_resource(ctx, "example_resourceResource"
<pulumi-choosable type="language" values="java">

```java
var example_resourceResource = new Example_resource("example_resourceResource", Example_resourceArgs.builder()
var example_resourceResource = new Example_resource("example_resourceResource", Example_resourceArgs.builder()
.map_enum(Map.of("string", "A"))
.request_HTTP(RequestArgs.builder()
.uRL("string")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := metaprovider.NewConfigurer(ctx, "configurerResource", &metaprovi
<pulumi-choosable type="language" values="java">

```java
var configurerResource = new Configurer("configurerResource", ConfigurerArgs.builder()
var configurerResource = new Configurer("configurerResource", ConfigurerArgs.builder()
.tlsProxy("string")
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ example, err := mod.NewComponent(ctx, "componentResource", &mod.ComponentArgs{
<pulumi-choosable type="language" values="java">

```java
var componentResource = new Component("componentResource", ComponentArgs.builder()
var componentResource = new Component("componentResource", ComponentArgs.builder()
.local(component2)
.main(mainComponent)
.build());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := deeply.NewResource(ctx, "resourceResource", &deeply.ResourceArgs
<pulumi-choosable type="language" values="java">

```java
var resourceResource = new Resource("resourceResource", ResourceArgs.builder()
var resourceResource = new Resource("resourceResource", ResourceArgs.builder()
.baz("string")
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := nested.NewResource(ctx, "resourceResource", &nested.ResourceArgs
<pulumi-choosable type="language" values="java">

```java
var resourceResource = new Resource("resourceResource", ResourceArgs.builder()
var resourceResource = new Resource("resourceResource", ResourceArgs.builder()
.bar("string")
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := bar.NewBarResource(ctx, "barResourceResource", &bar.BarResourceA
<pulumi-choosable type="language" values="java">

```java
var barResourceResource = new BarResource("barResourceResource", BarResourceArgs.builder()
var barResourceResource = new BarResource("barResourceResource", BarResourceArgs.builder()
.foo(resource)
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := foo.NewFooResource(ctx, "fooResourceResource", &foo.FooResourceA
<pulumi-choosable type="language" values="java">

```java
var fooResourceResource = new FooResource("fooResourceResource", FooResourceArgs.builder()
var fooResourceResource = new FooResource("fooResourceResource", FooResourceArgs.builder()
.foo(resource)
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := example.NewOtherResource(ctx, "otherResourceResource", &example.
<pulumi-choosable type="language" values="java">

```java
var otherResourceResource = new OtherResource("otherResourceResource", OtherResourceArgs.builder()
var otherResourceResource = new OtherResource("otherResourceResource", OtherResourceArgs.builder()
.foo(resource)
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ example, err := example.NewOverlayResource(ctx, "overlayResourceResource", &exam
<pulumi-choosable type="language" values="java">

```java
var overlayResourceResource = new OverlayResource("overlayResourceResource", OverlayResourceArgs.builder()
var overlayResourceResource = new OverlayResource("overlayResourceResource", OverlayResourceArgs.builder()
.bar("SOME_ENUM_VALUE")
.foo(ConfigMapOverlayArgs.builder()
.config("string")
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/codegen/other-owned/docs/resource/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := example.NewResource(ctx, "resourceResource", &example.ResourceAr
<pulumi-choosable type="language" values="java">

```java
var resourceResource = new Resource("resourceResource", ResourceArgs.builder()
var resourceResource = new Resource("resourceResource", ResourceArgs.builder()
.bar("string")
.build());
```
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/codegen/other-owned/docs/typeuses/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ example, err := example.NewTypeUses(ctx, "typeUsesResource", &example.TypeUsesAr
<pulumi-choosable type="language" values="java">

```java
var typeUsesResource = new TypeUses("typeUsesResource", TypeUsesArgs.builder()
var typeUsesResource = new TypeUses("typeUsesResource", TypeUsesArgs.builder()
.bar(SomeOtherObjectArgs.builder()
.baz("string")
.build())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ Coming soon!
<pulumi-choosable type="language" values="java">

```java
var moduleResourceResource = new ModuleResource("moduleResourceResource", ModuleResourceArgs.builder()
var moduleResourceResource = new ModuleResource("moduleResourceResource", ModuleResourceArgs.builder()
.plainRequiredBool(false)
.requiredString("string")
.requiredNumber(0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ Recursive: pulumi.Any(layeredType),
<pulumi-choosable type="language" values="java">

```java
var fooResource = new Foo("fooResource", FooArgs.builder()
var fooResource = new Foo("fooResource", FooArgs.builder()
.backupKubeClientSettings(KubeClientSettingsArgs.builder()
.burst(0)
.qps(0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ Val: pulumi.String("string"),
<pulumi-choosable type="language" values="java">

```java
var moduleTestResource = new ModuleTest("moduleTestResource", ModuleTestArgs.builder()
var moduleTestResource = new ModuleTest("moduleTestResource", ModuleTestArgs.builder()
.mod1(TypArgs.builder()
.val("string")
.build())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ Recursive: pulumi.Any(layeredType),
<pulumi-choosable type="language" values="java">

```java
var fooResource = new Foo("fooResource", FooArgs.builder()
var fooResource = new Foo("fooResource", FooArgs.builder()
.backupKubeClientSettings(KubeClientSettingsArgs.builder()
.burst(0)
.qps(0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ Val: pulumi.String("string"),
<pulumi-choosable type="language" values="java">

```java
var moduleTestResource = new ModuleTest("moduleTestResource", ModuleTestArgs.builder()
var moduleTestResource = new ModuleTest("moduleTestResource", ModuleTestArgs.builder()
.mod1(TypArgs.builder()
.val("string")
.build())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ example, err := xyz.NewStaticPage(ctx, "staticPageResource", &xyz.StaticPageArgs
<pulumi-choosable type="language" values="java">

```java
var staticPageResource = new StaticPage("staticPageResource", StaticPageArgs.builder()
var staticPageResource = new StaticPage("staticPageResource", StaticPageArgs.builder()
.indexContent("string")
.foo(FooArgs.builder()
.a(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := submod.Newprovider(ctx, "providerResource", &submod.providerArgs
<pulumi-choosable type="language" values="java">

```java
var providerResource = new Provider("providerResource", ProviderArgs.builder()
var providerResource = new Provider("providerResource", ProviderArgs.builder()
.a(false)
.build());
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ example, err := example.NewPerson(ctx, "personResource", &example.PersonArgs{
<pulumi-choosable type="language" values="java">

```java
var personResource = new Person("personResource", PersonArgs.builder()
var personResource = new Person("personResource", PersonArgs.builder()
.name("string")
.pets(PetArgs.builder()
.name("string")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ example, err := example.NewPet(ctx, "petResource", &example.PetArgs{
<pulumi-choosable type="language" values="java">

```java
var petResource = new Pet("petResource", PetArgs.builder()
var petResource = new Pet("petResource", PetArgs.builder()
.name("string")
.build());
```
Expand Down

0 comments on commit 1ea602d

Please sign in to comment.