-
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.
Fix the language plugin to return a version
This change fixes `pulumi about` to show the real version instead of `unknown` for the java language plugin. The fix updates `GetPluginInfo` to return the `Version` from the right `version` Go package—the one that's actually being set during build via `ldflags` (`"github.com/pulumi/pulumi-java/pkg/version"` instead of `"github.com/pulumi/pulumi/sdk/v3/go/common/version"`).
- Loading branch information
Showing
7 changed files
with
153 additions
and
5 deletions.
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
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
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
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,3 @@ | ||
| name: about | ||
| description: An empty project | ||
| runtime: 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,112 @@ | ||
| <?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.example</groupId> | ||
| <artifactId>about</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>${project.groupId}.${project.artifactId}.App</mainClass> | ||
| <mainArgs/> | ||
| <pulumiSdkVersion>0.0.1</pulumiSdkVersion> | ||
| </properties> | ||
|
|
||
| <profiles> | ||
| <profile> | ||
| <id>env-dependencies</id> | ||
| <activation> | ||
| <property> | ||
| <name>env.PULUMI_JAVA_SDK_VERSION</name> | ||
| </property> | ||
| </activation> | ||
| <properties> | ||
| <pulumiSdkVersion>${env.PULUMI_JAVA_SDK_VERSION}</pulumiSdkVersion> | ||
| </properties> | ||
| </profile> | ||
| </profiles> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.pulumi</groupId> | ||
| <artifactId>pulumi</artifactId> | ||
| <version>${pulumiSdkVersion}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.code.findbugs</groupId> | ||
| <artifactId>jsr305</artifactId> | ||
| <version>3.0.2</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.pulumi</groupId> | ||
| <artifactId>random</artifactId> | ||
| <version>4.8.1</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.3.0</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.0.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.0</version> | ||
| <configuration> | ||
| <mavenVersion>3.8.5</mavenVersion> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
12 changes: 12 additions & 0 deletions
12
tests/integration/about/src/main/java/com/pulumi/example/about/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,12 @@ | ||
| package com.pulumi.example.about; | ||
|
|
||
| import com.pulumi.Pulumi; | ||
| import com.pulumi.core.Output; | ||
|
|
||
| public class App { | ||
| public static void main(String[] args) { | ||
| Pulumi.run(ctx -> { | ||
| ctx.export("exampleOutput", Output.of("example")); | ||
| }); | ||
| } | ||
| } |
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