@cloud-copilot/iam-collect 0.1.110 → 0.1.111
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/cjs/download/download.d.ts.map +1 -1
- package/dist/cjs/download/download.js +24 -1
- package/dist/cjs/download/download.js.map +1 -1
- package/dist/cjs/utils/client-tools.d.ts.map +1 -1
- package/dist/cjs/utils/client-tools.js +13 -19
- package/dist/cjs/utils/client-tools.js.map +1 -1
- package/dist/esm/download/download.d.ts.map +1 -1
- package/dist/esm/download/download.js +24 -1
- package/dist/esm/download/download.js.map +1 -1
- package/dist/esm/utils/client-tools.d.ts.map +1 -1
- package/dist/esm/utils/client-tools.js +13 -19
- package/dist/esm/utils/client-tools.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../../src/download/download.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../../src/download/download.ts"],"names":[],"mappings":"AAGA,OAAO,EAYL,cAAc,EACf,MAAM,qBAAqB,CAAA;AAa5B;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,cAAc,EAAE,EACzB,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,EAAE,EAClB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,IAAI,CAAC,CAgLf"}
|
|
@@ -48,6 +48,7 @@ async function downloadData(configs, accountIds, regions, services, concurrency,
|
|
|
48
48
|
if (!storageConfig) {
|
|
49
49
|
throw new Error('No storage configuration found. Cannot download data.');
|
|
50
50
|
}
|
|
51
|
+
const storage = await getIamStoreForAccount(storageConfig, accountIds.at(0), configs, deleteData);
|
|
51
52
|
const indexJobs = [];
|
|
52
53
|
log_js_1.log.debug('Starting download runner', { concurrency });
|
|
53
54
|
const downloadRunner = new jobRunner_js_1.JobRunner(concurrency);
|
|
@@ -60,7 +61,6 @@ async function downloadData(configs, accountIds, regions, services, concurrency,
|
|
|
60
61
|
const partitionConfig = (0, partitionDefaults_js_1.getPartitionDefaults)(partition);
|
|
61
62
|
const accountConfigs = [partitionConfig, ...configs];
|
|
62
63
|
const accountRegions = await getAccountRegions(regions, accountId, configs, credentials);
|
|
63
|
-
const storage = (0, util_js_2.createStorageClient)(storageConfig, partition, deleteData);
|
|
64
64
|
if (services.length === 0) {
|
|
65
65
|
services = services_js_1.allServices;
|
|
66
66
|
}
|
|
@@ -150,6 +150,15 @@ async function downloadData(configs, accountIds, regions, services, concurrency,
|
|
|
150
150
|
}
|
|
151
151
|
await (0, runIndexers_js_1.runIndexJobs)(indexJobs, storageConfig, concurrency);
|
|
152
152
|
}
|
|
153
|
+
/**
|
|
154
|
+
* Get the regions to use for an account
|
|
155
|
+
*
|
|
156
|
+
* @param allRegions the list of all available regions
|
|
157
|
+
* @param accountId the ID of the account
|
|
158
|
+
* @param configs the iam-collect configs
|
|
159
|
+
* @param accountCredentials the credentials for the account
|
|
160
|
+
* @returns a list of regions to use for the account
|
|
161
|
+
*/
|
|
153
162
|
async function getAccountRegions(allRegions, accountId, configs, accountCredentials) {
|
|
154
163
|
if (allRegions.length > 0) {
|
|
155
164
|
return allRegions;
|
|
@@ -166,4 +175,18 @@ async function getAccountRegions(allRegions, accountId, configs, accountCredenti
|
|
|
166
175
|
return (0, regions_js_1.getEnabledRegions)(accountCredentials);
|
|
167
176
|
}
|
|
168
177
|
}
|
|
178
|
+
/**
|
|
179
|
+
* Create the AwsIamStore for a given account
|
|
180
|
+
*
|
|
181
|
+
* @param storageConfig the storage configuration to use
|
|
182
|
+
* @param accountId the account ID to get the partition from
|
|
183
|
+
* @param configs the iam-collect configs
|
|
184
|
+
* @returns a Promise that resolves to the AwsIamStore for the account
|
|
185
|
+
*/
|
|
186
|
+
async function getIamStoreForAccount(storageConfig, accountId, configs, deleteData) {
|
|
187
|
+
const authForAccount = (0, config_js_1.getAccountAuthConfig)(accountId, configs);
|
|
188
|
+
const credentials = await (0, auth_js_1.getCredentials)(accountId, authForAccount);
|
|
189
|
+
const partition = credentials.partition;
|
|
190
|
+
return (0, util_js_2.createStorageClient)(storageConfig, partition, deleteData);
|
|
191
|
+
}
|
|
169
192
|
//# sourceMappingURL=download.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../../src/download/download.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../../src/download/download.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-tools.d.ts","sourceRoot":"","sources":["../../../src/utils/client-tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAG3C;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACpC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GACtC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAUxB;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,EAC7C,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAC/C,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"client-tools.d.ts","sourceRoot":"","sources":["../../../src/utils/client-tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAG3C;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACpC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GACtC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAUxB;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,EAC7C,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAC/C,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAmBxB;AAED,wBAAsB,8BAA8B,CAAC,CAAC,EACpD,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GACtC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAWxB;AAED;;;;;;;GAOG;AAEH,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAC/C,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAaxB"}
|
|
@@ -36,7 +36,9 @@ async function runAndCatchAccessDenied(operation, onError) {
|
|
|
36
36
|
}
|
|
37
37
|
catch (e) {
|
|
38
38
|
const errorName = e.name;
|
|
39
|
-
if (errorName == 'AccessDeniedException' ||
|
|
39
|
+
if (errorName == 'AccessDeniedException' ||
|
|
40
|
+
errorName == 'AccessDenied' ||
|
|
41
|
+
errorName == 'AuthorizationErrorException') {
|
|
40
42
|
if (onError) {
|
|
41
43
|
return onError(e);
|
|
42
44
|
}
|
|
@@ -46,24 +48,16 @@ async function runAndCatchAccessDenied(operation, onError) {
|
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
50
|
async function runAndCatchAccessDeniedWithLog(arn, awsService, resourceType, field, operation) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
field,
|
|
60
|
-
resourceType,
|
|
61
|
-
awsService
|
|
62
|
-
});
|
|
63
|
-
return undefined;
|
|
64
|
-
}
|
|
65
|
-
throw e;
|
|
66
|
-
}
|
|
51
|
+
return runAndCatchAccessDenied(operation, async (error) => {
|
|
52
|
+
log_js_1.log.warn(`Access denied for ${field} in ${arn}`, error, {
|
|
53
|
+
accessDenied: true,
|
|
54
|
+
arn,
|
|
55
|
+
field,
|
|
56
|
+
resourceType,
|
|
57
|
+
awsService
|
|
58
|
+
});
|
|
59
|
+
return undefined;
|
|
60
|
+
});
|
|
67
61
|
}
|
|
68
62
|
/**
|
|
69
63
|
* Run an operation and catch a specific error by name. Return undefined if the error matches, otherwise rethrow the error.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-tools.js","sourceRoot":"","sources":["../../../src/utils/client-tools.ts"],"names":[],"mappings":";;AASA,wCAYC;AAQD,
|
|
1
|
+
{"version":3,"file":"client-tools.js","sourceRoot":"","sources":["../../../src/utils/client-tools.ts"],"names":[],"mappings":";;AASA,wCAYC;AAQD,0DAsBC;AAED,wEAiBC;AAWD,4CAiBC;AAjGD,qCAA8B;AAE9B;;;;;GAKG;AACI,KAAK,UAAU,cAAc,CAClC,SAAuC;IAEvC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,WAAW,CAAC,EAAE,cAAc,IAAI,GAAG,EAAE,CAAC;YAC1C,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,uBAAuB,CAC3C,SAAuC,EACvC,OAAgD;IAEhD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAA;QAExB,IACE,SAAS,IAAI,uBAAuB;YACpC,SAAS,IAAI,cAAc;YAC3B,SAAS,IAAI,6BAA6B,EAC1C,CAAC;YACD,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;YACnB,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,8BAA8B,CAClD,GAAW,EACX,UAAsB,EACtB,YAAoB,EACpB,KAAa,EACb,SAAuC;IAEvC,OAAO,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE;QAC7D,YAAG,CAAC,IAAI,CAAC,qBAAqB,KAAK,OAAO,GAAG,EAAE,EAAE,KAAK,EAAE;YACtD,YAAY,EAAE,IAAI;YAClB,GAAG;YACH,KAAK;YACL,YAAY;YACZ,UAAU;SACX,CAAC,CAAA;QACF,OAAO,SAAS,CAAA;IAClB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;;GAOG;AAEI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,SAAuC,EACvC,OAAgD;IAEhD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;YACxB,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;YACnB,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../../src/download/download.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../../src/download/download.ts"],"names":[],"mappings":"AAGA,OAAO,EAYL,cAAc,EACf,MAAM,qBAAqB,CAAA;AAa5B;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,cAAc,EAAE,EACzB,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,EAAE,EAClB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,IAAI,CAAC,CAgLf"}
|
|
@@ -45,6 +45,7 @@ export async function downloadData(configs, accountIds, regions, services, concu
|
|
|
45
45
|
if (!storageConfig) {
|
|
46
46
|
throw new Error('No storage configuration found. Cannot download data.');
|
|
47
47
|
}
|
|
48
|
+
const storage = await getIamStoreForAccount(storageConfig, accountIds.at(0), configs, deleteData);
|
|
48
49
|
const indexJobs = [];
|
|
49
50
|
log.debug('Starting download runner', { concurrency });
|
|
50
51
|
const downloadRunner = new JobRunner(concurrency);
|
|
@@ -57,7 +58,6 @@ export async function downloadData(configs, accountIds, regions, services, concu
|
|
|
57
58
|
const partitionConfig = getPartitionDefaults(partition);
|
|
58
59
|
const accountConfigs = [partitionConfig, ...configs];
|
|
59
60
|
const accountRegions = await getAccountRegions(regions, accountId, configs, credentials);
|
|
60
|
-
const storage = createStorageClient(storageConfig, partition, deleteData);
|
|
61
61
|
if (services.length === 0) {
|
|
62
62
|
services = allServices;
|
|
63
63
|
}
|
|
@@ -147,6 +147,15 @@ export async function downloadData(configs, accountIds, regions, services, concu
|
|
|
147
147
|
}
|
|
148
148
|
await runIndexJobs(indexJobs, storageConfig, concurrency);
|
|
149
149
|
}
|
|
150
|
+
/**
|
|
151
|
+
* Get the regions to use for an account
|
|
152
|
+
*
|
|
153
|
+
* @param allRegions the list of all available regions
|
|
154
|
+
* @param accountId the ID of the account
|
|
155
|
+
* @param configs the iam-collect configs
|
|
156
|
+
* @param accountCredentials the credentials for the account
|
|
157
|
+
* @returns a list of regions to use for the account
|
|
158
|
+
*/
|
|
150
159
|
async function getAccountRegions(allRegions, accountId, configs, accountCredentials) {
|
|
151
160
|
if (allRegions.length > 0) {
|
|
152
161
|
return allRegions;
|
|
@@ -163,4 +172,18 @@ async function getAccountRegions(allRegions, accountId, configs, accountCredenti
|
|
|
163
172
|
return getEnabledRegions(accountCredentials);
|
|
164
173
|
}
|
|
165
174
|
}
|
|
175
|
+
/**
|
|
176
|
+
* Create the AwsIamStore for a given account
|
|
177
|
+
*
|
|
178
|
+
* @param storageConfig the storage configuration to use
|
|
179
|
+
* @param accountId the account ID to get the partition from
|
|
180
|
+
* @param configs the iam-collect configs
|
|
181
|
+
* @returns a Promise that resolves to the AwsIamStore for the account
|
|
182
|
+
*/
|
|
183
|
+
async function getIamStoreForAccount(storageConfig, accountId, configs, deleteData) {
|
|
184
|
+
const authForAccount = getAccountAuthConfig(accountId, configs);
|
|
185
|
+
const credentials = await getCredentials(accountId, authForAccount);
|
|
186
|
+
const partition = credentials.partition;
|
|
187
|
+
return createStorageClient(storageConfig, partition, deleteData);
|
|
188
|
+
}
|
|
166
189
|
//# sourceMappingURL=download.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../../src/download/download.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAqC,wBAAwB,EAAE,MAAM,oBAAoB,CAAA;AAChG,OAAO,EACL,0BAA0B,EAC1B,8BAA8B,EAC9B,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"download.js","sourceRoot":"","sources":["../../../src/download/download.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-tools.d.ts","sourceRoot":"","sources":["../../../src/utils/client-tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAG3C;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACpC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GACtC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAUxB;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,EAC7C,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAC/C,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"client-tools.d.ts","sourceRoot":"","sources":["../../../src/utils/client-tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAG3C;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACpC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GACtC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAUxB;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,EAC7C,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAC/C,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAmBxB;AAED,wBAAsB,8BAA8B,CAAC,CAAC,EACpD,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GACtC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAWxB;AAED;;;;;;;GAOG;AAEH,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EACvC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,GAC/C,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAaxB"}
|
|
@@ -30,7 +30,9 @@ export async function runAndCatchAccessDenied(operation, onError) {
|
|
|
30
30
|
}
|
|
31
31
|
catch (e) {
|
|
32
32
|
const errorName = e.name;
|
|
33
|
-
if (errorName == 'AccessDeniedException' ||
|
|
33
|
+
if (errorName == 'AccessDeniedException' ||
|
|
34
|
+
errorName == 'AccessDenied' ||
|
|
35
|
+
errorName == 'AuthorizationErrorException') {
|
|
34
36
|
if (onError) {
|
|
35
37
|
return onError(e);
|
|
36
38
|
}
|
|
@@ -40,24 +42,16 @@ export async function runAndCatchAccessDenied(operation, onError) {
|
|
|
40
42
|
}
|
|
41
43
|
}
|
|
42
44
|
export async function runAndCatchAccessDeniedWithLog(arn, awsService, resourceType, field, operation) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
field,
|
|
54
|
-
resourceType,
|
|
55
|
-
awsService
|
|
56
|
-
});
|
|
57
|
-
return undefined;
|
|
58
|
-
}
|
|
59
|
-
throw e;
|
|
60
|
-
}
|
|
45
|
+
return runAndCatchAccessDenied(operation, async (error) => {
|
|
46
|
+
log.warn(`Access denied for ${field} in ${arn}`, error, {
|
|
47
|
+
accessDenied: true,
|
|
48
|
+
arn,
|
|
49
|
+
field,
|
|
50
|
+
resourceType,
|
|
51
|
+
awsService
|
|
52
|
+
});
|
|
53
|
+
return undefined;
|
|
54
|
+
});
|
|
61
55
|
}
|
|
62
56
|
/**
|
|
63
57
|
* Run an operation and catch a specific error by name. Return undefined if the error matches, otherwise rethrow the error.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-tools.js","sourceRoot":"","sources":["../../../src/utils/client-tools.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAE9B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,SAAuC;IAEvC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,WAAW,CAAC,EAAE,cAAc,IAAI,GAAG,EAAE,CAAC;YAC1C,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,SAAuC,EACvC,OAAgD;IAEhD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAA;QAExB,
|
|
1
|
+
{"version":3,"file":"client-tools.js","sourceRoot":"","sources":["../../../src/utils/client-tools.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAE9B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,SAAuC;IAEvC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,WAAW,CAAC,EAAE,cAAc,IAAI,GAAG,EAAE,CAAC;YAC1C,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,SAAuC,EACvC,OAAgD;IAEhD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAA;QAExB,IACE,SAAS,IAAI,uBAAuB;YACpC,SAAS,IAAI,cAAc;YAC3B,SAAS,IAAI,6BAA6B,EAC1C,CAAC;YACD,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;YACnB,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,GAAW,EACX,UAAsB,EACtB,YAAoB,EACpB,KAAa,EACb,SAAuC;IAEvC,OAAO,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE;QAC7D,GAAG,CAAC,IAAI,CAAC,qBAAqB,KAAK,OAAO,GAAG,EAAE,EAAE,KAAK,EAAE;YACtD,YAAY,EAAE,IAAI;YAClB,GAAG;YACH,KAAK;YACL,YAAY;YACZ,UAAU;SACX,CAAC,CAAA;QACF,OAAO,SAAS,CAAA;IAClB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;;GAOG;AAEH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,SAAuC,EACvC,OAAgD;IAEhD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;QAChC,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;YACxB,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;YACnB,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC;AACH,CAAC"}
|