@quiltdata/benchling-webhook 0.9.0-20251127T032721Z → 0.9.0-20251127T201515Z
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 +3 -0
- package/dist/bin/commands/deploy.d.ts.map +1 -1
- package/dist/bin/commands/deploy.js +78 -66
- package/dist/bin/commands/deploy.js.map +1 -1
- package/dist/bin/commands/logs.d.ts.map +1 -1
- package/dist/bin/commands/logs.js +9 -3
- package/dist/bin/commands/logs.js.map +1 -1
- package/dist/lib/configuration-saver.d.ts +1 -1
- package/dist/lib/configuration-saver.d.ts.map +1 -1
- package/dist/lib/configuration-saver.js +4 -5
- package/dist/lib/configuration-saver.js.map +1 -1
- package/dist/lib/constants.d.ts +5 -0
- package/dist/lib/constants.d.ts.map +1 -1
- package/dist/lib/constants.js +6 -1
- package/dist/lib/constants.js.map +1 -1
- package/dist/lib/http-api-gateway.d.ts.map +1 -1
- package/dist/lib/http-api-gateway.js +5 -1
- package/dist/lib/http-api-gateway.js.map +1 -1
- package/dist/lib/rest-api-gateway.d.ts.map +1 -1
- package/dist/lib/rest-api-gateway.js +31 -20
- package/dist/lib/rest-api-gateway.js.map +1 -1
- package/dist/lib/types/config.d.ts +1 -1
- package/dist/lib/wizard/phase2-stack-query.d.ts.map +1 -1
- package/dist/lib/wizard/phase2-stack-query.js +44 -0
- 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 +62 -0
- package/dist/lib/wizard/phase3-parameter-collection.js.map +1 -1
- package/dist/lib/wizard/phase6-integrated-mode.d.ts.map +1 -1
- package/dist/lib/wizard/phase6-integrated-mode.js +3 -1
- package/dist/lib/wizard/phase6-integrated-mode.js.map +1 -1
- package/dist/lib/wizard/phase7-standalone-mode.d.ts.map +1 -1
- package/dist/lib/wizard/phase7-standalone-mode.js +3 -1
- package/dist/lib/wizard/phase7-standalone-mode.js.map +1 -1
- package/dist/lib/wizard/types.d.ts +24 -0
- package/dist/lib/wizard/types.d.ts.map +1 -1
- package/dist/package.json +3 -1
- package/dist/scripts/discover-vpc.d.ts +69 -0
- package/dist/scripts/discover-vpc.d.ts.map +1 -0
- package/dist/scripts/discover-vpc.js +196 -0
- package/dist/scripts/discover-vpc.js.map +1 -0
- package/package.json +3 -1
|
@@ -108,19 +108,18 @@ class RestApiGateway {
|
|
|
108
108
|
retention: logs.RetentionDays.ONE_WEEK,
|
|
109
109
|
removalPolicy: cdk.RemovalPolicy.DESTROY,
|
|
110
110
|
});
|
|
111
|
+
const bundlingCommands = [
|
|
112
|
+
"set -euo pipefail",
|
|
113
|
+
"export PIP_NO_BUILD_ISOLATION=1 PIP_ONLY_BINARY=:all: PIP_DISABLE_PIP_VERSION_CHECK=1 PIP_CACHE_DIR=/tmp/pipcache",
|
|
114
|
+
"pip install -q --platform manylinux2014_x86_64 --implementation cp --python-version 3.11 --abi cp311 --only-binary=:all: -t /asset-output -r /asset-input/lambda/authorizer/requirements.txt -c /asset-input/lambda/authorizer/constraints.txt",
|
|
115
|
+
"cp /asset-input/docker/src/lambda_authorizer.py /asset-output/index.py",
|
|
116
|
+
].join(" && ");
|
|
111
117
|
const authorizerCode = process.env.NODE_ENV === "test"
|
|
112
118
|
? lambda.Code.fromInline("def handler(event, context):\n return {}")
|
|
113
119
|
: lambda.Code.fromAsset(".", {
|
|
114
120
|
bundling: {
|
|
115
121
|
image: lambda.Runtime.PYTHON_3_11.bundlingImage,
|
|
116
|
-
command: [
|
|
117
|
-
"bash",
|
|
118
|
-
"-c",
|
|
119
|
-
[
|
|
120
|
-
"pip install -q -r /asset-input/lambda/authorizer/requirements.txt -t /asset-output",
|
|
121
|
-
"cp /asset-input/docker/src/lambda_authorizer.py /asset-output/index.py",
|
|
122
|
-
].join(" && "),
|
|
123
|
-
],
|
|
122
|
+
command: ["bash", "-c", bundlingCommands],
|
|
124
123
|
},
|
|
125
124
|
});
|
|
126
125
|
this.authorizer = new lambda.Function(scope, "WebhookAuthorizerFunction", {
|
|
@@ -128,6 +127,7 @@ class RestApiGateway {
|
|
|
128
127
|
handler: "index.handler",
|
|
129
128
|
memorySize: 128,
|
|
130
129
|
timeout: cdk.Duration.seconds(10),
|
|
130
|
+
architecture: lambda.Architecture.X86_64,
|
|
131
131
|
description: "Benchling webhook signature verification (defense-in-depth)",
|
|
132
132
|
environment: {
|
|
133
133
|
BENCHLING_SECRET_ARN: benchlingSecretArn,
|
|
@@ -139,18 +139,7 @@ class RestApiGateway {
|
|
|
139
139
|
actions: ["secretsmanager:GetSecretValue"],
|
|
140
140
|
resources: [benchlingSecretArn],
|
|
141
141
|
}));
|
|
142
|
-
|
|
143
|
-
? new apigateway.RequestAuthorizer(scope, "WebhookRequestAuthorizer", {
|
|
144
|
-
handler: this.authorizer,
|
|
145
|
-
identitySources: [
|
|
146
|
-
apigateway.IdentitySource.header("webhook-id"),
|
|
147
|
-
apigateway.IdentitySource.header("webhook-signature"),
|
|
148
|
-
apigateway.IdentitySource.header("webhook-timestamp"),
|
|
149
|
-
],
|
|
150
|
-
resultsCacheTtl: cdk.Duration.seconds(0),
|
|
151
|
-
})
|
|
152
|
-
: undefined;
|
|
153
|
-
// Create REST API
|
|
142
|
+
// Create REST API first (needed for proper authorizer permissions)
|
|
154
143
|
this.api = new apigateway.RestApi(scope, "BenchlingWebhookRestAPI", {
|
|
155
144
|
restApiName: "BenchlingWebhookRestAPI",
|
|
156
145
|
description: "REST API for Benchling webhook integration with IP whitelisting (v1.0.0+)",
|
|
@@ -176,6 +165,28 @@ class RestApiGateway {
|
|
|
176
165
|
types: [apigateway.EndpointType.REGIONAL],
|
|
177
166
|
},
|
|
178
167
|
});
|
|
168
|
+
// Create authorizer AFTER API is created (for proper source ARN permissions)
|
|
169
|
+
const requestAuthorizer = verificationEnabled
|
|
170
|
+
? new apigateway.RequestAuthorizer(scope, "WebhookRequestAuthorizer", {
|
|
171
|
+
handler: this.authorizer,
|
|
172
|
+
identitySources: [
|
|
173
|
+
apigateway.IdentitySource.header("webhook-id"),
|
|
174
|
+
apigateway.IdentitySource.header("webhook-signature"),
|
|
175
|
+
apigateway.IdentitySource.header("webhook-timestamp"),
|
|
176
|
+
],
|
|
177
|
+
resultsCacheTtl: cdk.Duration.seconds(0),
|
|
178
|
+
})
|
|
179
|
+
: undefined;
|
|
180
|
+
// Grant API Gateway permission to invoke Lambda authorizer from any method
|
|
181
|
+
// The CDK RequestAuthorizer grants permission only for /authorizers/{id},
|
|
182
|
+
// but API Gateway invokes from /{stage}/{method}/{path}, so we add explicit permission
|
|
183
|
+
if (verificationEnabled && this.authorizer) {
|
|
184
|
+
this.authorizer.addPermission("ApiGatewayInvokePermission", {
|
|
185
|
+
principal: new iam.ServicePrincipal("apigateway.amazonaws.com"),
|
|
186
|
+
action: "lambda:InvokeFunction",
|
|
187
|
+
sourceArn: this.api.arnForExecuteApi("*", "/*", "*"),
|
|
188
|
+
});
|
|
189
|
+
}
|
|
179
190
|
const createIntegration = (path) => new apigateway.Integration({
|
|
180
191
|
type: apigateway.IntegrationType.HTTP_PROXY,
|
|
181
192
|
integrationHttpMethod: "ANY",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-api-gateway.js","sourceRoot":"","sources":["../../lib/rest-api-gateway.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"rest-api-gateway.js","sourceRoot":"","sources":["../../lib/rest-api-gateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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,CA8K3B"}
|
|
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.runStackQuery = runStackQuery;
|
|
15
15
|
const chalk_1 = __importDefault(require("chalk"));
|
|
16
16
|
const infer_quilt_config_1 = require("../../bin/commands/infer-quilt-config");
|
|
17
|
+
const discover_vpc_1 = require("../../scripts/discover-vpc");
|
|
17
18
|
/**
|
|
18
19
|
* Phase 2: Stack Query
|
|
19
20
|
*
|
|
@@ -106,6 +107,48 @@ async function runStackQuery(catalogDns, options = {}) {
|
|
|
106
107
|
? chalk_1.default.green("✓ Benchling Integration: Enabled")
|
|
107
108
|
: chalk_1.default.yellow("⚠ Benchling Integration: Disabled"));
|
|
108
109
|
}
|
|
110
|
+
// Discover VPC from stack
|
|
111
|
+
let discoveredVpcInfo;
|
|
112
|
+
try {
|
|
113
|
+
const discoveredVpc = await (0, discover_vpc_1.discoverVpcFromStack)({
|
|
114
|
+
stackArn,
|
|
115
|
+
region,
|
|
116
|
+
});
|
|
117
|
+
if (discoveredVpc) {
|
|
118
|
+
const privateSubnets = discoveredVpc.subnets.filter((s) => !s.isPublic);
|
|
119
|
+
const azs = new Set(privateSubnets.map((s) => s.availabilityZone));
|
|
120
|
+
discoveredVpcInfo = {
|
|
121
|
+
vpcId: discoveredVpc.vpcId,
|
|
122
|
+
name: discoveredVpc.name,
|
|
123
|
+
cidrBlock: discoveredVpc.cidrBlock,
|
|
124
|
+
privateSubnetCount: privateSubnets.length,
|
|
125
|
+
availabilityZoneCount: azs.size,
|
|
126
|
+
isValid: discoveredVpc.isValid,
|
|
127
|
+
validationErrors: discoveredVpc.validationErrors,
|
|
128
|
+
};
|
|
129
|
+
if (discoveredVpc.isValid) {
|
|
130
|
+
console.log(chalk_1.default.green(`✓ VPC: ${discoveredVpc.vpcId}`));
|
|
131
|
+
if (discoveredVpc.name) {
|
|
132
|
+
console.log(chalk_1.default.dim(` Name: ${discoveredVpc.name}`));
|
|
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`));
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
console.log(chalk_1.default.yellow(`⚠ VPC: ${discoveredVpc.vpcId} (does not meet requirements)`));
|
|
139
|
+
discoveredVpc.validationErrors.forEach((err) => {
|
|
140
|
+
console.log(chalk_1.default.dim(` - ${err}`));
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
console.log(chalk_1.default.dim(" VPC: Not found in stack"));
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
catch (error) {
|
|
149
|
+
const err = error;
|
|
150
|
+
console.log(chalk_1.default.dim(` VPC: Discovery failed (${err.message})`));
|
|
151
|
+
}
|
|
109
152
|
console.log("");
|
|
110
153
|
return {
|
|
111
154
|
stackArn,
|
|
@@ -124,6 +167,7 @@ async function runStackQuery(catalogDns, options = {}) {
|
|
|
124
167
|
athenaResultsBucketPolicy,
|
|
125
168
|
readRoleArn,
|
|
126
169
|
writeRoleArn,
|
|
170
|
+
discoveredVpc: discoveredVpcInfo,
|
|
127
171
|
stackQuerySucceeded: true,
|
|
128
172
|
};
|
|
129
173
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase2-stack-query.js","sourceRoot":"","sources":["../../../lib/wizard/phase2-stack-query.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;
|
|
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,CA6bpC"}
|
|
@@ -321,6 +321,67 @@ async function runParameterCollection(input) {
|
|
|
321
321
|
console.log(` Region: ${region} (from stack)`);
|
|
322
322
|
console.log(` Account: ${account} (from stack)`);
|
|
323
323
|
// =========================================================================
|
|
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
|
+
// =========================================================================
|
|
324
385
|
// Optional Configuration
|
|
325
386
|
// =========================================================================
|
|
326
387
|
console.log("\n" + chalk_1.default.cyan("Optional Configuration:"));
|
|
@@ -376,6 +437,7 @@ async function runParameterCollection(input) {
|
|
|
376
437
|
deployment: {
|
|
377
438
|
region,
|
|
378
439
|
account,
|
|
440
|
+
vpc: vpcId ? { vpcId } : undefined,
|
|
379
441
|
},
|
|
380
442
|
logging: {
|
|
381
443
|
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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase6-integrated-mode.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase6-integrated-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"phase6-integrated-mode.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase6-integrated-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAmFpE;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA6HjG"}
|
|
@@ -48,6 +48,7 @@ exports.runIntegratedMode = runIntegratedMode;
|
|
|
48
48
|
const chalk_1 = __importDefault(require("chalk"));
|
|
49
49
|
const inquirer_1 = __importDefault(require("inquirer"));
|
|
50
50
|
const sync_secrets_1 = require("../../bin/commands/sync-secrets");
|
|
51
|
+
const package_json_1 = __importDefault(require("../../package.json"));
|
|
51
52
|
/**
|
|
52
53
|
* Builds ProfileConfig from collected parameters
|
|
53
54
|
*/
|
|
@@ -77,6 +78,7 @@ function buildProfileConfig(input) {
|
|
|
77
78
|
deployment: {
|
|
78
79
|
region: parameters.deployment.region,
|
|
79
80
|
account: parameters.deployment.account,
|
|
81
|
+
vpc: parameters.deployment.vpc,
|
|
80
82
|
},
|
|
81
83
|
integratedStack: true, // CRITICAL: Mark as integrated mode
|
|
82
84
|
logging: {
|
|
@@ -87,7 +89,7 @@ function buildProfileConfig(input) {
|
|
|
87
89
|
webhookAllowList: parameters.security.webhookAllowList,
|
|
88
90
|
},
|
|
89
91
|
_metadata: {
|
|
90
|
-
version:
|
|
92
|
+
version: package_json_1.default.version,
|
|
91
93
|
createdAt: now,
|
|
92
94
|
updatedAt: now,
|
|
93
95
|
source: "wizard",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase6-integrated-mode.js","sourceRoot":"","sources":["../../../lib/wizard/phase6-integrated-mode.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"phase6-integrated-mode.js","sourceRoot":"","sources":["../../../lib/wizard/phase6-integrated-mode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase7-standalone-mode.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase7-standalone-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"phase7-standalone-mode.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase7-standalone-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAmFpE;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoGjG"}
|
|
@@ -48,6 +48,7 @@ exports.runStandaloneMode = runStandaloneMode;
|
|
|
48
48
|
const inquirer_1 = __importDefault(require("inquirer"));
|
|
49
49
|
const chalk_1 = __importDefault(require("chalk"));
|
|
50
50
|
const sync_secrets_1 = require("../../bin/commands/sync-secrets");
|
|
51
|
+
const package_json_1 = __importDefault(require("../../package.json"));
|
|
51
52
|
/**
|
|
52
53
|
* Builds ProfileConfig from collected parameters
|
|
53
54
|
*/
|
|
@@ -77,6 +78,7 @@ function buildProfileConfig(input) {
|
|
|
77
78
|
deployment: {
|
|
78
79
|
region: parameters.deployment.region,
|
|
79
80
|
account: parameters.deployment.account,
|
|
81
|
+
vpc: parameters.deployment.vpc,
|
|
80
82
|
},
|
|
81
83
|
integratedStack: false, // CRITICAL: Mark as standalone mode
|
|
82
84
|
logging: {
|
|
@@ -87,7 +89,7 @@ function buildProfileConfig(input) {
|
|
|
87
89
|
webhookAllowList: parameters.security.webhookAllowList,
|
|
88
90
|
},
|
|
89
91
|
_metadata: {
|
|
90
|
-
version:
|
|
92
|
+
version: package_json_1.default.version,
|
|
91
93
|
createdAt: now,
|
|
92
94
|
updatedAt: now,
|
|
93
95
|
source: "wizard",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase7-standalone-mode.js","sourceRoot":"","sources":["../../../lib/wizard/phase7-standalone-mode.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"phase7-standalone-mode.js","sourceRoot":"","sources":["../../../lib/wizard/phase7-standalone-mode.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,25 @@ export interface CatalogDiscoveryResult {
|
|
|
19
19
|
/** The catalog that was initially detected (if any) */
|
|
20
20
|
detectedCatalog?: string;
|
|
21
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* Discovered VPC from stack query (subset of full VPC discovery)
|
|
24
|
+
*/
|
|
25
|
+
export interface DiscoveredVpcInfo {
|
|
26
|
+
/** VPC ID */
|
|
27
|
+
vpcId: string;
|
|
28
|
+
/** VPC name from tags */
|
|
29
|
+
name?: string;
|
|
30
|
+
/** CIDR block */
|
|
31
|
+
cidrBlock: string;
|
|
32
|
+
/** Number of private subnets */
|
|
33
|
+
privateSubnetCount: number;
|
|
34
|
+
/** Number of availability zones */
|
|
35
|
+
availabilityZoneCount: number;
|
|
36
|
+
/** Whether VPC meets architecture requirements */
|
|
37
|
+
isValid: boolean;
|
|
38
|
+
/** Validation error messages */
|
|
39
|
+
validationErrors: string[];
|
|
40
|
+
}
|
|
22
41
|
/**
|
|
23
42
|
* Phase 2: Stack Query Result
|
|
24
43
|
*/
|
|
@@ -57,6 +76,8 @@ export interface StackQueryResult {
|
|
|
57
76
|
readRoleArn?: string;
|
|
58
77
|
/** IAM role ARN for read-write S3 access (from T4BucketWriteRole) */
|
|
59
78
|
writeRoleArn?: string;
|
|
79
|
+
/** Discovered VPC from Quilt stack (optional) */
|
|
80
|
+
discoveredVpc?: DiscoveredVpcInfo;
|
|
60
81
|
}
|
|
61
82
|
/**
|
|
62
83
|
* Phase 3: Parameter Collection Input
|
|
@@ -95,6 +116,9 @@ export interface ParameterCollectionResult {
|
|
|
95
116
|
deployment: {
|
|
96
117
|
region: string;
|
|
97
118
|
account: string;
|
|
119
|
+
vpc?: {
|
|
120
|
+
vpcId?: string;
|
|
121
|
+
};
|
|
98
122
|
};
|
|
99
123
|
logging: {
|
|
100
124
|
level: "DEBUG" | "INFO" | "WARNING" | "ERROR";
|
|
@@ -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,gBAAgB;IAC7B,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,qBAAqB;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qEAAqE;IACrE,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,oCAAoC;IACpC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,mDAAmD;IACnD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,wCAAwC;IACxC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+DAA+D;IAC/D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,4CAA4C;IAC5C,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,mEAAmE;IACnE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qEAAqE;IACrE,YAAY,CAAC,EAAE,MAAM,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-20251127T201515Z",
|
|
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",
|
|
@@ -48,6 +48,7 @@
|
|
|
48
48
|
"test:native": "npm run launch -- --mode native --profile dev --test",
|
|
49
49
|
"test:dev": "npm run deploy:dev && make -C docker test-deployed-dev PROFILE=dev",
|
|
50
50
|
"test:prod": "make -C docker test-deployed-prod PROFILE=default",
|
|
51
|
+
"test:lambda-bundle": "bash scripts/test-lambda-bundle.sh",
|
|
51
52
|
"test:python": "make -C docker test-unit",
|
|
52
53
|
"test:ts": "cross-env NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules' jest --maxWorkers=50%",
|
|
53
54
|
"version": "ts-node scripts/version.ts",
|
|
@@ -97,6 +98,7 @@
|
|
|
97
98
|
"dependencies": {
|
|
98
99
|
"@aws-sdk/client-cloudformation": "^3.920.0",
|
|
99
100
|
"@aws-sdk/client-cloudwatch-logs": "^3.933.0",
|
|
101
|
+
"@aws-sdk/client-ec2": "^3.940.0",
|
|
100
102
|
"@aws-sdk/client-ecs": "^3.933.0",
|
|
101
103
|
"@aws-sdk/client-elastic-load-balancing-v2": "^3.932.0",
|
|
102
104
|
"@aws-sdk/client-s3": "^3.758.0",
|