@quiltdata/benchling-webhook 0.7.9 → 0.8.0-20251117T215047Z
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 +1 -0
- package/dist/bin/benchling-webhook.js +4 -2
- package/dist/bin/benchling-webhook.js.map +1 -1
- package/dist/bin/cli.js +15 -7
- package/dist/bin/cli.js.map +1 -1
- package/dist/bin/commands/deploy.d.ts.map +1 -1
- package/dist/bin/commands/deploy.js +64 -8
- package/dist/bin/commands/deploy.js.map +1 -1
- package/dist/bin/commands/health-check.d.ts.map +1 -1
- package/dist/bin/commands/health-check.js +2 -35
- package/dist/bin/commands/health-check.js.map +1 -1
- package/dist/bin/commands/infer-quilt-config.d.ts +6 -0
- package/dist/bin/commands/infer-quilt-config.d.ts.map +1 -1
- package/dist/bin/commands/infer-quilt-config.js +127 -49
- package/dist/bin/commands/infer-quilt-config.js.map +1 -1
- package/dist/bin/commands/install.d.ts.map +1 -1
- package/dist/bin/commands/install.js +13 -17
- package/dist/bin/commands/install.js.map +1 -1
- package/dist/bin/commands/logs.d.ts.map +1 -1
- package/dist/bin/commands/logs.js +4 -128
- package/dist/bin/commands/logs.js.map +1 -1
- package/dist/bin/commands/manifest.d.ts.map +1 -1
- package/dist/bin/commands/manifest.js +2 -3
- package/dist/bin/commands/manifest.js.map +1 -1
- package/dist/bin/commands/setup-wizard.d.ts +2 -0
- package/dist/bin/commands/setup-wizard.d.ts.map +1 -1
- package/dist/bin/commands/setup-wizard.js +5 -5
- package/dist/bin/commands/setup-wizard.js.map +1 -1
- package/dist/bin/commands/status.d.ts +49 -0
- package/dist/bin/commands/status.d.ts.map +1 -1
- package/dist/bin/commands/status.js +666 -41
- package/dist/bin/commands/status.js.map +1 -1
- package/dist/bin/commands/sync-secrets.d.ts.map +1 -1
- package/dist/bin/commands/sync-secrets.js +3 -36
- package/dist/bin/commands/sync-secrets.js.map +1 -1
- package/dist/bin/commands/validate.js +1 -1
- package/dist/bin/commands/validate.js.map +1 -1
- package/dist/bin/xdg-launch.d.ts +74 -0
- package/dist/bin/xdg-launch.d.ts.map +1 -0
- package/dist/bin/xdg-launch.js +588 -0
- package/dist/bin/xdg-launch.js.map +1 -0
- package/dist/lib/benchling-webhook-stack.d.ts.map +1 -1
- package/dist/lib/benchling-webhook-stack.js +59 -7
- package/dist/lib/benchling-webhook-stack.js.map +1 -1
- package/dist/lib/fargate-service.d.ts +24 -4
- package/dist/lib/fargate-service.d.ts.map +1 -1
- package/dist/lib/fargate-service.js +75 -27
- package/dist/lib/fargate-service.js.map +1 -1
- package/dist/lib/types/config.d.ts +99 -5
- package/dist/lib/types/config.d.ts.map +1 -1
- package/dist/lib/types/config.js +4 -1
- package/dist/lib/types/config.js.map +1 -1
- package/dist/lib/utils/service-resolver.d.ts +155 -0
- package/dist/lib/utils/service-resolver.d.ts.map +1 -0
- package/dist/lib/utils/service-resolver.js +195 -0
- package/dist/lib/utils/service-resolver.js.map +1 -0
- package/dist/lib/utils/stack-inference.d.ts +58 -0
- package/dist/lib/utils/stack-inference.d.ts.map +1 -1
- package/dist/lib/utils/stack-inference.js +76 -2
- package/dist/lib/utils/stack-inference.js.map +1 -1
- package/dist/lib/utils/stack-parameter-update.js +2 -2
- package/dist/lib/utils/stack-parameter-update.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 -9
- package/dist/lib/wizard/phase2-stack-query.js.map +1 -1
- package/dist/lib/wizard/phase3-parameter-collection.js +5 -5
- package/dist/lib/wizard/phase3-parameter-collection.js.map +1 -1
- package/dist/lib/wizard/phase4-validation.d.ts.map +1 -1
- package/dist/lib/wizard/phase4-validation.js +4 -5
- package/dist/lib/wizard/phase4-validation.js.map +1 -1
- package/dist/lib/wizard/phase5-mode-decision.js +1 -1
- package/dist/lib/wizard/phase5-mode-decision.js.map +1 -1
- package/dist/lib/wizard/phase6-integrated-mode.d.ts.map +1 -1
- package/dist/lib/wizard/phase6-integrated-mode.js +19 -0
- 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 +24 -10
- package/dist/lib/wizard/phase7-standalone-mode.js.map +1 -1
- package/dist/lib/wizard/types.d.ts +14 -0
- package/dist/lib/wizard/types.d.ts.map +1 -1
- package/dist/package.json +20 -9
- package/package.json +20 -9
- package/dist/lib/utils/config-loader.d.ts +0 -48
- package/dist/lib/utils/config-loader.d.ts.map +0 -1
- package/dist/lib/utils/config-loader.js +0 -110
- package/dist/lib/utils/config-loader.js.map +0 -1
- package/dist/lib/utils/config-resolver.d.ts +0 -138
- package/dist/lib/utils/config-resolver.d.ts.map +0 -1
- package/dist/lib/utils/config-resolver.js +0 -279
- package/dist/lib/utils/config-resolver.js.map +0 -1
|
@@ -43,10 +43,15 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
43
43
|
return result;
|
|
44
44
|
};
|
|
45
45
|
})();
|
|
46
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
47
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
48
|
+
};
|
|
46
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
47
50
|
exports.inferQuiltConfig = inferQuiltConfig;
|
|
48
51
|
const child_process_1 = require("child_process");
|
|
49
52
|
const readline = __importStar(require("readline"));
|
|
53
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
54
|
+
const credential_providers_1 = require("@aws-sdk/credential-providers");
|
|
50
55
|
const client_cloudformation_1 = require("@aws-sdk/client-cloudformation");
|
|
51
56
|
const sqs_1 = require("../../lib/utils/sqs");
|
|
52
57
|
const stack_inference_1 = require("../../lib/utils/stack-inference");
|
|
@@ -75,27 +80,30 @@ function getQuilt3Catalog() {
|
|
|
75
80
|
*
|
|
76
81
|
* @param region - AWS region to search (defaults to us-east-1)
|
|
77
82
|
* @param profile - AWS profile to use
|
|
83
|
+
* @param targetCatalog - If provided, stop after finding this specific catalog (optimization)
|
|
78
84
|
* @returns Array of Quilt stack information
|
|
79
85
|
*/
|
|
80
|
-
async function findQuiltStacks(region = "us-east-1", profile) {
|
|
86
|
+
async function findQuiltStacks(region = "us-east-1", profile, targetCatalog) {
|
|
81
87
|
try {
|
|
82
88
|
const clientConfig = { region };
|
|
83
89
|
if (profile) {
|
|
84
90
|
// Load AWS profile credentials
|
|
85
|
-
|
|
86
|
-
clientConfig.credentials = fromIni({ profile });
|
|
91
|
+
clientConfig.credentials = (0, credential_providers_1.fromIni)({ profile });
|
|
87
92
|
}
|
|
88
93
|
const client = new client_cloudformation_1.CloudFormationClient(clientConfig);
|
|
89
|
-
// List
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
});
|
|
94
|
+
// List ALL stacks regardless of status - we'll check and warn about status later
|
|
95
|
+
// Don't filter here because we need to find the user's stack even if it's in a failed state
|
|
96
|
+
const listCommand = new client_cloudformation_1.ListStacksCommand({});
|
|
93
97
|
const listResponse = await client.send(listCommand);
|
|
94
98
|
const stacks = listResponse.StackSummaries || [];
|
|
95
99
|
// Get detailed information for each stack and filter for Quilt stacks
|
|
96
100
|
// All Quilt catalog stacks have a "QuiltWebHost" output - this is the canonical identifier
|
|
97
101
|
// Stack names vary (e.g., "quilt-staging", "tf-stable", "sales-prod") so we check outputs
|
|
98
102
|
const stackInfos = [];
|
|
103
|
+
// Show progress when searching for target catalog
|
|
104
|
+
if (targetCatalog) {
|
|
105
|
+
process.stdout.write("Checking: ");
|
|
106
|
+
}
|
|
99
107
|
for (const stack of stacks) {
|
|
100
108
|
if (!stack.StackName)
|
|
101
109
|
continue;
|
|
@@ -112,11 +120,17 @@ async function findQuiltStacks(region = "us-east-1", profile) {
|
|
|
112
120
|
const hasQuiltWebHost = outputs.some((output) => output.OutputKey === "QuiltWebHost");
|
|
113
121
|
if (!hasQuiltWebHost)
|
|
114
122
|
continue;
|
|
123
|
+
// Show progress dot for this Quilt stack
|
|
124
|
+
if (targetCatalog) {
|
|
125
|
+
process.stdout.write(`${stack.StackName}...`);
|
|
126
|
+
}
|
|
115
127
|
const stackInfo = {
|
|
116
128
|
stackName: stack.StackName,
|
|
117
129
|
stackArn: stackDetail.StackId || "",
|
|
118
130
|
region: region,
|
|
119
131
|
};
|
|
132
|
+
// Check stack status (will warn later if this is the selected stack)
|
|
133
|
+
const stackStatus = stackDetail.StackStatus;
|
|
120
134
|
// Extract AWS Account ID from Stack ARN
|
|
121
135
|
// ARN format: arn:aws:cloudformation:REGION:ACCOUNT_ID:stack/STACK_NAME/STACK_ID
|
|
122
136
|
const arnMatch = stackInfo.stackArn.match(/^arn:aws:cloudformation:[^:]+:(\d{12}):/);
|
|
@@ -142,6 +156,10 @@ async function findQuiltStacks(region = "us-east-1", profile) {
|
|
|
142
156
|
// Check for BenchlingSecret output from T4 template
|
|
143
157
|
stackInfo.benchlingSecretArn = value;
|
|
144
158
|
}
|
|
159
|
+
else if (key === "IcebergDatabase") {
|
|
160
|
+
// Extract IcebergDatabase from outputs (fallback)
|
|
161
|
+
stackInfo.icebergDatabase = value;
|
|
162
|
+
}
|
|
145
163
|
}
|
|
146
164
|
// Extract parameters
|
|
147
165
|
const parameters = stackDetail.Parameters || [];
|
|
@@ -152,7 +170,43 @@ async function findQuiltStacks(region = "us-east-1", profile) {
|
|
|
152
170
|
stackInfo.benchlingIntegrationEnabled = value === "Enabled";
|
|
153
171
|
}
|
|
154
172
|
}
|
|
173
|
+
// NEW: Query stack resources for additional data - FAIL LOUDLY on errors
|
|
174
|
+
try {
|
|
175
|
+
const resources = await (0, stack_inference_1.getStackResources)(region, stack.StackName);
|
|
176
|
+
const discovered = (0, stack_inference_1.extractQuiltResources)(resources);
|
|
177
|
+
// Destructure discovered resources and assign to stackInfo
|
|
178
|
+
const { athenaUserWorkgroup, athenaUserPolicy, icebergWorkgroup, icebergDatabase, athenaResultsBucket, athenaResultsBucketPolicy, } = discovered;
|
|
179
|
+
Object.assign(stackInfo, {
|
|
180
|
+
athenaUserWorkgroup,
|
|
181
|
+
athenaUserPolicy,
|
|
182
|
+
icebergWorkgroup,
|
|
183
|
+
icebergDatabase,
|
|
184
|
+
athenaResultsBucket,
|
|
185
|
+
athenaResultsBucketPolicy,
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
catch (error) {
|
|
189
|
+
// FAIL LOUDLY - show the error with full stack trace
|
|
190
|
+
console.error(chalk_1.default.red(`[ERROR] Failed to query stack resources: ${error.message}`));
|
|
191
|
+
console.error(chalk_1.default.red("[ERROR] Stack:"), error.stack);
|
|
192
|
+
}
|
|
155
193
|
stackInfos.push(stackInfo);
|
|
194
|
+
// If we're looking for a specific catalog and found it, stop searching
|
|
195
|
+
// MUST BE EXACT MATCH - no fuzzy matching or greedy behavior
|
|
196
|
+
if (targetCatalog && stackInfo.catalogUrl) {
|
|
197
|
+
const normalizeUrl = (url) => url.replace(/^https?:\/\//, "").replace(/\/$/, "");
|
|
198
|
+
const normalizedStackUrl = normalizeUrl(stackInfo.catalogUrl);
|
|
199
|
+
const normalizedTargetUrl = normalizeUrl(targetCatalog);
|
|
200
|
+
// EXACT MATCH ONLY - QuiltWebHost must exactly equal the target catalog
|
|
201
|
+
if (normalizedStackUrl === normalizedTargetUrl) {
|
|
202
|
+
console.log(`\nFound: ${stackInfo.stackName}`);
|
|
203
|
+
// Warn if stack is in a problematic state
|
|
204
|
+
if (stackStatus && !["CREATE_COMPLETE", "UPDATE_COMPLETE", "UPDATE_ROLLBACK_COMPLETE"].includes(stackStatus)) {
|
|
205
|
+
console.log(`⚠️ Stack is in state: ${stackStatus}`);
|
|
206
|
+
}
|
|
207
|
+
return stackInfos;
|
|
208
|
+
}
|
|
209
|
+
}
|
|
156
210
|
}
|
|
157
211
|
catch {
|
|
158
212
|
// Silently skip stacks that can't be described
|
|
@@ -217,7 +271,7 @@ async function inferQuiltConfig(options) {
|
|
|
217
271
|
if (catalogDns) {
|
|
218
272
|
// Use the provided catalog DNS - skip quilt3 check
|
|
219
273
|
console.log(`Using provided catalog: ${catalogDns}`);
|
|
220
|
-
const catalogUrl = catalogDns.startsWith(
|
|
274
|
+
const catalogUrl = catalogDns.startsWith("http") ? catalogDns : `https://${catalogDns}`;
|
|
221
275
|
result.catalog = catalogUrl;
|
|
222
276
|
result.source = "provided";
|
|
223
277
|
quilt3Config = { catalogUrl }; // Create fake quilt3Config for config.json fetch
|
|
@@ -236,7 +290,6 @@ async function inferQuiltConfig(options) {
|
|
|
236
290
|
}
|
|
237
291
|
// Step 1.5: If we have a catalog URL but no region specified, fetch config.json to get the region
|
|
238
292
|
let searchRegion = region;
|
|
239
|
-
let catalogNameFromUrl;
|
|
240
293
|
if (quilt3Config?.catalogUrl && !searchRegion) {
|
|
241
294
|
try {
|
|
242
295
|
console.log(`\nFetching catalog configuration from ${quilt3Config.catalogUrl}...`);
|
|
@@ -248,15 +301,20 @@ async function inferQuiltConfig(options) {
|
|
|
248
301
|
console.log(`✓ Found catalog region: ${searchRegion}`);
|
|
249
302
|
}
|
|
250
303
|
else {
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
catalogNameFromUrl = catalogConfig.stackName;
|
|
304
|
+
// FAIL FAST: config.json must have region field for exact catalog matching
|
|
305
|
+
throw new Error(`config.json from catalog ${quilt3Config.catalogUrl} does not contain 'region' field. ` +
|
|
306
|
+
"Cannot determine which AWS region to search for the CloudFormation stack. " +
|
|
307
|
+
"This catalog may be using an older version of Quilt that doesn't support automatic region detection.");
|
|
256
308
|
}
|
|
257
309
|
}
|
|
258
310
|
catch (error) {
|
|
259
|
-
|
|
311
|
+
const err = error;
|
|
312
|
+
// Re-throw if this is our explicit region validation error
|
|
313
|
+
if (err.message.includes("does not contain 'region' field")) {
|
|
314
|
+
throw err;
|
|
315
|
+
}
|
|
316
|
+
// Otherwise, just warn about fetch failure and continue
|
|
317
|
+
console.log(`⚠️ Could not fetch config.json: ${err.message}`);
|
|
260
318
|
console.log(" Falling back to default region search...");
|
|
261
319
|
}
|
|
262
320
|
}
|
|
@@ -265,22 +323,28 @@ async function inferQuiltConfig(options) {
|
|
|
265
323
|
// Use the region from config.json if available, otherwise use provided region or default
|
|
266
324
|
const regionToSearch = searchRegion || "us-east-1";
|
|
267
325
|
console.log(`Searching in region: ${regionToSearch}`);
|
|
268
|
-
|
|
326
|
+
// Pass the target catalog so we can stop early if we find it
|
|
327
|
+
const stacks = await findQuiltStacks(regionToSearch, profile, result.catalog);
|
|
269
328
|
if (stacks.length === 0) {
|
|
329
|
+
// If catalog was explicitly provided, this is a fatal error
|
|
330
|
+
if (catalogDns) {
|
|
331
|
+
throw new Error(`No Quilt CloudFormation stack found with QuiltWebHost matching '${catalogDns}'. ` +
|
|
332
|
+
`The catalog does not exist in region ${regionToSearch}.`);
|
|
333
|
+
}
|
|
270
334
|
console.log("No Quilt CloudFormation stacks found.");
|
|
271
335
|
return result;
|
|
272
336
|
}
|
|
273
337
|
console.log(`Found ${stacks.length} Quilt stack(s):\n`);
|
|
274
338
|
let selectedStack;
|
|
275
|
-
// If we have a catalog URL from quilt3, try to find matching stack
|
|
276
|
-
if (result.catalog
|
|
339
|
+
// If we have a catalog URL (from catalogDns or quilt3), try to find matching stack
|
|
340
|
+
if (result.catalog) {
|
|
277
341
|
// Normalize URLs for comparison (remove protocol and trailing slashes)
|
|
278
342
|
const normalizeUrl = (url) => url.replace(/^https?:\/\//, "").replace(/\/$/, "");
|
|
279
343
|
const targetUrl = normalizeUrl(result.catalog);
|
|
280
344
|
const matchingStack = stacks.find((s) => s.catalogUrl && normalizeUrl(s.catalogUrl) === targetUrl);
|
|
281
345
|
if (matchingStack) {
|
|
282
346
|
selectedStack = matchingStack;
|
|
283
|
-
console.log(`
|
|
347
|
+
console.log(`Using stack: ${selectedStack.stackName}`);
|
|
284
348
|
// If --yes not passed, interactive mode, and catalog was NOT explicitly provided, verify the catalog name before using it
|
|
285
349
|
if (!yes && interactive && !catalogDns) {
|
|
286
350
|
const rl = readline.createInterface({
|
|
@@ -303,8 +367,19 @@ async function inferQuiltConfig(options) {
|
|
|
303
367
|
}
|
|
304
368
|
}
|
|
305
369
|
else {
|
|
306
|
-
// No match found,
|
|
370
|
+
// No match found - if catalog was explicitly provided, this is FATAL
|
|
371
|
+
if (catalogDns) {
|
|
372
|
+
// FATAL ERROR: User provided explicit catalog but no matching stack found
|
|
373
|
+
console.error(`\n❌ No stack found with QuiltWebHost matching: ${result.catalog}`);
|
|
374
|
+
console.error(`\nFound ${stacks.length} Quilt stack(s) but NONE have matching QuiltWebHost:`);
|
|
375
|
+
stacks.forEach((s) => console.error(` - ${s.stackName}: ${s.catalogUrl || "NO QuiltWebHost"}`));
|
|
376
|
+
throw new Error(`No CloudFormation stack found with QuiltWebHost exactly matching '${result.catalog}'. ` +
|
|
377
|
+
`Found ${stacks.length} stack(s) in region ${regionToSearch} but none match exactly.`);
|
|
378
|
+
}
|
|
379
|
+
// For non-explicit catalog (quilt3 CLI), allow fallback to selection
|
|
307
380
|
console.log(`No stack found matching catalog URL: ${result.catalog}`);
|
|
381
|
+
console.log("Available stacks:");
|
|
382
|
+
stacks.forEach((s) => console.log(` - ${s.catalogUrl || s.stackName}`));
|
|
308
383
|
if (interactive) {
|
|
309
384
|
const options = stacks.map((s) => `${s.stackName} (${s.region})`);
|
|
310
385
|
const selectedIndex = await promptCatalogSelection(options);
|
|
@@ -312,33 +387,10 @@ async function inferQuiltConfig(options) {
|
|
|
312
387
|
console.log(`\nSelected: ${selectedStack.stackName}`);
|
|
313
388
|
}
|
|
314
389
|
else {
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
}
|
|
320
|
-
else if (stacks.length === 1) {
|
|
321
|
-
selectedStack = stacks[0];
|
|
322
|
-
console.log(`Using stack: ${selectedStack.stackName}`);
|
|
323
|
-
// If --yes not passed, interactive mode, and catalog was NOT explicitly provided, verify the catalog name before using it
|
|
324
|
-
if (!yes && interactive && !catalogDns) {
|
|
325
|
-
const rl = readline.createInterface({
|
|
326
|
-
input: process.stdin,
|
|
327
|
-
output: process.stdout,
|
|
328
|
-
});
|
|
329
|
-
const confirmed = await new Promise((resolve) => {
|
|
330
|
-
rl.question(`\nUsing catalog stack: ${selectedStack.stackName}\nIs this the correct catalog? (y/n): `, (answer) => {
|
|
331
|
-
rl.close();
|
|
332
|
-
resolve(answer.trim().toLowerCase() === "y" || answer.trim().toLowerCase() === "yes");
|
|
333
|
-
});
|
|
334
|
-
});
|
|
335
|
-
if (!confirmed) {
|
|
336
|
-
// User wants to select manually - let the wizard handle it
|
|
337
|
-
// Return partial result so wizard can prompt for missing fields
|
|
338
|
-
return {
|
|
339
|
-
...result,
|
|
340
|
-
source: "manual-selection-required",
|
|
341
|
-
};
|
|
390
|
+
// In non-interactive mode, we CANNOT guess - must fail
|
|
391
|
+
throw new Error(`No CloudFormation stack found matching catalog '${result.catalog}'. ` +
|
|
392
|
+
`Found ${stacks.length} stack(s) but none match. ` +
|
|
393
|
+
`Available: ${stacks.map((s) => s.catalogUrl || s.stackName).join(", ")}`);
|
|
342
394
|
}
|
|
343
395
|
}
|
|
344
396
|
}
|
|
@@ -349,8 +401,14 @@ async function inferQuiltConfig(options) {
|
|
|
349
401
|
console.log(`\nSelected: ${selectedStack.stackName}`);
|
|
350
402
|
}
|
|
351
403
|
else {
|
|
404
|
+
// Non-interactive mode with multiple stacks and no catalog to match - cannot determine which to use
|
|
405
|
+
if (stacks.length > 1) {
|
|
406
|
+
throw new Error("Cannot determine which Quilt stack to use in non-interactive mode. " +
|
|
407
|
+
`Found ${stacks.length} stacks: ${stacks.map((s) => s.stackName).join(", ")}. ` +
|
|
408
|
+
"Please specify a catalog URL or use interactive mode.");
|
|
409
|
+
}
|
|
352
410
|
selectedStack = stacks[0];
|
|
353
|
-
console.log(`Using
|
|
411
|
+
console.log(`Using stack: ${selectedStack.stackName}`);
|
|
354
412
|
}
|
|
355
413
|
// Populate result from selected stack
|
|
356
414
|
if (selectedStack.stackArn) {
|
|
@@ -377,7 +435,27 @@ async function inferQuiltConfig(options) {
|
|
|
377
435
|
}
|
|
378
436
|
if (selectedStack.benchlingIntegrationEnabled !== undefined) {
|
|
379
437
|
result.benchlingIntegrationEnabled = selectedStack.benchlingIntegrationEnabled;
|
|
380
|
-
console.log(`✓ BenchlingIntegration: ${selectedStack.benchlingIntegrationEnabled ?
|
|
438
|
+
console.log(`✓ BenchlingIntegration: ${selectedStack.benchlingIntegrationEnabled ? "Enabled" : "Disabled"}`);
|
|
439
|
+
}
|
|
440
|
+
// NEW: Add discovered workgroups and resources to result
|
|
441
|
+
if (selectedStack.athenaUserWorkgroup) {
|
|
442
|
+
result.athenaUserWorkgroup = selectedStack.athenaUserWorkgroup;
|
|
443
|
+
}
|
|
444
|
+
if (selectedStack.athenaUserPolicy) {
|
|
445
|
+
result.athenaUserPolicy = selectedStack.athenaUserPolicy;
|
|
446
|
+
}
|
|
447
|
+
if (selectedStack.icebergWorkgroup) {
|
|
448
|
+
result.icebergWorkgroup = selectedStack.icebergWorkgroup;
|
|
449
|
+
}
|
|
450
|
+
// icebergDatabase already handled (prefer resource over output)
|
|
451
|
+
if (selectedStack.icebergDatabase) {
|
|
452
|
+
result.icebergDatabase = selectedStack.icebergDatabase;
|
|
453
|
+
}
|
|
454
|
+
if (selectedStack.athenaResultsBucket) {
|
|
455
|
+
result.athenaResultsBucket = selectedStack.athenaResultsBucket;
|
|
456
|
+
}
|
|
457
|
+
if (selectedStack.athenaResultsBucketPolicy) {
|
|
458
|
+
result.athenaResultsBucketPolicy = selectedStack.athenaResultsBucketPolicy;
|
|
381
459
|
}
|
|
382
460
|
if (result.source === "quilt3-cli") {
|
|
383
461
|
result.source = "quilt3-cli+cloudformation";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infer-quilt-config.js","sourceRoot":"","sources":["../../../bin/commands/infer-quilt-config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"infer-quilt-config.js","sourceRoot":"","sources":["../../../bin/commands/infer-quilt-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../bin/commands/install.ts"],"names":[],"mappings":";AACA;;;;;;;GAOG;AA6BH;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CAEjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../bin/commands/install.ts"],"names":[],"mappings":";AACA;;;;;;;GAOG;AA6BH;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CAEjB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAuJvF"}
|
|
@@ -75,27 +75,23 @@ async function installCommand(options = {}) {
|
|
|
75
75
|
if (!setupResult.success) {
|
|
76
76
|
throw new Error("Setup failed. Please check the errors above and try again.");
|
|
77
77
|
}
|
|
78
|
-
console.log(chalk_1.default.green("\n✓ Setup complete!\n"));
|
|
79
78
|
// Check if integrated stack mode - no deployment needed
|
|
80
79
|
const isIntegratedMode = setupResult.config.integratedStack === true;
|
|
81
80
|
if (isIntegratedMode) {
|
|
82
|
-
// Integrated
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
console.log(" 3. Monitor logs:");
|
|
94
|
-
console.log(chalk_1.default.cyan(` npx @quiltdata/benchling-webhook logs --profile ${setupResult.profile}`));
|
|
95
|
-
console.log("");
|
|
81
|
+
// Integrated mode already displayed complete message in phase6
|
|
82
|
+
// Just return early without additional output
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
console.log(chalk_1.default.green("\n✓ Setup complete!\n"));
|
|
86
|
+
// Step 2: Check if Phase 7 already handled deployment
|
|
87
|
+
if (setupResult.deploymentHandled) {
|
|
88
|
+
// Phase 7 already asked about deployment or deployed
|
|
89
|
+
// If deployed, Phase 7 showed success message
|
|
90
|
+
// If user declined, Phase 7 showed next steps
|
|
91
|
+
// Either way, we're done here
|
|
96
92
|
return;
|
|
97
93
|
}
|
|
98
|
-
// Step
|
|
94
|
+
// Step 3: Determine if we should deploy
|
|
99
95
|
if (setupOnly) {
|
|
100
96
|
// User explicitly requested setup only
|
|
101
97
|
console.log(chalk_1.default.blue("═══════════════════════════════════════════════════════════\n"));
|
|
@@ -110,7 +106,7 @@ async function installCommand(options = {}) {
|
|
|
110
106
|
console.log();
|
|
111
107
|
return;
|
|
112
108
|
}
|
|
113
|
-
// Step
|
|
109
|
+
// Step 4: Prompt for deployment (unless --yes)
|
|
114
110
|
let shouldDeploy = yes;
|
|
115
111
|
if (!yes && !yes) {
|
|
116
112
|
printPhaseHeader(2, PHASE_TITLES.deployment);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../bin/commands/install.ts"],"names":[],"mappings":";;AACA;;;;;;;GAOG;;;;;AA8EH,
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../bin/commands/install.ts"],"names":[],"mappings":";;AACA;;;;;;;GAOG;;;;;AA8EH,wCAuJC;AAnOD,wDAAgC;AAChC,kDAA0B;AAC1B,iDAAuE;AACvE,qCAAyC;AACzC,yEAAmE;AAEnE;;;GAGG;AACH,MAAM,YAAY,GAAG;IACjB,KAAK,EAAE,qBAAqB;IAC5B,UAAU,EAAE,YAAY;CAC3B,CAAC;AAEF;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,WAAmB,EAAE,KAAa;IACxD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC,CAAC;IACzF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,WAAW,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC,CAAC;AAC7F,CAAC;AAuCD;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,cAAc,CAAC,UAAiC,EAAE;IACpE,MAAM,EACF,OAAO,GAAG,SAAS,EACnB,WAAW,EACX,UAAU,EACV,SAAS,EACT,SAAS,GAAG,KAAK,EACjB,GAAG,GAAG,KAAK,GACd,GAAG,OAAO,CAAC;IAEZ,iBAAiB;IACjB,aAAa,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IAElC,4BAA4B;IAC5B,gBAAgB,CAAC,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IAExC,IAAI,WAA8B,CAAC;IAEnC,IAAI,CAAC;QACD,WAAW,GAAG,MAAM,IAAA,iCAAkB,EAAC;YACnC,OAAO;YACP,WAAW;YACX,UAAU;YACV,SAAS;YACT,GAAG,EAAE,GAAG;YACR,eAAe,EAAE,IAAI,EAAE,wCAAwC;SAClE,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,KAAc,CAAC;QAC3B,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,qBAAqB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,KAAK,CAAC;IAChB,CAAC;IAED,sBAAsB;IACtB,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAClF,CAAC;IAED,wDAAwD;IACxD,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC,eAAe,KAAK,IAAI,CAAC;IAErE,IAAI,gBAAgB,EAAE,CAAC;QACnB,+DAA+D;QAC/D,8CAA8C;QAC9C,OAAO;IACX,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAElD,sDAAsD;IACtD,IAAI,WAAW,CAAC,iBAAiB,EAAE,CAAC;QAChC,qDAAqD;QACrD,8CAA8C;QAC9C,8CAA8C;QAC9C,8BAA8B;QAC9B,OAAO;IACX,CAAC;IAED,wCAAwC;IACxC,IAAI,SAAS,EAAE,CAAC;QACZ,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC,CAAC;QACzF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,2CAA2C,CAAC,CAAC,CAAC;QAEvE,wCAAwC;QACxC,MAAM,SAAS,GAAG,IAAA,wCAAiB,EAAC;YAChC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,KAAK,EAAE,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC;YAC1C,cAAc,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,OAAO;IACX,CAAC;IAED,+CAA+C;IAC/C,IAAI,YAAY,GAAG,GAAG,CAAC;IAEvB,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACf,gBAAgB,CAAC,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;QAE7C,MAAM,OAAO,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YAClC;gBACI,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,oBAAoB;gBAC7B,OAAO,EAAE,IAAI;aAChB;SACJ,CAAC,CAAC;QAEH,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IACxC,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,2BAA2B;QAC3B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC,CAAC;QAC3F,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAEnD,wCAAwC;QACxC,MAAM,SAAS,GAAG,IAAA,wCAAiB,EAAC;YAChC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,KAAK,EAAE,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC;YAC1C,cAAc,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,OAAO;IACX,CAAC;IAED,6BAA6B;IAC7B,gBAAgB,CAAC,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;IAEjE,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAElD,IAAI,CAAC;QACD,MAAM,IAAA,sBAAa,EAAC;YAChB,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,KAAK;YACL,GAAG,EAAE,IAAI,EAAE,yCAAyC;SACvD,CAAC,CAAC;QAEH,8CAA8C;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC,CAAC;QAC3F,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAE5D,4DAA4D;QAC5D,uCAAuC;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,KAAc,CAAC;QAC3B,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,0BAA0B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAElE,2BAA2B;QAC3B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC,CAAC;QAC3F,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,gDAAgD,CAAC,CAAC,CAAC;QAE5E,MAAM,SAAS,GAAG,IAAA,wCAAiB,EAAC;YAChC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,KAAK;YACL,UAAU,EAAE;gBACR,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,GAAG,CAAC,OAAO;aACrB;SACJ,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,OAAe;IACnC,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,gDAAgD;IAChD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CAAC,OAA6C;IAChE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACX,gDAAgD;YAC5C,+DAA+D,CACtE,CAAC;IACN,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../bin/commands/logs.ts"],"names":[],"mappings":";AACA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAIlD,MAAM,WAAW,kBAAkB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,UAAU;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../bin/commands/logs.ts"],"names":[],"mappings":";AACA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAIlD,MAAM,WAAW,kBAAkB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,UAAU;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AA6FD;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,UAAU,CAAC,CA4EvF"}
|
|
@@ -34,7 +34,7 @@ function getDeploymentInfo(profile, configStorage) {
|
|
|
34
34
|
region,
|
|
35
35
|
stackName: STACK_NAME, // Still check BenchlingWebhookStack for metadata
|
|
36
36
|
integratedMode: true,
|
|
37
|
-
quiltStackName: match[1] // But use Quilt stack name for logs
|
|
37
|
+
quiltStackName: match[1], // But use Quilt stack name for logs
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
40
|
}
|
|
@@ -42,7 +42,7 @@ function getDeploymentInfo(profile, configStorage) {
|
|
|
42
42
|
return {
|
|
43
43
|
region,
|
|
44
44
|
stackName: STACK_NAME,
|
|
45
|
-
integratedMode: false
|
|
45
|
+
integratedMode: false,
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
48
|
}
|
|
@@ -52,82 +52,6 @@ function getDeploymentInfo(profile, configStorage) {
|
|
|
52
52
|
}
|
|
53
53
|
return null;
|
|
54
54
|
}
|
|
55
|
-
/**
|
|
56
|
-
* Get CloudFormation stack outputs
|
|
57
|
-
*/
|
|
58
|
-
function getStackOutputs(stackName, region, awsProfile) {
|
|
59
|
-
try {
|
|
60
|
-
const profileFlag = awsProfile ? `--profile ${awsProfile}` : "";
|
|
61
|
-
const output = (0, child_process_1.execSync)(`aws cloudformation describe-stacks --stack-name ${stackName} --region ${region} ${profileFlag} --query 'Stacks[0].Outputs' --output json`, { encoding: "utf-8" });
|
|
62
|
-
return JSON.parse(output);
|
|
63
|
-
}
|
|
64
|
-
catch {
|
|
65
|
-
throw new Error(`Could not get stack outputs for ${stackName}. ` +
|
|
66
|
-
`Make sure the stack is deployed and AWS credentials are configured.`);
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
/**
|
|
70
|
-
* Get log group from stack outputs by type
|
|
71
|
-
*/
|
|
72
|
-
function getLogGroupFromOutputs(outputs, logType) {
|
|
73
|
-
let outputKey;
|
|
74
|
-
if (logType === "ecs") {
|
|
75
|
-
outputKey = "EcsLogGroup";
|
|
76
|
-
}
|
|
77
|
-
else if (logType === "api") {
|
|
78
|
-
outputKey = "ApiGatewayLogGroup";
|
|
79
|
-
}
|
|
80
|
-
else if (logType === "api-exec") {
|
|
81
|
-
outputKey = "ApiGatewayExecutionLogGroup";
|
|
82
|
-
}
|
|
83
|
-
else {
|
|
84
|
-
throw new Error(`Invalid log type: ${logType}`);
|
|
85
|
-
}
|
|
86
|
-
const logGroupOutput = outputs.find((o) => o.OutputKey === outputKey);
|
|
87
|
-
if (!logGroupOutput) {
|
|
88
|
-
throw new Error(`Could not find ${outputKey} in stack outputs. ` +
|
|
89
|
-
`Stack may need to be redeployed.`);
|
|
90
|
-
}
|
|
91
|
-
return logGroupOutput.OutputValue;
|
|
92
|
-
}
|
|
93
|
-
/**
|
|
94
|
-
* Print stack information header
|
|
95
|
-
*/
|
|
96
|
-
function printStackInfo(outputs, logType, profile, stage) {
|
|
97
|
-
console.log("=".repeat(80));
|
|
98
|
-
console.log("Benchling Webhook Logs");
|
|
99
|
-
console.log("=".repeat(80));
|
|
100
|
-
const clusterName = outputs.find((o) => o.OutputKey === "FargateServiceClusterNameCD3B109F");
|
|
101
|
-
const serviceName = outputs.find((o) => o.OutputKey === "FargateServiceServiceName24CFD869");
|
|
102
|
-
const webhookEndpoint = outputs.find((o) => o.OutputKey === "WebhookEndpoint");
|
|
103
|
-
const version = outputs.find((o) => o.OutputKey === "StackVersion");
|
|
104
|
-
const ecsLogGroup = outputs.find((o) => o.OutputKey === "EcsLogGroup");
|
|
105
|
-
const apiLogGroup = outputs.find((o) => o.OutputKey === "ApiGatewayLogGroup");
|
|
106
|
-
const apiExecLogGroup = outputs.find((o) => o.OutputKey === "ApiGatewayExecutionLogGroup");
|
|
107
|
-
console.log(`Profile: ${profile}`);
|
|
108
|
-
console.log(`Stage: ${stage}`);
|
|
109
|
-
if (clusterName)
|
|
110
|
-
console.log(`Cluster: ${clusterName.OutputValue}`);
|
|
111
|
-
if (serviceName)
|
|
112
|
-
console.log(`Service: ${serviceName.OutputValue}`);
|
|
113
|
-
if (webhookEndpoint)
|
|
114
|
-
console.log(`Endpoint: ${webhookEndpoint.OutputValue}`);
|
|
115
|
-
if (version)
|
|
116
|
-
console.log(`Version: ${version.OutputValue}`);
|
|
117
|
-
console.log("");
|
|
118
|
-
console.log("Log Groups:");
|
|
119
|
-
if (ecsLogGroup) {
|
|
120
|
-
console.log(` ECS: ${ecsLogGroup.OutputValue}${logType === "ecs" ? " (viewing)" : ""}`);
|
|
121
|
-
}
|
|
122
|
-
if (apiLogGroup) {
|
|
123
|
-
console.log(` API Access: ${apiLogGroup.OutputValue}${logType === "api" ? " (viewing)" : ""}`);
|
|
124
|
-
}
|
|
125
|
-
if (apiExecLogGroup) {
|
|
126
|
-
console.log(` API Exec: ${apiExecLogGroup.OutputValue}${logType === "api-exec" ? " (viewing)" : ""}`);
|
|
127
|
-
}
|
|
128
|
-
console.log("=".repeat(80));
|
|
129
|
-
console.log("");
|
|
130
|
-
}
|
|
131
55
|
/**
|
|
132
56
|
* Tail logs from a single log group
|
|
133
57
|
*/
|
|
@@ -154,7 +78,8 @@ function tailLogs(logGroup, region, options) {
|
|
|
154
78
|
(0, child_process_1.execSync)(command, { stdio: "inherit" });
|
|
155
79
|
}
|
|
156
80
|
catch (error) {
|
|
157
|
-
|
|
81
|
+
const err = error;
|
|
82
|
+
if (err.status !== 130) {
|
|
158
83
|
// Ignore Ctrl+C exit (status 130)
|
|
159
84
|
throw new Error("Error fetching logs. Make sure:\n" +
|
|
160
85
|
"1. The stack is deployed\n" +
|
|
@@ -163,55 +88,6 @@ function tailLogs(logGroup, region, options) {
|
|
|
163
88
|
}
|
|
164
89
|
}
|
|
165
90
|
}
|
|
166
|
-
/**
|
|
167
|
-
* Show logs from all log groups
|
|
168
|
-
*/
|
|
169
|
-
function showAllLogs(outputs, region, options) {
|
|
170
|
-
console.log("Showing logs from all sources (most recent first):\n");
|
|
171
|
-
const logGroupDefs = [
|
|
172
|
-
{ type: "ECS", group: outputs.find((o) => o.OutputKey === "EcsLogGroup")?.OutputValue },
|
|
173
|
-
{ type: "API-Access", group: outputs.find((o) => o.OutputKey === "ApiGatewayLogGroup")?.OutputValue },
|
|
174
|
-
{ type: "API-Exec", group: outputs.find((o) => o.OutputKey === "ApiGatewayExecutionLogGroup")?.OutputValue },
|
|
175
|
-
];
|
|
176
|
-
// Warn about missing log groups
|
|
177
|
-
const missingGroups = logGroupDefs.filter((lg) => !lg.group);
|
|
178
|
-
if (missingGroups.length > 0) {
|
|
179
|
-
console.log(chalk_1.default.yellow("⚠️ WARNING: Some log groups are not available:"));
|
|
180
|
-
missingGroups.forEach(({ type }) => {
|
|
181
|
-
console.log(chalk_1.default.yellow(` - ${type}: Stack output not found (may need to redeploy)`));
|
|
182
|
-
});
|
|
183
|
-
console.log("");
|
|
184
|
-
}
|
|
185
|
-
const logGroups = logGroupDefs.filter((lg) => lg.group);
|
|
186
|
-
for (const { type, group } of logGroups) {
|
|
187
|
-
console.log(`\n${"=".repeat(80)}`);
|
|
188
|
-
console.log(`${type}: ${group}`);
|
|
189
|
-
console.log("=".repeat(80));
|
|
190
|
-
const profileFlag = options.awsProfile ? `--profile ${options.awsProfile}` : "";
|
|
191
|
-
let command = `aws logs tail "${group}"`;
|
|
192
|
-
command += ` --region ${region}`;
|
|
193
|
-
if (profileFlag)
|
|
194
|
-
command += ` ${profileFlag}`;
|
|
195
|
-
command += ` --since ${options.since}`;
|
|
196
|
-
command += " --format short";
|
|
197
|
-
if (options.filter) {
|
|
198
|
-
command += ` --filter-pattern "${options.filter}"`;
|
|
199
|
-
}
|
|
200
|
-
command += ` 2>&1 | tail -${options.tail}`;
|
|
201
|
-
try {
|
|
202
|
-
const output = (0, child_process_1.execSync)(command, { encoding: "utf-8", shell: "/bin/bash" });
|
|
203
|
-
if (output.trim()) {
|
|
204
|
-
console.log(output);
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
207
|
-
console.log(chalk_1.default.dim(`(No logs in the last ${options.since})`));
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
catch (error) {
|
|
211
|
-
console.log(chalk_1.default.red(`Error reading ${type} logs: ${error.message}`));
|
|
212
|
-
}
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
91
|
/**
|
|
216
92
|
* Logs command implementation
|
|
217
93
|
*/
|