Skip to content

Get Everything building locally with Mise #1761

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Get Everything building locally with Mise #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c498e51
Make it so
i-am-tom Apr 8, 2025
e752eb9
Maybe
i-am-tom Apr 8, 2025
b34903a
info
i-am-tom Apr 8, 2025
0ea85da
?
i-am-tom Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Build and unit-test Pulumi Java SDK
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
arguments: build testAll
arguments: build testAll --info
build-root-directory: sdk/java
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5
Expand Down
5 changes: 5 additions & 0 deletions .mise.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[tools]
go = "latest"
gradle = "8.8"
java = "22"
maven = "3.8.4"
48 changes: 32 additions & 16 deletions sdk/java/pulumi/src/test/java/com/pulumi/automation/LocalWorkspaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,16 @@ void testCreateSelectRemoveStack(@EnvVars Map<String, String> envVars) throws Ex
var env = new HashMap<String, String>(envVars);
env.put("PULUMI_CONFIG_PASSPHRASE", "test");

var projectName = "create_select_remove_stack_test";

try (var workspace = LocalWorkspace.create(LocalWorkspaceOptions.builder()
.projectSettings(ProjectSettings.builder(
"create_select_remove_stack_test",
projectName,
ProjectRuntimeName.NODEJS).build())
.environmentVariables(env)
.build())) {

var stackName = randomStackName();
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());

Predicate<StackSummary> isStack = s -> s.name().equals(stackName);

Expand Down Expand Up @@ -192,7 +194,7 @@ void testImportExportStack(@EnvVars Map<String, String> envVars) throws Exceptio
.environmentVariables(env)
.build())) {

var stackName = randomStackName();
var stackName = fullyQualifiedStackName(getTestOrg(), "testproj", randomStackName());

try {
var stack = WorkspaceStack.create(stackName, workspace);
Expand Down Expand Up @@ -238,7 +240,7 @@ public void testManipulateConfig(@EnvVars Map<String, String> envVars) throws Ex
.environmentVariables(env)
.build())) {

var stackName = randomStackName();
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());
var stack = WorkspaceStack.create(stackName, workspace);

var plainKey = normalizeConfigKey("plain", projectName);
Expand Down Expand Up @@ -302,7 +304,7 @@ public void testManipulateConfigPath(@EnvVars Map<String, String> envVars) throw
.environmentVariables(env)
.build())) {

var stackName = randomStackName();
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());
var stack = WorkspaceStack.create(stackName, workspace);

try {
Expand Down Expand Up @@ -407,7 +409,7 @@ public void testSupportConfigFlagLike(@EnvVars Map<String, String> envVars) thro
.environmentVariables(env)
.build())) {

var stackName = randomStackName();
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());
var stack = WorkspaceStack.create(stackName, workspace);

