@quiltdata/benchling-webhook 0.9.0-20251130T062440Z → 0.9.0-20251204T040448Z
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +63 -47
- package/cdk.json +1 -0
- package/dist/bin/benchling-webhook.js +13 -0
- package/dist/bin/benchling-webhook.js.map +1 -1
- package/dist/bin/commands/deploy.d.ts.map +1 -1
- package/dist/bin/commands/deploy.js +60 -95
- package/dist/bin/commands/deploy.js.map +1 -1
- package/dist/bin/commands/destroy.d.ts +0 -1
- package/dist/bin/commands/destroy.d.ts.map +1 -1
- package/dist/bin/commands/destroy.js +0 -1
- package/dist/bin/commands/destroy.js.map +1 -1
- package/dist/bin/commands/infer-quilt-config.d.ts.map +1 -1
- package/dist/bin/commands/infer-quilt-config.js +13 -10
- package/dist/bin/commands/infer-quilt-config.js.map +1 -1
- package/dist/bin/commands/setup-profile.js +1 -1
- package/dist/bin/commands/setup-profile.js.map +1 -1
- package/dist/bin/commands/setup-wizard.d.ts.map +1 -1
- package/dist/bin/commands/setup-wizard.js +1 -0
- package/dist/bin/commands/setup-wizard.js.map +1 -1
- package/dist/lib/benchling-webhook-stack.d.ts.map +1 -1
- package/dist/lib/benchling-webhook-stack.js +61 -38
- package/dist/lib/benchling-webhook-stack.js.map +1 -1
- package/dist/lib/fargate-service.js +1 -1
- package/dist/lib/fargate-service.js.map +1 -1
- package/dist/lib/index.d.ts +1 -1
- package/dist/lib/index.js +3 -3
- package/dist/lib/network-load-balancer.d.ts.map +1 -1
- package/dist/lib/network-load-balancer.js +0 -2
- package/dist/lib/network-load-balancer.js.map +1 -1
- package/dist/lib/{http-api-gateway.d.ts → rest-api-gateway.d.ts} +9 -9
- package/dist/lib/rest-api-gateway.d.ts.map +1 -0
- package/dist/lib/rest-api-gateway.js +212 -0
- package/dist/lib/rest-api-gateway.js.map +1 -0
- package/dist/lib/types/config.d.ts +36 -3
- package/dist/lib/types/config.d.ts.map +1 -1
- package/dist/lib/types/config.js.map +1 -1
- package/dist/lib/wizard/phase2-stack-query.d.ts.map +1 -1
- package/dist/lib/wizard/phase2-stack-query.js +46 -21
- package/dist/lib/wizard/phase2-stack-query.js.map +1 -1
- package/dist/lib/wizard/phase3-parameter-collection.d.ts.map +1 -1
- package/dist/lib/wizard/phase3-parameter-collection.js +101 -67
- package/dist/lib/wizard/phase3-parameter-collection.js.map +1 -1
- package/dist/lib/wizard/types.d.ts +11 -0
- package/dist/lib/wizard/types.d.ts.map +1 -1
- package/dist/package.json +2 -2
- package/dist/scripts/discover-vpc.js +12 -11
- package/dist/scripts/discover-vpc.js.map +1 -1
- package/package.json +2 -2
- package/dist/lib/http-api-gateway.d.ts.map +0 -1
- package/dist/lib/http-api-gateway.js +0 -166
- package/dist/lib/http-api-gateway.js.map +0 -1
- package/dist/lib/waf-web-acl.d.ts +0 -51
- package/dist/lib/waf-web-acl.d.ts.map +0 -1
- package/dist/lib/waf-web-acl.js +0 -192
- package/dist/lib/waf-web-acl.js.map +0 -1
|
@@ -29,11 +29,93 @@ const manifest_1 = require("../../bin/commands/manifest");
|
|
|
29
29
|
* @returns Parameter collection result
|
|
30
30
|
*/
|
|
31
31
|
async function runParameterCollection(input) {
|
|
32
|
-
const { stackQuery, existingConfig, yes = false } = input;
|
|
32
|
+
const { stackQuery, existingConfig, yes = false, profile = "default" } = input;
|
|
33
|
+
// =========================================================================
|
|
34
|
+
// VPC Configuration (FIRST - most important infrastructure decision)
|
|
35
|
+
// =========================================================================
|
|
36
|
+
console.log(chalk_1.default.cyan("VPC Configuration:"));
|
|
37
|
+
let vpcId;
|
|
38
|
+
// Use VPC discovered in Phase 2 (Stack Query)
|
|
39
|
+
const discoveredVpc = stackQuery.discoveredVpc;
|
|
40
|
+
if (discoveredVpc && discoveredVpc.isValid) {
|
|
41
|
+
// Report discovered VPC
|
|
42
|
+
const vpcDescription = discoveredVpc.name
|
|
43
|
+
? `${discoveredVpc.name} (${discoveredVpc.vpcId})`
|
|
44
|
+
: discoveredVpc.vpcId;
|
|
45
|
+
console.log(` VPC: ${vpcDescription} - ${discoveredVpc.privateSubnetCount} private subnets in ${discoveredVpc.availabilityZoneCount} AZs`);
|
|
46
|
+
// Warn about potential connectivity issues
|
|
47
|
+
console.log(chalk_1.default.yellow(" ⚠ Warning: This VPC may block Benchling webhook access"));
|
|
48
|
+
if (yes) {
|
|
49
|
+
// In non-interactive mode, check if there's an existing VPC preference
|
|
50
|
+
if (existingConfig?.deployment?.vpc?.vpcId) {
|
|
51
|
+
vpcId = existingConfig.deployment.vpc.vpcId;
|
|
52
|
+
console.log(chalk_1.default.dim(` Using VPC: ${vpcId} (from existing config)`));
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
// Default to creating new VPC in non-interactive mode (safer default)
|
|
56
|
+
vpcId = undefined;
|
|
57
|
+
console.log(chalk_1.default.dim(" Will create new standalone VPC (recommended, safer default)"));
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
// Interactive mode - ask if they want to create standalone VPC
|
|
62
|
+
// Default to YES (create new VPC) unless existing config uses this VPC
|
|
63
|
+
const defaultCreateStandalone = existingConfig?.deployment?.vpc?.vpcId !== discoveredVpc.vpcId;
|
|
64
|
+
const { createStandaloneVpc } = await inquirer_1.default.prompt([
|
|
65
|
+
{
|
|
66
|
+
type: "confirm",
|
|
67
|
+
name: "createStandaloneVpc",
|
|
68
|
+
message: "Create standalone VPC? (No = use existing VPC from stack)",
|
|
69
|
+
default: defaultCreateStandalone,
|
|
70
|
+
},
|
|
71
|
+
]);
|
|
72
|
+
vpcId = createStandaloneVpc ? undefined : discoveredVpc.vpcId;
|
|
73
|
+
// Check if VPC selection changed from existing configuration
|
|
74
|
+
const existingVpcId = existingConfig?.deployment?.vpc?.vpcId;
|
|
75
|
+
const vpcChanged = existingVpcId && existingVpcId !== vpcId;
|
|
76
|
+
if (vpcChanged) {
|
|
77
|
+
// CRITICAL WARNING: Changing VPC requires stack destruction
|
|
78
|
+
// Use actual profile name for commands (omit --profile flag if default)
|
|
79
|
+
const profileFlag = profile !== "default" ? ` --profile ${profile}` : "";
|
|
80
|
+
console.log("\n" + chalk_1.default.red.bold("⚠️ IMPORTANT: VPC CONFIGURATION CHANGED"));
|
|
81
|
+
console.log(chalk_1.default.yellow(` Previous VPC: ${existingVpcId}`));
|
|
82
|
+
console.log(chalk_1.default.yellow(` New VPC: ${vpcId || "new standalone VPC"}`));
|
|
83
|
+
console.log("");
|
|
84
|
+
console.log(chalk_1.default.red(" Changing VPC requires destroying and redeploying the stack."));
|
|
85
|
+
console.log(chalk_1.default.yellow(" You will likely need to run:"));
|
|
86
|
+
console.log(chalk_1.default.cyan(` npx @quiltdata/benchling-webhook destroy${profileFlag}`));
|
|
87
|
+
console.log(chalk_1.default.cyan(` npx @quiltdata/benchling-webhook deploy${profileFlag}`));
|
|
88
|
+
console.log("");
|
|
89
|
+
const { confirmVpcChange } = await inquirer_1.default.prompt([
|
|
90
|
+
{
|
|
91
|
+
type: "confirm",
|
|
92
|
+
name: "confirmVpcChange",
|
|
93
|
+
message: "Do you understand that changing VPC requires stack destruction and redeployment?",
|
|
94
|
+
default: false,
|
|
95
|
+
},
|
|
96
|
+
]);
|
|
97
|
+
if (!confirmVpcChange) {
|
|
98
|
+
console.log(chalk_1.default.yellow("\nSetup cancelled. VPC configuration not changed.\n"));
|
|
99
|
+
process.exit(0);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
if (vpcId) {
|
|
103
|
+
console.log(chalk_1.default.dim(` Using existing VPC: ${vpcId}`));
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
console.log(chalk_1.default.dim(" Will create new standalone VPC (2 AZs, private subnets, NAT Gateways)"));
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
// No valid VPC discovered - will auto-create
|
|
112
|
+
console.log(" VPC: Will create new standalone VPC (2 AZs, private subnets, NAT Gateways)");
|
|
113
|
+
vpcId = undefined;
|
|
114
|
+
}
|
|
33
115
|
// =========================================================================
|
|
34
116
|
// Benchling Configuration
|
|
35
117
|
// =========================================================================
|
|
36
|
-
console.log(chalk_1.default.cyan("Benchling Configuration:"));
|
|
118
|
+
console.log("\n" + chalk_1.default.cyan("Benchling Configuration:"));
|
|
37
119
|
// Tenant
|
|
38
120
|
let tenant;
|
|
39
121
|
if (input.benchlingTenant) {
|
|
@@ -321,67 +403,6 @@ async function runParameterCollection(input) {
|
|
|
321
403
|
console.log(` Region: ${region} (from stack)`);
|
|
322
404
|
console.log(` Account: ${account} (from stack)`);
|
|
323
405
|
// =========================================================================
|
|
324
|
-
// VPC Configuration
|
|
325
|
-
// =========================================================================
|
|
326
|
-
console.log("\n" + chalk_1.default.cyan("VPC Configuration:"));
|
|
327
|
-
let vpcId;
|
|
328
|
-
// Use VPC discovered in Phase 2 (Stack Query)
|
|
329
|
-
const discoveredVpc = stackQuery.discoveredVpc;
|
|
330
|
-
if (discoveredVpc && discoveredVpc.isValid) {
|
|
331
|
-
// VPC is valid - ask user if they want to use it
|
|
332
|
-
if (yes) {
|
|
333
|
-
// In non-interactive mode, check if there's an existing VPC preference
|
|
334
|
-
if (existingConfig?.deployment?.vpc?.vpcId) {
|
|
335
|
-
vpcId = existingConfig.deployment.vpc.vpcId;
|
|
336
|
-
console.log(` Using VPC: ${vpcId} (from existing config)`);
|
|
337
|
-
}
|
|
338
|
-
else {
|
|
339
|
-
// Default to using discovered VPC in non-interactive mode
|
|
340
|
-
vpcId = discoveredVpc.vpcId;
|
|
341
|
-
console.log(` Using VPC: ${vpcId} (from stack)`);
|
|
342
|
-
}
|
|
343
|
-
}
|
|
344
|
-
else {
|
|
345
|
-
// Interactive mode - present choices
|
|
346
|
-
const vpcDescription = discoveredVpc.name
|
|
347
|
-
? `${discoveredVpc.name} - ${discoveredVpc.privateSubnetCount} private subnets in ${discoveredVpc.availabilityZoneCount} AZs`
|
|
348
|
-
: `${discoveredVpc.privateSubnetCount} private subnets in ${discoveredVpc.availabilityZoneCount} AZs`;
|
|
349
|
-
const vpcChoices = [
|
|
350
|
-
{
|
|
351
|
-
name: `Use existing VPC (${discoveredVpc.vpcId})`,
|
|
352
|
-
value: discoveredVpc.vpcId,
|
|
353
|
-
short: discoveredVpc.vpcId,
|
|
354
|
-
},
|
|
355
|
-
{
|
|
356
|
-
name: "Create new VPC (recommended for isolation)",
|
|
357
|
-
value: undefined,
|
|
358
|
-
short: "Auto-create",
|
|
359
|
-
},
|
|
360
|
-
];
|
|
361
|
-
// Set default based on existing config
|
|
362
|
-
const defaultChoice = existingConfig?.deployment?.vpc?.vpcId === discoveredVpc.vpcId
|
|
363
|
-
? 0
|
|
364
|
-
: existingConfig?.deployment?.vpc?.vpcId === undefined
|
|
365
|
-
? 1
|
|
366
|
-
: 0;
|
|
367
|
-
const vpcAnswer = await inquirer_1.default.prompt([
|
|
368
|
-
{
|
|
369
|
-
type: "list",
|
|
370
|
-
name: "vpcId",
|
|
371
|
-
message: `VPC Configuration (${vpcDescription}):`,
|
|
372
|
-
choices: vpcChoices,
|
|
373
|
-
default: defaultChoice,
|
|
374
|
-
},
|
|
375
|
-
]);
|
|
376
|
-
vpcId = vpcAnswer.vpcId;
|
|
377
|
-
}
|
|
378
|
-
}
|
|
379
|
-
else {
|
|
380
|
-
// No valid VPC discovered - will auto-create
|
|
381
|
-
console.log(chalk_1.default.dim(" Will auto-create new VPC (2 AZs, private subnets, NAT Gateways)"));
|
|
382
|
-
vpcId = undefined;
|
|
383
|
-
}
|
|
384
|
-
// =========================================================================
|
|
385
406
|
// Optional Configuration
|
|
386
407
|
// =========================================================================
|
|
387
408
|
console.log("\n" + chalk_1.default.cyan("Optional Configuration:"));
|
|
@@ -402,6 +423,8 @@ async function runParameterCollection(input) {
|
|
|
402
423
|
}
|
|
403
424
|
else {
|
|
404
425
|
// Always show prompts with defaults from existing config
|
|
426
|
+
const existingAllowList = existingConfig?.security?.webhookAllowList;
|
|
427
|
+
const hasExistingAllowList = existingAllowList && existingAllowList.length > 0;
|
|
405
428
|
const optionalAnswers = await inquirer_1.default.prompt([
|
|
406
429
|
{
|
|
407
430
|
type: "list",
|
|
@@ -413,12 +436,17 @@ async function runParameterCollection(input) {
|
|
|
413
436
|
{
|
|
414
437
|
type: "input",
|
|
415
438
|
name: "webhookAllowList",
|
|
416
|
-
message:
|
|
417
|
-
|
|
439
|
+
message: hasExistingAllowList
|
|
440
|
+
? `Webhook IP allowlist (currently: ${existingAllowList}, enter 'none' to clear):`
|
|
441
|
+
: "Webhook IP allowlist (comma-separated, empty for none):",
|
|
442
|
+
default: existingAllowList || "",
|
|
418
443
|
},
|
|
419
444
|
]);
|
|
420
445
|
logLevel = optionalAnswers.logLevel;
|
|
421
|
-
|
|
446
|
+
// Handle 'none' keyword to explicitly clear the allowlist
|
|
447
|
+
webhookAllowList = optionalAnswers.webhookAllowList.trim().toLowerCase() === "none"
|
|
448
|
+
? ""
|
|
449
|
+
: optionalAnswers.webhookAllowList;
|
|
422
450
|
}
|
|
423
451
|
console.log(""); // Empty line for spacing
|
|
424
452
|
return {
|
|
@@ -437,7 +465,13 @@ async function runParameterCollection(input) {
|
|
|
437
465
|
deployment: {
|
|
438
466
|
region,
|
|
439
467
|
account,
|
|
440
|
-
vpc: vpcId ? {
|
|
468
|
+
vpc: vpcId && discoveredVpc ? {
|
|
469
|
+
vpcId,
|
|
470
|
+
privateSubnetIds: discoveredVpc.privateSubnetIds,
|
|
471
|
+
publicSubnetIds: discoveredVpc.publicSubnetIds,
|
|
472
|
+
availabilityZones: discoveredVpc.availabilityZones,
|
|
473
|
+
vpcCidrBlock: discoveredVpc.cidrBlock,
|
|
474
|
+
} : undefined,
|
|
441
475
|
},
|
|
442
476
|
logging: {
|
|
443
477
|
level: logLevel,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase3-parameter-collection.js","sourceRoot":"","sources":["../../../lib/wizard/phase3-parameter-collection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"phase3-parameter-collection.js","sourceRoot":"","sources":["../../../lib/wizard/phase3-parameter-collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,12 @@ export interface DiscoveredVpcInfo {
|
|
|
37
37
|
isValid: boolean;
|
|
38
38
|
/** Validation error messages */
|
|
39
39
|
validationErrors: string[];
|
|
40
|
+
/** Actual private subnet IDs for CDK VPC construction */
|
|
41
|
+
privateSubnetIds: string[];
|
|
42
|
+
/** Actual public subnet IDs for CDK VPC construction */
|
|
43
|
+
publicSubnetIds: string[];
|
|
44
|
+
/** Availability zones for the subnets */
|
|
45
|
+
availabilityZones: string[];
|
|
40
46
|
}
|
|
41
47
|
/**
|
|
42
48
|
* Phase 2: Stack Query Result
|
|
@@ -86,6 +92,7 @@ export interface ParameterCollectionInput {
|
|
|
86
92
|
stackQuery: StackQueryResult;
|
|
87
93
|
existingConfig?: ProfileConfig | null;
|
|
88
94
|
yes?: boolean;
|
|
95
|
+
profile?: string;
|
|
89
96
|
benchlingTenant?: string;
|
|
90
97
|
benchlingClientId?: string;
|
|
91
98
|
benchlingClientSecret?: string;
|
|
@@ -118,6 +125,10 @@ export interface ParameterCollectionResult {
|
|
|
118
125
|
account: string;
|
|
119
126
|
vpc?: {
|
|
120
127
|
vpcId?: string;
|
|
128
|
+
privateSubnetIds?: string[];
|
|
129
|
+
publicSubnetIds?: string[];
|
|
130
|
+
availabilityZones?: string[];
|
|
131
|
+
vpcCidrBlock?: string;
|
|
121
132
|
};
|
|
122
133
|
};
|
|
123
134
|
logging: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/wizard/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,uDAAuD;IACvD,kBAAkB,EAAE,OAAO,CAAC;IAC5B,uDAAuD;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,aAAa;IACb,KAAK,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mCAAmC;IACnC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,kDAAkD;IAClD,OAAO,EAAE,OAAO,CAAC;IACjB,gCAAgC;IAChC,gBAAgB,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/wizard/types.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quiltdata/benchling-webhook",
|
|
3
|
-
"version": "0.9.0-
|
|
3
|
+
"version": "0.9.0-20251204T040448Z",
|
|
4
4
|
"description": "AWS CDK deployment for Benchling webhook processing using Fargate - Deploy directly with npx",
|
|
5
5
|
"main": "dist/lib/index.js",
|
|
6
6
|
"types": "dist/lib/index.d.ts",
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
"adm-zip": "^0.5.10",
|
|
109
109
|
"ajv": "^8.17.1",
|
|
110
110
|
"ajv-formats": "^3.0.1",
|
|
111
|
-
"aws-cdk-lib": "2.
|
|
111
|
+
"aws-cdk-lib": "2.231.0",
|
|
112
112
|
"boxen": "^8.0.0",
|
|
113
113
|
"chalk": "^5.0.0",
|
|
114
114
|
"commander": "^14.0.2",
|
|
@@ -168,27 +168,28 @@ async function discoverVpcFromStack(options) {
|
|
|
168
168
|
* Validates VPC meets architecture requirements
|
|
169
169
|
*
|
|
170
170
|
* Requirements:
|
|
171
|
-
* - Must have ≥2 private subnets in different AZs
|
|
172
|
-
* - Private subnets must have NAT Gateway for outbound access
|
|
171
|
+
* - Must have ≥2 private subnets WITH NAT Gateway in different AZs
|
|
172
|
+
* - Private subnets must have NAT Gateway for outbound access (excludes "intra" subnets)
|
|
173
173
|
*
|
|
174
174
|
* @param vpc - Discovered VPC to validate
|
|
175
175
|
*/
|
|
176
176
|
function validateVpc(vpc) {
|
|
177
177
|
const errors = [];
|
|
178
|
-
// Check private subnets
|
|
179
|
-
|
|
178
|
+
// Check private subnets with NAT Gateway (excludes "intra" subnets)
|
|
179
|
+
// Private subnets: !isPublic && hasNatGateway (for ECS outbound access)
|
|
180
|
+
// Intra subnets: !isPublic && !hasNatGateway (isolated, should be excluded)
|
|
181
|
+
const privateSubnets = vpc.subnets.filter((s) => !s.isPublic && s.hasNatGateway);
|
|
182
|
+
const intraSubnets = vpc.subnets.filter((s) => !s.isPublic && !s.hasNatGateway);
|
|
180
183
|
if (privateSubnets.length < 2) {
|
|
181
|
-
errors.push(`Insufficient private subnets (found ${privateSubnets.length}, need ≥2)`);
|
|
184
|
+
errors.push(`Insufficient private subnets with NAT Gateway (found ${privateSubnets.length}, need ≥2)`);
|
|
185
|
+
if (intraSubnets.length > 0) {
|
|
186
|
+
errors.push(`Note: Found ${intraSubnets.length} isolated "intra" subnet(s) without NAT Gateway - these cannot be used for ECS tasks`);
|
|
187
|
+
}
|
|
182
188
|
}
|
|
183
189
|
// Check AZ distribution
|
|
184
190
|
const azs = new Set(privateSubnets.map((s) => s.availabilityZone));
|
|
185
191
|
if (azs.size < 2) {
|
|
186
|
-
errors.push(`Private subnets span only ${azs.size} AZ(s) (need ≥2 for high availability)`);
|
|
187
|
-
}
|
|
188
|
-
// Check NAT Gateway
|
|
189
|
-
const hasNat = vpc.subnets.some((s) => s.hasNatGateway);
|
|
190
|
-
if (!hasNat) {
|
|
191
|
-
errors.push("No NAT Gateway configured (required for ECS outbound access)");
|
|
192
|
+
errors.push(`Private subnets with NAT span only ${azs.size} AZ(s) (need ≥2 for high availability)`);
|
|
192
193
|
}
|
|
193
194
|
vpc.isValid = errors.length === 0;
|
|
194
195
|
vpc.validationErrors = errors;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discover-vpc.js","sourceRoot":"","sources":["../../scripts/discover-vpc.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"discover-vpc.js","sourceRoot":"","sources":["../../scripts/discover-vpc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quiltdata/benchling-webhook",
|
|
3
|
-
"version": "0.9.0-
|
|
3
|
+
"version": "0.9.0-20251204T040448Z",
|
|
4
4
|
"description": "AWS CDK deployment for Benchling webhook processing using Fargate - Deploy directly with npx",
|
|
5
5
|
"main": "dist/lib/index.js",
|
|
6
6
|
"types": "dist/lib/index.d.ts",
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
"adm-zip": "^0.5.10",
|
|
109
109
|
"ajv": "^8.17.1",
|
|
110
110
|
"ajv-formats": "^3.0.1",
|
|
111
|
-
"aws-cdk-lib": "2.
|
|
111
|
+
"aws-cdk-lib": "2.231.0",
|
|
112
112
|
"boxen": "^8.0.0",
|
|
113
113
|
"chalk": "^5.0.0",
|
|
114
114
|
"commander": "^14.0.2",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"http-api-gateway.d.ts","sourceRoot":"","sources":["../../lib/http-api-gateway.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,YAAY,MAAM,8BAA8B,CAAC;AAG7D,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,wCAAwC,CAAC;AAChE,OAAO,KAAK,IAAI,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC;IACvB,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,oBAAoB,CAAC;IACzD,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,gBAAgB,CAAC;IAC7C,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,cAAc,CAAC;IAClD,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;CAClC;AAED,qBAAa,cAAc;IACvB,SAAgB,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC;IAC1C,SAAgB,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC;IAC9C,SAAgB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzC,SAAgB,SAAS,CAAC,EAAE,SAAS,CAAC;gBAE1B,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;CA4IvE"}
|
|
@@ -1,166 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.HttpApiGateway = void 0;
|
|
37
|
-
const cdk = __importStar(require("aws-cdk-lib"));
|
|
38
|
-
const apigatewayv2 = __importStar(require("aws-cdk-lib/aws-apigatewayv2"));
|
|
39
|
-
const apigatewayv2Integrations = __importStar(require("aws-cdk-lib/aws-apigatewayv2-integrations"));
|
|
40
|
-
const wafv2 = __importStar(require("aws-cdk-lib/aws-wafv2"));
|
|
41
|
-
const logs = __importStar(require("aws-cdk-lib/aws-logs"));
|
|
42
|
-
const waf_web_acl_1 = require("./waf-web-acl");
|
|
43
|
-
class HttpApiGateway {
|
|
44
|
-
constructor(scope, id, props) {
|
|
45
|
-
// Access logs for HTTP API
|
|
46
|
-
this.logGroup = new logs.LogGroup(scope, "ApiGatewayAccessLogs", {
|
|
47
|
-
logGroupName: "/aws/apigateway/benchling-webhook-http",
|
|
48
|
-
retention: logs.RetentionDays.ONE_WEEK,
|
|
49
|
-
removalPolicy: cdk.RemovalPolicy.DESTROY,
|
|
50
|
-
});
|
|
51
|
-
// VPC Link for private integration with Network Load Balancer
|
|
52
|
-
// v0.9.0: NLB provides reliable health checks for ECS tasks
|
|
53
|
-
this.vpcLink = new apigatewayv2.VpcLink(scope, "VpcLink", {
|
|
54
|
-
vpc: props.vpc,
|
|
55
|
-
securityGroups: [props.serviceSecurityGroup],
|
|
56
|
-
vpcLinkName: "benchling-webhook-vpclink",
|
|
57
|
-
});
|
|
58
|
-
// Create HTTP API v2
|
|
59
|
-
this.api = new apigatewayv2.HttpApi(scope, "BenchlingWebhookHttpAPI", {
|
|
60
|
-
apiName: "BenchlingWebhookHttpAPI",
|
|
61
|
-
description: "HTTP API for Benchling webhook integration (v0.9.0+ with NLB and optional WAF)",
|
|
62
|
-
});
|
|
63
|
-
// Network Load Balancer integration via VPC Link
|
|
64
|
-
// v0.9.0: Replaced Cloud Map with NLB for reliable routing
|
|
65
|
-
const integration = new apigatewayv2Integrations.HttpNlbIntegration("NlbIntegration", props.nlbListener, {
|
|
66
|
-
vpcLink: this.vpcLink,
|
|
67
|
-
});
|
|
68
|
-
// Webhook routes - HMAC verification handled by FastAPI application
|
|
69
|
-
// Event webhooks
|
|
70
|
-
this.api.addRoutes({
|
|
71
|
-
path: "/event",
|
|
72
|
-
methods: [apigatewayv2.HttpMethod.POST],
|
|
73
|
-
integration,
|
|
74
|
-
});
|
|
75
|
-
// Lifecycle webhooks
|
|
76
|
-
this.api.addRoutes({
|
|
77
|
-
path: "/lifecycle",
|
|
78
|
-
methods: [apigatewayv2.HttpMethod.POST],
|
|
79
|
-
integration,
|
|
80
|
-
});
|
|
81
|
-
// Canvas webhooks
|
|
82
|
-
this.api.addRoutes({
|
|
83
|
-
path: "/canvas",
|
|
84
|
-
methods: [apigatewayv2.HttpMethod.POST],
|
|
85
|
-
integration,
|
|
86
|
-
});
|
|
87
|
-
// Health check routes - always unauthenticated
|
|
88
|
-
this.api.addRoutes({
|
|
89
|
-
path: "/health",
|
|
90
|
-
methods: [apigatewayv2.HttpMethod.GET],
|
|
91
|
-
integration,
|
|
92
|
-
});
|
|
93
|
-
this.api.addRoutes({
|
|
94
|
-
path: "/health/ready",
|
|
95
|
-
methods: [apigatewayv2.HttpMethod.GET],
|
|
96
|
-
integration,
|
|
97
|
-
});
|
|
98
|
-
this.api.addRoutes({
|
|
99
|
-
path: "/health/live",
|
|
100
|
-
methods: [apigatewayv2.HttpMethod.GET],
|
|
101
|
-
integration,
|
|
102
|
-
});
|
|
103
|
-
// Root path - unauthenticated (informational endpoint)
|
|
104
|
-
this.api.addRoutes({
|
|
105
|
-
path: "/",
|
|
106
|
-
methods: [apigatewayv2.HttpMethod.GET],
|
|
107
|
-
integration,
|
|
108
|
-
});
|
|
109
|
-
// Conditionally create WAF Web ACL for IP filtering
|
|
110
|
-
// Only deploy WAF if webhookAllowList is configured
|
|
111
|
-
const webhookAllowList = props.config.security?.webhookAllowList || "";
|
|
112
|
-
if (webhookAllowList) {
|
|
113
|
-
console.log("WAF IP filtering: ENABLED");
|
|
114
|
-
// Create WAF Web ACL
|
|
115
|
-
this.wafWebAcl = new waf_web_acl_1.WafWebAcl(scope, "WafWebAcl", {
|
|
116
|
-
ipAllowList: webhookAllowList,
|
|
117
|
-
});
|
|
118
|
-
// Construct HTTP API ARN for WAF association
|
|
119
|
-
// Format: arn:aws:apigateway:{region}::/apis/{api-id}/stages/{stage-name}
|
|
120
|
-
const apiArn = cdk.Stack.of(scope).formatArn({
|
|
121
|
-
service: "apigateway",
|
|
122
|
-
resource: `/apis/${this.api.apiId}/stages/${this.api.defaultStage?.stageName || "$default"}`,
|
|
123
|
-
arnFormat: cdk.ArnFormat.SLASH_RESOURCE_NAME,
|
|
124
|
-
});
|
|
125
|
-
// Associate WAF with HTTP API
|
|
126
|
-
new wafv2.CfnWebACLAssociation(scope, "WafAssociation", {
|
|
127
|
-
resourceArn: apiArn,
|
|
128
|
-
webAclArn: this.wafWebAcl.webAcl.attrArn,
|
|
129
|
-
});
|
|
130
|
-
}
|
|
131
|
-
else {
|
|
132
|
-
console.log("WAF IP filtering: DISABLED (no webhookAllowList configured)");
|
|
133
|
-
}
|
|
134
|
-
// Configure access logging on the default stage
|
|
135
|
-
const stage = this.api.defaultStage?.node.defaultChild;
|
|
136
|
-
if (stage) {
|
|
137
|
-
stage.accessLogSettings = {
|
|
138
|
-
destinationArn: this.logGroup.logGroupArn,
|
|
139
|
-
format: JSON.stringify({
|
|
140
|
-
requestId: "$context.requestId",
|
|
141
|
-
ip: "$context.identity.sourceIp",
|
|
142
|
-
requestTime: "$context.requestTime",
|
|
143
|
-
httpMethod: "$context.httpMethod",
|
|
144
|
-
routeKey: "$context.routeKey",
|
|
145
|
-
status: "$context.status",
|
|
146
|
-
protocol: "$context.protocol",
|
|
147
|
-
responseLength: "$context.responseLength",
|
|
148
|
-
errorMessage: "$context.error.message",
|
|
149
|
-
errorType: "$context.error.messageString",
|
|
150
|
-
}),
|
|
151
|
-
};
|
|
152
|
-
}
|
|
153
|
-
// Webhook verification status
|
|
154
|
-
const verificationEnabled = props.config.security?.enableVerification !== false;
|
|
155
|
-
if (verificationEnabled) {
|
|
156
|
-
console.log("Webhook signature verification: ENABLED (FastAPI application)");
|
|
157
|
-
}
|
|
158
|
-
else {
|
|
159
|
-
console.warn("WARNING: Webhook signature verification is DISABLED. " +
|
|
160
|
-
"This should only be used for testing. Enable it in production by setting " +
|
|
161
|
-
"config.security.enableVerification = true");
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
exports.HttpApiGateway = HttpApiGateway;
|
|
166
|
-
//# sourceMappingURL=http-api-gateway.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"http-api-gateway.js","sourceRoot":"","sources":["../../lib/http-api-gateway.ts"],"names":[],"mappings":"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"}
|