@quiltdata/benchling-webhook 0.9.0-20251129T071202Z → 0.9.0-20251204T020520Z
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 +61 -98
- 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 +1 -0
- package/dist/lib/benchling-webhook-stack.d.ts.map +1 -1
- package/dist/lib/benchling-webhook-stack.js +77 -33
- package/dist/lib/benchling-webhook-stack.js.map +1 -1
- package/dist/lib/fargate-service.d.ts +5 -4
- package/dist/lib/fargate-service.d.ts.map +1 -1
- package/dist/lib/fargate-service.js +9 -19
- 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 +27 -0
- package/dist/lib/network-load-balancer.d.ts.map +1 -0
- package/dist/lib/network-load-balancer.js +109 -0
- package/dist/lib/network-load-balancer.js.map +1 -0
- package/dist/lib/rest-api-gateway.d.ts +22 -0
- 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 +38 -5
- package/dist/lib/types/config.d.ts.map +1 -1
- package/dist/lib/types/config.js.map +1 -1
- package/dist/lib/utils/service-resolver.d.ts +1 -1
- package/dist/lib/utils/service-resolver.js +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 +4 -9
- package/dist/scripts/discover-vpc.js +12 -11
- package/dist/scripts/discover-vpc.js.map +1 -1
- package/package.json +4 -9
- package/dist/lib/http-api-gateway.d.ts +0 -21
- package/dist/lib/http-api-gateway.d.ts.map +0 -1
- package/dist/lib/http-api-gateway.js +0 -153
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/types/config.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/types/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* These values are then passed as explicit environment variables to the container,
|
|
6
6
|
* eliminating the need for runtime CloudFormation API calls.
|
|
7
7
|
*
|
|
8
|
-
* **Breaking Change (
|
|
8
|
+
* **Breaking Change (v0.9.0)**: Replaces runtime config-resolver with deployment-time resolution.
|
|
9
9
|
*
|
|
10
10
|
* @module utils/service-resolver
|
|
11
11
|
* @version 1.0.0
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* These values are then passed as explicit environment variables to the container,
|
|
7
7
|
* eliminating the need for runtime CloudFormation API calls.
|
|
8
8
|
*
|
|
9
|
-
* **Breaking Change (
|
|
9
|
+
* **Breaking Change (v0.9.0)**: Replaces runtime config-resolver with deployment-time resolution.
|
|
10
10
|
*
|
|
11
11
|
* @module utils/service-resolver
|
|
12
12
|
* @version 1.0.0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase2-stack-query.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase2-stack-query.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,gBAAgB,EAAqB,MAAM,SAAS,CAAC;AAG9D;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,iBAAsB,GAChC,OAAO,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"phase2-stack-query.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase2-stack-query.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,gBAAgB,EAAqB,MAAM,SAAS,CAAC;AAG9D;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,iBAAsB,GAChC,OAAO,CAAC,gBAAgB,CAAC,CA8M3B"}
|
|
@@ -30,7 +30,7 @@ const discover_vpc_1 = require("../../scripts/discover-vpc");
|
|
|
30
30
|
*/
|
|
31
31
|
async function runStackQuery(catalogDns, options = {}) {
|
|
32
32
|
const { awsProfile, awsRegion } = options;
|
|
33
|
-
console.log(`
|
|
33
|
+
console.log(`Fetching catalog configuration for: ${catalogDns}...`);
|
|
34
34
|
try {
|
|
35
35
|
// Use inferQuiltConfig with the confirmed catalog - this will skip quilt3 check
|
|
36
36
|
const inferenceResult = await (0, infer_quilt_config_1.inferQuiltConfig)({
|
|
@@ -65,6 +65,13 @@ async function runStackQuery(catalogDns, options = {}) {
|
|
|
65
65
|
const athenaResultsBucketPolicy = inferenceResult.athenaResultsBucketPolicy;
|
|
66
66
|
const readRoleArn = inferenceResult.readRoleArn;
|
|
67
67
|
const writeRoleArn = inferenceResult.writeRoleArn;
|
|
68
|
+
// Show IAM roles (these are logged by inferQuiltConfig)
|
|
69
|
+
if (readRoleArn) {
|
|
70
|
+
console.log(chalk_1.default.dim(`✓ T4BucketReadRole discovered: ${readRoleArn}`));
|
|
71
|
+
}
|
|
72
|
+
if (writeRoleArn) {
|
|
73
|
+
console.log(chalk_1.default.dim(`✓ T4BucketWriteRole: ${writeRoleArn}`));
|
|
74
|
+
}
|
|
68
75
|
// Log what we found
|
|
69
76
|
console.log(chalk_1.default.green("✓ Stack query succeeded\n"));
|
|
70
77
|
console.log(chalk_1.default.dim(`✓ Stack ARN: ${stackArn}`));
|
|
@@ -82,19 +89,13 @@ async function runStackQuery(catalogDns, options = {}) {
|
|
|
82
89
|
console.log(athenaResultsBucketPolicy
|
|
83
90
|
? chalk_1.default.dim(`✓ Athena Results Bucket Policy: ${athenaResultsBucketPolicy}`)
|
|
84
91
|
: chalk_1.default.yellow("⚠ Athena Results Bucket Policy: NOT FOUND"));
|
|
85
|
-
// Iceberg resources are optional (recent addition to Quilt stacks)
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
if (icebergWorkgroup) {
|
|
93
|
-
console.log(chalk_1.default.green(`✓ Iceberg Workgroup: ${icebergWorkgroup}`));
|
|
94
|
-
}
|
|
95
|
-
else {
|
|
96
|
-
console.log(chalk_1.default.dim(" Iceberg Workgroup: Not available (optional)"));
|
|
97
|
-
}
|
|
92
|
+
// Iceberg resources are optional (recent addition to Quilt stacks) - keep dimmed
|
|
93
|
+
console.log(icebergDatabase
|
|
94
|
+
? chalk_1.default.dim(`✓ Iceberg Database: ${icebergDatabase}`)
|
|
95
|
+
: chalk_1.default.dim(" Iceberg Database: Not available (optional)"));
|
|
96
|
+
console.log(icebergWorkgroup
|
|
97
|
+
? chalk_1.default.dim(`✓ Iceberg Workgroup: ${icebergWorkgroup}`)
|
|
98
|
+
: chalk_1.default.dim(" Iceberg Workgroup: Not available (optional)"));
|
|
98
99
|
// IAM role ARNs are logged by inferQuiltConfig, so no need to log again here
|
|
99
100
|
if (benchlingSecretArn) {
|
|
100
101
|
console.log(chalk_1.default.green(`✓ BenchlingSecret: ${benchlingSecretArn}`));
|
|
@@ -115,8 +116,30 @@ async function runStackQuery(catalogDns, options = {}) {
|
|
|
115
116
|
region,
|
|
116
117
|
});
|
|
117
118
|
if (discoveredVpc) {
|
|
118
|
-
|
|
119
|
+
// Filter for private subnets with NAT Gateway (NOT intra subnets)
|
|
120
|
+
// Private subnets: !isPublic && hasNatGateway (for ECS outbound access)
|
|
121
|
+
// Intra subnets: !isPublic && !hasNatGateway (isolated, no internet)
|
|
122
|
+
const privateSubnets = discoveredVpc.subnets.filter((s) => !s.isPublic && s.hasNatGateway);
|
|
123
|
+
const publicSubnets = discoveredVpc.subnets.filter((s) => s.isPublic);
|
|
119
124
|
const azs = new Set(privateSubnets.map((s) => s.availabilityZone));
|
|
125
|
+
// Deduplicate subnets - select one subnet per AZ for NLB compatibility
|
|
126
|
+
// AWS NLB requires exactly one subnet per availability zone
|
|
127
|
+
const privateSubnetsByAz = new Map();
|
|
128
|
+
const publicSubnetsByAz = new Map();
|
|
129
|
+
for (const subnet of privateSubnets) {
|
|
130
|
+
if (!privateSubnetsByAz.has(subnet.availabilityZone)) {
|
|
131
|
+
privateSubnetsByAz.set(subnet.availabilityZone, subnet);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
for (const subnet of publicSubnets) {
|
|
135
|
+
if (!publicSubnetsByAz.has(subnet.availabilityZone)) {
|
|
136
|
+
publicSubnetsByAz.set(subnet.availabilityZone, subnet);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
// Extract deduplicated subnet IDs and AZs
|
|
140
|
+
const deduplicatedPrivateSubnets = Array.from(privateSubnetsByAz.values());
|
|
141
|
+
const deduplicatedPublicSubnets = Array.from(publicSubnetsByAz.values());
|
|
142
|
+
const deduplicatedAzs = Array.from(privateSubnetsByAz.keys());
|
|
120
143
|
discoveredVpcInfo = {
|
|
121
144
|
vpcId: discoveredVpc.vpcId,
|
|
122
145
|
name: discoveredVpc.name,
|
|
@@ -125,14 +148,16 @@ async function runStackQuery(catalogDns, options = {}) {
|
|
|
125
148
|
availabilityZoneCount: azs.size,
|
|
126
149
|
isValid: discoveredVpc.isValid,
|
|
127
150
|
validationErrors: discoveredVpc.validationErrors,
|
|
151
|
+
// Use deduplicated subnets - exactly one per AZ for NLB compatibility
|
|
152
|
+
privateSubnetIds: deduplicatedPrivateSubnets.map(s => s.subnetId),
|
|
153
|
+
publicSubnetIds: deduplicatedPublicSubnets.map(s => s.subnetId),
|
|
154
|
+
availabilityZones: deduplicatedAzs,
|
|
128
155
|
};
|
|
129
156
|
if (discoveredVpc.isValid) {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
}
|
|
134
|
-
console.log(chalk_1.default.dim(` CIDR: ${discoveredVpc.cidrBlock}`));
|
|
135
|
-
console.log(chalk_1.default.dim(` Private subnets: ${privateSubnets.length} across ${azs.size} AZs`));
|
|
157
|
+
const vpcDisplay = discoveredVpc.name
|
|
158
|
+
? `${discoveredVpc.name} (${discoveredVpc.vpcId})`
|
|
159
|
+
: discoveredVpc.vpcId;
|
|
160
|
+
console.log(chalk_1.default.dim(`✓ VPC: ${vpcDisplay} - ${privateSubnets.length} private subnets in ${azs.size} AZs`));
|
|
136
161
|
}
|
|
137
162
|
else {
|
|
138
163
|
console.log(chalk_1.default.yellow(`⚠ VPC: ${discoveredVpc.vpcId} (does not meet requirements)`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase2-stack-query.js","sourceRoot":"","sources":["../../../lib/wizard/phase2-stack-query.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;AAgCH,
|
|
1
|
+
{"version":3,"file":"phase2-stack-query.js","sourceRoot":"","sources":["../../../lib/wizard/phase2-stack-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase3-parameter-collection.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase3-parameter-collection.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAE9E;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CACxC,KAAK,EAAE,wBAAwB,GAChC,OAAO,CAAC,yBAAyB,CAAC,
|
|
1
|
+
{"version":3,"file":"phase3-parameter-collection.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase3-parameter-collection.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAE9E;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CACxC,KAAK,EAAE,wBAAwB,GAChC,OAAO,CAAC,yBAAyB,CAAC,CAsepC"}
|
|
@@ -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":";AAAA;;;;;;;GAOG;;;;;AAoBH,wDAweC;AA1fD,wDAAgC;AAChC,kDAA0B;AAC1B,0DAA8D;AAG9D;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,sBAAsB,CACxC,KAA+B;IAE/B,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,GAAG,KAAK,EAAE,OAAO,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC;IAE/E,4EAA4E;IAC5E,qEAAqE;IACrE,4EAA4E;IAC5E,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE9C,IAAI,KAAyB,CAAC;IAE9B,8CAA8C;IAC9C,MAAM,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC;IAE/C,IAAI,aAAa,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;QACzC,wBAAwB;QACxB,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI;YACrC,CAAC,CAAC,GAAG,aAAa,CAAC,IAAI,KAAK,aAAa,CAAC,KAAK,GAAG;YAClD,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,UAAU,cAAc,MAAM,aAAa,CAAC,kBAAkB,uBAAuB,aAAa,CAAC,qBAAqB,MAAM,CAAC,CAAC;QAE5I,2CAA2C;QAC3C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,0DAA0D,CAAC,CAAC,CAAC;QAEtF,IAAI,GAAG,EAAE,CAAC;YACN,uEAAuE;YACvE,IAAI,cAAc,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;gBACzC,KAAK,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC;gBAC5C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,gBAAgB,KAAK,yBAAyB,CAAC,CAAC,CAAC;YAC3E,CAAC;iBAAM,CAAC;gBACJ,sEAAsE;gBACtE,KAAK,GAAG,SAAS,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC,CAAC;YAC5F,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,+DAA+D;YAC/D,uEAAuE;YACvE,MAAM,uBAAuB,GAAG,cAAc,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,KAAK,aAAa,CAAC,KAAK,CAAC;YAE/F,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;gBAClD;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,qBAAqB;oBAC3B,OAAO,EAAE,2DAA2D;oBACpE,OAAO,EAAE,uBAAuB;iBACnC;aACJ,CAAC,CAAC;YAEH,KAAK,GAAG,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC;YAE9D,6DAA6D;YAC7D,MAAM,aAAa,GAAG,cAAc,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,CAAC;YAC7D,MAAM,UAAU,GAAG,aAAa,IAAI,aAAa,KAAK,KAAK,CAAC;YAE5D,IAAI,UAAU,EAAE,CAAC;gBACb,4DAA4D;gBAC5D,wEAAwE;gBACxE,MAAM,WAAW,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAEzE,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC,CAAC;gBAC/E,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,oBAAoB,aAAa,EAAE,CAAC,CAAC,CAAC;gBAC/D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,oBAAoB,KAAK,IAAI,oBAAoB,EAAE,CAAC,CAAC,CAAC;gBAC/E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAChB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC,CAAC;gBACzF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC,CAAC;gBAC7D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,gDAAgD,WAAW,EAAE,CAAC,CAAC,CAAC;gBACvF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,+CAA+C,WAAW,EAAE,CAAC,CAAC,CAAC;gBACtF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAEhB,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;oBAC/C;wBACI,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,kBAAkB;wBACxB,OAAO,EAAE,kFAAkF;wBAC3F,OAAO,EAAE,KAAK;qBACjB;iBACJ,CAAC,CAAC;gBAEH,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACpB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,qDAAqD,CAAC,CAAC,CAAC;oBACjF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpB,CAAC;YACL,CAAC;YAED,IAAI,KAAK,EAAE,CAAC;gBACR,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,yEAAyE,CAAC,CAAC,CAAC;YACtG,CAAC;QACL,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,6CAA6C;QAC7C,OAAO,CAAC,GAAG,CAAC,8EAA8E,CAAC,CAAC;QAC5F,KAAK,GAAG,SAAS,CAAC;IACtB,CAAC;IAED,4EAA4E;IAC5E,0BAA0B;IAC1B,4EAA4E;IAC5E,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAE3D,SAAS;IACT,IAAI,MAAc,CAAC;IACnB,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,aAAa,CAAC,CAAC;IAClD,CAAC;SAAM,IAAI,GAAG,EAAE,CAAC;QACb,wDAAwD;QACxD,IAAI,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;YACpC,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,yBAAyB,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC9E,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,uDAAuD;QACvD,MAAM,YAAY,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YACvC;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,mBAAmB;gBAC5B,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,IAAI,EAAE;gBAChD,QAAQ,EAAE,CAAC,KAAa,EAAoB,EAAE,CAC1C,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,oBAAoB;aACtD;SACJ,CAAC,CAAC;QACH,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IACjC,CAAC;IAED,+DAA+D;IAC/D,IAAI,cAAc,GAAG,IAAI,CAAC,CAAC,kCAAkC;IAC7D,MAAM,cAAc,GAAG,cAAc,EAAE,KAAK,EAAE,OAAO,IAAI,cAAc,CAAC,KAAK,CAAC,OAAO,KAAK,UAAU,CAAC,OAAO,CAAC;IAE7G,IAAI,cAAc,EAAE,SAAS,EAAE,eAAe,IAAI,CAAC,GAAG,EAAE,CAAC;QACrD,4CAA4C;QAC5C,IAAI,cAAc,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,eAAK,CAAC,MAAM,CAC3B,wBAAwB,cAAc,CAAC,KAAK,CAAC,OAAO,OAAO,UAAU,CAAC,OAAO,EAAE,CAClF,CAAC,CAAC;QACP,CAAC;QAED,mEAAmE;QACnE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YACvC;gBACI,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,qBAAqB,cAAc,CAAC,SAAS,CAAC,eAAe,IAAI;gBAC1E,OAAO,EAAE,IAAI;aAChB;SACJ,CAAC,CAAC;QAEH,cAAc,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC,CAAC;QACpE,CAAC;IACL,CAAC;IAED,oBAAoB;IACpB,IAAI,eAAmC,CAAC;IACxC,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,IAAI,KAAK,CAAC,wBAAwB,EAAE,CAAC;QACjC,eAAe,GAAG,KAAK,CAAC,wBAAwB,CAAC;QACjD,WAAW,GAAG,IAAI,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,wBAAwB,eAAe,aAAa,CAAC,CAAC;IACtE,CAAC;SAAM,IAAI,GAAG,EAAE,CAAC;QACb,wDAAwD;QACxD,IAAI,cAAc,EAAE,SAAS,EAAE,eAAe,IAAI,cAAc,EAAE,CAAC;YAC/D,eAAe,GAAG,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC;YAC3D,WAAW,GAAG,IAAI,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,wBAAwB,eAAe,yBAAyB,CAAC,CAAC;QAClF,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;QACzF,CAAC;IACL,CAAC;SAAM,IAAI,cAAc,EAAE,SAAS,EAAE,eAAe,IAAI,cAAc,EAAE,CAAC;QACtE,0EAA0E;QAC1E,MAAM,YAAY,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YACvC;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,8BAA8B;gBACvC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,eAAe;gBACjD,QAAQ,EAAE,CAAC,KAAa,EAAoB,EAAE,CAC1C,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,+BAA+B;aACjE;SACJ,CAAC,CAAC;QACH,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;QAC/C,WAAW,GAAG,IAAI,CAAC;IACvB,CAAC;SAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QACzB,wEAAwE;QACxE,WAAW,GAAG,KAAK,CAAC;IACxB,CAAC;SAAM,CAAC;QACJ,+DAA+D;QAC/D,MAAM,iBAAiB,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YAC5C;gBACI,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,yDAAyD;gBAClE,OAAO,EAAE,KAAK;aACjB;SACJ,CAAC,CAAC;QACH,WAAW,GAAG,iBAAiB,CAAC,KAAK,CAAC;QAEtC,IAAI,WAAW,EAAE,CAAC;YACd,gBAAgB;YAChB,MAAM,YAAY,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;gBACvC;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,8BAA8B;oBACvC,QAAQ,EAAE,CAAC,KAAa,EAAoB,EAAE,CAC1C,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,+BAA+B;iBACjE;aACJ,CAAC,CAAC;YACH,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;QACnD,CAAC;IACL,CAAC;IAED,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,sDAAsD;QACtD,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,IAAI,CAAC,CAAC;QAElE,MAAM,IAAA,0BAAe,EAAC;YAClB,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,MAAM,EAAE,mBAAmB;SAC9B,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,eAAK,CAAC,MAAM,CAC3B,iGAAiG,CACpG,GAAG,IAAI,CAAC,CAAC;QAEV,oCAAoC;QACpC,MAAM,YAAY,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YACvC;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,8BAA8B;gBACvC,QAAQ,EAAE,CAAC,KAAa,EAAoB,EAAE,CAC1C,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,2CAA2C;aAC7E;SACJ,CAAC,CAAC;QACH,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;IACnD,CAAC;IAED,2CAA2C;IAC3C,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1D,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,eAAK,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC,CAAC;QACrF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,oEAAoE,CAAC,CAAC,CAAC;QAChG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,oBAAoB;IACpB,IAAI,QAAgB,CAAC;IACrB,IAAI,YAAoB,CAAC;IAEzB,IAAI,KAAK,CAAC,iBAAiB,IAAI,KAAK,CAAC,qBAAqB,EAAE,CAAC;QACzD,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC;QACnC,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IACxD,CAAC;SAAM,IAAI,GAAG,EAAE,CAAC;QACb,wDAAwD;QACxD,IAAI,cAAc,EAAE,SAAS,EAAE,QAAQ,IAAI,cAAc,EAAE,SAAS,EAAE,YAAY,IAAI,cAAc,EAAE,CAAC;YACnG,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC,QAAQ,CAAC;YAC7C,YAAY,GAAG,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,gBAAgB,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,4BAA4B,CAAC,CAAC;YAClF,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;QACpE,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,0FAA0F,CAAC,CAAC;QAChH,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,+EAA+E;QAC/E,MAAM,gBAAgB,GAAG,cAAc,IAAI,cAAc,EAAE,SAAS,EAAE,QAAQ,IAAI,cAAc,EAAE,SAAS,EAAE,YAAY,CAAC;QAC1H,MAAM,iBAAiB,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YAC5C;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,4BAA4B;gBACrC,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE;gBACpE,QAAQ,EAAE,CAAC,KAAa,EAAoB,EAAE,CAC1C,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,uBAAuB;aACzD;YACD;gBACI,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,+BAA+B;oBACpC,CAAC,gBAAgB,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,GAAG,CAAC;gBACjE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,cAAc,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE;gBACxE,QAAQ,EAAE,CAAC,KAAa,EAAoB,EAAE;oBAC1C,uEAAuE;oBACvE,IAAI,gBAAgB,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAChD,OAAO,IAAI,CAAC;oBAChB,CAAC;oBACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,2BAA2B,CAAC;gBAClE,CAAC;aACJ;SACJ,CAAC,CAAC;QACH,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC;QACtC,6FAA6F;QAC7F,YAAY,GAAG,iBAAiB,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,gBAAgB;YAC3E,CAAC,CAAC,cAAe,CAAC,SAAU,CAAC,YAAa;YAC1C,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC;IACzC,CAAC;IAED,sEAAsE;IACtE,IAAI,WAA+B,CAAC;IACpC,IAAI,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAC7B,WAAW,GAAG,KAAK,CAAC,oBAAoB,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,oBAAoB,WAAW,aAAa,CAAC,CAAC;IAC9D,CAAC;SAAM,IAAI,GAAG,EAAE,CAAC;QACb,4DAA4D;QAC5D,WAAW,GAAG,cAAc,EAAE,SAAS,EAAE,WAAW,CAAC;QACrD,IAAI,WAAW,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,oBAAoB,WAAW,yBAAyB,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,2EAA2E;QAC3E,MAAM,mBAAmB,GAAG,cAAc,EAAE,SAAS,EAAE,WAAW,CAAC;QACnE,MAAM,eAAe,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YAC1C;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,oCAAoC;oBACzC,CAAC,mBAAmB,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,GAAG,CAAC;gBACpE,OAAO,EAAE,mBAAmB,IAAI,EAAE;aACrC;SACJ,CAAC,CAAC;QACH,sDAAsD;QACtD,IAAI,eAAe,CAAC,WAAW,IAAI,eAAe,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAC3E,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACrD,CAAC;aAAM,IAAI,mBAAmB,EAAE,CAAC;YAC7B,mDAAmD;YACnD,WAAW,GAAG,mBAAmB,CAAC;QACtC,CAAC;IACL,CAAC;IAED,4EAA4E;IAC5E,wBAAwB;IACxB,4EAA4E;IAC5E,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAEzD,IAAI,MAAc,CAAC;IACnB,IAAI,MAAc,CAAC;IACnB,IAAI,WAAmB,CAAC;IAExB,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACtD,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC;QAC1B,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;QACzB,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,aAAa,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,aAAa,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,mBAAmB,WAAW,aAAa,CAAC,CAAC;IAC7D,CAAC;SAAM,IAAI,GAAG,EAAE,CAAC;QACb,oEAAoE;QACpE,MAAM,GAAG,KAAK,CAAC,UAAU,IAAI,cAAc,EAAE,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC;QACpE,MAAM,GAAG,KAAK,CAAC,SAAS,IAAI,cAAc,EAAE,QAAQ,EAAE,MAAM,IAAI,WAAW,CAAC;QAC5E,WAAW,GAAG,KAAK,CAAC,MAAM,IAAI,cAAc,EAAE,QAAQ,EAAE,WAAW,IAAI,eAAe,CAAC;QAEvF,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,UAAU,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAC1F,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,UAAU,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;QACxI,OAAO,CAAC,GAAG,CAAC,mBAAmB,WAAW,UAAU,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IACzJ,CAAC;SAAM,CAAC;QACJ,yDAAyD;QACzD,MAAM,cAAc,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YACzC;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,oBAAoB;gBAC7B,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,IAAI,EAAE;gBAC/C,QAAQ,EAAE,CAAC,KAAa,EAAoB,EAAE,CAC1C,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,yBAAyB;aAC3D;YACD;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,oBAAoB;gBAC7B,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,IAAI,WAAW;aAC3D;YACD;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,uBAAuB;gBAChC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,IAAI,eAAe;aACpE;SACJ,CAAC,CAAC;QACH,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QAC/B,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QAC/B,WAAW,GAAG,cAAc,CAAC,WAAW,CAAC;IAC7C,CAAC;IAED,4EAA4E;IAC5E,2BAA2B;IAC3B,4EAA4E;IAC5E,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IACjC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,eAAe,CAAC,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,cAAc,OAAO,eAAe,CAAC,CAAC;IAElD,4EAA4E;IAC5E,yBAAyB;IACzB,4EAA4E;IAC5E,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAE1D,IAAI,QAAgD,CAAC;IACrD,IAAI,gBAAwB,CAAC;IAE7B,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACzD,QAAQ,GAAG,KAAK,CAAC,QAAkD,CAAC;QACpE,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,gBAAgB,QAAQ,aAAa,CAAC,CAAC;QACnD,OAAO,CAAC,GAAG,CAAC,yBAAyB,gBAAgB,IAAI,QAAQ,aAAa,CAAC,CAAC;IACpF,CAAC;SAAM,IAAI,GAAG,EAAE,CAAC;QACb,uEAAuE;QACvE,QAAQ,GAAI,KAAK,CAAC,QAAmD,IAAI,cAAc,EAAE,OAAO,EAAE,KAAK,IAAI,MAAM,CAAC;QAClH,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,IAAI,cAAc,EAAE,QAAQ,EAAE,gBAAgB,IAAI,EAAE,CAAC;QAC9F,OAAO,CAAC,GAAG,CAAC,gBAAgB,QAAQ,UAAU,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;QAC1I,OAAO,CAAC,GAAG,CAAC,yBAAyB,gBAAgB,IAAI,QAAQ,UAAU,KAAK,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IAC7M,CAAC;SAAM,CAAC;QACJ,yDAAyD;QACzD,MAAM,iBAAiB,GAAG,cAAc,EAAE,QAAQ,EAAE,gBAAgB,CAAC;QACrE,MAAM,oBAAoB,GAAG,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;QAE/E,MAAM,eAAe,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YAC1C;gBACI,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,YAAY;gBACrB,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC;gBAC9C,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,IAAI,MAAM;aACpD;YACD;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,oBAAoB;oBACzB,CAAC,CAAC,oCAAoC,iBAAiB,2BAA2B;oBAClF,CAAC,CAAC,yDAAyD;gBAC/D,OAAO,EAAE,iBAAiB,IAAI,EAAE;aACnC;SACJ,CAAC,CAAC;QACH,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;QACpC,0DAA0D;QAC1D,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,MAAM;YAC/E,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,eAAe,CAAC,gBAAgB,CAAC;IAC3C,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB;IAE1C,OAAO;QACH,SAAS,EAAE;YACP,MAAM;YACN,QAAQ;YACR,YAAY;YACZ,eAAe;YACf,WAAW;SACd;QACD,QAAQ,EAAE;YACN,MAAM;YACN,MAAM;YACN,WAAW;SACd;QACD,UAAU,EAAE;YACR,MAAM;YACN,OAAO;YACP,GAAG,EAAE,KAAK,IAAI,aAAa,CAAC,CAAC,CAAC;gBAC1B,KAAK;gBACL,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;gBAChD,eAAe,EAAE,aAAa,CAAC,eAAe;gBAC9C,iBAAiB,EAAE,aAAa,CAAC,iBAAiB;gBAClD,YAAY,EAAE,aAAa,CAAC,SAAS;aACxC,CAAC,CAAC,CAAC,SAAS;SAChB;QACD,OAAO,EAAE;YACL,KAAK,EAAE,QAAQ;SAClB;QACD,QAAQ,EAAE;YACN,kBAAkB,EAAE,IAAI;YACxB,gBAAgB;SACnB;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -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-20251204T020520Z",
|
|
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",
|
|
@@ -18,11 +18,8 @@
|
|
|
18
18
|
"build:clean": "rm -rf cdk.out dist */{*.js,*.d.ts}",
|
|
19
19
|
"build:synth": "npx cdk synth",
|
|
20
20
|
"build:typecheck": "tsc --noEmit",
|
|
21
|
-
"
|
|
22
|
-
"
|
|
23
|
-
"build:lambda:clean": "make clean",
|
|
24
|
-
"deploy:dev": "make lambda-bundle && ts-node bin/cli.ts deploy --stage dev --profile dev",
|
|
25
|
-
"deploy:prod": "make lambda-bundle && ts-node bin/cli.ts deploy --stage prod",
|
|
21
|
+
"deploy:dev": "ts-node bin/cli.ts deploy --stage dev --profile dev",
|
|
22
|
+
"deploy:prod": "ts-node bin/cli.ts deploy --stage prod",
|
|
26
23
|
"deploy:notes": "bash scripts/release-notes.sh",
|
|
27
24
|
"destroy": "ts-node bin/cli.ts destroy",
|
|
28
25
|
"destroy:dev": "ts-node bin/cli.ts destroy --stage dev --profile dev",
|
|
@@ -51,7 +48,6 @@
|
|
|
51
48
|
"test:native": "npm run launch -- --mode native --profile dev --test",
|
|
52
49
|
"test:dev": "npm run deploy:dev && make -C docker test-deployed-dev PROFILE=dev",
|
|
53
50
|
"test:prod": "make -C docker test-deployed-prod PROFILE=default",
|
|
54
|
-
"test:lambda-bundle": "bash scripts/test-lambda-bundle.sh",
|
|
55
51
|
"test:python": "make -C docker test-unit",
|
|
56
52
|
"test:ts": "cross-env NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules' jest --maxWorkers=50%",
|
|
57
53
|
"version": "ts-node scripts/version.ts",
|
|
@@ -81,7 +77,6 @@
|
|
|
81
77
|
"devDependencies": {
|
|
82
78
|
"@eslint/js": "^9.22.0",
|
|
83
79
|
"@types/adm-zip": "^0.5.7",
|
|
84
|
-
"@types/aws-lambda": "^8.10.156",
|
|
85
80
|
"@types/jest": "^30.0.0",
|
|
86
81
|
"@types/node": "^24.0.0",
|
|
87
82
|
"@typescript-eslint/eslint-plugin": "^8.26.1",
|
|
@@ -113,7 +108,7 @@
|
|
|
113
108
|
"adm-zip": "^0.5.10",
|
|
114
109
|
"ajv": "^8.17.1",
|
|
115
110
|
"ajv-formats": "^3.0.1",
|
|
116
|
-
"aws-cdk-lib": "2.
|
|
111
|
+
"aws-cdk-lib": "2.231.0",
|
|
117
112
|
"boxen": "^8.0.0",
|
|
118
113
|
"chalk": "^5.0.0",
|
|
119
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;
|