Skip to content

Commit b160280

Browse files
authored
Make serverless worker Terraform template configurable (COM-216) (#3671)
1 parent bf9908c commit b160280

3 files changed

Lines changed: 13 additions & 2 deletions

File tree

src/lib/components/workers/serverless-worker-form/compute-fields.svelte

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import { translate } from '$lib/i18n/translate';
1212
1313
import { GCP_REGIONS } from './gcp-regions';
14-
import terraformTemplate from './serverless-worker-lambda.tf?raw';
14+
import defaultTerraformTemplate from './serverless-worker-lambda.tf?raw';
1515
import cfnTemplate from './temporal-worker-role.yaml?raw';
1616
1717
interface Props {
@@ -30,6 +30,7 @@
3030
metricsPollIntervalMs?: number;
3131
cfnTemplateUrl?: string;
3232
cfnTemplate?: string;
33+
terraformTemplate?: string;
3334
errors?: {
3435
lambdaArn?: string[];
3536
iamRoleArn?: string[];
@@ -61,10 +62,14 @@
6162
metricsPollIntervalMs = $bindable(),
6263
cfnTemplateUrl,
6364
cfnTemplate: cfnTemplateProp,
65+
terraformTemplate,
6466
errors = {},
6567
}: Props = $props();
6668
6769
const resolvedCfnTemplate = $derived(cfnTemplateProp ?? cfnTemplate);
70+
const resolvedTerraformTemplate = $derived(
71+
terraformTemplate ?? defaultTerraformTemplate,
72+
);
6873
6974
const launchStackHref = $derived.by(() => {
7075
if (!cfnTemplateUrl) {
@@ -272,7 +277,7 @@
272277
>{translate('workers.terraform-description-after')}
273278
</p>
274279
<CodeBlock
275-
content={terraformTemplate}
280+
content={resolvedTerraformTemplate}
276281
language="text"
277282
maxHeight={300}
278283
copyable

src/lib/components/workers/serverless-worker-form/serverless-worker-create-form.svelte

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
cancelHref: string;
3333
cfnTemplateUrl?: string;
3434
cfnTemplate?: string;
35+
terraformTemplate?: string;
3536
computeProviders?: readonly ComputeProviderOption[];
3637
gcpRegions?: string[];
3738
}
@@ -42,6 +43,7 @@
4243
cancelHref,
4344
cfnTemplateUrl,
4445
cfnTemplate,
46+
terraformTemplate,
4547
computeProviders,
4648
gcpRegions,
4749
}: Props = $props();
@@ -159,6 +161,7 @@
159161
bind:metricsPollIntervalMs={$form.metricsPollIntervalMs}
160162
{cfnTemplateUrl}
161163
{cfnTemplate}
164+
{terraformTemplate}
162165
errors={$errors}
163166
/>
164167
</Card>

src/lib/pages/serverless-worker-create.svelte

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
onSuccess: () => void;
2424
cfnTemplateUrl?: string;
2525
cfnTemplate?: string;
26+
terraformTemplate?: string;
2627
computeProviders?: readonly ComputeProviderOption[];
2728
gcpRegions?: string[];
2829
}
@@ -37,6 +38,7 @@
3738
onSuccess,
3839
cfnTemplateUrl,
3940
cfnTemplate,
41+
terraformTemplate,
4042
computeProviders,
4143
gcpRegions,
4244
}: Props = $props();
@@ -209,6 +211,7 @@
209211
onSubmit={handleCreate}
210212
{cfnTemplateUrl}
211213
{cfnTemplate}
214+
{terraformTemplate}
212215
{computeProviders}
213216
{gcpRegions}
214217
/>

0 commit comments

Comments
 (0)