Unskip l2-large-string test

The `l2-large-string` test emits a resource named `String` which is imported as `com.pulumi.large.String` in the generated program, which then conflicts with the `String` used in the program's `public static void main(String[] args)`. This change avoids the conflict by fully qualifying the built-in Java `String` type when another type named `String` has been imported.
pulumi · Jan 3, 2025 · 3ccaa48 · 3ccaa48
1 parent 047b576
commit 3ccaa48
Show file tree

Hide file tree

Showing 13 changed files with 635 additions and 2 deletions.
diff --git a/pkg/cmd/pulumi-language-java/language_test.go b/pkg/cmd/pulumi-language-java/language_test.go
@@ -170,7 +170,6 @@ var expectedFailures = map[string]string{
 	"l2-invoke-secrets":                     "unimplemented for Java",
 	"l2-invoke-simple":                      "unimplemented for Java",
 	"l2-invoke-variants":                    "unimplemented for Java",
-	"l2-large-string":                       "unimplemented for Java",
 	"l2-map-keys":                           "unimplemented for Java",
 	"l2-provider-grpc-config-schema-secret": "unimplemented for Java",
 	"l2-provider-grpc-config-secret":        "unimplemented for Java",

diff --git a/pkg/cmd/pulumi-language-java/testdata/projects/l2-large-string/Pulumi.yaml b/pkg/cmd/pulumi-language-java/testdata/projects/l2-large-string/Pulumi.yaml
@@ -0,0 +1,2 @@
+name: l2-large-string
+runtime: java
diff --git a/pkg/cmd/pulumi-language-java/testdata/projects/l2-large-string/pom.xml b/pkg/cmd/pulumi-language-java/testdata/projects/l2-large-string/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+		<project xmlns="http://maven.apache.org/POM/4.0.0"
+				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+			<modelVersion>4.0.0</modelVersion>
+
+			<groupId>com.pulumi</groupId>
+			<artifactId>l2-large-string</artifactId>
+			<version>1.0-SNAPSHOT</version>
+
+			<properties>
+				<encoding>UTF-8</encoding>
+				<maven.compiler.source>11</maven.compiler.source>
+				<maven.compiler.target>11</maven.compiler.target>
+				<maven.compiler.release>11</maven.compiler.release>
+				<mainClass>generated_program.App</mainClass>
+				<mainArgs/>
+			</properties>
+
+			<repositories>
+				<repository>
+					<id>repository-0</id>
+					<url>REPOSITORY</url>
+				</repository>
+			</repositories>
+
+			<dependencies>
+				<dependency>
+					<groupId>com.pulumi</groupId>
+					<artifactId>pulumi</artifactId>
+					<version>CORE.VERSION</version>
+				</dependency>
+				<dependency>
+					<groupId>com.pulumi</groupId>
+					<artifactId>large</artifactId>
+					<version>4.3.2</version>
+				</dependency>
+			</dependencies>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>3.2.2</version>
+						<configuration>
+							<archive>
+								<manifest>
+									<addClasspath>true</addClasspath>
+									<mainClass>${mainClass}</mainClass>
+								</manifest>
+							</archive>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<version>3.4.2</version>
+						<configuration>
+							<archive>
+								<manifest>
+									<addClasspath>true</addClasspath>
+									<mainClass>${mainClass}</mainClass>
+								</manifest>
+							</archive>
+							<descriptorRefs>
+								<descriptorRef>jar-with-dependencies</descriptorRef>
+							</descriptorRefs>
+						</configuration>
+						<executions>
+							<execution>
+								<id>make-my-jar-with-dependencies</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<version>3.1.0</version>
+						<configuration>
+							<mainClass>${mainClass}</mainClass>
+							<commandlineArgs>${mainArgs}</commandlineArgs>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-wrapper-plugin</artifactId>
+						<version>3.1.1</version>
+						<configuration>
+							<mavenVersion>3.8.5</mavenVersion>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</project>
diff --git a/...-language-java/testdata/projects/l2-large-string/src/main/java/generated_program/App.java b/...-language-java/testdata/projects/l2-large-string/src/main/java/generated_program/App.java
@@ -0,0 +1,27 @@
+package generated_program;
+
+import com.pulumi.Context;
+import com.pulumi.Pulumi;
+import com.pulumi.core.Output;
+import com.pulumi.large.String;
+import com.pulumi.large.StringArgs;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public class App {
+    public static void main(java.lang.String[] args) {
+        Pulumi.run(App::stack);
+    }
+
+    public static void stack(Context ctx) {
+        var res = new String("res", StringArgs.builder()
+            .value("hello world")
+            .build());
+
+        ctx.export("output", res.value());
+    }
+}
diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/large-4.3.2/README.md b/pkg/cmd/pulumi-language-java/testdata/sdks/large-4.3.2/README.md
@@ -0,0 +1 @@
+
diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/large-4.3.2/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/large-4.3.2/build.gradle
@@ -0,0 +1,157 @@
+// *** WARNING: this file was generated by pulumi-java-gen ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+plugins {
+    id("signing")
+    id("java-library")
+    id("maven-publish")
+}
+
+group = "com.pulumi"
+
+def resolvedVersion = System.getenv("PACKAGE_VERSION") ?:
+    (project.version == "unspecified"
+         ? "4.3.2"
+         : project.version)
+
+def signingKey = System.getenv("SIGNING_KEY")
+def signingPassword = System.getenv("SIGNING_PASSWORD")
+def publishRepoURL = System.getenv("PUBLISH_REPO_URL")
+def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME")
+def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD")
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
+compileJava {
+    options.fork = true
+    options.forkOptions.jvmArgs.addAll(["-Xmx16g"])
+    options.encoding = "UTF-8"
+}
+
+repositories {
+    maven {
+        url("REPOSITORY")
+    }
+    mavenLocal()
+    maven { // The google mirror is less flaky than mavenCentral()
+        url("https://maven-central.storage-download.googleapis.com/maven2/")
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation("com.google.code.findbugs:jsr305:3.0.2")
+    implementation("com.google.code.gson:gson:2.8.9")
+    implementation("com.pulumi:pulumi:CORE.VERSION")
+}
+
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allJava
+    archiveClassifier.set('sources')
+}
+
+task javadocJar(type: Jar) {
+    from javadoc
+    archiveClassifier.set('javadoc')
+    zip64 = true
+}
+
+def genPulumiResources = tasks.register('genPulumiResources') {
+    doLast {
+        def resourcesDir = sourceSets.main.output.resourcesDir
+        def subDir = project.name.replace(".", "/")
+        def outDir = file("$resourcesDir/$subDir")
+        outDir.mkdirs()
+        new File(outDir, "version.txt").text = resolvedVersion
+        def builder = new groovy.json.JsonBuilder()
+        builder {
+            resource true
+            name "large"
+            version resolvedVersion
+        }
+        def infoJson = builder.toPrettyString()
+        new File(outDir, "plugin.json").text = infoJson
+    }
+}
+
+jar.configure {
+    dependsOn genPulumiResources
+}
+
+publishing {
+    publications {
+        mainPublication(MavenPublication) {
+            groupId = "com.pulumi"
+            artifactId = "large"
+            version = resolvedVersion
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+
+            pom {
+                inceptionYear = ""
+                name = ""
+                packaging = "jar"
+                description = " "
+
+                url = "https://example.com"
+
+                scm {
+                    connection = "https://example.com"
+                    developerConnection = "https://example.com"
+                    url = "https://example.com"
+                }
+
+                licenses {
+                    license {
+                        name = ""
+                        url = ""
+                    }
+                }
+
+                developers {
+                    developer {
+                        id = ""
+                        name = ""
+                        email = ""
+                    }
+                }
+            }
+        }
+    }
+
+    if (publishRepoURL) {
+        repositories {
+            maven {
+                name = "PublishRepo"
+                url = publishRepoURL
+                credentials {
+                    username = publishRepoUsername
+                    password = publishRepoPassword
+                }
+            }
+        }
+    }
+}
+
+javadoc {
+    if (JavaVersion.current().isJava9Compatible()) {
+        options.addBooleanOption('html5', true)
+    }
+    options.jFlags("-Xmx8g", "-Xms512m")
+}
+
+jar {
+    zip64 = true
+}
+
+if (signingKey) {
+    signing {
+        useInMemoryPgpKeys(signingKey, signingPassword)
+        sign publishing.publications.mainPublication
+    }
+}
diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/large-4.3.2/settings.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/large-4.3.2/settings.gradle
@@ -0,0 +1,14 @@
+// *** WARNING: this file was generated by pulumi-java-gen. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+pluginManagement {
+  repositories {
+    maven { // The google mirror is less flaky than mavenCentral()
+      url("https://maven-central.storage-download.googleapis.com/maven2/")
+    }
+    gradlePluginPortal()
+  }
+}
+
+rootProject.name = "com.pulumi.large"
+include("lib")
diff --git a/...lumi-language-java/testdata/sdks/large-4.3.2/src/main/java/com/pulumi/large/Provider.java b/...lumi-language-java/testdata/sdks/large-4.3.2/src/main/java/com/pulumi/large/Provider.java
@@ -0,0 +1,54 @@
+// *** WARNING: this file was generated by pulumi-language-java. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+package com.pulumi.large;
+
+import com.pulumi.core.Output;
+import com.pulumi.core.annotations.ResourceType;
+import com.pulumi.core.internal.Codegen;
+import com.pulumi.large.ProviderArgs;
+import com.pulumi.large.Utilities;
+import javax.annotation.Nullable;
+
+@ResourceType(type="pulumi:providers:large")
+public class Provider extends com.pulumi.resources.ProviderResource {
+    /**
+     *
+     * @param name The _unique_ name of the resulting resource.
+     */
+    public Provider(java.lang.String name) {
+        this(name, ProviderArgs.Empty);
+    }
+    /**
+     *
+     * @param name The _unique_ name of the resulting resource.
+     * @param args The arguments to use to populate this resource's properties.
+     */
+    public Provider(java.lang.String name, @Nullable ProviderArgs args) {
+        this(name, args, null);
+    }
+    /**
+     *
+     * @param name The _unique_ name of the resulting resource.
+     * @param args The arguments to use to populate this resource's properties.
+     * @param options A bag of options that control this resource's behavior.
+     */
+    public Provider(java.lang.String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        super("large", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false);
+    }
+
+    private static ProviderArgs makeArgs(@Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+        if (options != null && options.getUrn().isPresent()) {
+            return null;
+        }
+        return args == null ? ProviderArgs.Empty : args;
+    }
+
+    private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<java.lang.String> id) {
+        var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
+            .version(Utilities.getVersion())
+            .build();
+        return com.pulumi.resources.CustomResourceOptions.merge(defaultOptions, options, id);
+    }
+
+}
diff --git a/...-language-java/testdata/sdks/large-4.3.2/src/main/java/com/pulumi/large/ProviderArgs.java b/...-language-java/testdata/sdks/large-4.3.2/src/main/java/com/pulumi/large/ProviderArgs.java
@@ -0,0 +1,28 @@
+// *** WARNING: this file was generated by pulumi-language-java. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+package com.pulumi.large;
+
+
+
+
+public final class ProviderArgs extends com.pulumi.resources.ResourceArgs {
+
+    public static final ProviderArgs Empty = new ProviderArgs();
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder {
+        private ProviderArgs $;
+
+        public Builder() {
+            $ = new ProviderArgs();
+        }
+        public ProviderArgs build() {
+            return $;
+        }
+    }
+
+}