Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/actions/setup-runtimes-caching/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
- name: Install Aspire CLI
uses: timheuer/setup-aspire@v0.1.0
with:
quality: release # temp workaround until url is fixed
quality: release

- name: Set up Python
uses: actions/setup-python@v5
Expand Down
5 changes: 2 additions & 3 deletions eng/testing/validate-typescript-apphost.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ param(
[Parameter(Mandatory = $true)]
[string]$PackageName,

[Parameter(Mandatory = $true)]
[string[]]$WaitForResources,
[string[]]$WaitForResources = @(),

[string[]]$RequiredCommands = @(),

Expand Down Expand Up @@ -87,7 +86,7 @@ if ([string]::IsNullOrWhiteSpace($PackageVersion)) {
$PackageVersion = "$versionPrefix-polyglot.local"
}

if ($WaitForResources.Count -eq 1) {
if ($WaitForResources.Count -eq 1 -and -not [string]::IsNullOrWhiteSpace($WaitForResources[0])) {
$splitOptions = [System.StringSplitOptions]::RemoveEmptyEntries -bor [System.StringSplitOptions]::TrimEntries
$WaitForResources = $WaitForResources[0].Split(",", $splitOptions)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { createBuilder } from './.modules/aspire.js';

const builder = await createBuilder();
const appHostDirectory = path.dirname(fileURLToPath(import.meta.url));
const javaProjectDirectory = path.join(appHostDirectory, '..', 'CommunityToolkit.Aspire.Hosting.Java.Spring.Maven');
const javaJarPath = path.join('target', 'spring-maven-0.0.1-SNAPSHOT.jar');
const isWindows = process.platform === 'win32';

const containerApp = await builder.addJavaContainerApp(
'java-container',
'docker.io/aliencube/aspire-spring-maven-sample',
{ imageTag: 'latest' });
await containerApp.withJvmArgs(['-Djava.awt.headless=true']);
await containerApp.withOtelAgent();
await containerApp.withExplicitStart();

await containerApp.entrypoint.set('java');
const _containerEntrypoint: string = await containerApp.entrypoint.get();
await containerApp.shellExecution.set(false);
const _containerShellExecution: boolean = await containerApp.shellExecution.get();
const _containerName: string = await containerApp.name.get();

const jarApp = await builder.addJavaAppWithJar(
'java-jar',
javaProjectDirectory,
javaJarPath,
{ args: ['--spring.main.banner-mode=off'] });
await jarApp.withWrapperPath(isWindows ? 'mvnw.cmd' : 'mvnw');
await jarApp.withMavenBuild([]);
await jarApp.withJvmArgs(['-Duser.timezone=UTC']);
await jarApp.withOtelAgent();
await jarApp.withExplicitStart();

const _jarCommand: string = await jarApp.command.get();
const _jarWorkingDirectory: string = await jarApp.workingDirectory.get();
const _jarName: string = await jarApp.name.get();
const _jarPathBefore: string = await jarApp.jarPath.get();
await jarApp.jarPath.set(javaJarPath);
const _jarPathAfter: string = await jarApp.jarPath.get();

const mavenGoalApp = await builder.addJavaApp('java-maven-goal', javaProjectDirectory);
await mavenGoalApp.withWrapperPath(isWindows ? 'mvnw.cmd' : 'mvnw');
await mavenGoalApp.withMavenGoal('spring-boot:run', []);
await mavenGoalApp.withJvmArgs(['-Dfile.encoding=UTF-8']);
await mavenGoalApp.withOtelAgent();
await mavenGoalApp.withHttpEndpoint({ targetPort: 8080, env: 'SERVER_PORT' });
await mavenGoalApp.withHttpHealthCheck({ path: '/health' });
await mavenGoalApp.withExplicitStart();

const _mavenGoalCommand: string = await mavenGoalApp.command.get();
const _mavenGoalWorkingDirectory: string = await mavenGoalApp.workingDirectory.get();
const _mavenGoalName: string = await mavenGoalApp.name.get();

const gradleBuildApp = await builder.addJavaApp('java-gradle-build', javaProjectDirectory);
await gradleBuildApp.withWrapperPath(isWindows ? 'gradlew.bat' : 'gradlew');
await gradleBuildApp.withGradleBuild(['--parallel']);
await gradleBuildApp.withExplicitStart();

const gradleTaskApp = await builder.addJavaApp('java-gradle-task', javaProjectDirectory);
await gradleTaskApp.withWrapperPath(isWindows ? 'gradlew.bat' : 'gradlew');
await gradleTaskApp.withGradleTask('bootRun', ['--args=--spring.main.banner-mode=off']);
await gradleTaskApp.withExplicitStart();

await builder.build().run();
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"appHost": {
"path": "apphost.ts",
"language": "typescript/nodejs"
},
"profiles": {
"https": {
"applicationUrl": "https://localhost:29750;http://localhost:28931",
"environmentVariables": {
"ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:10975",
"ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:13319"
}
}
},
"packages": {
"CommunityToolkit.Aspire.Hosting.Java": ""
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// @ts-check

import { defineConfig } from 'eslint/config';
import tseslint from 'typescript-eslint';

export default defineConfig({
files: ['apphost.ts'],
extends: [tseslint.configs.base],
languageOptions: {
parserOptions: {
projectService: true,
},
},
rules: {
'@typescript-eslint/no-floating-promises': ['error', { checkThenables: true }],
},
});
Loading
Loading