Skip to content
Merged
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,26 @@
import { createBuilder } from './.modules/aspire.js';

const builder = await createBuilder();

const username = await builder.addParameterWithValue("zitadel-username", "admin");
const password = await builder.addParameterWithValue("zitadel-password", "AspireZitadelPassword!1", { secret: true });
const masterKey = await builder.addParameterWithValue("zitadel-master-key", "Aa1!Aa1!Aa1!Aa1!Aa1!Aa1!Aa1!Aa1!", { secret: true });

const postgres = await builder.addPostgres("postgres");
const existingDatabase = await postgres.addDatabase("zitadel-existing-db");

const zitadel = await builder.addZitadel("zitadel", {
port: 8080,
username,
password,
masterKey
});

await zitadel.withExternalDomain("auth.example.com");
await zitadel.withDatabase(postgres, { databaseName: "zitadel-db" });

const minimalZitadel = await builder.addZitadel("zitadel-minimal");
await minimalZitadel.withExistingDatabase(existingDatabase);
await minimalZitadel.withExternalDomain("login.example.com");

await builder.build().run();
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"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.Zitadel": "13.2.1-polyglot.local",
"Aspire.Hosting.PostgreSQL": ""
}
}
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