-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Unskip l2-explicit-parameterized-provider test (#1538)
This conformance test can be enabled now with the implementation of `GetRequiredPackages` from #1535.
- Loading branch information
Showing
12 changed files
with
665 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...cmd/pulumi-language-java/testdata/projects/l2-explicit-parameterized-provider/Pulumi.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
name: l2-explicit-parameterized-provider | ||
runtime: java |
99 changes: 99 additions & 0 deletions
99
pkg/cmd/pulumi-language-java/testdata/projects/l2-explicit-parameterized-provider/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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-explicit-parameterized-provider</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>goodbye</artifactId> | ||
<version>2.0.0</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> |
35 changes: 35 additions & 0 deletions
35
...data/projects/l2-explicit-parameterized-provider/src/main/java/generated_program/App.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package generated_program; | ||
|
||
import com.pulumi.Context; | ||
import com.pulumi.Pulumi; | ||
import com.pulumi.core.Output; | ||
import com.pulumi.goodbye.Provider; | ||
import com.pulumi.goodbye.ProviderArgs; | ||
import com.pulumi.goodbye.Goodbye; | ||
import com.pulumi.goodbye.GoodbyeArgs; | ||
import com.pulumi.resources.CustomResourceOptions; | ||
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(String[] args) { | ||
Pulumi.run(App::stack); | ||
} | ||
|
||
public static void stack(Context ctx) { | ||
var prov = new Provider("prov", ProviderArgs.builder() | ||
.text("World") | ||
.build()); | ||
|
||
// The resource name is based on the parameter value | ||
var res = new Goodbye("res", GoodbyeArgs.Empty, CustomResourceOptions.builder() | ||
.provider(prov) | ||
.build()); | ||
|
||
ctx.export("parameterValue", res.parameterValue()); | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
pkg/cmd/pulumi-language-java/testdata/sdks/goodbye-2.0.0/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
|
162 changes: 162 additions & 0 deletions
162
pkg/cmd/pulumi-language-java/testdata/sdks/goodbye-2.0.0/build.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
// *** 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" | ||
? "2.0.0" | ||
: 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 "parameterized" | ||
version "1.2.3" | ||
parameterization { | ||
name "goodbye" | ||
version resolvedVersion | ||
value "R29vZGJ5ZQ==" | ||
} | ||
} | ||
def infoJson = builder.toPrettyString() | ||
new File(outDir, "plugin.json").text = infoJson | ||
} | ||
} | ||
|
||
jar.configure { | ||
dependsOn genPulumiResources | ||
} | ||
|
||
publishing { | ||
publications { | ||
mainPublication(MavenPublication) { | ||
groupId = "com.pulumi" | ||
artifactId = "goodbye" | ||
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 | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
pkg/cmd/pulumi-language-java/testdata/sdks/goodbye-2.0.0/settings.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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.goodbye" | ||
include("lib") |
Oops, something went wrong.