@trunkrs/common 1.5.8 → 1.5.12
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/package.json +3 -3
- package/providers/auth0.js +1 -0
- package/providers/auth0.js.map +1 -1
- package/services/client/AxiosClient.js +8 -4
- package/services/client/AxiosClient.js.map +1 -1
- package/services/queue/QueueClient/models.d.ts +1 -0
- package/services/queue/SNSQueueClient.d.ts +2 -1
- package/services/queue/SNSQueueClient.js +36 -12
- package/services/queue/SNSQueueClient.js.map +1 -1
- package/utils/caching/GlobalAtomicCache.js +13 -0
- package/utils/caching/GlobalAtomicCache.js.map +1 -1
- package/utils/caching/SecretCache.js +7 -0
- package/utils/caching/SecretCache.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trunkrs/common",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.12",
|
|
4
4
|
"description": "Common standards library for development in Trunkrs",
|
|
5
5
|
"types": "./index.d.ts",
|
|
6
6
|
"repository": "https://github.com/Trunkrs/common.git",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"deepmerge": "^4.2.2"
|
|
13
13
|
},
|
|
14
14
|
"devDependencies": {
|
|
15
|
-
"@types/aws-lambda": "^8.10.
|
|
15
|
+
"@types/aws-lambda": "^8.10.92",
|
|
16
16
|
"@types/faker": "^5.5.8",
|
|
17
17
|
"@types/jest": "^27.0.1",
|
|
18
18
|
"@types/joi": "^17.2.3",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"peerDependencies": {
|
|
48
48
|
"@typescript-eslint/eslint-plugin": ">=4 || <5",
|
|
49
49
|
"@typescript-eslint/parser": ">=4 || <5",
|
|
50
|
-
"aws-sdk": ">2.
|
|
50
|
+
"aws-sdk": ">2.1000.0 || <3",
|
|
51
51
|
"date-fns": ">=2 || <3",
|
|
52
52
|
"eslint": ">=7.2.0",
|
|
53
53
|
"eslint-config-airbnb-base-typescript-prettier": ">=3.1 || <4",
|
package/providers/auth0.js
CHANGED
|
@@ -34,6 +34,7 @@ exports.Auth0MachineTokenClient = service_provider_1.default.createSymbol('Auth0
|
|
|
34
34
|
const configureAuth0Service = (baseUrl, appClientSecretName, tokenCacheStoreName, tokenCacheMountPath) => {
|
|
35
35
|
const serviceProvider = new service_provider_1.default((0, caching_1.configureDailyTokenCache)(tokenCacheStoreName, tokenCacheMountPath));
|
|
36
36
|
serviceProvider.register(exports.Auth0MachineTokenClient, service_provider_1.Lifecycle.Singleton, () => new client_1.MachineTokenClient(appClientSecretName, aws_1.default.provide(aws_2.SecretsClient), utils_1.default.provide(client_1.OAuthClient), utils_1.default.provide(utils_1.Serializer)));
|
|
37
|
+
utils_1.default.provide(utils_1.Logger);
|
|
37
38
|
serviceProvider.register(exports.Auth0MachineClient, service_provider_1.Lifecycle.Singleton, () => new client_1.MachineClient(serviceProvider.provide(exports.Auth0MachineTokenClient), utils_1.default.provide(utils_1.HttpClient), serviceProvider.provide(caching_1.DailyTokenCache), appClientSecretName, baseUrl));
|
|
38
39
|
return serviceProvider;
|
|
39
40
|
};
|
package/providers/auth0.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth0.js","sourceRoot":"","sources":["../../providers/auth0.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8EAAsE;AAEtE,+CAI2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"auth0.js","sourceRoot":"","sources":["../../providers/auth0.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8EAAsE;AAEtE,+CAI2B;AAC3B,iDAAuE;AAEvE,uCAAqE;AACrE,gDAA+B;AAC/B,yCAA+C;AAElC,QAAA,kBAAkB,GAC7B,0BAAe,CAAC,YAAY,CAAgB,oBAAoB,CAAC,CAAA;AAEtD,QAAA,uBAAuB,GAClC,0BAAe,CAAC,YAAY,CAAqB,yBAAyB,CAAC,CAAA;AAStE,MAAM,qBAAqB,GAAG,CACnC,OAAe,EACf,mBAA2B,EAC3B,mBAA2B,EAC3B,mBAA2B,EACV,EAAE;IACnB,MAAM,eAAe,GAAG,IAAI,0BAAe,CACzC,IAAA,kCAAwB,EAAC,mBAAmB,EAAE,mBAAmB,CAAC,CACnE,CAAA;IAED,eAAe,CAAC,QAAQ,CACtB,+BAAuB,EACvB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,2BAAkB,CACpB,mBAAmB,EACnB,aAAW,CAAC,OAAO,CAAC,mBAAa,CAAC,EAClC,eAAa,CAAC,OAAO,CAAC,oBAAW,CAAC,EAClC,eAAa,CAAC,OAAO,CAAC,kBAAU,CAAC,CAClC,CACJ,CAAA;IAED,eAAa,CAAC,OAAO,CAAC,cAAM,CAAC,CAAA;IAE7B,eAAe,CAAC,QAAQ,CACtB,0BAAkB,EAClB,4BAAS,CAAC,SAAS,EACnB,GAAG,EAAE,CACH,IAAI,sBAAa,CACf,eAAe,CAAC,OAAO,CAAC,+BAAuB,CAAC,EAChD,eAAa,CAAC,OAAO,CAAC,kBAAU,CAAC,EACjC,eAAe,CAAC,OAAO,CAAC,yBAAe,CAAC,EACxC,mBAAmB,EACnB,OAAO,CACR,CACJ,CAAA;IAED,OAAO,eAAe,CAAA;AACxB,CAAC,CAAA;AAtCY,QAAA,qBAAqB,yBAsCjC"}
|
|
@@ -19,13 +19,14 @@ class AxiosClient {
|
|
|
19
19
|
return new errors_1.HttpRequestError(axiosError, request, (_a = axiosError.response) === null || _a === void 0 ? void 0 : _a.status, (_b = axiosError.response) === null || _b === void 0 ? void 0 : _b.headers, (_c = axiosError.response) === null || _c === void 0 ? void 0 : _c.data);
|
|
20
20
|
}
|
|
21
21
|
async get(request) {
|
|
22
|
-
var _a;
|
|
22
|
+
var _a, _b;
|
|
23
23
|
try {
|
|
24
24
|
const response = await this.axiosClient.get(request.url, {
|
|
25
25
|
auth: request.authentication,
|
|
26
26
|
params: request.params,
|
|
27
27
|
headers: request.headers,
|
|
28
28
|
timeout: (_a = request.timeout) !== null && _a !== void 0 ? _a : defaultTimeout,
|
|
29
|
+
responseType: (_b = request.responseType) !== null && _b !== void 0 ? _b : 'json',
|
|
29
30
|
});
|
|
30
31
|
return response.data;
|
|
31
32
|
}
|
|
@@ -34,12 +35,13 @@ class AxiosClient {
|
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
async post(request) {
|
|
37
|
-
var _a;
|
|
38
|
+
var _a, _b;
|
|
38
39
|
try {
|
|
39
40
|
const response = await this.axiosClient.post(request.url, request.params, {
|
|
40
41
|
auth: request.authentication,
|
|
41
42
|
headers: request.headers,
|
|
42
43
|
timeout: (_a = request.timeout) !== null && _a !== void 0 ? _a : defaultTimeout,
|
|
44
|
+
responseType: (_b = request.responseType) !== null && _b !== void 0 ? _b : 'json',
|
|
43
45
|
});
|
|
44
46
|
return response.data;
|
|
45
47
|
}
|
|
@@ -48,12 +50,13 @@ class AxiosClient {
|
|
|
48
50
|
}
|
|
49
51
|
}
|
|
50
52
|
async put(request) {
|
|
51
|
-
var _a;
|
|
53
|
+
var _a, _b;
|
|
52
54
|
try {
|
|
53
55
|
const response = await this.axiosClient.put(request.url, request.params, {
|
|
54
56
|
auth: request.authentication,
|
|
55
57
|
headers: request.headers,
|
|
56
58
|
timeout: (_a = request.timeout) !== null && _a !== void 0 ? _a : defaultTimeout,
|
|
59
|
+
responseType: (_b = request.responseType) !== null && _b !== void 0 ? _b : 'json',
|
|
57
60
|
});
|
|
58
61
|
return response.data;
|
|
59
62
|
}
|
|
@@ -62,13 +65,14 @@ class AxiosClient {
|
|
|
62
65
|
}
|
|
63
66
|
}
|
|
64
67
|
async delete(request) {
|
|
65
|
-
var _a;
|
|
68
|
+
var _a, _b;
|
|
66
69
|
try {
|
|
67
70
|
await this.axiosClient.delete(request.url, {
|
|
68
71
|
auth: request.authentication,
|
|
69
72
|
params: request.params,
|
|
70
73
|
headers: request.headers,
|
|
71
74
|
timeout: (_a = request.timeout) !== null && _a !== void 0 ? _a : defaultTimeout,
|
|
75
|
+
responseType: (_b = request.responseType) !== null && _b !== void 0 ? _b : 'json',
|
|
72
76
|
});
|
|
73
77
|
}
|
|
74
78
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosClient.js","sourceRoot":"","sources":["../../../services/client/AxiosClient.ts"],"names":[],"mappings":";;;;;AAAA,kDAAyC;AACzC,gDAAsD;AAItD,MAAM,cAAc,GAAG,IAAI,CAAA;AAE3B,MAAM,WAAW;IAAjB;QACkB,gBAAW,GAAG,eAAK,CAAC,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"AxiosClient.js","sourceRoot":"","sources":["../../../services/client/AxiosClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,10 @@ declare class SNSQueueClient implements QueueClient {
|
|
|
4
4
|
private readonly topicArn;
|
|
5
5
|
private readonly serializer;
|
|
6
6
|
private static translateJStypeToSNSType;
|
|
7
|
+
private static translateAttributesToSNSAttributes;
|
|
7
8
|
private readonly client;
|
|
8
9
|
constructor(topicArn: string, serializer: Serializer);
|
|
9
10
|
sendMessage<TMessage>(request: QueueMessageRequest<TMessage, SNSMessageOptions>): Promise<void>;
|
|
10
|
-
sendBatchMessage<TMessage>(request: QueueBatchMessageRequest<TMessage>): Promise<void>;
|
|
11
|
+
sendBatchMessage<TMessage>(request: QueueBatchMessageRequest<TMessage, SNSMessageOptions>): Promise<void>;
|
|
11
12
|
}
|
|
12
13
|
export default SNSQueueClient;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const aws_sdk_1 = require("aws-sdk");
|
|
4
|
+
const uuid_1 = require("uuid");
|
|
4
5
|
class SNSQueueClient {
|
|
5
6
|
constructor(topicArn, serializer) {
|
|
6
7
|
this.topicArn = topicArn;
|
|
@@ -19,32 +20,55 @@ class SNSQueueClient {
|
|
|
19
20
|
return 'String';
|
|
20
21
|
}
|
|
21
22
|
}
|
|
23
|
+
static translateAttributesToSNSAttributes(attributes) {
|
|
24
|
+
return Object.keys(attributes).reduce((keyMap, attrKey) => Object.assign(keyMap, {
|
|
25
|
+
[attrKey]: {
|
|
26
|
+
DataType: SNSQueueClient.translateJStypeToSNSType(typeof attributes[attrKey]),
|
|
27
|
+
StringValue: String(attributes[attrKey]),
|
|
28
|
+
},
|
|
29
|
+
}), {});
|
|
30
|
+
}
|
|
22
31
|
async sendMessage(request) {
|
|
23
32
|
var _a, _b, _c, _d;
|
|
24
33
|
const attributes = ((_a = request.options) === null || _a === void 0 ? void 0 : _a.attributes)
|
|
25
|
-
?
|
|
26
|
-
var _a, _b, _c, _d;
|
|
27
|
-
return Object.assign(keyMap, {
|
|
28
|
-
[attrKey]: {
|
|
29
|
-
DataType: SNSQueueClient.translateJStypeToSNSType(typeof ((_b = (_a = request.options) === null || _a === void 0 ? void 0 : _a.attributes) === null || _b === void 0 ? void 0 : _b[attrKey])),
|
|
30
|
-
StringValue: String((_d = (_c = request.options) === null || _c === void 0 ? void 0 : _c.attributes) === null || _d === void 0 ? void 0 : _d[attrKey]),
|
|
31
|
-
},
|
|
32
|
-
});
|
|
33
|
-
}, {})
|
|
34
|
+
? SNSQueueClient.translateAttributesToSNSAttributes((_b = request.options) === null || _b === void 0 ? void 0 : _b.attributes)
|
|
34
35
|
: {};
|
|
35
36
|
await this.client
|
|
36
37
|
.publish({
|
|
37
38
|
TopicArn: this.topicArn,
|
|
38
39
|
Message: this.serializer.serialize(request.message, 'string'),
|
|
39
40
|
MessageGroupId: (_c = request.options) === null || _c === void 0 ? void 0 : _c.messageGroupId,
|
|
40
|
-
MessageDeduplicationId: (_d = request.options) === null || _d === void 0 ? void 0 : _d.
|
|
41
|
+
MessageDeduplicationId: (_d = request.options) === null || _d === void 0 ? void 0 : _d.messageDeduplicationId,
|
|
41
42
|
MessageAttributes: attributes,
|
|
42
43
|
})
|
|
43
44
|
.promise();
|
|
44
45
|
}
|
|
45
46
|
async sendBatchMessage(request) {
|
|
46
|
-
|
|
47
|
-
|
|
47
|
+
var _a, _b;
|
|
48
|
+
const isPublishBatchSupported = this.client.publishBatch;
|
|
49
|
+
if (!isPublishBatchSupported) {
|
|
50
|
+
const batchSendMessagePromises = request.messages.map((message) => this.sendMessage({ message, options: request.options }));
|
|
51
|
+
await Promise.all(batchSendMessagePromises);
|
|
52
|
+
}
|
|
53
|
+
const attributes = ((_a = request.options) === null || _a === void 0 ? void 0 : _a.attributes)
|
|
54
|
+
? SNSQueueClient.translateAttributesToSNSAttributes((_b = request.options) === null || _b === void 0 ? void 0 : _b.attributes)
|
|
55
|
+
: {};
|
|
56
|
+
const batchSendMessageEntries = request.messages.map((message) => {
|
|
57
|
+
var _a, _b;
|
|
58
|
+
return ({
|
|
59
|
+
Id: (0, uuid_1.v1)(),
|
|
60
|
+
Message: this.serializer.serialize(message, 'string'),
|
|
61
|
+
MessageGroupId: (_a = request.options) === null || _a === void 0 ? void 0 : _a.messageGroupId,
|
|
62
|
+
MessageDeduplicationId: (_b = request.options) === null || _b === void 0 ? void 0 : _b.messageDeduplicationId,
|
|
63
|
+
MessageAttributes: attributes,
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
await this.client
|
|
67
|
+
.publishBatch({
|
|
68
|
+
TopicArn: this.topicArn,
|
|
69
|
+
PublishBatchRequestEntries: batchSendMessageEntries,
|
|
70
|
+
})
|
|
71
|
+
.promise();
|
|
48
72
|
}
|
|
49
73
|
}
|
|
50
74
|
exports.default = SNSQueueClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SNSQueueClient.js","sourceRoot":"","sources":["../../../services/queue/SNSQueueClient.ts"],"names":[],"mappings":";;AAAA,qCAA6B;
|
|
1
|
+
{"version":3,"file":"SNSQueueClient.js","sourceRoot":"","sources":["../../../services/queue/SNSQueueClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,10 @@ class GlobalAtomicCache extends Cache_1.default {
|
|
|
34
34
|
this.fetchers = new Map();
|
|
35
35
|
}
|
|
36
36
|
getLockFilePath(key) {
|
|
37
|
+
const lockfilePath = path.join(this.mountPath, `portal-${this.storeName}-${key}.lck`);
|
|
38
|
+
this.logger.info('[GlobalAtomicCache] - Getting lockfile path', {
|
|
39
|
+
lockfilePath,
|
|
40
|
+
});
|
|
37
41
|
return path.join(this.mountPath, `portal-${this.storeName}-${key}.lck`);
|
|
38
42
|
}
|
|
39
43
|
async isLockFilePresent(key) {
|
|
@@ -69,10 +73,12 @@ class GlobalAtomicCache extends Cache_1.default {
|
|
|
69
73
|
async waitOrDeleteLock(key) {
|
|
70
74
|
const watcher = (0, fs_1.watch)(this.getLockFilePath(key));
|
|
71
75
|
const watchPromise = new Promise((resolve) => {
|
|
76
|
+
this.logger.info('[GlobalAtomicCache] - Deleting lockfile', { key });
|
|
72
77
|
watcher.on('change', async () => {
|
|
73
78
|
const isLockFilePresent = await this.isLockFilePresent(key);
|
|
74
79
|
if (!isLockFilePresent) {
|
|
75
80
|
resolve(true);
|
|
81
|
+
this.logger.info('[GlobalAtomicCache] - Lockfile deleted', { key });
|
|
76
82
|
}
|
|
77
83
|
});
|
|
78
84
|
});
|
|
@@ -85,6 +91,9 @@ class GlobalAtomicCache extends Cache_1.default {
|
|
|
85
91
|
}
|
|
86
92
|
async executeFactoryAtomically(key, factory) {
|
|
87
93
|
const isLockFilePresent = await this.isLockFilePresent(key);
|
|
94
|
+
this.logger.info('[GlobalAtomicCache] - Checking file existence', {
|
|
95
|
+
isLockFilePresent,
|
|
96
|
+
});
|
|
88
97
|
if (isLockFilePresent) {
|
|
89
98
|
await this.waitOrDeleteLock(key);
|
|
90
99
|
return this.getOrAdd(key, factory);
|
|
@@ -105,6 +114,10 @@ class GlobalAtomicCache extends Cache_1.default {
|
|
|
105
114
|
}
|
|
106
115
|
async getOrAdd(key, factory) {
|
|
107
116
|
const fetcher = this.fetchers.get(key);
|
|
117
|
+
this.logger.info('[GlobalAtomicCache] - Getting or adding cached value', {
|
|
118
|
+
fetchers: this.fetchers,
|
|
119
|
+
key,
|
|
120
|
+
});
|
|
108
121
|
if (fetcher) {
|
|
109
122
|
return fetcher;
|
|
110
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GlobalAtomicCache.js","sourceRoot":"","sources":["../../../utils/caching/GlobalAtomicCache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAA0C;AAC1C,2CAA4B;AAC5B,oDAA2B;AAU3B,MAAe,iBAAkB,SAAQ,eAAK;IAG5C,YACE,gBAAwB,EACL,SAAiB,EACjB,SAAiB,EACjB,MAAc;QAEjC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QAJJ,cAAS,GAAT,SAAS,CAAQ;QACjB,cAAS,GAAT,SAAS,CAAQ;QACjB,WAAM,GAAN,MAAM,CAAQ;QANlB,aAAQ,GAAG,IAAI,GAAG,EAA4B,CAAA;IAS/D,CAAC;IAEO,eAAe,CAAC,GAAW;QACjC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,IAAI,CAAC,SAAS,IAAI,GAAG,MAAM,CAAC,CAAA;IACzE,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,GAAW;QACzC,IAAI;YACF,MAAM,aAAE,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAA;YAE1C,OAAO,IAAI,CAAA;SACZ;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAA;SACb;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,GAAW;QACtC,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;QAE3D,IAAI,iBAAiB,EAAE;YACrB,IAAI;gBACF,MAAM,aAAE,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAA;aAC3C;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,OAAO,GAAG,KAAgB,CAAA;gBAEhC,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE;oBAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,sEAAsE,CACvE,CAAA;iBACF;qBAAM;oBACL,MAAM,KAAK,CAAA;iBACZ;aACF;SACF;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,GAAW;QACnC,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3D,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,GAAW;QACxC,MAAM,OAAO,GAAG,IAAA,UAAK,EAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAA;QAEhD,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3C,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;gBAC9B,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;gBAE3D,IAAI,CAAC,iBAAiB,EAAE;oBACtB,OAAO,CAAC,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"GlobalAtomicCache.js","sourceRoot":"","sources":["../../../utils/caching/GlobalAtomicCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ class SecretCache extends GlobalAtomicCache_1.default {
|
|
|
24
24
|
},
|
|
25
25
|
},
|
|
26
26
|
];
|
|
27
|
+
this.logger.info('[SecretCache] - Saving SSM Parameter', key, value);
|
|
27
28
|
await this.ssmClient
|
|
28
29
|
.putParameter({
|
|
29
30
|
Name: this.getFullParameterName(key),
|
|
@@ -33,15 +34,20 @@ class SecretCache extends GlobalAtomicCache_1.default {
|
|
|
33
34
|
Tier: 'Advanced',
|
|
34
35
|
})
|
|
35
36
|
.promise();
|
|
37
|
+
this.logger.info('SSM parameter saved!');
|
|
36
38
|
}
|
|
37
39
|
async get(key) {
|
|
38
40
|
try {
|
|
41
|
+
this.logger.info('[SecretCache] - Fetching parameter');
|
|
39
42
|
const parameter = await this.ssmClient
|
|
40
43
|
.getParameter({
|
|
41
44
|
Name: this.getFullParameterName(key),
|
|
42
45
|
WithDecryption: true,
|
|
43
46
|
})
|
|
44
47
|
.promise();
|
|
48
|
+
this.logger.info('[SecretCache] - Fetched parameter', {
|
|
49
|
+
parameter: parameter === null || parameter === void 0 ? void 0 : parameter.Parameter,
|
|
50
|
+
});
|
|
45
51
|
if (!parameter.Parameter) {
|
|
46
52
|
return null;
|
|
47
53
|
}
|
|
@@ -49,6 +55,7 @@ class SecretCache extends GlobalAtomicCache_1.default {
|
|
|
49
55
|
return secretValue ? JSON.parse(secretValue) : null;
|
|
50
56
|
}
|
|
51
57
|
catch (e) {
|
|
58
|
+
this.logger.error('[SecretCache] - Error', { error: e });
|
|
52
59
|
return null;
|
|
53
60
|
}
|
|
54
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SecretCache.js","sourceRoot":"","sources":["../../../utils/caching/SecretCache.ts"],"names":[],"mappings":";;;;;AAAA,qCAA6B;AAC7B,qEAA4C;AAK5C,4EAAmD;AAEnD,MAAM,WAAY,SAAQ,2BAAiB;IAGzC,YACE,SAAiB,EACjB,SAAiB,EACE,gBAAwB,EAC3C,MAAc,EACN,cAAc,OAAO;QAE7B,KAAK,CAAC,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QAJlC,qBAAgB,GAAhB,gBAAgB,CAAQ;QAEnC,gBAAW,GAAX,WAAW,CAAU;QAPd,cAAS,GAAG,IAAI,aAAG,EAAE,CAAA;IAUtC,CAAC;IAEM,KAAK,CAAC,GAAG,CAAS,GAAW,EAAE,KAAa;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QACrC,MAAM,gBAAgB,GAAG;YACvB;gBACE,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE;iBAC3C;aACF;SACF,CAAA;QAED,MAAM,IAAI,CAAC,SAAS;aACjB,YAAY,CAAC;YACZ,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC;YACpC,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC;YAC1C,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,IAAI,EAAE,UAAU;SACjB,CAAC;aACD,OAAO,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"SecretCache.js","sourceRoot":"","sources":["../../../utils/caching/SecretCache.ts"],"names":[],"mappings":";;;;;AAAA,qCAA6B;AAC7B,qEAA4C;AAK5C,4EAAmD;AAEnD,MAAM,WAAY,SAAQ,2BAAiB;IAGzC,YACE,SAAiB,EACjB,SAAiB,EACE,gBAAwB,EAC3C,MAAc,EACN,cAAc,OAAO;QAE7B,KAAK,CAAC,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QAJlC,qBAAgB,GAAhB,gBAAgB,CAAQ;QAEnC,gBAAW,GAAX,WAAW,CAAU;QAPd,cAAS,GAAG,IAAI,aAAG,EAAE,CAAA;IAUtC,CAAC;IAEM,KAAK,CAAC,GAAG,CAAS,GAAW,EAAE,KAAa;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QACrC,MAAM,gBAAgB,GAAG;YACvB;gBACE,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE;iBAC3C;aACF;SACF,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QAEpE,MAAM,IAAI,CAAC,SAAS;aACjB,YAAY,CAAC;YACZ,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC;YACpC,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC;YAC1C,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,IAAI,EAAE,UAAU;SACjB,CAAC;aACD,OAAO,EAAE,CAAA;QAEZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;IAC1C,CAAC;IAEM,KAAK,CAAC,GAAG,CAAS,GAAW;QAClC,IAAI;YACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAA;YACtD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS;iBACnC,YAAY,CAAC;gBACZ,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC;gBACpC,cAAc,EAAE,IAAI;aACrB,CAAC;iBACD,OAAO,EAAE,CAAA;YAEZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE;gBACpD,SAAS,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS;aAChC,CAAC,CAAA;YACF,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;gBACxB,OAAO,IAAI,CAAA;aACZ;YAED,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,SAAS,CAAA;YAElD,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;SACpD;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;YACxD,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS;aACpD,mBAAmB,CAAC;YACnB,IAAI,EAAE,iBAAiB,IAAI,CAAC,SAAS,EAAE;SACxC,CAAC;aACD,OAAO,EAAE,CAAA;QAEZ,IAAI,CAAC,UAAU,EAAE;YACf,OAAM;SACP;QACD,MAAM,KAAK,GAAG,UAAU;aACrB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;aAChC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAE7B,MAAM,IAAI,CAAC,SAAS;aACjB,gBAAgB,CAAC;YAChB,KAAK,EAAE,KAAK;SACb,CAAC;aACD,OAAO,EAAE,CAAA;IACd,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAW;QAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAElC,OAAO,CAAC,CAAC,MAAM,CAAA;IACjB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,GAAW;QAC7B,MAAM,IAAI,CAAC,SAAS;aACjB,eAAe,CAAC;YACf,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC;SACrC,CAAC;aACD,OAAO,EAAE,CAAA;IACd,CAAC;IAEO,oBAAoB,CAAC,GAAW;QACtC,OAAO,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,SAAS,IAAI,GAAG,EAAE,CAAA;IACxD,CAAC;IAES,UAAU,CAAS,QAAgB;QAC3C,OAAO;YACL,UAAU,EAAE,IAAA,oBAAU,EAAC,IAAI,IAAI,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC;YACzD,KAAK,EAAE,QAAQ;SAChB,CAAA;IACH,CAAC;CACF;AAED,kBAAe,WAAW,CAAA"}
|