Skip to content
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

fix: add a site id to razzle api path #8

Merged
merged 6 commits into from
Jul 27, 2024
Merged

fix: add a site id to razzle api path #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
022049b
fix: add a site id to razzle api path
jensens Jul 27, 2024
f0214eb
fix test output
jensens Jul 27, 2024
1ee4a5f
Merge branch 'main' into site_id
jensens Jul 27, 2024
430006a
fix package.json
jensens Jul 27, 2024
11dc94d
camelCase Du olles Kamel
jensens Jul 27, 2024
52db5ee
chore: self mutation
invalid-email-address Jul 27, 2024
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
11 changes: 11 additions & 0 deletions API.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/plone.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface PloneBaseOptions {
}
export interface PloneOptions {
readonly version?: string;
readonly siteId?: string;
readonly backend?: PloneBaseOptions;
readonly frontend?: PloneBaseOptions;
readonly imagePullSecrets?: string[];
Expand All @@ -30,6 +31,10 @@ export class Plone extends Construct {
constructor(scope: Construct, id: string, options: PloneOptions = {}) {
super(scope, id);

// ------------------------------------------------------------------------
// General
const siteId = options.siteId ?? 'Plone';

// ------------------------------------------------------------------------
// Backend
const backend = options.backend ?? {};
Expand Down Expand Up @@ -134,7 +139,7 @@ export class Plone extends Construct {
var frontendEnvironment = frontend.environment ?? new kplus.Env([], {});
if (frontendEnvironment.variables.RAZZLE_INTERNAL_API_PATH === undefined) {
// connect with backend service
frontendEnvironment?.addVariable('RAZZLE_INTERNAL_API_PATH', kplus.EnvValue.fromValue(`http://${backendService.name}:${backendPort}`));
frontendEnvironment?.addVariable('RAZZLE_INTERNAL_API_PATH', kplus.EnvValue.fromValue(`http://${backendService.name}:${backendPort}/${siteId}`));
}

// Deployment
Expand Down
4 changes: 2 additions & 2 deletions test/__snapshots__/plone.test.ts.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.