@quiltdata/benchling-webhook 0.10.0-20251224T233317Z → 0.10.0
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/commands/infer-quilt-config.d.ts +2 -3
- package/dist/bin/commands/infer-quilt-config.d.ts.map +1 -1
- package/dist/bin/commands/infer-quilt-config.js +12 -20
- package/dist/bin/commands/infer-quilt-config.js.map +1 -1
- package/dist/bin/xdg-launch.d.ts.map +1 -1
- package/dist/bin/xdg-launch.js +5 -2
- package/dist/bin/xdg-launch.js.map +1 -1
- package/dist/lib/benchling-webhook-stack.d.ts.map +1 -1
- package/dist/lib/benchling-webhook-stack.js +3 -2
- package/dist/lib/benchling-webhook-stack.js.map +1 -1
- package/dist/lib/fargate-service.d.ts +2 -1
- package/dist/lib/fargate-service.d.ts.map +1 -1
- package/dist/lib/fargate-service.js +11 -13
- package/dist/lib/fargate-service.js.map +1 -1
- package/dist/lib/types/config.d.ts +25 -9
- package/dist/lib/types/config.d.ts.map +1 -1
- package/dist/lib/types/config.js +2 -1
- package/dist/lib/types/config.js.map +1 -1
- package/dist/lib/types/stack-config.d.ts +18 -7
- package/dist/lib/types/stack-config.d.ts.map +1 -1
- package/dist/lib/utils/config-transform.d.ts +3 -2
- package/dist/lib/utils/config-transform.d.ts.map +1 -1
- package/dist/lib/utils/config-transform.js +16 -9
- package/dist/lib/utils/config-transform.js.map +1 -1
- package/dist/lib/utils/stack-inference.d.ts +7 -10
- package/dist/lib/utils/stack-inference.d.ts.map +1 -1
- package/dist/lib/utils/stack-inference.js +9 -21
- package/dist/lib/utils/stack-inference.js.map +1 -1
- package/dist/lib/wizard/phase2-stack-query.d.ts.map +1 -1
- package/dist/lib/wizard/phase2-stack-query.js +11 -13
- package/dist/lib/wizard/phase2-stack-query.js.map +1 -1
- package/dist/lib/wizard/phase6-integrated-mode.js +6 -6
- package/dist/lib/wizard/phase6-integrated-mode.js.map +1 -1
- package/dist/lib/wizard/phase7-standalone-mode.js +6 -6
- package/dist/lib/wizard/phase7-standalone-mode.js.map +1 -1
- package/dist/lib/wizard/types.d.ts +4 -7
- package/dist/lib/wizard/types.d.ts.map +1 -1
- package/dist/package.json +2 -2
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack-config.d.ts","sourceRoot":"","sources":["../../../lib/types/stack-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,WAAW,WAAW;IACxB;;OAEG;IACH,SAAS,EAAE;QACP;;;;;;;WAOG;QACH,SAAS,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF;;OAEG;IACH,KAAK,EAAE;QACH;;;;;;WAMG;QACH,OAAO,EAAE,MAAM,CAAC;QAEhB;;;;;;WAMG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;;;;;WAOG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;;;;WAMG;QACH,MAAM,EAAE,MAAM,CAAC;QAEf;;;;;;;;;;WAUG;QACH,
|
|
1
|
+
{"version":3,"file":"stack-config.d.ts","sourceRoot":"","sources":["../../../lib/types/stack-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,WAAW,WAAW;IACxB;;OAEG;IACH,SAAS,EAAE;QACP;;;;;;;WAOG;QACH,SAAS,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF;;OAEG;IACH,KAAK,EAAE;QACH;;;;;;WAMG;QACH,OAAO,EAAE,MAAM,CAAC;QAEhB;;;;;;WAMG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;;;;;WAOG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;;;;WAMG;QACH,MAAM,EAAE,MAAM,CAAC;QAEf;;;;;;;;;WASG;QACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAE9B;;;;;;;;;;WAUG;QACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAChC,CAAC;IAEF;;OAEG;IACH,UAAU,EAAE;QACR;;;;WAIG;QACH,MAAM,EAAE,MAAM,CAAC;QAEf;;;;;;WAMG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;QAElB;;;;WAIG;QACH,GAAG,CAAC,EAAE,SAAS,CAAC;QAEhB;;;;;;;;;WASG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IAEF;;OAEG;IACH,QAAQ,CAAC,EAAE;QACP;;;;;;;;WAQG;QACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;CACL"}
|
|
@@ -23,7 +23,7 @@ import type { StackConfig } from "../types/stack-config";
|
|
|
23
23
|
*
|
|
24
24
|
* **Transformation logic:**
|
|
25
25
|
* - Benchling: Only secretArn (credentials stored in secret)
|
|
26
|
-
* - Quilt: Service endpoints (catalog, database, queueUrl, region,
|
|
26
|
+
* - Quilt: Service endpoints (catalog, database, queueUrl, region, bucketWritePolicyArn, athenaUserPolicyArn)
|
|
27
27
|
* - Deployment: Infrastructure settings (region, imageTag, vpc, stackName)
|
|
28
28
|
* - Security: Optional IP allowlist
|
|
29
29
|
*
|
|
@@ -62,7 +62,8 @@ export declare function profileToStackConfig(profile: ProfileConfig, options?: {
|
|
|
62
62
|
* - deployment.region (deployment region)
|
|
63
63
|
*
|
|
64
64
|
* **Optional fields:**
|
|
65
|
-
* - quilt.
|
|
65
|
+
* - quilt.bucketWritePolicyArn (IAM managed policy for S3 access)
|
|
66
|
+
* - quilt.athenaUserPolicyArn (IAM managed policy for Athena access)
|
|
66
67
|
* - deployment.imageTag (defaults to "latest")
|
|
67
68
|
* - deployment.vpc (defaults to creating new VPC)
|
|
68
69
|
* - deployment.stackName (auto-generated from profile name)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-transform.d.ts","sourceRoot":"","sources":["../../../lib/utils/config-transform.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,oBAAoB,CAChC,OAAO,EAAE,aAAa,EACtB,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACvC,WAAW,
|
|
1
|
+
{"version":3,"file":"config-transform.d.ts","sourceRoot":"","sources":["../../../lib/utils/config-transform.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,oBAAoB,CAChC,OAAO,EAAE,aAAa,EACtB,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACvC,WAAW,CA2Db;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,gBAAgB,CA4F3E"}
|
|
@@ -25,7 +25,7 @@ exports.validateStackConfig = validateStackConfig;
|
|
|
25
25
|
*
|
|
26
26
|
* **Transformation logic:**
|
|
27
27
|
* - Benchling: Only secretArn (credentials stored in secret)
|
|
28
|
-
* - Quilt: Service endpoints (catalog, database, queueUrl, region,
|
|
28
|
+
* - Quilt: Service endpoints (catalog, database, queueUrl, region, bucketWritePolicyArn, athenaUserPolicyArn)
|
|
29
29
|
* - Deployment: Infrastructure settings (region, imageTag, vpc, stackName)
|
|
30
30
|
* - Security: Optional IP allowlist
|
|
31
31
|
*
|
|
@@ -71,9 +71,12 @@ function profileToStackConfig(profile, options) {
|
|
|
71
71
|
},
|
|
72
72
|
};
|
|
73
73
|
// Add optional fields if present
|
|
74
|
-
// Quilt
|
|
75
|
-
if (profile.quilt.
|
|
76
|
-
stackConfig.quilt.
|
|
74
|
+
// Quilt managed policy ARNs (for S3 and Athena access)
|
|
75
|
+
if (profile.quilt.bucketWritePolicyArn) {
|
|
76
|
+
stackConfig.quilt.bucketWritePolicyArn = profile.quilt.bucketWritePolicyArn;
|
|
77
|
+
}
|
|
78
|
+
if (profile.quilt.athenaUserPolicyArn) {
|
|
79
|
+
stackConfig.quilt.athenaUserPolicyArn = profile.quilt.athenaUserPolicyArn;
|
|
77
80
|
}
|
|
78
81
|
// Deployment image tag
|
|
79
82
|
if (profile.deployment.imageTag) {
|
|
@@ -110,7 +113,8 @@ function profileToStackConfig(profile, options) {
|
|
|
110
113
|
* - deployment.region (deployment region)
|
|
111
114
|
*
|
|
112
115
|
* **Optional fields:**
|
|
113
|
-
* - quilt.
|
|
116
|
+
* - quilt.bucketWritePolicyArn (IAM managed policy for S3 access)
|
|
117
|
+
* - quilt.athenaUserPolicyArn (IAM managed policy for Athena access)
|
|
114
118
|
* - deployment.imageTag (defaults to "latest")
|
|
115
119
|
* - deployment.vpc (defaults to creating new VPC)
|
|
116
120
|
* - deployment.stackName (auto-generated from profile name)
|
|
@@ -172,11 +176,14 @@ function validateStackConfig(config) {
|
|
|
172
176
|
errors.push("Missing 'quilt.region' - run 'npm run setup' to configure");
|
|
173
177
|
}
|
|
174
178
|
// Optional but recommended fields
|
|
175
|
-
if (!config.quilt.
|
|
176
|
-
warnings.push("Missing 'quilt.
|
|
179
|
+
if (!config.quilt.bucketWritePolicyArn) {
|
|
180
|
+
warnings.push("Missing 'quilt.bucketWritePolicyArn' - S3 write operations may fail");
|
|
181
|
+
}
|
|
182
|
+
else if (!config.quilt.bucketWritePolicyArn.startsWith("arn:aws:iam::")) {
|
|
183
|
+
errors.push(`Invalid 'quilt.bucketWritePolicyArn' format: ${config.quilt.bucketWritePolicyArn}`);
|
|
177
184
|
}
|
|
178
|
-
|
|
179
|
-
errors.push(`Invalid 'quilt.
|
|
185
|
+
if (config.quilt.athenaUserPolicyArn && !config.quilt.athenaUserPolicyArn.startsWith("arn:aws:iam::")) {
|
|
186
|
+
errors.push(`Invalid 'quilt.athenaUserPolicyArn' format: ${config.quilt.athenaUserPolicyArn}`);
|
|
180
187
|
}
|
|
181
188
|
}
|
|
182
189
|
// Validate required deployment fields
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-transform.js","sourceRoot":"","sources":["../../../lib/utils/config-transform.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;AAkCH,
|
|
1
|
+
{"version":3,"file":"config-transform.js","sourceRoot":"","sources":["../../../lib/utils/config-transform.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,20 +49,18 @@ export interface StackResourceMap {
|
|
|
49
49
|
*
|
|
50
50
|
* Target resources:
|
|
51
51
|
* - UserAthenaNonManagedRoleWorkgroup (AWS::Athena::WorkGroup)
|
|
52
|
-
* - UserAthenaNonManagedRolePolicy (AWS::IAM::
|
|
52
|
+
* - UserAthenaNonManagedRolePolicy (AWS::IAM::ManagedPolicy)
|
|
53
53
|
* - UserAthenaResultsBucket (AWS::S3::Bucket)
|
|
54
54
|
* - UserAthenaResultsBucketPolicy (AWS::S3::BucketPolicy)
|
|
55
|
-
* -
|
|
56
|
-
* - T4BucketWriteRole (AWS::IAM::Role)
|
|
55
|
+
* - BucketWritePolicy (AWS::IAM::ManagedPolicy)
|
|
57
56
|
* - BenchlingSecret (AWS::SecretsManager::Secret)
|
|
58
57
|
*/
|
|
59
58
|
export interface DiscoveredQuiltResources {
|
|
60
59
|
athenaUserWorkgroup?: string;
|
|
61
|
-
|
|
60
|
+
athenaUserPolicyArn?: string;
|
|
62
61
|
athenaResultsBucket?: string;
|
|
63
62
|
athenaResultsBucketPolicy?: string;
|
|
64
|
-
|
|
65
|
-
writeRoleArn?: string;
|
|
63
|
+
bucketWritePolicyArn?: string;
|
|
66
64
|
benchlingSecretArn?: string;
|
|
67
65
|
}
|
|
68
66
|
/**
|
|
@@ -93,15 +91,14 @@ export declare function validateRoleArn(arn: string): boolean;
|
|
|
93
91
|
*/
|
|
94
92
|
export declare function toRoleArn(roleNameOrArn: string, account: string): string;
|
|
95
93
|
/**
|
|
96
|
-
* Extract Athena workgroups, IAM policies, S3 buckets,
|
|
94
|
+
* Extract Athena workgroups, IAM policies, S3 buckets, and Secrets Manager secrets from stack resources
|
|
97
95
|
*
|
|
98
96
|
* Target resources:
|
|
99
97
|
* - UserAthenaNonManagedRoleWorkgroup (AWS::Athena::WorkGroup)
|
|
100
|
-
* - UserAthenaNonManagedRolePolicy (AWS::IAM::
|
|
98
|
+
* - UserAthenaNonManagedRolePolicy (AWS::IAM::ManagedPolicy)
|
|
101
99
|
* - UserAthenaResultsBucket (AWS::S3::Bucket)
|
|
102
100
|
* - UserAthenaResultsBucketPolicy (AWS::S3::BucketPolicy)
|
|
103
|
-
* -
|
|
104
|
-
* - T4BucketWriteRole (AWS::IAM::Role)
|
|
101
|
+
* - BucketWritePolicy (AWS::IAM::ManagedPolicy)
|
|
105
102
|
* - BenchlingSecret (AWS::SecretsManager::Secret)
|
|
106
103
|
*
|
|
107
104
|
* @param resources Stack resource map from getStackResources
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack-inference.d.ts","sourceRoot":"","sources":["../../../lib/utils/stack-inference.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAIrF,MAAM,WAAW,kBAAkB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAGD,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,YAAY;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC7B,CAAC,SAAS,EAAE,MAAM,GAAG;QACjB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;KAC1B,CAAC;CACL;AAED
|
|
1
|
+
{"version":3,"file":"stack-inference.d.ts","sourceRoot":"","sources":["../../../lib/utils/stack-inference.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAIrF,MAAM,WAAW,kBAAkB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAGD,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,YAAY;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC7B,CAAC,SAAS,EAAE,MAAM,GAAG;QACjB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;KAC1B,CAAC;CACL;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,wBAAwB;IACrC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CACnC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,YAAY,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CA+B3B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGpD;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAOxE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CACjC,SAAS,EAAE,gBAAgB,EAC3B,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,GAChB,wBAAwB,CA0C1B;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAoC7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAWrF;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY,CAsB/E;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,GAAG,IAAI,CAS/C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGnE;AAGD;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC3B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,oBAAoB,GAAE,YAAY,GAAG,OAAc,EACnD,OAAO,UAAO,GACf,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyBxB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAiB5D;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAUvE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,UAAQ,GAAG,UAAU,EAAE,CA0BhF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,aAAa,EAAE,MAAM,GACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgDxB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACpC,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,UAAU,CAAC,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAClC,UAAU,EAAE,MAAM,EAClB,gBAAgB,GAAE,uBAAuB,GAAG,OAAc,GAC3D,OAAO,CAAC,iBAAiB,CAAC,CAkJ5B"}
|
|
@@ -123,15 +123,14 @@ function toRoleArn(roleNameOrArn, account) {
|
|
|
123
123
|
return `arn:aws:iam::${account}:role/${roleNameOrArn}`;
|
|
124
124
|
}
|
|
125
125
|
/**
|
|
126
|
-
* Extract Athena workgroups, IAM policies, S3 buckets,
|
|
126
|
+
* Extract Athena workgroups, IAM policies, S3 buckets, and Secrets Manager secrets from stack resources
|
|
127
127
|
*
|
|
128
128
|
* Target resources:
|
|
129
129
|
* - UserAthenaNonManagedRoleWorkgroup (AWS::Athena::WorkGroup)
|
|
130
|
-
* - UserAthenaNonManagedRolePolicy (AWS::IAM::
|
|
130
|
+
* - UserAthenaNonManagedRolePolicy (AWS::IAM::ManagedPolicy)
|
|
131
131
|
* - UserAthenaResultsBucket (AWS::S3::Bucket)
|
|
132
132
|
* - UserAthenaResultsBucketPolicy (AWS::S3::BucketPolicy)
|
|
133
|
-
* -
|
|
134
|
-
* - T4BucketWriteRole (AWS::IAM::Role)
|
|
133
|
+
* - BucketWritePolicy (AWS::IAM::ManagedPolicy)
|
|
135
134
|
* - BenchlingSecret (AWS::SecretsManager::Secret)
|
|
136
135
|
*
|
|
137
136
|
* @param resources Stack resource map from getStackResources
|
|
@@ -143,11 +142,10 @@ function extractQuiltResources(resources, account, region) {
|
|
|
143
142
|
// Map logical resource IDs to discovered resource properties
|
|
144
143
|
const resourceMapping = {
|
|
145
144
|
UserAthenaNonManagedRoleWorkgroup: "athenaUserWorkgroup",
|
|
146
|
-
UserAthenaNonManagedRolePolicy: "
|
|
145
|
+
UserAthenaNonManagedRolePolicy: "athenaUserPolicyArn",
|
|
147
146
|
UserAthenaResultsBucket: "athenaResultsBucket",
|
|
148
147
|
UserAthenaResultsBucketPolicy: "athenaResultsBucketPolicy",
|
|
149
|
-
|
|
150
|
-
T4BucketWriteRole: "writeRoleArn",
|
|
148
|
+
BucketWritePolicy: "bucketWritePolicyArn",
|
|
151
149
|
BenchlingSecret: "benchlingSecretArn",
|
|
152
150
|
};
|
|
153
151
|
const discovered = {};
|
|
@@ -155,20 +153,10 @@ function extractQuiltResources(resources, account, region) {
|
|
|
155
153
|
for (const [logicalId, propertyName] of Object.entries(resourceMapping)) {
|
|
156
154
|
if (resources[logicalId]) {
|
|
157
155
|
const physicalId = resources[logicalId].physicalResourceId;
|
|
158
|
-
// For IAM
|
|
159
|
-
if (propertyName === "
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
discovered[propertyName] = physicalId;
|
|
163
|
-
}
|
|
164
|
-
else if (account) {
|
|
165
|
-
// Convert role name to ARN using account ID
|
|
166
|
-
discovered[propertyName] = toRoleArn(physicalId, account);
|
|
167
|
-
}
|
|
168
|
-
else {
|
|
169
|
-
// Log warning if we can't convert - need account ID
|
|
170
|
-
console.warn(`Warning: Cannot convert role name to ARN for ${logicalId}: ${physicalId} (missing account ID)`);
|
|
171
|
-
}
|
|
156
|
+
// For IAM managed policies, the physical ID is already the ARN
|
|
157
|
+
if (propertyName === "athenaUserPolicyArn" || propertyName === "bucketWritePolicyArn") {
|
|
158
|
+
// Policy ARNs are returned directly as physical resource IDs
|
|
159
|
+
discovered[propertyName] = physicalId;
|
|
172
160
|
}
|
|
173
161
|
else if (propertyName === "benchlingSecretArn") {
|
|
174
162
|
// For Secrets Manager secrets, convert secret name to ARN if needed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack-inference.js","sourceRoot":"","sources":["../../../lib/utils/stack-inference.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stack-inference.js","sourceRoot":"","sources":["../../../lib/utils/stack-inference.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase2-stack-query.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase2-stack-query.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,gBAAgB,EAAqB,MAAM,SAAS,CAAC;AAG9D;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,iBAAsB,GAChC,OAAO,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"phase2-stack-query.d.ts","sourceRoot":"","sources":["../../../lib/wizard/phase2-stack-query.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,gBAAgB,EAAqB,MAAM,SAAS,CAAC;AAG9D;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAC/B,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,iBAAsB,GAChC,OAAO,CAAC,gBAAgB,CAAC,CAgM3B"}
|
|
@@ -58,17 +58,16 @@ async function runStackQuery(catalogDns, options = {}) {
|
|
|
58
58
|
const benchlingSecretArn = inferenceResult.benchlingSecretArn;
|
|
59
59
|
const benchlingIntegrationEnabled = inferenceResult.benchlingIntegrationEnabled;
|
|
60
60
|
const athenaUserWorkgroup = inferenceResult.athenaUserWorkgroup;
|
|
61
|
-
const athenaUserPolicy = inferenceResult.athenaUserPolicy;
|
|
62
61
|
const athenaResultsBucket = inferenceResult.athenaResultsBucket;
|
|
63
62
|
const athenaResultsBucketPolicy = inferenceResult.athenaResultsBucketPolicy;
|
|
64
|
-
const
|
|
65
|
-
const
|
|
66
|
-
// Show IAM
|
|
67
|
-
if (
|
|
68
|
-
console.log(chalk_1.default.dim(`✓
|
|
63
|
+
const bucketWritePolicyArn = inferenceResult.bucketWritePolicyArn;
|
|
64
|
+
const athenaUserPolicyArn = inferenceResult.athenaUserPolicyArn;
|
|
65
|
+
// Show IAM managed policies (these are logged by inferQuiltConfig)
|
|
66
|
+
if (bucketWritePolicyArn) {
|
|
67
|
+
console.log(chalk_1.default.dim(`✓ BucketWritePolicy discovered: ${bucketWritePolicyArn}`));
|
|
69
68
|
}
|
|
70
|
-
if (
|
|
71
|
-
console.log(chalk_1.default.dim(`✓
|
|
69
|
+
if (athenaUserPolicyArn) {
|
|
70
|
+
console.log(chalk_1.default.dim(`✓ UserAthenaNonManagedRolePolicy discovered: ${athenaUserPolicyArn}`));
|
|
72
71
|
}
|
|
73
72
|
// Log what we found
|
|
74
73
|
console.log(chalk_1.default.green("✓ Stack query succeeded\n"));
|
|
@@ -78,8 +77,8 @@ async function runStackQuery(catalogDns, options = {}) {
|
|
|
78
77
|
console.log(chalk_1.default.dim(`✓ Queue URL: ${queueUrl}`));
|
|
79
78
|
console.log(chalk_1.default.dim(`✓ Database: ${database}`));
|
|
80
79
|
console.log(chalk_1.default.dim(`✓ Workgroup: ${athenaUserWorkgroup}`));
|
|
81
|
-
console.log(
|
|
82
|
-
? chalk_1.default.dim(`✓ Athena User Policy: ${
|
|
80
|
+
console.log(athenaUserPolicyArn
|
|
81
|
+
? chalk_1.default.dim(`✓ Athena User Policy: ${athenaUserPolicyArn}`)
|
|
83
82
|
: chalk_1.default.yellow("⚠ Athena User Policy: NOT FOUND"));
|
|
84
83
|
console.log(athenaResultsBucket
|
|
85
84
|
? chalk_1.default.dim(`✓ Athena Results Bucket: ${athenaResultsBucket}`)
|
|
@@ -176,11 +175,10 @@ async function runStackQuery(catalogDns, options = {}) {
|
|
|
176
175
|
benchlingSecretArn,
|
|
177
176
|
benchlingIntegrationEnabled,
|
|
178
177
|
athenaUserWorkgroup,
|
|
179
|
-
athenaUserPolicy,
|
|
180
178
|
athenaResultsBucket,
|
|
181
179
|
athenaResultsBucketPolicy,
|
|
182
|
-
|
|
183
|
-
|
|
180
|
+
bucketWritePolicyArn,
|
|
181
|
+
athenaUserPolicyArn,
|
|
184
182
|
discoveredVpc: discoveredVpcInfo,
|
|
185
183
|
stackQuerySucceeded: true,
|
|
186
184
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase2-stack-query.js","sourceRoot":"","sources":["../../../lib/wizard/phase2-stack-query.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;AAgCH,
|
|
1
|
+
{"version":3,"file":"phase2-stack-query.js","sourceRoot":"","sources":["../../../lib/wizard/phase2-stack-query.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;AAgCH,sCAmMC;AAjOD,kDAA0B;AAC1B,8EAAyE;AAEzE,6DAAoF;AAcpF;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,aAAa,CAC/B,UAAkB,EAClB,UAA6B,EAAE;IAE/B,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE1C,OAAO,CAAC,GAAG,CAAC,uCAAuC,UAAU,KAAK,CAAC,CAAC;IAEpE,IAAI,CAAC;QACD,gFAAgF;QAChF,MAAM,eAAe,GAAG,MAAM,IAAA,qCAAgB,EAAC;YAC3C,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,UAAU;YACnB,WAAW,EAAE,KAAK,EAAE,6CAA6C;YACjE,GAAG,EAAE,IAAI,EAAE,sDAAsD;YACjE,UAAU,EAAE,UAAU,EAAE,6BAA6B;SACxD,CAAC,CAAC;QAEH,4DAA4D;QAC5D,MAAM,kBAAkB,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnG,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEtF,IAAI,kBAAkB,KAAK,mBAAmB,EAAE,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CACpB,8BAA8B,kBAAkB,uCAAuC,mBAAmB,GAAG,CAChH,CAAC,CAAC;QACP,CAAC;QAED,qCAAqC;QACrC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,8CAA8C,UAAU,EAAE,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;QAC1C,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,IAAI,eAAe,CAAC;QAC7D,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,IAAI,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,IAAI,SAAS,IAAI,WAAW,CAAC;QAClE,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,IAAI,EAAE,CAAC;QAC9C,MAAM,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,CAAC;QAC9D,MAAM,2BAA2B,GAAG,eAAe,CAAC,2BAA2B,CAAC;QAChF,MAAM,mBAAmB,GAAG,eAAe,CAAC,mBAAmB,CAAC;QAChE,MAAM,mBAAmB,GAAG,eAAe,CAAC,mBAAmB,CAAC;QAChE,MAAM,yBAAyB,GAAG,eAAe,CAAC,yBAAyB,CAAC;QAC5E,MAAM,oBAAoB,GAAG,eAAe,CAAC,oBAAoB,CAAC;QAClE,MAAM,mBAAmB,GAAG,eAAe,CAAC,mBAAmB,CAAC;QAEhE,mEAAmE;QACnE,IAAI,oBAAoB,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,mCAAmC,oBAAoB,EAAE,CAAC,CAAC,CAAC;QACtF,CAAC;QACD,IAAI,mBAAmB,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,gDAAgD,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAClG,CAAC;QAED,oBAAoB;QACpB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,gBAAgB,QAAQ,EAAE,CAAC,CAAC,CAAC;QACnD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,cAAc,OAAO,EAAE,CAAC,CAAC,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,aAAa,MAAM,EAAE,CAAC,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,gBAAgB,QAAQ,EAAE,CAAC,CAAC,CAAC;QACnD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,eAAe,QAAQ,EAAE,CAAC,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,gBAAgB,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAC9D,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC3B,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,yBAAyB,mBAAmB,EAAE,CAAC;YAC3D,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC3B,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,4BAA4B,mBAAmB,EAAE,CAAC;YAC9D,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,oCAAoC,CAAC,CAAC,CAAC;QAC1D,OAAO,CAAC,GAAG,CAAC,yBAAyB;YACjC,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,mCAAmC,yBAAyB,EAAE,CAAC;YAC3E,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,2CAA2C,CAAC,CAAC,CAAC;QAEjE,6EAA6E;QAE7E,IAAI,kBAAkB,EAAE,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,sBAAsB,kBAAkB,EAAE,CAAC,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,2BAA2B,KAAK,SAAS,EAAE,CAAC;YAC5C,OAAO,CAAC,GAAG,CACP,2BAA2B;gBACvB,CAAC,CAAC,eAAK,CAAC,KAAK,CAAC,kCAAkC,CAAC;gBACjD,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,mCAAmC,CAAC,CAC1D,CAAC;QACN,CAAC;QAED,0BAA0B;QAC1B,IAAI,iBAAgD,CAAC;QACrD,IAAI,CAAC;YACD,MAAM,aAAa,GAAG,MAAM,IAAA,mCAAoB,EAAC;gBAC7C,QAAQ;gBACR,MAAM;aACT,CAAC,CAAC;YAEH,IAAI,aAAa,EAAE,CAAC;gBAChB,kEAAkE;gBAClE,wEAAwE;gBACxE,qEAAqE;gBACrE,MAAM,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC;gBAC3F,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACtE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBAEnE,uEAAuE;gBACvE,4DAA4D;gBAC5D,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAA4B,CAAC;gBAC/D,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA4B,CAAC;gBAE9D,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;oBAClC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;wBACnD,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;oBAC5D,CAAC;gBACL,CAAC;gBAED,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;oBACjC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;wBAClD,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;oBAC3D,CAAC;gBACL,CAAC;gBAED,0CAA0C;gBAC1C,MAAM,0BAA0B,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC3E,MAAM,yBAAyB,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;gBACzE,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC;gBAE9D,iBAAiB,GAAG;oBAChB,KAAK,EAAE,aAAa,CAAC,KAAK;oBAC1B,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,kBAAkB,EAAE,cAAc,CAAC,MAAM;oBACzC,qBAAqB,EAAE,GAAG,CAAC,IAAI;oBAC/B,OAAO,EAAE,aAAa,CAAC,OAAO;oBAC9B,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;oBAChD,sEAAsE;oBACtE,gBAAgB,EAAE,0BAA0B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;oBACjE,eAAe,EAAE,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;oBAC/D,iBAAiB,EAAE,eAAe;iBACrC,CAAC;gBAEF,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;oBACxB,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI;wBACjC,CAAC,CAAC,GAAG,aAAa,CAAC,IAAI,KAAK,aAAa,CAAC,KAAK,GAAG;wBAClD,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,UAAU,UAAU,MAAM,cAAc,CAAC,MAAM,uBAAuB,GAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC;gBACjH,CAAC;qBAAM,CAAC;oBACJ,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,UAAU,aAAa,CAAC,KAAK,+BAA+B,CAAC,CAAC,CAAC;oBACxF,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;wBAC3C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;oBACzC,CAAC,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC;YACxD,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,4BAA4B,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEhB,OAAO;YACH,QAAQ;YACR,OAAO,EAAE,mBAAmB;YAC5B,QAAQ;YACR,QAAQ;YACR,MAAM;YACN,OAAO;YACP,kBAAkB;YAClB,2BAA2B;YAC3B,mBAAmB;YACnB,mBAAmB;YACnB,yBAAyB;YACzB,oBAAoB;YACpB,mBAAmB;YACnB,aAAa,EAAE,iBAAiB;YAChC,mBAAmB,EAAE,IAAI;SAC5B,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,YAAY,GAAI,KAAe,CAAC,OAAO,CAAC;QAC9C,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,uBAAuB,YAAY,IAAI,CAAC,CAAC,CAAC;QAElE,+CAA+C;QAC/C,OAAO;YACH,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,UAAU;YACnB,QAAQ,EAAE,eAAe;YACzB,QAAQ,EAAE,EAAE;YACZ,MAAM,EAAE,SAAS,IAAI,WAAW;YAChC,OAAO,EAAE,EAAE;YACX,kBAAkB,EAAE,SAAS;YAC7B,2BAA2B,EAAE,SAAS;YACtC,mBAAmB,EAAE,KAAK;SAC7B,CAAC;IACN,CAAC;AACL,CAAC"}
|
|
@@ -100,18 +100,18 @@ function buildProfileConfig(input) {
|
|
|
100
100
|
if (stackQuery.athenaUserWorkgroup) {
|
|
101
101
|
config.quilt.athenaUserWorkgroup = stackQuery.athenaUserWorkgroup;
|
|
102
102
|
}
|
|
103
|
-
if (stackQuery.athenaUserPolicy) {
|
|
104
|
-
config.quilt.athenaUserPolicy = stackQuery.athenaUserPolicy;
|
|
105
|
-
}
|
|
106
103
|
if (stackQuery.athenaResultsBucket) {
|
|
107
104
|
config.quilt.athenaResultsBucket = stackQuery.athenaResultsBucket;
|
|
108
105
|
}
|
|
109
106
|
if (stackQuery.athenaResultsBucketPolicy) {
|
|
110
107
|
config.quilt.athenaResultsBucketPolicy = stackQuery.athenaResultsBucketPolicy;
|
|
111
108
|
}
|
|
112
|
-
// Add IAM
|
|
113
|
-
if (stackQuery.
|
|
114
|
-
config.quilt.
|
|
109
|
+
// Add IAM managed policy ARNs if discovered
|
|
110
|
+
if (stackQuery.bucketWritePolicyArn) {
|
|
111
|
+
config.quilt.bucketWritePolicyArn = stackQuery.bucketWritePolicyArn;
|
|
112
|
+
}
|
|
113
|
+
if (stackQuery.athenaUserPolicyArn) {
|
|
114
|
+
config.quilt.athenaUserPolicyArn = stackQuery.athenaUserPolicyArn;
|
|
115
115
|
}
|
|
116
116
|
return config;
|
|
117
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase6-integrated-mode.js","sourceRoot":"","sources":["../../../lib/wizard/phase6-integrated-mode.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6FH,8CAuOC;AAlUD,kDAA0B;AAC1B,wDAAgC;AAChC,4CAA4D;AAC5D,kEAAmE;AAEnE,sEAA6C;AAE7C;;GAEG;AACH,SAAS,kBAAkB,CAAC,KAA0B;IAClD,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,kBAAkB,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAEzE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAErC,MAAM,MAAM,GAAkB;QAC1B,KAAK,EAAE;YACH,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,OAAO,EAAE,UAAU;YACnB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,MAAM,EAAE,UAAU,CAAC,MAAM;SAC5B;QACD,SAAS,EAAE;YACP,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,MAAM;YACnC,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,QAAQ;YACvC,YAAY,EAAE,UAAU,CAAC,SAAS,CAAC,YAAY;YAC/C,eAAe,EAAE,UAAU,CAAC,SAAS,CAAC,eAAe;YACrD,SAAS,EAAE,kBAAkB;SAChC;QACD,QAAQ,EAAE;YACN,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM;YAClC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM;YAClC,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW;SAC/C;QACD,UAAU,EAAE;YACR,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,MAAM;YACpC,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO;YACtC,GAAG,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG;SACjC;QACD,eAAe,EAAE,IAAI,EAAE,oCAAoC;QAC3D,OAAO,EAAE;YACL,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK;SAClC;QACD,QAAQ,EAAE;YACN,kBAAkB,EAAE,UAAU,CAAC,QAAQ,CAAC,kBAAkB;YAC1D,gBAAgB,EAAE,UAAU,CAAC,QAAQ,CAAC,gBAAgB;SACzD;QACD,SAAS,EAAE;YACP,OAAO,EAAE,sBAAW,CAAC,OAAO;YAC5B,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,GAAG;YACd,MAAM,EAAE,QAAQ;SACnB;KACJ,CAAC;IAEF,qDAAqD;IACrD,IAAI,UAAU,CAAC,mBAAmB,EAAE,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,mBAAmB,GAAG,UAAU,CAAC,mBAAmB,CAAC;IACtE,CAAC;IACD,IAAI,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"phase6-integrated-mode.js","sourceRoot":"","sources":["../../../lib/wizard/phase6-integrated-mode.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,18 +99,18 @@ function buildProfileConfig(input) {
|
|
|
99
99
|
if (stackQuery.athenaUserWorkgroup) {
|
|
100
100
|
config.quilt.athenaUserWorkgroup = stackQuery.athenaUserWorkgroup;
|
|
101
101
|
}
|
|
102
|
-
if (stackQuery.athenaUserPolicy) {
|
|
103
|
-
config.quilt.athenaUserPolicy = stackQuery.athenaUserPolicy;
|
|
104
|
-
}
|
|
105
102
|
if (stackQuery.athenaResultsBucket) {
|
|
106
103
|
config.quilt.athenaResultsBucket = stackQuery.athenaResultsBucket;
|
|
107
104
|
}
|
|
108
105
|
if (stackQuery.athenaResultsBucketPolicy) {
|
|
109
106
|
config.quilt.athenaResultsBucketPolicy = stackQuery.athenaResultsBucketPolicy;
|
|
110
107
|
}
|
|
111
|
-
// Add IAM
|
|
112
|
-
if (stackQuery.
|
|
113
|
-
config.quilt.
|
|
108
|
+
// Add IAM managed policy ARNs if discovered
|
|
109
|
+
if (stackQuery.bucketWritePolicyArn) {
|
|
110
|
+
config.quilt.bucketWritePolicyArn = stackQuery.bucketWritePolicyArn;
|
|
111
|
+
}
|
|
112
|
+
if (stackQuery.athenaUserPolicyArn) {
|
|
113
|
+
config.quilt.athenaUserPolicyArn = stackQuery.athenaUserPolicyArn;
|
|
114
114
|
}
|
|
115
115
|
return config;
|
|
116
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phase7-standalone-mode.js","sourceRoot":"","sources":["../../../lib/wizard/phase7-standalone-mode.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6FH,8CAqGC;AAhMD,wDAAgC;AAChC,kDAA0B;AAE1B,kEAAmE;AAEnE,sEAA6C;AAE7C;;GAEG;AACH,SAAS,kBAAkB,CAAC,KAA0B;IAClD,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAErD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAErC,MAAM,MAAM,GAAkB;QAC1B,KAAK,EAAE;YACH,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,OAAO,EAAE,UAAU;YACnB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,MAAM,EAAE,UAAU,CAAC,MAAM;SAC5B;QACD,SAAS,EAAE;YACP,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,MAAM;YACnC,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,QAAQ;YACvC,YAAY,EAAE,UAAU,CAAC,SAAS,CAAC,YAAY;YAC/C,eAAe,EAAE,UAAU,CAAC,SAAS,CAAC,eAAe;YACrD,uDAAuD;SAC1D;QACD,QAAQ,EAAE;YACN,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM;YAClC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM;YAClC,WAAW,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW;SAC/C;QACD,UAAU,EAAE;YACR,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,MAAM;YACpC,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO;YACtC,GAAG,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG;SACjC;QACD,eAAe,EAAE,KAAK,EAAE,oCAAoC;QAC5D,OAAO,EAAE;YACL,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK;SAClC;QACD,QAAQ,EAAE;YACN,kBAAkB,EAAE,UAAU,CAAC,QAAQ,CAAC,kBAAkB;YAC1D,gBAAgB,EAAE,UAAU,CAAC,QAAQ,CAAC,gBAAgB;SACzD;QACD,SAAS,EAAE;YACP,OAAO,EAAE,sBAAW,CAAC,OAAO;YAC5B,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,GAAG;YACd,MAAM,EAAE,QAAQ;SACnB;KACJ,CAAC;IAEF,qDAAqD;IACrD,IAAI,UAAU,CAAC,mBAAmB,EAAE,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,mBAAmB,GAAG,UAAU,CAAC,mBAAmB,CAAC;IACtE,CAAC;IACD,IAAI,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"phase7-standalone-mode.js","sourceRoot":"","sources":["../../../lib/wizard/phase7-standalone-mode.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,17 +68,14 @@ export interface StackQueryResult {
|
|
|
68
68
|
stackQuerySucceeded: boolean;
|
|
69
69
|
/** Athena workgroup for user queries (optional) */
|
|
70
70
|
athenaUserWorkgroup?: string;
|
|
71
|
-
/** Athena user policy ARN (optional) */
|
|
72
|
-
athenaUserPolicy?: string;
|
|
73
|
-
/** Athena workgroup */
|
|
74
71
|
/** User Athena results bucket (S3 bucket for query results) */
|
|
75
72
|
athenaResultsBucket?: string;
|
|
76
73
|
/** User Athena results bucket policy ARN */
|
|
77
74
|
athenaResultsBucketPolicy?: string;
|
|
78
|
-
/** IAM
|
|
79
|
-
|
|
80
|
-
/** IAM
|
|
81
|
-
|
|
75
|
+
/** IAM managed policy ARN for S3 bucket write access (from BucketWritePolicy) */
|
|
76
|
+
bucketWritePolicyArn?: string;
|
|
77
|
+
/** IAM managed policy ARN for Athena query access (from UserAthenaNonManagedRolePolicy) */
|
|
78
|
+
athenaUserPolicyArn?: string;
|
|
82
79
|
/** Discovered VPC from Quilt stack (optional) */
|
|
83
80
|
discoveredVpc?: DiscoveredVpcInfo;
|
|
84
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/wizard/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,uDAAuD;IACvD,kBAAkB,EAAE,OAAO,CAAC;IAC5B,uDAAuD;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,aAAa;IACb,KAAK,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mCAAmC;IACnC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,kDAAkD;IAClD,OAAO,EAAE,OAAO,CAAC;IACjB,gCAAgC;IAChC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,yDAAyD;IACzD,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,wDAAwD;IACxD,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,kBAAkB;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,qBAAqB;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qEAAqE;IACrE,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,oCAAoC;IACpC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,mDAAmD;IACnD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/wizard/types.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quiltdata/benchling-webhook",
|
|
3
|
-
"version": "0.10.0
|
|
3
|
+
"version": "0.10.0",
|
|
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",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"setup:sync-secrets": "ts-node bin/commands/sync-secrets.ts",
|
|
44
44
|
"test": "npm run lint && npm run build:typecheck && npm run test:ts && npm run test:python",
|
|
45
45
|
"test:ci": "npm run lint && npm run build:typecheck && npm run test:unit",
|
|
46
|
-
"test:unit": "cross-env NODE_ENV=test jest --testPathIgnorePatterns='/test/integration/' --maxWorkers=50%",
|
|
46
|
+
"test:unit": "cross-env NODE_ENV=test jest --testPathIgnorePatterns='/test/integration/' --maxWorkers=50% --silent",
|
|
47
47
|
"test:no-secret": "make -C docker test-no-secret",
|
|
48
48
|
"test:minimal": "bash scripts/test-minimal.sh",
|
|
49
49
|
"test:local": "npm run launch -- --mode docker-dev --profile dev --test",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quiltdata/benchling-webhook",
|
|
3
|
-
"version": "0.10.0
|
|
3
|
+
"version": "0.10.0",
|
|
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",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"setup:sync-secrets": "ts-node bin/commands/sync-secrets.ts",
|
|
44
44
|
"test": "npm run lint && npm run build:typecheck && npm run test:ts && npm run test:python",
|
|
45
45
|
"test:ci": "npm run lint && npm run build:typecheck && npm run test:unit",
|
|
46
|
-
"test:unit": "cross-env NODE_ENV=test jest --testPathIgnorePatterns='/test/integration/' --maxWorkers=50%",
|
|
46
|
+
"test:unit": "cross-env NODE_ENV=test jest --testPathIgnorePatterns='/test/integration/' --maxWorkers=50% --silent",
|
|
47
47
|
"test:no-secret": "make -C docker test-no-secret",
|
|
48
48
|
"test:minimal": "bash scripts/test-minimal.sh",
|
|
49
49
|
"test:local": "npm run launch -- --mode docker-dev --profile dev --test",
|