@actsecurity/iam-collect 0.1.222 → 0.1.223
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 -1
- package/dist/cjs/awsConfigClients/clients/AwsConfigKmsClient.d.ts.map +1 -1
- package/dist/cjs/awsConfigClients/clients/AwsConfigKmsClient.js +20 -1
- package/dist/cjs/awsConfigClients/clients/AwsConfigKmsClient.js.map +1 -1
- package/dist/cjs/config/version.d.ts +1 -1
- package/dist/cjs/config/version.js +1 -1
- package/dist/cjs/syncs/kms/key.d.ts.map +1 -1
- package/dist/cjs/syncs/kms/key.js +8 -1
- package/dist/cjs/syncs/kms/key.js.map +1 -1
- package/dist/esm/awsConfigClients/clients/AwsConfigKmsClient.d.ts.map +1 -1
- package/dist/esm/awsConfigClients/clients/AwsConfigKmsClient.js +21 -2
- package/dist/esm/awsConfigClients/clients/AwsConfigKmsClient.js.map +1 -1
- package/dist/esm/config/version.d.ts +1 -1
- package/dist/esm/config/version.js +1 -1
- package/dist/esm/syncs/kms/key.d.ts.map +1 -1
- package/dist/esm/syncs/kms/key.js +9 -2
- package/dist/esm/syncs/kms/key.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -164,7 +164,7 @@ If you prefer, you can configure iam-collect to pull data from AWS Config instea
|
|
|
164
164
|
| iot | Policies | name, default version, default version doc, attachment targets |
|
|
165
165
|
| kafka | MSK Clusters | name, policy, kms key, tags |
|
|
166
166
|
| kinesis | Data Streams | name, encryption type, key id, policy, tags |
|
|
167
|
-
| kms | Keys | id, policy, tags
|
|
167
|
+
| kms | Keys | id, AWS/Customer managed, policy, tags |
|
|
168
168
|
| lambda | Functions | name, role, tags, policy |
|
|
169
169
|
| lambda | Function Aliases | name, role, alias, version, policy |
|
|
170
170
|
| lambda | Layer Versions | name, version, policy |
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsConfigKmsClient.d.ts","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigKmsClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AwsConfigKmsClient.d.ts","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigKmsClient.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,iCAAiC,EAAE,MAAM,uBAAuB,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AAEtE,OAAO,EAAE,KAAK,sBAAsB,EAAoB,MAAM,8BAA8B,CAAA;AAO5F;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,cAAc,CAAC,sBAAsB,CAAC;IAC5E,MAAM,CAAC,QAAQ,CAAC,UAAU,SAAiB;gBAGzC,OAAO,EAAE;QACP,WAAW,EAAE,iCAAiC,CAAA;QAC9C,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAC3B,EACD,aAAa,EAAE,sBAAsB;IAKvC;;OAEG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;CAMnC"}
|
|
@@ -19,6 +19,7 @@ class AwsConfigKmsClient extends AbstractClient_js_1.AbstractClient {
|
|
|
19
19
|
*/
|
|
20
20
|
registerCommands() {
|
|
21
21
|
this.registerCommand(AwsConfigListKeysCommand);
|
|
22
|
+
this.registerCommand(AwsConfigDescribeKeyCommand);
|
|
22
23
|
this.registerCommand(AwsConfigGetKeyPolicyCommand);
|
|
23
24
|
this.registerCommand(AwsConfigListResourceTagsCommand);
|
|
24
25
|
}
|
|
@@ -34,6 +35,7 @@ const AwsConfigListKeysCommand = (0, AwsConfigClientContext_js_1.awsConfigComman
|
|
|
34
35
|
SELECT
|
|
35
36
|
arn,
|
|
36
37
|
resourceId,
|
|
38
|
+
configuration.keyManager,
|
|
37
39
|
supplementaryConfiguration.Policy,
|
|
38
40
|
tags
|
|
39
41
|
WHERE
|
|
@@ -44,9 +46,10 @@ const AwsConfigListKeysCommand = (0, AwsConfigClientContext_js_1.awsConfigComman
|
|
|
44
46
|
`;
|
|
45
47
|
const results = await (0, awsConfigUtils_js_1.executeConfigQuery)(query, context);
|
|
46
48
|
const keys = results.map((resultString) => {
|
|
47
|
-
const { configItem, supplementaryConfiguration, tags } = (0, awsConfigUtils_js_1.parseConfigItem)(resultString);
|
|
49
|
+
const { configItem, configuration, supplementaryConfiguration, tags } = (0, awsConfigUtils_js_1.parseConfigItem)(resultString);
|
|
48
50
|
// Cache data that will be needed by other commands
|
|
49
51
|
// Use KeyId as cache key for both GetKeyPolicyCommand and ListResourceTagsCommand
|
|
52
|
+
context.putCache(configItem.resourceId, 'keyManager', configuration?.keyManager);
|
|
50
53
|
context.putCache(configItem.resourceId, 'supplementaryConfiguration', supplementaryConfiguration);
|
|
51
54
|
context.putCache(configItem.resourceId, 'tags', tags);
|
|
52
55
|
return {
|
|
@@ -59,6 +62,22 @@ const AwsConfigListKeysCommand = (0, AwsConfigClientContext_js_1.awsConfigComman
|
|
|
59
62
|
};
|
|
60
63
|
}
|
|
61
64
|
});
|
|
65
|
+
/**
|
|
66
|
+
* Config-based implementation of KMS DescribeKeyCommand
|
|
67
|
+
*/
|
|
68
|
+
const AwsConfigDescribeKeyCommand = (0, AwsConfigClientContext_js_1.awsConfigCommand)({
|
|
69
|
+
command: client_kms_1.DescribeKeyCommand,
|
|
70
|
+
execute: async (input, context) => {
|
|
71
|
+
const { KeyId } = input;
|
|
72
|
+
if (!KeyId) {
|
|
73
|
+
throw new ResourceNotFoundException_js_1.ResourceNotFoundException('KeyId is required');
|
|
74
|
+
}
|
|
75
|
+
const keyManager = context.getCache(KeyId, 'keyManager');
|
|
76
|
+
return {
|
|
77
|
+
KeyMetadata: keyManager ? { KeyId, KeyManager: keyManager } : undefined
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
});
|
|
62
81
|
/**
|
|
63
82
|
* Config-based implementation of KMS GetKeyPolicyCommand
|
|
64
83
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsConfigKmsClient.js","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigKmsClient.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"AwsConfigKmsClient.js","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigKmsClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../../../src/syncs/kms/key.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../../../src/syncs/kms/key.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,OAAO,2BAoDnB,CAAA"}
|
|
@@ -19,6 +19,12 @@ exports.KeySync = (0, typedSync_js_1.createTypedSyncOperation)('kms', 'keys', (0
|
|
|
19
19
|
region: region
|
|
20
20
|
}),
|
|
21
21
|
extraFields: {
|
|
22
|
+
keyManager: async (client, key) => {
|
|
23
|
+
return (0, client_tools_js_1.runAndCatch404)(async () => {
|
|
24
|
+
const describeResult = await client.send(new client_kms_1.DescribeKeyCommand({ KeyId: key.KeyId }));
|
|
25
|
+
return describeResult.KeyMetadata?.KeyManager;
|
|
26
|
+
});
|
|
27
|
+
},
|
|
22
28
|
tags: async (client, key) => {
|
|
23
29
|
return (0, client_tools_js_1.runAndCatch404)(async () => {
|
|
24
30
|
const tagResult = await client.send(new client_kms_1.ListResourceTagsCommand({ KeyId: key.KeyId }));
|
|
@@ -39,7 +45,8 @@ exports.KeySync = (0, typedSync_js_1.createTypedSyncOperation)('kms', 'keys', (0
|
|
|
39
45
|
arn: (func) => func.KeyArn,
|
|
40
46
|
results: (func) => ({
|
|
41
47
|
metadata: {
|
|
42
|
-
id: func.KeyId
|
|
48
|
+
id: func.KeyId,
|
|
49
|
+
...(func.extraFields.keyManager === 'AWS' ? { awsManaged: true } : {})
|
|
43
50
|
},
|
|
44
51
|
policy: func.extraFields.policy
|
|
45
52
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../../src/syncs/kms/key.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../../src/syncs/kms/key.ts"],"names":[],"mappings":";;;AAAA,oDAM4B;AAC5B,iEAA4D;AAC5D,kDAAkF;AAErE,QAAA,OAAO,GAAG,IAAA,uCAAwB,EAC7C,KAAK,EACL,MAAM,EACN,IAAA,qCAAsB,EAAC;IACrB,MAAM,EAAE,sBAAS;IACjB,OAAO,EAAE,4BAAe;IACxB,GAAG,EAAE,MAAM;IACX,gBAAgB,EAAE;QAChB,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,YAAY;KACxB;IACD,iBAAiB,EAAE,CAAC,SAAiB,EAAE,MAAc,EAAE,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,KAAK;QACd,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;KACf,CAAC;IACF,WAAW,EAAE;QACX,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAChC,OAAO,IAAA,gCAAc,EAAC,KAAK,IAAI,EAAE;gBAC/B,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,+BAAkB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBACtF,OAAO,cAAc,CAAC,WAAW,EAAE,UAAU,CAAA;YAC/C,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAC1B,OAAO,IAAA,gCAAc,EAAC,KAAK,IAAI,EAAE;gBAC/B,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,oCAAuB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBACtF,OAAO,SAAS,CAAC,IAAI,CAAA;YACvB,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAC5B,OAAO,IAAA,gCAAc,EAAC,KAAK,IAAI,EAAE;gBAC/B,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,IAAI,CACpC,IAAI,gCAAmB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CACrE,CAAA;gBACD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;gBACxC,CAAC;gBACD,OAAO,SAAS,CAAA;YAClB,CAAC,CAAC,CAAA;QACJ,CAAC;KACF;IACD,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI;IACrC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAO;IAC3B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAClB,QAAQ,EAAE;YACR,EAAE,EAAE,IAAI,CAAC,KAAK;YACd,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE;QACD,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;KAChC,CAAC;CACH,CAAC,CACH,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsConfigKmsClient.d.ts","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigKmsClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AwsConfigKmsClient.d.ts","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigKmsClient.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,iCAAiC,EAAE,MAAM,uBAAuB,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AAEtE,OAAO,EAAE,KAAK,sBAAsB,EAAoB,MAAM,8BAA8B,CAAA;AAO5F;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,cAAc,CAAC,sBAAsB,CAAC;IAC5E,MAAM,CAAC,QAAQ,CAAC,UAAU,SAAiB;gBAGzC,OAAO,EAAE;QACP,WAAW,EAAE,iCAAiC,CAAA;QAC9C,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAC3B,EACD,aAAa,EAAE,sBAAsB;IAKvC;;OAEG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;CAMnC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GetKeyPolicyCommand, KMSClient, ListKeysCommand, ListResourceTagsCommand } from '@aws-sdk/client-kms';
|
|
1
|
+
import { DescribeKeyCommand, GetKeyPolicyCommand, KMSClient, ListKeysCommand, ListResourceTagsCommand } from '@aws-sdk/client-kms';
|
|
2
2
|
import {} from '../../aws/coreAuth.js';
|
|
3
3
|
import { AbstractClient } from '../../customClients/AbstractClient.js';
|
|
4
4
|
import { ResourceNotFoundException } from '../../customClients/ResourceNotFoundException.js';
|
|
@@ -16,6 +16,7 @@ export class AwsConfigKmsClient extends AbstractClient {
|
|
|
16
16
|
*/
|
|
17
17
|
registerCommands() {
|
|
18
18
|
this.registerCommand(AwsConfigListKeysCommand);
|
|
19
|
+
this.registerCommand(AwsConfigDescribeKeyCommand);
|
|
19
20
|
this.registerCommand(AwsConfigGetKeyPolicyCommand);
|
|
20
21
|
this.registerCommand(AwsConfigListResourceTagsCommand);
|
|
21
22
|
}
|
|
@@ -31,6 +32,7 @@ const AwsConfigListKeysCommand = awsConfigCommand({
|
|
|
31
32
|
SELECT
|
|
32
33
|
arn,
|
|
33
34
|
resourceId,
|
|
35
|
+
configuration.keyManager,
|
|
34
36
|
supplementaryConfiguration.Policy,
|
|
35
37
|
tags
|
|
36
38
|
WHERE
|
|
@@ -41,9 +43,10 @@ const AwsConfigListKeysCommand = awsConfigCommand({
|
|
|
41
43
|
`;
|
|
42
44
|
const results = await executeConfigQuery(query, context);
|
|
43
45
|
const keys = results.map((resultString) => {
|
|
44
|
-
const { configItem, supplementaryConfiguration, tags } = parseConfigItem(resultString);
|
|
46
|
+
const { configItem, configuration, supplementaryConfiguration, tags } = parseConfigItem(resultString);
|
|
45
47
|
// Cache data that will be needed by other commands
|
|
46
48
|
// Use KeyId as cache key for both GetKeyPolicyCommand and ListResourceTagsCommand
|
|
49
|
+
context.putCache(configItem.resourceId, 'keyManager', configuration?.keyManager);
|
|
47
50
|
context.putCache(configItem.resourceId, 'supplementaryConfiguration', supplementaryConfiguration);
|
|
48
51
|
context.putCache(configItem.resourceId, 'tags', tags);
|
|
49
52
|
return {
|
|
@@ -56,6 +59,22 @@ const AwsConfigListKeysCommand = awsConfigCommand({
|
|
|
56
59
|
};
|
|
57
60
|
}
|
|
58
61
|
});
|
|
62
|
+
/**
|
|
63
|
+
* Config-based implementation of KMS DescribeKeyCommand
|
|
64
|
+
*/
|
|
65
|
+
const AwsConfigDescribeKeyCommand = awsConfigCommand({
|
|
66
|
+
command: DescribeKeyCommand,
|
|
67
|
+
execute: async (input, context) => {
|
|
68
|
+
const { KeyId } = input;
|
|
69
|
+
if (!KeyId) {
|
|
70
|
+
throw new ResourceNotFoundException('KeyId is required');
|
|
71
|
+
}
|
|
72
|
+
const keyManager = context.getCache(KeyId, 'keyManager');
|
|
73
|
+
return {
|
|
74
|
+
KeyMetadata: keyManager ? { KeyId, KeyManager: keyManager } : undefined
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
});
|
|
59
78
|
/**
|
|
60
79
|
* Config-based implementation of KMS GetKeyPolicyCommand
|
|
61
80
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsConfigKmsClient.js","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigKmsClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,SAAS,EACT,eAAe,EACf,uBAAuB,EACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAA0C,MAAM,uBAAuB,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAA;AAC5F,OAAO,EAA+B,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAC5F,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,yBAAyB,EAC1B,MAAM,sBAAsB,CAAA;AAE7B;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,cAAsC;IAG5E,YACE,OAGC,EACD,aAAqC;QAErC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAC/B,CAAC;IAED;;OAEG;IACO,gBAAgB;QACxB,IAAI,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAA;QAC9C,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAAC,CAAA;QAClD,IAAI,CAAC,eAAe,CAAC,gCAAgC,CAAC,CAAA;IACxD,CAAC;;
|
|
1
|
+
{"version":3,"file":"AwsConfigKmsClient.js","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigKmsClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../../../src/syncs/kms/key.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../../../src/syncs/kms/key.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,OAAO,2BAoDnB,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GetKeyPolicyCommand, KMSClient, ListKeysCommand, ListResourceTagsCommand } from '@aws-sdk/client-kms';
|
|
1
|
+
import { DescribeKeyCommand, GetKeyPolicyCommand, KMSClient, ListKeysCommand, ListResourceTagsCommand } from '@aws-sdk/client-kms';
|
|
2
2
|
import { runAndCatch404 } from '../../utils/client-tools.js';
|
|
3
3
|
import { createResourceSyncType, createTypedSyncOperation } from '../typedSync.js';
|
|
4
4
|
export const KeySync = createTypedSyncOperation('kms', 'keys', createResourceSyncType({
|
|
@@ -16,6 +16,12 @@ export const KeySync = createTypedSyncOperation('kms', 'keys', createResourceSyn
|
|
|
16
16
|
region: region
|
|
17
17
|
}),
|
|
18
18
|
extraFields: {
|
|
19
|
+
keyManager: async (client, key) => {
|
|
20
|
+
return runAndCatch404(async () => {
|
|
21
|
+
const describeResult = await client.send(new DescribeKeyCommand({ KeyId: key.KeyId }));
|
|
22
|
+
return describeResult.KeyMetadata?.KeyManager;
|
|
23
|
+
});
|
|
24
|
+
},
|
|
19
25
|
tags: async (client, key) => {
|
|
20
26
|
return runAndCatch404(async () => {
|
|
21
27
|
const tagResult = await client.send(new ListResourceTagsCommand({ KeyId: key.KeyId }));
|
|
@@ -36,7 +42,8 @@ export const KeySync = createTypedSyncOperation('kms', 'keys', createResourceSyn
|
|
|
36
42
|
arn: (func) => func.KeyArn,
|
|
37
43
|
results: (func) => ({
|
|
38
44
|
metadata: {
|
|
39
|
-
id: func.KeyId
|
|
45
|
+
id: func.KeyId,
|
|
46
|
+
...(func.extraFields.keyManager === 'AWS' ? { awsManaged: true } : {})
|
|
40
47
|
},
|
|
41
48
|
policy: func.extraFields.policy
|
|
42
49
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../../src/syncs/kms/key.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,SAAS,EACT,eAAe,EACf,uBAAuB,EACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAElF,MAAM,CAAC,MAAM,OAAO,GAAG,wBAAwB,CAC7C,KAAK,EACL,MAAM,EACN,sBAAsB,CAAC;IACrB,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,eAAe;IACxB,GAAG,EAAE,MAAM;IACX,gBAAgB,EAAE;QAChB,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,YAAY;KACxB;IACD,iBAAiB,EAAE,CAAC,SAAiB,EAAE,MAAc,EAAE,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,KAAK;QACd,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;KACf,CAAC;IACF,WAAW,EAAE;QACX,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAC1B,OAAO,cAAc,CAAC,KAAK,IAAI,EAAE;gBAC/B,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBACtF,OAAO,SAAS,CAAC,IAAI,CAAA;YACvB,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAC5B,OAAO,cAAc,CAAC,KAAK,IAAI,EAAE;gBAC/B,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,IAAI,CACpC,IAAI,mBAAmB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CACrE,CAAA;gBACD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;gBACxC,CAAC;gBACD,OAAO,SAAS,CAAA;YAClB,CAAC,CAAC,CAAA;QACJ,CAAC;KACF;IACD,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI;IACrC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAO;IAC3B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAClB,QAAQ,EAAE;YACR,EAAE,EAAE,IAAI,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../../src/syncs/kms/key.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,SAAS,EACT,eAAe,EACf,uBAAuB,EACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAElF,MAAM,CAAC,MAAM,OAAO,GAAG,wBAAwB,CAC7C,KAAK,EACL,MAAM,EACN,sBAAsB,CAAC;IACrB,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,eAAe;IACxB,GAAG,EAAE,MAAM;IACX,gBAAgB,EAAE;QAChB,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,YAAY;KACxB;IACD,iBAAiB,EAAE,CAAC,SAAiB,EAAE,MAAc,EAAE,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,KAAK;QACd,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;KACf,CAAC;IACF,WAAW,EAAE;QACX,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAChC,OAAO,cAAc,CAAC,KAAK,IAAI,EAAE;gBAC/B,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBACtF,OAAO,cAAc,CAAC,WAAW,EAAE,UAAU,CAAA;YAC/C,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAC1B,OAAO,cAAc,CAAC,KAAK,IAAI,EAAE;gBAC/B,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;gBACtF,OAAO,SAAS,CAAC,IAAI,CAAA;YACvB,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;YAC5B,OAAO,cAAc,CAAC,KAAK,IAAI,EAAE;gBAC/B,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,IAAI,CACpC,IAAI,mBAAmB,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CACrE,CAAA;gBACD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;gBACxC,CAAC;gBACD,OAAO,SAAS,CAAA;YAClB,CAAC,CAAC,CAAA;QACJ,CAAC;KACF;IACD,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI;IACrC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAO;IAC3B,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAClB,QAAQ,EAAE;YACR,EAAE,EAAE,IAAI,CAAC,KAAK;YACd,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE;QACD,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;KAChC,CAAC;CACH,CAAC,CACH,CAAA"}
|