@quiltdata/benchling-webhook 0.5.1-20251030T013402Z → 0.5.4
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/dist/bin/benchling-webhook.d.ts.map +1 -1
- package/dist/bin/benchling-webhook.js +15 -9
- package/dist/bin/benchling-webhook.js.map +1 -1
- package/dist/bin/cdk-dev.js +252 -0
- package/dist/bin/cli.js +1 -0
- package/dist/bin/cli.js.map +1 -1
- package/dist/bin/commands/deploy.d.ts.map +1 -1
- package/dist/bin/commands/deploy.js +46 -10
- package/dist/bin/commands/deploy.js.map +1 -1
- package/dist/bin/commands/init.d.ts.map +1 -1
- package/dist/bin/commands/init.js +2 -3
- package/dist/bin/commands/init.js.map +1 -1
- package/dist/bin/commands/manifest.d.ts.map +1 -1
- package/dist/bin/commands/manifest.js +8 -2
- package/dist/bin/commands/manifest.js.map +1 -1
- package/dist/bin/commands/test.js +2 -2
- package/dist/bin/commands/validate.d.ts.map +1 -1
- package/dist/bin/commands/validate.js +0 -1
- package/dist/bin/commands/validate.js.map +1 -1
- package/dist/lib/alb-api-gateway.d.ts.map +1 -1
- package/dist/lib/alb-api-gateway.js +24 -7
- package/dist/lib/alb-api-gateway.js.map +1 -1
- package/dist/lib/benchling-webhook-stack.d.ts +2 -1
- package/dist/lib/benchling-webhook-stack.d.ts.map +1 -1
- package/dist/lib/benchling-webhook-stack.js +54 -9
- package/dist/lib/benchling-webhook-stack.js.map +1 -1
- package/dist/lib/fargate-service.d.ts +4 -1
- package/dist/lib/fargate-service.d.ts.map +1 -1
- package/dist/lib/fargate-service.js +7 -5
- package/dist/lib/fargate-service.js.map +1 -1
- package/dist/lib/utils/config.d.ts +4 -3
- package/dist/lib/utils/config.d.ts.map +1 -1
- package/dist/lib/utils/config.js +10 -21
- package/dist/lib/utils/config.js.map +1 -1
- package/dist/lib/utils/stack-inference.d.ts +2 -14
- package/dist/lib/utils/stack-inference.d.ts.map +1 -1
- package/dist/lib/utils/stack-inference.js +33 -132
- package/dist/lib/utils/stack-inference.js.map +1 -1
- package/dist/package.json +10 -5
- package/env.template +1 -2
- package/package.json +10 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benchling-webhook.d.ts","sourceRoot":"","sources":["../../bin/benchling-webhook.ts"],"names":[],"mappings":";AACA,OAAO,eAAe,CAAC;AACvB,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,QAAA,MAAQ,gBAAgB,KAA4B,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC;IACb,KAAK,EAAE,qBAAqB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACnC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAsC1B;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAoBrF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"benchling-webhook.d.ts","sourceRoot":"","sources":["../../bin/benchling-webhook.ts"],"names":[],"mappings":";AACA,OAAO,eAAe,CAAC;AACvB,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,QAAA,MAAQ,gBAAgB,KAA4B,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC;IACb,KAAK,EAAE,qBAAqB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACnC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAsC1B;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAoBrF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CA8B5D;AAwKD,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
|
|
@@ -117,7 +117,7 @@ function createStack(config) {
|
|
|
117
117
|
region: config.cdkRegion,
|
|
118
118
|
},
|
|
119
119
|
bucketName: config.quiltUserBucket,
|
|
120
|
-
|
|
120
|
+
queueArn: config.queueArn,
|
|
121
121
|
environment: "production",
|
|
122
122
|
prefix: config.pkgPrefix || "benchling",
|
|
123
123
|
benchlingClientId: config.benchlingClientId,
|
|
@@ -129,6 +129,7 @@ function createStack(config) {
|
|
|
129
129
|
logLevel: config.logLevel || "INFO",
|
|
130
130
|
createEcrRepository: config.createEcrRepository === "true",
|
|
131
131
|
ecrRepositoryName: config.ecrRepositoryName || "quiltdata/benchling",
|
|
132
|
+
imageTag: config.imageTag || "latest",
|
|
132
133
|
});
|
|
133
134
|
return {
|
|
134
135
|
app,
|
|
@@ -182,8 +183,7 @@ async function legacyGetConfig() {
|
|
|
182
183
|
const requiredInferredVars = [
|
|
183
184
|
"CDK_DEFAULT_ACCOUNT",
|
|
184
185
|
"CDK_DEFAULT_REGION",
|
|
185
|
-
"
|
|
186
|
-
"SQS_QUEUE_URL",
|
|
186
|
+
"QUEUE_ARN",
|
|
187
187
|
"QUILT_DATABASE",
|
|
188
188
|
];
|
|
189
189
|
const missingInferredVars = requiredInferredVars.filter((varName) => !config[varName]);
|
|
@@ -200,11 +200,17 @@ async function legacyGetConfig() {
|
|
|
200
200
|
console.error("\nAlternatively, you can manually set these values in your .env file.");
|
|
201
201
|
process.exit(1);
|
|
202
202
|
}
|
|
203
|
-
// Validate
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
203
|
+
// Validate required Benchling fields
|
|
204
|
+
const requiredBenchlingFields = [
|
|
205
|
+
"BENCHLING_TENANT",
|
|
206
|
+
"BENCHLING_CLIENT_ID",
|
|
207
|
+
"BENCHLING_CLIENT_SECRET",
|
|
208
|
+
"BENCHLING_APP_DEFINITION_ID",
|
|
209
|
+
];
|
|
210
|
+
const missingBenchling = requiredBenchlingFields.filter((field) => !config[field]);
|
|
211
|
+
if (missingBenchling.length > 0) {
|
|
212
|
+
console.error("Error: The following required Benchling configuration is missing:");
|
|
213
|
+
missingBenchling.forEach((field) => console.error(` - ${field}`));
|
|
208
214
|
process.exit(1);
|
|
209
215
|
}
|
|
210
216
|
return config;
|
|
@@ -243,7 +249,7 @@ async function legacyMain() {
|
|
|
243
249
|
region: config.CDK_DEFAULT_REGION,
|
|
244
250
|
},
|
|
245
251
|
bucketName: config.QUILT_USER_BUCKET, // User's data bucket
|
|
246
|
-
|
|
252
|
+
queueArn: config.QUEUE_ARN,
|
|
247
253
|
environment: "production",
|
|
248
254
|
prefix: config.PKG_PREFIX || "benchling",
|
|
249
255
|
benchlingClientId: config.BENCHLING_CLIENT_ID,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benchling-webhook.js","sourceRoot":"","sources":["../../bin/benchling-webhook.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6CA,8CAyCC;AAMD,gDAoBC;AAMD,
|
|
1
|
+
{"version":3,"file":"benchling-webhook.js","sourceRoot":"","sources":["../../bin/benchling-webhook.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Development deployment workflow script
|
|
5
|
+
*
|
|
6
|
+
* This script:
|
|
7
|
+
* 1. Creates a dev git tag with timestamp (v{version}-{timestamp})
|
|
8
|
+
* 2. Pushes the tag to GitHub (triggers CI to build Docker image)
|
|
9
|
+
* 3. Waits for CI/CD pipeline to complete (monitors GitHub Actions)
|
|
10
|
+
* 4. Deploys CDK stack using the CI-built image tag
|
|
11
|
+
*
|
|
12
|
+
* Usage:
|
|
13
|
+
* npm run cdk:dev # Full workflow
|
|
14
|
+
* npm run cdk:dev -- --continue # Skip tag creation, wait for CI and deploy
|
|
15
|
+
* npm run cdk:dev -- --tag <tag> # Use specific existing tag
|
|
16
|
+
*
|
|
17
|
+
* IMPORTANT: This uses CI-built images (x86_64), NOT local builds.
|
|
18
|
+
* Local ARM builds would fail in AWS which runs on x86_64.
|
|
19
|
+
*/
|
|
20
|
+
|
|
21
|
+
const { execSync } = require('child_process');
|
|
22
|
+
const fs = require('fs');
|
|
23
|
+
const path = require('path');
|
|
24
|
+
|
|
25
|
+
// Read package.json for version
|
|
26
|
+
const packagePath = path.join(__dirname, '..', 'package.json');
|
|
27
|
+
const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
|
|
28
|
+
|
|
29
|
+
function run(command, options = {}) {
|
|
30
|
+
const silent = options.silent || false;
|
|
31
|
+
if (!silent) {
|
|
32
|
+
console.log(`\n$ ${command}\n`);
|
|
33
|
+
}
|
|
34
|
+
try {
|
|
35
|
+
return execSync(command, {
|
|
36
|
+
stdio: silent ? 'pipe' : 'inherit',
|
|
37
|
+
encoding: 'utf-8',
|
|
38
|
+
...options
|
|
39
|
+
});
|
|
40
|
+
} catch (error) {
|
|
41
|
+
if (!silent) {
|
|
42
|
+
console.error(`\n❌ Command failed: ${command}`);
|
|
43
|
+
}
|
|
44
|
+
if (options.allowFailure) {
|
|
45
|
+
return null;
|
|
46
|
+
}
|
|
47
|
+
process.exit(1);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
async function waitForWorkflow(commitSha, timeoutMinutes = 15) {
|
|
52
|
+
console.log('');
|
|
53
|
+
console.log(`Waiting for CI workflow to complete (timeout: ${timeoutMinutes} minutes)...`);
|
|
54
|
+
console.log('');
|
|
55
|
+
|
|
56
|
+
// Check if gh CLI is available
|
|
57
|
+
try {
|
|
58
|
+
execSync('gh --version', { stdio: 'ignore' });
|
|
59
|
+
} catch (e) {
|
|
60
|
+
console.error('❌ GitHub CLI (gh) is not installed or not in PATH');
|
|
61
|
+
console.error(' Install from: https://cli.github.com/');
|
|
62
|
+
console.error('\n Alternatively, monitor the workflow manually and deploy when complete:');
|
|
63
|
+
console.error(' 1. Watch: https://github.com/quiltdata/benchling-webhook/actions');
|
|
64
|
+
console.error(' 2. Deploy: npm run cli -- --image-tag <version> --yes');
|
|
65
|
+
process.exit(1);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
const startTime = Date.now();
|
|
69
|
+
const timeoutMs = timeoutMinutes * 60 * 1000;
|
|
70
|
+
let attempt = 0;
|
|
71
|
+
let workflowUrl = null;
|
|
72
|
+
|
|
73
|
+
while (Date.now() - startTime < timeoutMs) {
|
|
74
|
+
attempt++;
|
|
75
|
+
|
|
76
|
+
try {
|
|
77
|
+
// Use gh to list recent workflow runs for this commit
|
|
78
|
+
const result = run(`gh run list --commit ${commitSha} --json status,conclusion,url,databaseId --limit 5`, {
|
|
79
|
+
silent: true,
|
|
80
|
+
allowFailure: true
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
if (!result) {
|
|
84
|
+
process.stdout.write(`\r Attempt ${attempt}: Waiting for workflow to start (commit ${commitSha.substring(0, 7)})...`);
|
|
85
|
+
await new Promise(resolve => setTimeout(resolve, 10000));
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
const runs = JSON.parse(result);
|
|
90
|
+
|
|
91
|
+
if (runs && runs.length > 0) {
|
|
92
|
+
const workflowRun = runs[0]; // Most recent run for this commit
|
|
93
|
+
const status = workflowRun.status;
|
|
94
|
+
const conclusion = workflowRun.conclusion;
|
|
95
|
+
workflowUrl = workflowRun.url;
|
|
96
|
+
|
|
97
|
+
process.stdout.write(`\r Attempt ${attempt}: Status=${status}, Conclusion=${conclusion || 'pending'}... ${workflowUrl}`);
|
|
98
|
+
|
|
99
|
+
if (status === 'completed') {
|
|
100
|
+
console.log('\n');
|
|
101
|
+
if (conclusion === 'success') {
|
|
102
|
+
console.log(`✅ CI workflow completed successfully!`);
|
|
103
|
+
console.log(` Run: ${workflowUrl}`);
|
|
104
|
+
return true;
|
|
105
|
+
} else {
|
|
106
|
+
console.error(`\n❌ CI workflow failed with conclusion: ${conclusion}`);
|
|
107
|
+
console.error(` Run: ${workflowUrl}`);
|
|
108
|
+
console.error(' Please check the workflow logs and fix any issues.');
|
|
109
|
+
process.exit(1);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
} else {
|
|
113
|
+
process.stdout.write(`\r Attempt ${attempt}: Waiting for workflow to start (commit ${commitSha.substring(0, 7)})...`);
|
|
114
|
+
}
|
|
115
|
+
} catch (error) {
|
|
116
|
+
// Errors are non-fatal, just retry
|
|
117
|
+
if (attempt % 10 === 0) {
|
|
118
|
+
console.log(`\n Warning: ${error.message}`);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
// Wait 10 seconds between checks
|
|
123
|
+
await new Promise(resolve => setTimeout(resolve, 10000));
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
console.error('\n\n❌ Timeout waiting for CI workflow to complete');
|
|
127
|
+
console.error(` Waited ${timeoutMinutes} minutes`);
|
|
128
|
+
if (workflowUrl) {
|
|
129
|
+
console.error(` Check status at: ${workflowUrl}`);
|
|
130
|
+
} else {
|
|
131
|
+
console.error(` Check status at: https://github.com/quiltdata/benchling-webhook/actions`);
|
|
132
|
+
}
|
|
133
|
+
console.error('\n Once the workflow completes, you can deploy manually with:');
|
|
134
|
+
console.error(` npm run cli -- --image-tag <version> --yes`);
|
|
135
|
+
process.exit(1);
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
async function main() {
|
|
139
|
+
console.log('🚀 Starting development deployment workflow...');
|
|
140
|
+
console.log('');
|
|
141
|
+
console.log('This workflow uses CI-built Docker images (x86_64 for AWS).');
|
|
142
|
+
console.log('Local ARM builds are NOT used as they would fail in AWS.');
|
|
143
|
+
console.log('');
|
|
144
|
+
|
|
145
|
+
// Parse command line arguments
|
|
146
|
+
const args = process.argv.slice(2);
|
|
147
|
+
const continueMode = args.includes('--continue');
|
|
148
|
+
const tagIndex = args.indexOf('--tag');
|
|
149
|
+
const specificTag = tagIndex !== -1 ? args[tagIndex + 1] : null;
|
|
150
|
+
|
|
151
|
+
let devTag;
|
|
152
|
+
let version;
|
|
153
|
+
|
|
154
|
+
if (specificTag) {
|
|
155
|
+
// Use specific tag provided by user
|
|
156
|
+
devTag = specificTag;
|
|
157
|
+
version = specificTag.replace(/^v/, '').split('-')[0]; // Extract version from tag
|
|
158
|
+
console.log(`Using specified tag: ${devTag}`);
|
|
159
|
+
console.log(`Extracted version: ${version}`);
|
|
160
|
+
} else if (continueMode) {
|
|
161
|
+
// Continue mode - find most recent dev tag
|
|
162
|
+
console.log('Continue mode: Finding most recent dev tag...');
|
|
163
|
+
try {
|
|
164
|
+
const tags = run('git tag --sort=-creatordate', { silent: true }).trim().split('\n');
|
|
165
|
+
const recentDevTag = tags.find(t => t.match(/^v[\d.]+-.+Z$/));
|
|
166
|
+
|
|
167
|
+
if (!recentDevTag) {
|
|
168
|
+
console.error('❌ No dev tags found');
|
|
169
|
+
console.error(' Run without --continue to create a new dev tag first');
|
|
170
|
+
process.exit(1);
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
devTag = recentDevTag;
|
|
174
|
+
version = devTag.replace(/^v/, '').split('-')[0];
|
|
175
|
+
console.log(`✅ Found recent dev tag: ${devTag}`);
|
|
176
|
+
console.log(` Version: ${version}`);
|
|
177
|
+
} catch (e) {
|
|
178
|
+
console.error('❌ Failed to find recent dev tag');
|
|
179
|
+
process.exit(1);
|
|
180
|
+
}
|
|
181
|
+
} else {
|
|
182
|
+
// Normal mode - create new tag
|
|
183
|
+
// 1. Check for uncommitted changes
|
|
184
|
+
console.log('Step 1: Checking for uncommitted changes...');
|
|
185
|
+
try {
|
|
186
|
+
execSync('git diff-index --quiet HEAD --', { stdio: 'ignore' });
|
|
187
|
+
} catch (e) {
|
|
188
|
+
console.error('❌ You have uncommitted changes');
|
|
189
|
+
console.error(' Commit or stash your changes before creating a dev deployment');
|
|
190
|
+
process.exit(1);
|
|
191
|
+
}
|
|
192
|
+
console.log('✅ Working directory is clean');
|
|
193
|
+
|
|
194
|
+
// 2. Generate dev tag name
|
|
195
|
+
version = pkg.version;
|
|
196
|
+
const timestamp = new Date().toISOString().replace(/[-:]/g, '').replace(/\.\d+Z$/, 'Z');
|
|
197
|
+
devTag = `v${version}-${timestamp}`;
|
|
198
|
+
|
|
199
|
+
console.log('');
|
|
200
|
+
console.log(`Step 2: Creating dev tag: ${devTag}`);
|
|
201
|
+
|
|
202
|
+
// Check if tag already exists
|
|
203
|
+
try {
|
|
204
|
+
execSync(`git rev-parse ${devTag}`, { stdio: 'ignore' });
|
|
205
|
+
console.error(`❌ Tag ${devTag} already exists`);
|
|
206
|
+
process.exit(1);
|
|
207
|
+
} catch (e) {
|
|
208
|
+
// Tag doesn't exist, continue
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
// Create tag
|
|
212
|
+
const message = `Development release ${devTag}\n\nThis is a pre-release for testing purposes.`;
|
|
213
|
+
run(`git tag -a ${devTag} -m "${message}"`);
|
|
214
|
+
console.log(`✅ Created git tag ${devTag}`);
|
|
215
|
+
|
|
216
|
+
// 3. Push tag to origin (triggers CI)
|
|
217
|
+
console.log('');
|
|
218
|
+
console.log(`Step 3: Pushing tag to origin (this triggers CI/CD)...`);
|
|
219
|
+
run(`git push origin ${devTag}`);
|
|
220
|
+
console.log(`✅ Pushed tag ${devTag} to origin`);
|
|
221
|
+
console.log(' CI will now build Docker image for x86_64 (AWS-compatible)');
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
// 4. Wait for CI to complete
|
|
225
|
+
console.log('');
|
|
226
|
+
console.log(`Step 4: Waiting for CI to build Docker image...`);
|
|
227
|
+
|
|
228
|
+
// Get the commit SHA for the tag (use ^{commit} to dereference annotated tags)
|
|
229
|
+
const commitSha = run(`git rev-parse ${devTag}^{commit}`, { silent: true }).trim();
|
|
230
|
+
|
|
231
|
+
await waitForWorkflow(commitSha);
|
|
232
|
+
|
|
233
|
+
// 5. Deploy CDK stack with CI-built image tag
|
|
234
|
+
console.log('');
|
|
235
|
+
console.log(`Step 5: Deploying CDK stack with CI-built image...`);
|
|
236
|
+
process.chdir(path.join(__dirname, '..'));
|
|
237
|
+
// Use the full version with timestamp (without 'v' prefix)
|
|
238
|
+
const imageTag = devTag.replace(/^v/, '');
|
|
239
|
+
run(`npm run cli -- --image-tag ${imageTag} --yes`);
|
|
240
|
+
|
|
241
|
+
console.log('');
|
|
242
|
+
console.log('✅ Development deployment complete!');
|
|
243
|
+
console.log('');
|
|
244
|
+
console.log(`Dev tag: ${devTag}`);
|
|
245
|
+
console.log(`Image tag: ${imageTag} (built by CI for x86_64)`);
|
|
246
|
+
console.log('');
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
main().catch(error => {
|
|
250
|
+
console.error('\n❌ Error:', error.message);
|
|
251
|
+
process.exit(1);
|
|
252
|
+
});
|
package/dist/bin/cli.js
CHANGED
|
@@ -35,6 +35,7 @@ program
|
|
|
35
35
|
.option("--require-approval <level>", "CDK approval level", "never")
|
|
36
36
|
.option("--profile <name>", "AWS profile to use")
|
|
37
37
|
.option("--region <region>", "AWS region to deploy to")
|
|
38
|
+
.option("--image-tag <tag>", "Docker image tag to deploy (default: latest)")
|
|
38
39
|
.option("--yes", "Skip confirmation prompts")
|
|
39
40
|
.action(async (options) => {
|
|
40
41
|
try {
|
package/dist/bin/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../bin/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../bin/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../bin/commands/deploy.ts"],"names":[],"mappings":"AAKA,OAAO,EAMH,KAAK,aAAa,EACrB,MAAM,wBAAwB,CAAC;AAOhC,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG;IAAE,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../bin/commands/deploy.ts"],"names":[],"mappings":"AAKA,OAAO,EAMH,KAAK,aAAa,EACrB,MAAM,wBAAwB,CAAC;AAOhC,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG;IAAE,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAyPjJ"}
|
|
@@ -90,11 +90,31 @@ async function deployCommand(options) {
|
|
|
90
90
|
console.log();
|
|
91
91
|
console.log(chalk_1.default.bold("Deployment Plan"));
|
|
92
92
|
console.log(chalk_1.default.gray("─".repeat(80)));
|
|
93
|
-
console.log(` ${chalk_1.default.bold("Stack:")}
|
|
94
|
-
console.log(` ${chalk_1.default.bold("Account:")}
|
|
95
|
-
console.log(` ${chalk_1.default.bold("Region:")}
|
|
96
|
-
console.log(
|
|
97
|
-
console.log(
|
|
93
|
+
console.log(` ${chalk_1.default.bold("Stack:")} BenchlingWebhookStack`);
|
|
94
|
+
console.log(` ${chalk_1.default.bold("Account:")} ${config.cdkAccount}`);
|
|
95
|
+
console.log(` ${chalk_1.default.bold("Region:")} ${config.cdkRegion}`);
|
|
96
|
+
console.log();
|
|
97
|
+
console.log(chalk_1.default.bold(" Stack Parameters:"));
|
|
98
|
+
console.log(` ${chalk_1.default.bold("Quilt Catalog:")} ${config.quiltCatalog}`);
|
|
99
|
+
console.log(` ${chalk_1.default.bold("Quilt Database:")} ${config.quiltDatabase}`);
|
|
100
|
+
console.log(` ${chalk_1.default.bold("Quilt User Bucket:")} ${config.quiltUserBucket}`);
|
|
101
|
+
console.log(` ${chalk_1.default.bold("Benchling Tenant:")} ${config.benchlingTenant}`);
|
|
102
|
+
console.log(` ${chalk_1.default.bold("Benchling Client ID:")} ${config.benchlingClientId}`);
|
|
103
|
+
console.log(` ${chalk_1.default.bold("Benchling Client Secret:")} ${config.benchlingClientSecret ? "***" + config.benchlingClientSecret.slice(-4) : "(not set)"}`);
|
|
104
|
+
if (config.benchlingAppDefinitionId) {
|
|
105
|
+
console.log(` ${chalk_1.default.bold("Benchling App ID:")} ${config.benchlingAppDefinitionId}`);
|
|
106
|
+
}
|
|
107
|
+
console.log(` ${chalk_1.default.bold("Queue ARN:")} ${config.queueArn}`);
|
|
108
|
+
console.log(` ${chalk_1.default.bold("Package Prefix:")} ${config.pkgPrefix || "benchling"}`);
|
|
109
|
+
console.log(` ${chalk_1.default.bold("Package Key:")} ${config.pkgKey || "experiment_id"}`);
|
|
110
|
+
console.log(` ${chalk_1.default.bold("Log Level:")} ${config.logLevel || "INFO"}`);
|
|
111
|
+
if (config.webhookAllowList) {
|
|
112
|
+
console.log(` ${chalk_1.default.bold("Webhook Allow List:")} ${config.webhookAllowList}`);
|
|
113
|
+
}
|
|
114
|
+
console.log(` ${chalk_1.default.bold("Webhook Verification:")} ${config.enableWebhookVerification ?? "true"}`);
|
|
115
|
+
console.log(` ${chalk_1.default.bold("Create ECR Repository:")} ${config.createEcrRepository || "false"}`);
|
|
116
|
+
console.log(` ${chalk_1.default.bold("ECR Repository Name:")} ${config.ecrRepositoryName || "quiltdata/benchling"}`);
|
|
117
|
+
console.log(` ${chalk_1.default.bold("Docker Image Tag:")} ${config.imageTag || "latest"}`);
|
|
98
118
|
console.log(chalk_1.default.gray("─".repeat(80)));
|
|
99
119
|
console.log();
|
|
100
120
|
// 6. Confirm (unless --yes)
|
|
@@ -123,7 +143,22 @@ async function deployCommand(options) {
|
|
|
123
143
|
// Execute CDK deploy directly - the app.synth() will be called by CDK
|
|
124
144
|
// We need to synthesize to cdk.out and then deploy
|
|
125
145
|
result.app.synth();
|
|
126
|
-
|
|
146
|
+
// Build CloudFormation parameters to pass explicitly
|
|
147
|
+
const parameters = [
|
|
148
|
+
`ImageTag=${config.imageTag || "latest"}`,
|
|
149
|
+
`BucketName=${config.quiltUserBucket}`,
|
|
150
|
+
`PackagePrefix=${config.pkgPrefix || "benchling"}`,
|
|
151
|
+
`PackageKey=${config.pkgKey || "experiment_id"}`,
|
|
152
|
+
`QueueArn=${config.queueArn}`,
|
|
153
|
+
`QuiltDatabase=${config.quiltDatabase}`,
|
|
154
|
+
`BenchlingTenant=${config.benchlingTenant}`,
|
|
155
|
+
`LogLevel=${config.logLevel || "INFO"}`,
|
|
156
|
+
`EnableWebhookVerification=${config.enableWebhookVerification ?? "true"}`,
|
|
157
|
+
`QuiltCatalog=${config.quiltCatalog || "open.quiltdata.com"}`,
|
|
158
|
+
`WebhookAllowList=${config.webhookAllowList || ""}`,
|
|
159
|
+
];
|
|
160
|
+
const parametersArg = parameters.map(p => `--parameters ${p}`).join(" ");
|
|
161
|
+
const cdkCommand = `npx cdk deploy --require-approval ${options.requireApproval || "never"} ${parametersArg}`;
|
|
127
162
|
(0, child_process_1.execSync)(cdkCommand, {
|
|
128
163
|
stdio: "inherit",
|
|
129
164
|
env: {
|
|
@@ -137,12 +172,13 @@ async function deployCommand(options) {
|
|
|
137
172
|
spinner.start("Retrieving stack outputs...");
|
|
138
173
|
let webhookUrl = "";
|
|
139
174
|
try {
|
|
175
|
+
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
140
176
|
const { CloudFormationClient, DescribeStacksCommand } = require("@aws-sdk/client-cloudformation");
|
|
141
177
|
const cloudformation = new CloudFormationClient({
|
|
142
|
-
region: config.cdkRegion
|
|
178
|
+
region: config.cdkRegion,
|
|
143
179
|
});
|
|
144
180
|
const command = new DescribeStacksCommand({
|
|
145
|
-
StackName: "BenchlingWebhookStack"
|
|
181
|
+
StackName: "BenchlingWebhookStack",
|
|
146
182
|
});
|
|
147
183
|
const response = await cloudformation.send(command);
|
|
148
184
|
if (response.Stacks && response.Stacks.length > 0) {
|
|
@@ -152,7 +188,7 @@ async function deployCommand(options) {
|
|
|
152
188
|
}
|
|
153
189
|
spinner.succeed("Stack outputs retrieved");
|
|
154
190
|
}
|
|
155
|
-
catch
|
|
191
|
+
catch {
|
|
156
192
|
spinner.warn("Could not retrieve stack outputs");
|
|
157
193
|
}
|
|
158
194
|
// 10. Test the webhook endpoint
|
|
@@ -171,7 +207,7 @@ async function deployCommand(options) {
|
|
|
171
207
|
spinner.warn(`Webhook returned HTTP ${statusCode}`);
|
|
172
208
|
}
|
|
173
209
|
}
|
|
174
|
-
catch
|
|
210
|
+
catch {
|
|
175
211
|
spinner.warn("Could not test webhook endpoint");
|
|
176
212
|
}
|
|
177
213
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../bin/commands/deploy.ts"],"names":[],"mappings":";;;;;AAmBA,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../bin/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../bin/commands/init.ts"],"names":[],"mappings":"AAQA,UAAU,WAAW;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../bin/commands/init.ts"],"names":[],"mappings":"AAQA,UAAU,WAAW;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAiLrE"}
|
|
@@ -117,10 +117,9 @@ async function initCommand(options) {
|
|
|
117
117
|
envLines.push(`CDK_DEFAULT_REGION=${inferredVars.CDK_DEFAULT_REGION}`);
|
|
118
118
|
envLines.push("");
|
|
119
119
|
}
|
|
120
|
-
if (inferredVars.
|
|
120
|
+
if (inferredVars.QUEUE_ARN) {
|
|
121
121
|
envLines.push("# SQS Configuration (inferred)");
|
|
122
|
-
envLines.push(`
|
|
123
|
-
envLines.push(`SQS_QUEUE_URL=${inferredVars.SQS_QUEUE_URL}`);
|
|
122
|
+
envLines.push(`QUEUE_ARN=${inferredVars.QUEUE_ARN}`);
|
|
124
123
|
envLines.push("");
|
|
125
124
|
}
|
|
126
125
|
if (inferredVars.QUILT_DATABASE) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../bin/commands/init.ts"],"names":[],"mappings":";;;;;AAeA,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../bin/commands/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../bin/commands/manifest.ts"],"names":[],"mappings":"AAGA,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAK5E,wBAAsB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../bin/commands/manifest.ts"],"names":[],"mappings":"AAGA,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAK5E,wBAAsB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDjG"}
|
|
@@ -13,14 +13,20 @@ const pkg = require("../../package.json");
|
|
|
13
13
|
async function manifestCommand(options) {
|
|
14
14
|
const config = (0, config_1.loadConfigSync)(options);
|
|
15
15
|
const outputPath = options.output || "app-manifest.yaml";
|
|
16
|
+
// Generate app name from catalog URL if available
|
|
17
|
+
let appName = "Quilt Integration";
|
|
18
|
+
if (config.quiltCatalog) {
|
|
19
|
+
// Replace dots and colons with hyphens to create a valid identifier
|
|
20
|
+
appName = config.quiltCatalog.replace(/[.:]/g, "-");
|
|
21
|
+
}
|
|
16
22
|
const manifest = `manifestVersion: 1
|
|
17
23
|
info:
|
|
18
|
-
name:
|
|
24
|
+
name: ${appName}
|
|
19
25
|
description: Package Benchling notebook entries as Quilt data packages
|
|
20
26
|
version: ${pkg.version}
|
|
21
27
|
features:
|
|
22
28
|
- name: Quilt Package
|
|
23
|
-
id:
|
|
29
|
+
id: quilt-entry
|
|
24
30
|
type: CANVAS
|
|
25
31
|
subscriptions:
|
|
26
32
|
deliveryMethod: WEBHOOK
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../bin/commands/manifest.ts"],"names":[],"mappings":";;;;;AAQA,
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../bin/commands/manifest.ts"],"names":[],"mappings":";;;;;AAQA,0CAoDC;AA5DD,2BAAmC;AACnC,kDAA0B;AAC1B,kDAA0B;AAC1B,mDAA4E;AAE5E,iEAAiE;AACjE,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEnC,KAAK,UAAU,eAAe,CAAC,OAA4C;IAC9E,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,IAAI,mBAAmB,CAAC;IAEzD,kDAAkD;IAClD,IAAI,OAAO,GAAG,mBAAmB,CAAC;IAClC,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACtB,oEAAoE;QACpE,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,QAAQ,GAAG;;UAEX,OAAO;;aAEJ,GAAG,CAAC,OAAO;;;;;;;;;;;;CAYvB,CAAC;IAEE,IAAI,CAAC;QACD,IAAA,kBAAa,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,aAAa,UAAU,EAAE,CAAC,CAAC,CAAC;QACpD,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CACP,IAAA,eAAK,EACD,GAAG,eAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM;YACxC,yCAAyC;YACzC,MAAM,eAAK,CAAC,IAAI,CAAC,gGAAgG,CAAC,MAAM;YACxH,8DAA8D;YAC9D,4EAA4E;YAC5E,MAAM,eAAK,CAAC,IAAI,CAAC,oFAAoF,CAAC,MAAM;YAC5G,qBAAqB;YACrB,MAAM,eAAK,CAAC,IAAI,CAAC,kCAAkC,CAAC,IAAI;YACxD,MAAM,eAAK,CAAC,GAAG,CAAC,gDAAgD,CAAC,MAAM;YACvE,yEAAyE,EACnE,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,CAC5D,CACJ,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,gCAAiC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACrF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC"}
|
|
@@ -17,7 +17,7 @@ async function testCommand(options) {
|
|
|
17
17
|
const cloudformation = new client_cloudformation_1.CloudFormationClient({});
|
|
18
18
|
// Try to find the stack
|
|
19
19
|
const command = new client_cloudformation_1.DescribeStacksCommand({
|
|
20
|
-
StackName: "BenchlingWebhookStack"
|
|
20
|
+
StackName: "BenchlingWebhookStack",
|
|
21
21
|
});
|
|
22
22
|
const response = await cloudformation.send(command);
|
|
23
23
|
if (response.Stacks && response.Stacks.length > 0) {
|
|
@@ -59,7 +59,7 @@ async function testCommand(options) {
|
|
|
59
59
|
const healthUrl = `${webhookUrl}/health`;
|
|
60
60
|
const result = (0, child_process_1.execSync)(`curl -s -w "\\n%{http_code}" "${healthUrl}"`, {
|
|
61
61
|
encoding: "utf-8",
|
|
62
|
-
timeout: 10000
|
|
62
|
+
timeout: 10000,
|
|
63
63
|
});
|
|
64
64
|
const lines = result.trim().split("\n");
|
|
65
65
|
const statusCode = lines[lines.length - 1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../bin/commands/validate.ts"],"names":[],"mappings":"AAIA,OAAO,EAKH,KAAK,aAAa,EACrB,MAAM,wBAAwB,CAAC;AAMhC,wBAAsB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../bin/commands/validate.ts"],"names":[],"mappings":"AAIA,OAAO,EAKH,KAAK,aAAa,EACrB,MAAM,wBAAwB,CAAC;AAMhC,wBAAsB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+InG"}
|