@quiltdata/benchling-webhook 0.7.10 → 0.8.0-20251118T003132Z
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.d.ts.map +1 -1
- package/dist/bin/benchling-webhook.js +14 -0
- package/dist/bin/benchling-webhook.js.map +1 -1
- package/dist/bin/cli.js +8 -5
- package/dist/bin/cli.js.map +1 -1
- package/dist/bin/commands/config-profiles.d.ts.map +1 -1
- package/dist/bin/commands/config-profiles.js +7 -0
- package/dist/bin/commands/config-profiles.js.map +1 -1
- package/dist/bin/commands/deploy.d.ts.map +1 -1
- package/dist/bin/commands/deploy.js +90 -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 +50 -2
- 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 +10 -2
- package/dist/bin/commands/install.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-profile.d.ts.map +1 -1
- package/dist/bin/commands/setup-profile.js +5 -0
- package/dist/bin/commands/setup-profile.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 +3 -1
- package/dist/bin/commands/setup-wizard.js.map +1 -1
- package/dist/bin/commands/status.d.ts +2 -0
- package/dist/bin/commands/status.d.ts.map +1 -1
- package/dist/bin/commands/status.js +44 -13
- 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 +2 -35
- 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 +57 -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 +261 -6
- package/dist/lib/types/config.d.ts.map +1 -1
- package/dist/lib/types/config.js +20 -2
- 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/wizard/phase2-stack-query.d.ts +4 -2
- package/dist/lib/wizard/phase2-stack-query.d.ts.map +1 -1
- package/dist/lib/wizard/phase2-stack-query.js +93 -10
- package/dist/lib/wizard/phase2-stack-query.js.map +1 -1
- package/dist/lib/wizard/phase4-validation.d.ts.map +1 -1
- package/dist/lib/wizard/phase4-validation.js +3 -4
- package/dist/lib/wizard/phase4-validation.js.map +1 -1
- package/dist/lib/wizard/phase6-integrated-mode.d.ts.map +1 -1
- package/dist/lib/wizard/phase6-integrated-mode.js +26 -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 +31 -10
- package/dist/lib/wizard/phase7-standalone-mode.js.map +1 -1
- package/dist/lib/wizard/types.d.ts +23 -1
- package/dist/lib/wizard/types.d.ts.map +1 -1
- package/dist/lib/xdg-base.d.ts.map +1 -1
- package/dist/lib/xdg-base.js +4 -2
- package/dist/lib/xdg-base.js.map +1 -1
- package/dist/package.json +16 -7
- package/package.json +16 -7
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase4-validation.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase4-validation.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"phase4-validation.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase4-validation.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoO5D;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA4DrF"}
|
|
@@ -47,6 +47,7 @@ exports.runValidation = runValidation;
|
|
|
47
47
|
const https = __importStar(require("https"));
|
|
48
48
|
const chalk_1 = __importDefault(require("chalk"));
|
|
49
49
|
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
50
|
+
const credential_providers_1 = require("@aws-sdk/credential-providers");
|
|
50
51
|
/**
|
|
51
52
|
* Detects the actual region of an S3 bucket
|
|
52
53
|
*/
|
|
@@ -56,8 +57,7 @@ async function detectBucketRegion(bucketName, awsProfile) {
|
|
|
56
57
|
region: "us-east-1", // Use us-east-1 as the API endpoint for GetBucketLocation
|
|
57
58
|
};
|
|
58
59
|
if (awsProfile) {
|
|
59
|
-
|
|
60
|
-
clientConfig.credentials = fromIni({ profile: awsProfile });
|
|
60
|
+
clientConfig.credentials = (0, credential_providers_1.fromIni)({ profile: awsProfile });
|
|
61
61
|
}
|
|
62
62
|
const s3Client = new client_s3_1.S3Client(clientConfig);
|
|
63
63
|
const command = new client_s3_1.GetBucketLocationCommand({ Bucket: bucketName });
|
|
@@ -193,8 +193,7 @@ async function validateS3BucketAccess(bucketName, region, awsProfile) {
|
|
|
193
193
|
try {
|
|
194
194
|
const clientConfig = { region: regionToUse };
|
|
195
195
|
if (awsProfile) {
|
|
196
|
-
|
|
197
|
-
clientConfig.credentials = fromIni({ profile: awsProfile });
|
|
196
|
+
clientConfig.credentials = (0, credential_providers_1.fromIni)({ profile: awsProfile });
|
|
198
197
|
}
|
|
199
198
|
const s3Client = new client_s3_1.S3Client(clientConfig);
|
|
200
199
|
console.log(` Testing S3 bucket access: ${bucketName} (region: ${regionToUse}${awsProfile ? `, profile: ${awsProfile}` : ""})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase4-validation.js","sourceRoot":"","sources":["../../../lib/wizard/phase4-validation.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"phase4-validation.js","sourceRoot":"","sources":["../../../lib/wizard/phase4-validation.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;AAuFpE;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA6HjG"}
|
|
@@ -54,6 +54,11 @@ const sync_secrets_1 = require("../../bin/commands/sync-secrets");
|
|
|
54
54
|
function buildProfileConfig(input) {
|
|
55
55
|
const { stackQuery, parameters, benchlingSecretArn, catalogDns } = input;
|
|
56
56
|
const now = new Date().toISOString();
|
|
57
|
+
// CRITICAL: Validate that resolvedServices is present
|
|
58
|
+
if (!stackQuery.resolvedServices) {
|
|
59
|
+
throw new Error("Setup failed: Quilt services were not resolved during stack query. " +
|
|
60
|
+
"This is a critical error - please report it as a bug.");
|
|
61
|
+
}
|
|
57
62
|
const config = {
|
|
58
63
|
quilt: {
|
|
59
64
|
stackArn: stackQuery.stackArn,
|
|
@@ -78,6 +83,8 @@ function buildProfileConfig(input) {
|
|
|
78
83
|
region: parameters.deployment.region,
|
|
79
84
|
account: parameters.deployment.account,
|
|
80
85
|
},
|
|
86
|
+
// NEW: Store resolved services (cached at setup time, read at deploy time)
|
|
87
|
+
resolvedServices: stackQuery.resolvedServices,
|
|
81
88
|
integratedStack: true, // CRITICAL: Mark as integrated mode
|
|
82
89
|
logging: {
|
|
83
90
|
level: parameters.logging.level,
|
|
@@ -96,6 +103,25 @@ function buildProfileConfig(input) {
|
|
|
96
103
|
if (parameters.benchling.testEntryId) {
|
|
97
104
|
config.benchling.testEntryId = parameters.benchling.testEntryId;
|
|
98
105
|
}
|
|
106
|
+
// Add discovered workgroups and resources if present
|
|
107
|
+
if (stackQuery.athenaUserWorkgroup) {
|
|
108
|
+
config.quilt.athenaUserWorkgroup = stackQuery.athenaUserWorkgroup;
|
|
109
|
+
}
|
|
110
|
+
if (stackQuery.athenaUserPolicy) {
|
|
111
|
+
config.quilt.athenaUserPolicy = stackQuery.athenaUserPolicy;
|
|
112
|
+
}
|
|
113
|
+
if (stackQuery.icebergWorkgroup) {
|
|
114
|
+
config.quilt.icebergWorkgroup = stackQuery.icebergWorkgroup;
|
|
115
|
+
}
|
|
116
|
+
if (stackQuery.icebergDatabase) {
|
|
117
|
+
config.quilt.icebergDatabase = stackQuery.icebergDatabase;
|
|
118
|
+
}
|
|
119
|
+
if (stackQuery.athenaResultsBucket) {
|
|
120
|
+
config.quilt.athenaResultsBucket = stackQuery.athenaResultsBucket;
|
|
121
|
+
}
|
|
122
|
+
if (stackQuery.athenaResultsBucketPolicy) {
|
|
123
|
+
config.quilt.athenaResultsBucketPolicy = stackQuery.athenaResultsBucketPolicy;
|
|
124
|
+
}
|
|
99
125
|
return config;
|
|
100
126
|
}
|
|
101
127
|
/**
|
|
@@ -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;
|
|
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;AAuFpE;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAoGjG"}
|
|
@@ -48,13 +48,17 @@ 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 next_steps_generator_1 = require("../next-steps-generator");
|
|
52
51
|
/**
|
|
53
52
|
* Builds ProfileConfig from collected parameters
|
|
54
53
|
*/
|
|
55
54
|
function buildProfileConfig(input) {
|
|
56
55
|
const { stackQuery, parameters, catalogDns } = input;
|
|
57
56
|
const now = new Date().toISOString();
|
|
57
|
+
// CRITICAL: Validate that resolvedServices is present
|
|
58
|
+
if (!stackQuery.resolvedServices) {
|
|
59
|
+
throw new Error("Setup failed: Quilt services were not resolved during stack query. " +
|
|
60
|
+
"This is a critical error - please report it as a bug.");
|
|
61
|
+
}
|
|
58
62
|
const config = {
|
|
59
63
|
quilt: {
|
|
60
64
|
stackArn: stackQuery.stackArn,
|
|
@@ -79,6 +83,8 @@ function buildProfileConfig(input) {
|
|
|
79
83
|
region: parameters.deployment.region,
|
|
80
84
|
account: parameters.deployment.account,
|
|
81
85
|
},
|
|
86
|
+
// NEW: Store resolved services (cached at setup time, read at deploy time)
|
|
87
|
+
resolvedServices: stackQuery.resolvedServices,
|
|
82
88
|
integratedStack: false, // CRITICAL: Mark as standalone mode
|
|
83
89
|
logging: {
|
|
84
90
|
level: parameters.logging.level,
|
|
@@ -97,6 +103,25 @@ function buildProfileConfig(input) {
|
|
|
97
103
|
if (parameters.benchling.testEntryId) {
|
|
98
104
|
config.benchling.testEntryId = parameters.benchling.testEntryId;
|
|
99
105
|
}
|
|
106
|
+
// Add discovered workgroups and resources if present
|
|
107
|
+
if (stackQuery.athenaUserWorkgroup) {
|
|
108
|
+
config.quilt.athenaUserWorkgroup = stackQuery.athenaUserWorkgroup;
|
|
109
|
+
}
|
|
110
|
+
if (stackQuery.athenaUserPolicy) {
|
|
111
|
+
config.quilt.athenaUserPolicy = stackQuery.athenaUserPolicy;
|
|
112
|
+
}
|
|
113
|
+
if (stackQuery.icebergWorkgroup) {
|
|
114
|
+
config.quilt.icebergWorkgroup = stackQuery.icebergWorkgroup;
|
|
115
|
+
}
|
|
116
|
+
if (stackQuery.icebergDatabase) {
|
|
117
|
+
config.quilt.icebergDatabase = stackQuery.icebergDatabase;
|
|
118
|
+
}
|
|
119
|
+
if (stackQuery.athenaResultsBucket) {
|
|
120
|
+
config.quilt.athenaResultsBucket = stackQuery.athenaResultsBucket;
|
|
121
|
+
}
|
|
122
|
+
if (stackQuery.athenaResultsBucketPolicy) {
|
|
123
|
+
config.quilt.athenaResultsBucketPolicy = stackQuery.athenaResultsBucketPolicy;
|
|
124
|
+
}
|
|
100
125
|
return config;
|
|
101
126
|
}
|
|
102
127
|
/**
|
|
@@ -189,15 +214,10 @@ async function runStandaloneMode(input) {
|
|
|
189
214
|
console.log("╔═══════════════════════════════════════════════════════════╗");
|
|
190
215
|
console.log("║ Setup Complete! ║");
|
|
191
216
|
console.log("╚═══════════════════════════════════════════════════════════╝\n");
|
|
192
|
-
if
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
});
|
|
197
|
-
console.log(nextSteps + "\n");
|
|
198
|
-
}
|
|
199
|
-
else if (setupOnly) {
|
|
200
|
-
console.log(chalk_1.default.bold("Configuration saved. Use deploy command to deploy:\n"));
|
|
217
|
+
// Only show next steps if --setup-only was used
|
|
218
|
+
// If user declined deployment interactively, respect their choice without nagging
|
|
219
|
+
if (setupOnly) {
|
|
220
|
+
console.log(chalk_1.default.bold("Configuration saved. Deploy when ready:\n"));
|
|
201
221
|
console.log(chalk_1.default.cyan(` npm run deploy:${profile === "prod" ? "prod" : "dev"} -- --profile ${profile}\n`));
|
|
202
222
|
}
|
|
203
223
|
return {
|
|
@@ -205,6 +225,7 @@ async function runStandaloneMode(input) {
|
|
|
205
225
|
configPath: `~/.config/benchling-webhook/${profile}/config.json`,
|
|
206
226
|
secretArn,
|
|
207
227
|
deployed,
|
|
228
|
+
deploymentHandled: !setupOnly, // True if we asked about deployment
|
|
208
229
|
};
|
|
209
230
|
}
|
|
210
231
|
//# sourceMappingURL=phase7-standalone-mode.js.map
|
|
@@ -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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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*
|
|
7
7
|
* @module wizard/types
|
|
8
8
|
*/
|
|
9
|
-
import { ProfileConfig } from "../types/config";
|
|
9
|
+
import { ProfileConfig, ResolvedQuiltServices } from "../types/config";
|
|
10
10
|
import { XDGBase } from "../xdg-base";
|
|
11
11
|
/**
|
|
12
12
|
* Phase 1: Catalog Discovery Result
|
|
@@ -41,6 +41,26 @@ export interface StackQueryResult {
|
|
|
41
41
|
benchlingIntegrationEnabled?: boolean;
|
|
42
42
|
/** Whether stack query succeeded */
|
|
43
43
|
stackQuerySucceeded: boolean;
|
|
44
|
+
/** Athena workgroup for user queries (optional) */
|
|
45
|
+
athenaUserWorkgroup?: string;
|
|
46
|
+
/** Athena user policy ARN (optional) */
|
|
47
|
+
athenaUserPolicy?: string;
|
|
48
|
+
/** Athena workgroup for Iceberg queries (optional) */
|
|
49
|
+
icebergWorkgroup?: string;
|
|
50
|
+
/** Iceberg database name - now from both outputs and resources */
|
|
51
|
+
icebergDatabase?: string;
|
|
52
|
+
/** User Athena results bucket (S3 bucket for query results) */
|
|
53
|
+
athenaResultsBucket?: string;
|
|
54
|
+
/** User Athena results bucket policy ARN */
|
|
55
|
+
athenaResultsBucketPolicy?: string;
|
|
56
|
+
/**
|
|
57
|
+
* Resolved Quilt services (cached at setup time)
|
|
58
|
+
*
|
|
59
|
+
* These values are resolved from CloudFormation stack outputs during Phase 2
|
|
60
|
+
* and cached in the profile configuration. At deployment time, these cached
|
|
61
|
+
* values are passed directly to the container without re-querying AWS.
|
|
62
|
+
*/
|
|
63
|
+
resolvedServices?: ResolvedQuiltServices;
|
|
44
64
|
}
|
|
45
65
|
/**
|
|
46
66
|
* Phase 3: Parameter Collection Input
|
|
@@ -174,5 +194,7 @@ export interface StandaloneModeResult {
|
|
|
174
194
|
secretArn: string;
|
|
175
195
|
/** Whether deployment was executed */
|
|
176
196
|
deployed: boolean;
|
|
197
|
+
/** Whether Phase 7 already handled deployment decision (asked user or deployed) */
|
|
198
|
+
deploymentHandled: boolean;
|
|
177
199
|
}
|
|
178
200
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/wizard/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xdg-base.d.ts","sourceRoot":"","sources":["../../lib/xdg-base.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAKH,OAAO,EACH,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAGnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,8BAAsB,OAAQ,YAAW,cAAc;IAKnD;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa;IAEjE;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAEhF;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAE1D;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,eAAe,IAAI,MAAM,EAAE;IAE9C;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAE7D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAEhF;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAMzF;;;;;;;;;;;;OAYG;IACI,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa;
|
|
1
|
+
{"version":3,"file":"xdg-base.d.ts","sourceRoot":"","sources":["../../lib/xdg-base.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAKH,OAAO,EACH,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAGnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,8BAAsB,OAAQ,YAAW,cAAc;IAKnD;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa;IAEjE;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAEhF;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAE1D;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,eAAe,IAAI,MAAM,EAAE;IAE9C;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAE7D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAEhF;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAMzF;;;;;;;;;;;;OAYG;IACI,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa;IAuBlD;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACI,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAcjE;;;;;;;;;;;;;OAaG;IACI,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAgB3C;;;;;;;;;;OAUG;IACI,YAAY,IAAI,MAAM,EAAE;IAI/B;;;;;;;;;;;;OAYG;IACI,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAQ9C;;;;;;;;;;;;;;OAcG;IACI,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB;IA8BzD;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,GAAG,IAAI;IA2B5E;;;;;;;;;;;;;;OAcG;IACI,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAanF;;;;;;;;;;;;;;;;;;;OAmBG;IACI,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,aAAa;IAKvF;;;;;;;;OAQG;IACH,OAAO,CAAC,kCAAkC;IAoC1C;;;;;;;;;;OAUG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;;;;;;;OAaG;IACI,eAAe,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB;IA8B/D;;;;;;;;OAQG;IACH,SAAS,CAAC,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAY/D"}
|
package/dist/lib/xdg-base.js
CHANGED
|
@@ -80,10 +80,12 @@ class XDGBase {
|
|
|
80
80
|
catch (error) {
|
|
81
81
|
throw new Error(`Failed to read profile "${profile}": ${error.message}`);
|
|
82
82
|
}
|
|
83
|
-
// Validate schema
|
|
83
|
+
// Validate schema - WARN instead of ERROR to allow migration from older schemas
|
|
84
84
|
const validation = this.validateProfile(config);
|
|
85
85
|
if (!validation.isValid) {
|
|
86
|
-
|
|
86
|
+
console.warn(`Warning: Configuration for profile "${profile}" has validation issues:`);
|
|
87
|
+
validation.errors.forEach((err) => console.warn(` - ${err}`));
|
|
88
|
+
console.warn("The configuration will still be loaded to allow migration. Please run setup again to fix these issues.\n");
|
|
87
89
|
}
|
|
88
90
|
return config;
|
|
89
91
|
}
|
package/dist/lib/xdg-base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xdg-base.js","sourceRoot":"","sources":["../../lib/xdg-base.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;GAaG;;;;;;AAEH,8CAAsB;AACtB,8DAAqC;AACrC,gEAAiC;AACjC,2CAOwB;AAGxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAsB,OAAO;IAgEzB,uEAAuE;IACvE,4DAA4D;IAC5D,uEAAuE;IAEvE;;;;;;;;;;;;OAYG;IACI,WAAW,CAAC,OAAe;QAC9B,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,MAAqB,CAAC;QAC1B,IAAI,CAAC;YACD,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,MAAO,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACxF,CAAC;QAED,
|
|
1
|
+
{"version":3,"file":"xdg-base.js","sourceRoot":"","sources":["../../lib/xdg-base.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.
|
|
3
|
+
"version": "0.8.0-20251118T003132Z",
|
|
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",
|
|
@@ -21,6 +21,10 @@
|
|
|
21
21
|
"deploy:dev": "ts-node bin/cli.ts deploy --stage dev --profile dev",
|
|
22
22
|
"deploy:prod": "ts-node bin/cli.ts deploy --stage prod",
|
|
23
23
|
"deploy:notes": "bash scripts/release-notes.sh",
|
|
24
|
+
"launch": "ts-node bin/xdg-launch.ts",
|
|
25
|
+
"dev": "npm run launch -- --mode native --profile dev --verbose",
|
|
26
|
+
"dev:docker": "npm run launch -- --mode docker-dev --profile dev --verbose",
|
|
27
|
+
"dev:prod": "npm run launch -- --mode docker --profile dev",
|
|
24
28
|
"logs": "ts-node scripts/check-logs.ts",
|
|
25
29
|
"logs:watch": "ts-node scripts/check-logs.ts --type=ecs --follow",
|
|
26
30
|
"lint": "eslint . --ext .ts --fix && make -C docker lint",
|
|
@@ -35,16 +39,21 @@
|
|
|
35
39
|
"setup:profile": "ts-node bin/cli.ts setup-profile",
|
|
36
40
|
"setup:sync-secrets": "ts-node bin/commands/sync-secrets.ts",
|
|
37
41
|
"test": "npm run lint && npm run build:typecheck && npm run test:ts && npm run test:python",
|
|
38
|
-
"test:ci": "npm run lint && npm run build:typecheck && npm run test:
|
|
42
|
+
"test:ci": "npm run lint && npm run build:typecheck && npm run test:unit",
|
|
43
|
+
"test:unit": "cross-env NODE_ENV=test jest --testPathIgnorePatterns='/test/integration/' --maxWorkers=50%",
|
|
44
|
+
"test:local": "npm run launch -- --mode docker-dev --profile dev --test",
|
|
45
|
+
"test:local:prod": "npm run launch -- --mode docker --profile dev --test",
|
|
46
|
+
"test:native": "npm run launch -- --mode native --profile dev --test",
|
|
39
47
|
"test:dev": "make -C docker test-deployed-dev PROFILE=dev",
|
|
40
|
-
"test:
|
|
41
|
-
"test:prod": "make -C docker test-deployed-prod",
|
|
48
|
+
"test:prod": "make -C docker test-deployed-prod PROFILE=default",
|
|
42
49
|
"test:python": "make -C docker test-unit",
|
|
43
|
-
"test:ts": "cross-env NODE_ENV=test jest --maxWorkers=50%",
|
|
50
|
+
"test:ts": "cross-env NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules' jest --maxWorkers=50%",
|
|
44
51
|
"version": "ts-node scripts/version.ts",
|
|
45
52
|
"version:dev": "ts-node scripts/get-dev-version.ts",
|
|
46
|
-
"version:tag": "npm
|
|
47
|
-
"version:tag:dev": "npm
|
|
53
|
+
"version:tag": "npm test && ts-node scripts/version.ts tag",
|
|
54
|
+
"version:tag:dev": "npm test && ts-node scripts/version.ts tag dev",
|
|
55
|
+
"test:integration": "cross-env NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules' jest --testMatch='**/test/integration/**/*.test.ts' --runInBand",
|
|
56
|
+
"test:integration:verbose": "npm run test:integration -- --verbose"
|
|
48
57
|
},
|
|
49
58
|
"keywords": [
|
|
50
59
|
"benchling",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quiltdata/benchling-webhook",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0-20251118T003132Z",
|
|
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",
|
|
@@ -21,6 +21,10 @@
|
|
|
21
21
|
"deploy:dev": "ts-node bin/cli.ts deploy --stage dev --profile dev",
|
|
22
22
|
"deploy:prod": "ts-node bin/cli.ts deploy --stage prod",
|
|
23
23
|
"deploy:notes": "bash scripts/release-notes.sh",
|
|
24
|
+
"launch": "ts-node bin/xdg-launch.ts",
|
|
25
|
+
"dev": "npm run launch -- --mode native --profile dev --verbose",
|
|
26
|
+
"dev:docker": "npm run launch -- --mode docker-dev --profile dev --verbose",
|
|
27
|
+
"dev:prod": "npm run launch -- --mode docker --profile dev",
|
|
24
28
|
"logs": "ts-node scripts/check-logs.ts",
|
|
25
29
|
"logs:watch": "ts-node scripts/check-logs.ts --type=ecs --follow",
|
|
26
30
|
"lint": "eslint . --ext .ts --fix && make -C docker lint",
|
|
@@ -35,16 +39,21 @@
|
|
|
35
39
|
"setup:profile": "ts-node bin/cli.ts setup-profile",
|
|
36
40
|
"setup:sync-secrets": "ts-node bin/commands/sync-secrets.ts",
|
|
37
41
|
"test": "npm run lint && npm run build:typecheck && npm run test:ts && npm run test:python",
|
|
38
|
-
"test:ci": "npm run lint && npm run build:typecheck && npm run test:
|
|
42
|
+
"test:ci": "npm run lint && npm run build:typecheck && npm run test:unit",
|
|
43
|
+
"test:unit": "cross-env NODE_ENV=test jest --testPathIgnorePatterns='/test/integration/' --maxWorkers=50%",
|
|
44
|
+
"test:local": "npm run launch -- --mode docker-dev --profile dev --test",
|
|
45
|
+
"test:local:prod": "npm run launch -- --mode docker --profile dev --test",
|
|
46
|
+
"test:native": "npm run launch -- --mode native --profile dev --test",
|
|
39
47
|
"test:dev": "make -C docker test-deployed-dev PROFILE=dev",
|
|
40
|
-
"test:
|
|
41
|
-
"test:prod": "make -C docker test-deployed-prod",
|
|
48
|
+
"test:prod": "make -C docker test-deployed-prod PROFILE=default",
|
|
42
49
|
"test:python": "make -C docker test-unit",
|
|
43
|
-
"test:ts": "cross-env NODE_ENV=test jest --maxWorkers=50%",
|
|
50
|
+
"test:ts": "cross-env NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules' jest --maxWorkers=50%",
|
|
44
51
|
"version": "ts-node scripts/version.ts",
|
|
45
52
|
"version:dev": "ts-node scripts/get-dev-version.ts",
|
|
46
|
-
"version:tag": "npm
|
|
47
|
-
"version:tag:dev": "npm
|
|
53
|
+
"version:tag": "npm test && ts-node scripts/version.ts tag",
|
|
54
|
+
"version:tag:dev": "npm test && ts-node scripts/version.ts tag dev",
|
|
55
|
+
"test:integration": "cross-env NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules' jest --testMatch='**/test/integration/**/*.test.ts' --runInBand",
|
|
56
|
+
"test:integration:verbose": "npm run test:integration -- --verbose"
|
|
48
57
|
},
|
|
49
58
|
"keywords": [
|
|
50
59
|
"benchling",
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Configuration loading helpers for application startup
|
|
3
|
-
*
|
|
4
|
-
* Provides simplified configuration loading for both production (from AWS)
|
|
5
|
-
* and testing (from environment variables).
|
|
6
|
-
*/
|
|
7
|
-
import { type ResolvedConfig } from "./config-resolver";
|
|
8
|
-
/**
|
|
9
|
-
* Load configuration for production (from AWS CloudFormation and Secrets Manager)
|
|
10
|
-
*
|
|
11
|
-
* Reads QuiltStackARN and BenchlingSecret from environment variables and
|
|
12
|
-
* resolves complete configuration by querying AWS APIs.
|
|
13
|
-
*
|
|
14
|
-
* @returns Complete resolved configuration
|
|
15
|
-
* @throws Error if required environment variables are missing
|
|
16
|
-
* @throws ConfigResolverError if AWS resolution fails
|
|
17
|
-
*
|
|
18
|
-
* @example
|
|
19
|
-
* // In production/container
|
|
20
|
-
* const config = await loadConfig();
|
|
21
|
-
* console.log(`Database: ${config.quiltDatabase}`);
|
|
22
|
-
*/
|
|
23
|
-
export declare function loadConfig(): Promise<ResolvedConfig>;
|
|
24
|
-
/**
|
|
25
|
-
* Load configuration for testing (from environment variables directly)
|
|
26
|
-
*
|
|
27
|
-
* Only available when NODE_ENV=test. Provides backward compatibility
|
|
28
|
-
* with existing test suite by reading configuration from individual
|
|
29
|
-
* environment variables instead of AWS services.
|
|
30
|
-
*
|
|
31
|
-
* @returns Partial configuration from environment variables
|
|
32
|
-
* @throws Error if called outside test environment
|
|
33
|
-
*
|
|
34
|
-
* @example
|
|
35
|
-
* // In test files
|
|
36
|
-
* process.env.NODE_ENV = 'test';
|
|
37
|
-
* process.env.QUILT_CATALOG = 'test.catalog.com';
|
|
38
|
-
* const config = loadConfigForTesting();
|
|
39
|
-
*/
|
|
40
|
-
export declare function loadConfigForTesting(): Partial<ResolvedConfig>;
|
|
41
|
-
/**
|
|
42
|
-
* Format ConfigResolverError for console output
|
|
43
|
-
*
|
|
44
|
-
* @param error - The error to format
|
|
45
|
-
* @returns Formatted error message
|
|
46
|
-
*/
|
|
47
|
-
export declare function formatConfigError(error: unknown): string;
|
|
48
|
-
//# sourceMappingURL=config-loader.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../../lib/utils/config-loader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAkB,KAAK,cAAc,EAAuB,MAAM,mBAAmB,CAAC;AAE7F;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAyB1D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAAC,cAAc,CAAC,CAiC9D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAUxD"}
|