var plainKey = normalizeConfigKey("key", projectName);
Expand Down Expand Up @@ -447,7 +449,7 @@ public void testListStackAndCurrentlySelected(@EnvVars Map<String, String> envVa
var stackNames = new ArrayList<String>();
try {
for (var i = 0; i < 2; i++) {
var stackName = "int_test" + getTestSuffix();
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, "int_test" + getTestSuffix());
WorkspaceStack.create(stackName, workspace);
stackNames.add(stackName);
var summary = workspace.getStack();
Expand Down Expand Up @@ -478,7 +480,7 @@ public void testCheckStackStatus(@EnvVars Map<String, String> envVars) throws Ex
.environmentVariables(env)
.build())) {

var stackName = randomStackName();
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());
var stack = WorkspaceStack.create(stackName, workspace);
try {
var history = stack.getHistory();
Expand All @@ -505,8 +507,8 @@ void testStackLifecycleInlineProgram(@EnvVars Map<String, String> envVars) {
ctx.export("exp_secret", config.getSecret("buzz"));
};

var stackName = randomStackName();
var projectName = "inline_java";
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());
try (var stack = LocalWorkspace.createStack(projectName, stackName, program,
LocalWorkspaceOptions.builder().environmentVariables(env).build())) {
try {
Expand Down Expand Up @@ -561,8 +563,8 @@ void testInlineProgramDoesNotEmitWarning(@EnvVars Map<String, String> envVars) {
Consumer<Context> program = ctx -> {
};

var stackName = randomStackName();
var projectName = "inline_java";
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());
try (var stack = LocalWorkspace.createStack(projectName, stackName, program,
LocalWorkspaceOptions.builder().environmentVariables(env).build())) {
try {
Expand Down Expand Up @@ -619,7 +621,7 @@ void testStackLifecycleLocalProgram(@EnvVars Map<String, String> envVars) {
var env = new HashMap<String, String>(envVars);
env.put("PULUMI_CONFIG_PASSPHRASE", "test");

var stackName = randomStackName();
var stackName = fullyQualifiedStackName(getTestOrg(), "testproj", randomStackName());
Path workingDir = Paths.get(getClass().getResource("/testproj").toURI());
try (var stack = LocalWorkspace.createStack(stackName, workingDir,
LocalWorkspaceOptions.builder().environmentVariables(env).build())) {
Expand Down Expand Up @@ -695,8 +697,8 @@ void testSupportsStackOutputs(@EnvVars Map<String, String> envVars) {
assertThat(expSecretValue.isSecret()).isTrue();
};

var stackName = randomStackName();
var projectName = "inline_java";
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());
try (var stack = LocalWorkspace.createStack(projectName, stackName, program,
LocalWorkspaceOptions.builder().environmentVariables(env).build())) {
try {
Expand Down Expand Up @@ -741,8 +743,8 @@ void testOutputStreamAndDelegateIsWritten(@EnvVars Map<String, String> envVars)
ctx.export("test", "test");
};

var stackName = randomStackName();
var projectName = "inline_output";
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());
try (var stack = LocalWorkspace.createStack(projectName, stackName, program,
LocalWorkspaceOptions.builder().environmentVariables(env).build())) {
try {
Expand Down Expand Up @@ -796,8 +798,8 @@ void testDetectsProjectSettingsConflict(@EnvVars Map<String, String> envVars) th
Consumer<Context> program = ctx -> {
};

var stackName = randomStackName();
var projectName = "project_was_overwritten";
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());

Path workDir = Paths.get(getClass().getResource("/correct_project").toURI());

Expand All @@ -824,8 +826,8 @@ void testStateDelete(@EnvVars Map<String, String> envVars) throws Exception {
new ComponentResource(type, "a");
};

var stackName = randomStackName();
var projectName = "test_state_delete";
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());

try (var stack = LocalWorkspace.createStack(projectName, stackName, program, LocalWorkspaceOptions.builder()
.environmentVariables(env)
Expand Down Expand Up @@ -883,8 +885,8 @@ void testStateDeleteForce(@EnvVars Map<String, String> envVars) throws Exception
.build());
};

var stackName = randomStackName();
var projectName = "test_state_delete_force";
var stackName = fullyQualifiedStackName(getTestOrg(), projectName, randomStackName());

try (var stack = LocalWorkspace.createStack(projectName, stackName, program, LocalWorkspaceOptions.builder()
.environmentVariables(env)
Expand Down Expand Up @@ -933,4 +935,18 @@ void testStateDeleteForce(@EnvVars Map<String, String> envVars) throws Exception
}
}
}

static String fullyQualifiedStackName(String org, String project, String stack) {
return String.format("%s/%s/%s", org, project, stack);
}

static String getTestOrg() {
if (System.getenv("PULUMI_ACCESS_TOKEN") != null) {
if (System.getenv("PULUMI_TEST_ORG") != null) {
return System.getenv("PULUMI_TEST_ORG");
}
return "organization";
}
return "pulumi-test";
Comment on lines +948 to +950
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these two are the wrong way around, no? If PULUMI_ACCESS_TOKEN is set we want to return pulumi-test by default, and return organization if it's not set at all.

}
}
Loading