@webda/aws 4.0.0-beta.5 → 4.0.0-beta.7
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 +5 -6
- package/lib/deployers/awsdeployer.d.ts +10 -4
- package/lib/deployers/awsdeployer.d.ts.map +1 -1
- package/lib/deployers/awsdeployer.js +19 -5
- package/lib/deployers/awsdeployer.js.map +1 -1
- package/lib/services/aws-parameters.d.ts +17 -3
- package/lib/services/aws-parameters.d.ts.map +1 -1
- package/lib/services/aws-parameters.js +18 -0
- package/lib/services/aws-parameters.js.map +1 -1
- package/lib/services/cloudwatchlogger.service.d.ts +6 -4
- package/lib/services/cloudwatchlogger.service.d.ts.map +1 -1
- package/lib/services/cloudwatchlogger.service.js +2 -2
- package/lib/services/cloudwatchlogger.service.js.map +1 -1
- package/lib/services/dynamodb.service.d.ts +18 -4
- package/lib/services/dynamodb.service.d.ts.map +1 -1
- package/lib/services/dynamodb.service.js +23 -3
- package/lib/services/dynamodb.service.js.map +1 -1
- package/lib/services/lambdacaller.service.d.ts +6 -3
- package/lib/services/lambdacaller.service.d.ts.map +1 -1
- package/lib/services/lambdacaller.service.js +2 -2
- package/lib/services/lambdacaller.service.js.map +1 -1
- package/lib/services/s3binary.service.d.ts +21 -4
- package/lib/services/s3binary.service.d.ts.map +1 -1
- package/lib/services/s3binary.service.js +29 -9
- package/lib/services/s3binary.service.js.map +1 -1
- package/lib/services/secretsmanager.service.d.ts +6 -4
- package/lib/services/secretsmanager.service.d.ts.map +1 -1
- package/lib/services/secretsmanager.service.js +2 -2
- package/lib/services/secretsmanager.service.js.map +1 -1
- package/lib/services/sqsqueue.service.d.ts +6 -4
- package/lib/services/sqsqueue.service.d.ts.map +1 -1
- package/lib/services/sqsqueue.service.js +2 -2
- package/lib/services/sqsqueue.service.js.map +1 -1
- package/package.json +7 -7
- package/webda.module.json +87 -36
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
This module is part of Webda Application Framework that allows you to quickly develop applications with all modern prerequisites: Security, Extensibility, GraphQL, REST, CloudNative [https://webda.io](https://webda.io)
|
|
4
4
|
|
|
5
|
-
<img src="https://webda.io/
|
|
5
|
+
<img src="https://webda.io/img/webda.svg" width="128" />
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
|
|
@@ -13,8 +13,6 @@ This module is part of Webda Application Framework that allows you to quickly de
|
|
|
13
13
|
|
|
14
14
|
<!-- README_HEADER -->
|
|
15
15
|
|
|
16
|
-
# @webda/aws
|
|
17
|
-
|
|
18
16
|
> AWS integration bundle for Webda — DynamoDB Store, S3 Binary, SQS Queue, CloudWatch Logger, Secrets Manager, Lambda server, Route53, and Lambda/CloudFormation deployers in one package.
|
|
19
17
|
|
|
20
18
|
## When to use it
|
|
@@ -79,6 +77,7 @@ pnpm add @webda/aws
|
|
|
79
77
|
- Related: [`@webda/core`](../core) for Store, Queue, and Binary base classes; [`@webda/async`](../async) for job orchestration using SQSQueue.
|
|
80
78
|
|
|
81
79
|
<!-- README_FOOTER -->
|
|
80
|
+
|
|
82
81
|
## Sponsors
|
|
83
82
|
|
|
84
83
|
<!--
|
|
@@ -87,12 +86,12 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
|
|
|
87
86
|
|
|
88
87
|
Arize AI is a machine learning observability and model monitoring platform. It helps you visualize, monitor, and explain your machine learning models. [Learn more](https://arize.com)
|
|
89
88
|
|
|
90
|
-
[<img src="https://
|
|
89
|
+
[<img src="https://webda.io/img/sponsors/arize.svg" width="200">](https://arize.com)
|
|
91
90
|
|
|
92
91
|
Loopingz is a software development company that provides consulting and development services. [Learn more](https://loopingz.com)
|
|
93
92
|
|
|
94
|
-
[<img src="https://
|
|
93
|
+
[<img src="https://webda.io/img/sponsors/loopingz.png" width="200">](https://loopingz.com)
|
|
95
94
|
|
|
96
95
|
Tellae is an innovative consulting firm specialized in cities transportation issues. We provide our clients, both public and private, with solutions to support your strategic and operational decisions. [Learn more](https://tellae.fr)
|
|
97
96
|
|
|
98
|
-
[<img src="https://tellae.
|
|
97
|
+
[<img src="https://webda.io/img/sponsors/tellae.svg" width="200">](https://tellae.fr)
|
|
@@ -2,7 +2,7 @@ import { CertificateDetail } from "@aws-sdk/client-acm";
|
|
|
2
2
|
import { HostedZone, RRType } from "@aws-sdk/client-route-53";
|
|
3
3
|
import { S3 } from "@aws-sdk/client-s3";
|
|
4
4
|
import { GetCallerIdentityResponse } from "@aws-sdk/client-sts";
|
|
5
|
-
import { Service, ServiceParameters } from "@webda/core";
|
|
5
|
+
import { SecretString, Service, ServiceParameters } from "@webda/core";
|
|
6
6
|
/**
|
|
7
7
|
* Tags as an AWS array or as a map
|
|
8
8
|
*/
|
|
@@ -31,22 +31,28 @@ export declare class AWSDeployerParameters extends ServiceParameters {
|
|
|
31
31
|
* AWS_ACCESS_KEY_ID to use
|
|
32
32
|
*
|
|
33
33
|
* Using static key is not recommended
|
|
34
|
+
*
|
|
35
|
+
* Can be encrypted with `webda config encrypt`
|
|
34
36
|
*/
|
|
35
|
-
accessKeyId?: string;
|
|
37
|
+
accessKeyId?: string | SecretString;
|
|
36
38
|
/**
|
|
37
39
|
* AWS_SECRET_ACCESS_KEY to use
|
|
38
40
|
*
|
|
39
41
|
* Using static key is not recommended
|
|
42
|
+
*
|
|
43
|
+
* Can be encrypted with `webda config encrypt`
|
|
40
44
|
*/
|
|
41
|
-
secretAccessKey?: string;
|
|
45
|
+
secretAccessKey?: string | SecretString;
|
|
42
46
|
/**
|
|
43
47
|
* AWS_SESSION_TOKEN Token
|
|
44
48
|
*
|
|
45
49
|
* Even if it is possible to add it here
|
|
46
50
|
* It is not sustainable as this token at its best will
|
|
47
51
|
* have a lifetime of 12 hours
|
|
52
|
+
*
|
|
53
|
+
* Can be encrypted with `webda config encrypt`
|
|
48
54
|
*/
|
|
49
|
-
sessionToken?: string;
|
|
55
|
+
sessionToken?: string | SecretString;
|
|
50
56
|
/**
|
|
51
57
|
* AWS_REGION to use
|
|
52
58
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"awsdeployer.d.ts","sourceRoot":"","sources":["../../src/deployers/awsdeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,iBAAiB,EAA4D,MAAM,qBAAqB,CAAC;AAEvH,OAAO,EAAE,UAAU,EAAE,MAAM,EAAW,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAY,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAO,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAIL,OAAO,EACP,iBAAiB,EAGlB,MAAM,aAAa,CAAC;AAWrB;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAE1F;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAC7B,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,GAAG,gBAAgB,GAAG,YAAY,GAAG,YAAY,CAAC;AAE5F;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,iBAAiB;IAC1D;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd
|
|
1
|
+
{"version":3,"file":"awsdeployer.d.ts","sourceRoot":"","sources":["../../src/deployers/awsdeployer.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ import { EC2 } from "@aws-sdk/client-ec2";
|
|
|
37
37
|
import { Route53 } from "@aws-sdk/client-route-53";
|
|
38
38
|
import { NotFound, S3 } from "@aws-sdk/client-s3";
|
|
39
39
|
import { STS } from "@aws-sdk/client-sts";
|
|
40
|
-
import { getDeploymentVariables, InstanceCache, resolveDeploymentVariables, Service, ServiceParameters, useCore, WebdaError } from "@webda/core";
|
|
40
|
+
import { getDeploymentVariables, InstanceCache, resolveDeploymentVariables, SecretString, Service, ServiceParameters, useCore, WebdaError } from "@webda/core";
|
|
41
41
|
import { WaitFor, WaitLinearDelay } from "@webda/utils";
|
|
42
42
|
import * as crypto from "node:crypto";
|
|
43
43
|
import { randomUUID } from "node:crypto";
|
|
@@ -86,11 +86,22 @@ let AWSDeployer = (() => {
|
|
|
86
86
|
*/
|
|
87
87
|
async prepare(extra = {}) {
|
|
88
88
|
var _b;
|
|
89
|
-
|
|
89
|
+
// Serializing the parameters masks the encrypted secrets: keep them aside
|
|
90
|
+
const secrets = {};
|
|
91
|
+
const parameters = this.getParameters() ?? {};
|
|
92
|
+
for (const key of ["accessKeyId", "secretAccessKey", "sessionToken"]) {
|
|
93
|
+
if (parameters[key] instanceof SecretString) {
|
|
94
|
+
secrets[key] = parameters[key];
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
this.resources = { ...this.getRawParameters(), ...secrets };
|
|
90
98
|
(_b = this.resources).name ?? (_b.name = this.getName());
|
|
91
99
|
// Defaults can use the deployment variables too
|
|
92
100
|
await this.defaultResources();
|
|
93
|
-
this.resources =
|
|
101
|
+
this.resources = {
|
|
102
|
+
...resolveDeploymentVariables(this.resources, getDeploymentVariables(this, { resources: this.resources, ...extra })),
|
|
103
|
+
...secrets
|
|
104
|
+
};
|
|
94
105
|
return this.resources;
|
|
95
106
|
}
|
|
96
107
|
/**
|
|
@@ -107,6 +118,9 @@ let AWSDeployer = (() => {
|
|
|
107
118
|
*/
|
|
108
119
|
async defaultResources() {
|
|
109
120
|
var _b, _c, _d, _e, _f;
|
|
121
|
+
// Warn once if static secrets are configured in clear text (environment variables are fine)
|
|
122
|
+
SecretString.from(this.resources.secretAccessKey, "secretAccessKey");
|
|
123
|
+
SecretString.from(this.resources.sessionToken, "sessionToken");
|
|
110
124
|
(_b = this.resources).accessKeyId ?? (_b.accessKeyId = process.env["AWS_ACCESS_KEY_ID"]);
|
|
111
125
|
(_c = this.resources).secretAccessKey ?? (_c.secretAccessKey = process.env["AWS_SECRET_ACCESS_KEY"]);
|
|
112
126
|
(_d = this.resources).sessionToken ?? (_d.sessionToken = process.env["AWS_SESSION_TOKEN"]);
|
|
@@ -129,11 +143,11 @@ let AWSDeployer = (() => {
|
|
|
129
143
|
config.endpoint = this.resources.endpoints[endpoint];
|
|
130
144
|
}
|
|
131
145
|
if (this.resources.accessKeyId && this.resources.secretAccessKey) {
|
|
132
|
-
config.credentials = {
|
|
146
|
+
config.credentials = SecretString.unwrap({
|
|
133
147
|
accessKeyId: this.resources.accessKeyId,
|
|
134
148
|
secretAccessKey: this.resources.secretAccessKey,
|
|
135
149
|
sessionToken: this.resources.sessionToken
|
|
136
|
-
};
|
|
150
|
+
});
|
|
137
151
|
}
|
|
138
152
|
return config;
|
|
139
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"awsdeployer.js","sourceRoot":"","sources":["../../src/deployers/awsdeployer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"awsdeployer.js","sourceRoot":"","sources":["../../src/deployers/awsdeployer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SecretString } from "@webda/core";
|
|
1
2
|
/**
|
|
2
3
|
* AWS client parameters shared by the AWS services
|
|
3
4
|
*
|
|
@@ -11,11 +12,13 @@ export interface AWSServiceParameters {
|
|
|
11
12
|
endpoint?: string;
|
|
12
13
|
/**
|
|
13
14
|
* Static credentials, default to the AWS environment variables
|
|
15
|
+
*
|
|
16
|
+
* Can be encrypted with `webda config encrypt`
|
|
14
17
|
*/
|
|
15
18
|
credentials?: {
|
|
16
|
-
accessKeyId: string;
|
|
17
|
-
secretAccessKey: string;
|
|
18
|
-
sessionToken?: string;
|
|
19
|
+
accessKeyId: string | SecretString;
|
|
20
|
+
secretAccessKey: string | SecretString;
|
|
21
|
+
sessionToken?: string | SecretString;
|
|
19
22
|
};
|
|
20
23
|
/**
|
|
21
24
|
* AWS region
|
|
@@ -30,4 +33,15 @@ export interface AWSServiceParameters {
|
|
|
30
33
|
* @returns the parameters
|
|
31
34
|
*/
|
|
32
35
|
export declare function loadAWSParameters<T extends AWSServiceParameters>(params: T): T;
|
|
36
|
+
/**
|
|
37
|
+
* Build the configuration to pass to an AWS SDK client constructor
|
|
38
|
+
*
|
|
39
|
+
* The credentials can hold {@link SecretString} values (encrypted configuration):
|
|
40
|
+
* they are replaced by their plain value in a shallow copy, the parameters
|
|
41
|
+
* themselves keep the masked secrets.
|
|
42
|
+
*
|
|
43
|
+
* @param params - the service parameters
|
|
44
|
+
* @returns the client configuration
|
|
45
|
+
*/
|
|
46
|
+
export declare function getAWSClientConfig<T extends AWSServiceParameters>(params: T): any;
|
|
33
47
|
//# sourceMappingURL=aws-parameters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-parameters.d.ts","sourceRoot":"","sources":["../../src/services/aws-parameters.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB
|
|
1
|
+
{"version":3,"file":"aws-parameters.d.ts","sourceRoot":"","sources":["../../src/services/aws-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,WAAW,CAAC,EAAE;QACZ,WAAW,EAAE,MAAM,GAAG,YAAY,CAAC;QACnC,eAAe,EAAE,MAAM,GAAG,YAAY,CAAC;QACvC,YAAY,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;KACtC,CAAC;IACF;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,oBAAoB,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAU9E;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,oBAAoB,EAAE,MAAM,EAAE,CAAC,GAAG,GAAG,CAMjF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SecretString } from "@webda/core";
|
|
1
2
|
/**
|
|
2
3
|
* Default the region and credentials from the AWS environment variables
|
|
3
4
|
*
|
|
@@ -15,4 +16,21 @@ export function loadAWSParameters(params) {
|
|
|
15
16
|
}
|
|
16
17
|
return params;
|
|
17
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* Build the configuration to pass to an AWS SDK client constructor
|
|
21
|
+
*
|
|
22
|
+
* The credentials can hold {@link SecretString} values (encrypted configuration):
|
|
23
|
+
* they are replaced by their plain value in a shallow copy, the parameters
|
|
24
|
+
* themselves keep the masked secrets.
|
|
25
|
+
*
|
|
26
|
+
* @param params - the service parameters
|
|
27
|
+
* @returns the client configuration
|
|
28
|
+
*/
|
|
29
|
+
export function getAWSClientConfig(params) {
|
|
30
|
+
const credentials = params.credentials;
|
|
31
|
+
if (!credentials || !Object.values(credentials).some(v => v instanceof SecretString)) {
|
|
32
|
+
return params;
|
|
33
|
+
}
|
|
34
|
+
return { ...params, credentials: SecretString.unwrap({ ...credentials }) };
|
|
35
|
+
}
|
|
18
36
|
//# sourceMappingURL=aws-parameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-parameters.js","sourceRoot":"","sources":["../../src/services/aws-parameters.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"aws-parameters.js","sourceRoot":"","sources":["../../src/services/aws-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA8B3C;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAiC,MAAS;IACzE,MAAM,CAAC,MAAM,KAAb,MAAM,CAAC,MAAM,GAAK,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,WAAW,EAAC;IACnE,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QAC5G,MAAM,CAAC,WAAW,KAAlB,MAAM,CAAC,WAAW,GAAK;YACrB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;YAC7C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;YACrD,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;SAC/C,EAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,kBAAkB,CAAiC,MAAS;IAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACvC,IAAI,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,YAAY,CAAC,EAAE,CAAC;QACrF,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,EAAE,CAAC;AAC7E,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CloudWatchLogs } from "@aws-sdk/client-cloudwatch-logs";
|
|
2
|
-
import { Service, ServiceParameters } from "@webda/core";
|
|
2
|
+
import { SecretString, Service, ServiceParameters } from "@webda/core";
|
|
3
3
|
import { WorkerLogLevel, WorkerMessage } from "@webda/workout";
|
|
4
4
|
import { AWSServiceParameters } from "./aws-parameters.js";
|
|
5
5
|
import type { CloudFormationContributor } from "./contributors.js";
|
|
@@ -13,11 +13,13 @@ export declare class CloudWatchLoggerParameters extends ServiceParameters implem
|
|
|
13
13
|
endpoint?: string;
|
|
14
14
|
/**
|
|
15
15
|
* Static credentials, default to the AWS environment variables
|
|
16
|
+
*
|
|
17
|
+
* Can be encrypted with `webda config encrypt`
|
|
16
18
|
*/
|
|
17
19
|
credentials?: {
|
|
18
|
-
accessKeyId: string;
|
|
19
|
-
secretAccessKey: string;
|
|
20
|
-
sessionToken?: string;
|
|
20
|
+
accessKeyId: string | SecretString;
|
|
21
|
+
secretAccessKey: string | SecretString;
|
|
22
|
+
sessionToken?: string | SecretString;
|
|
21
23
|
};
|
|
22
24
|
/**
|
|
23
25
|
* AWS region
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudwatchlogger.service.d.ts","sourceRoot":"","sources":["../../src/services/cloudwatchlogger.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAiB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"cloudwatchlogger.service.d.ts","sourceRoot":"","sources":["../../src/services/cloudwatchlogger.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAiB,MAAM,aAAa,CAAC;AACtF,OAAO,EAA8B,cAAc,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE3F,OAAO,EAAE,oBAAoB,EAAyC,MAAM,qBAAqB,CAAC;AAClG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAEnE;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,iBAAkB,YAAW,oBAAoB;IAC/F;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,WAAW,CAAC,EAAE;QACZ,WAAW,EAAE,MAAM,GAAG,YAAY,CAAC;QACnC,eAAe,EAAE,MAAM,GAAG,YAAY,CAAC;QACvC,YAAY,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;KACtC,CAAC;IACF;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IACX;;;OAGG;IACH,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;;;OAIG;IACH,IAAI,CAAC,MAAM,GAAE,GAAQ,GAAG,IAAI,CAK3B;CACF;AAED;;;;GAIG;AACH,qBAAa,gBAAgB,CAAC,CAAC,SAAS,0BAA0B,GAAG,0BAA0B,CAC7F,SAAQ,OAAO,CAAC,CAAC,CACjB,YAAW,yBAAyB;IAEpC,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE,cAAc,CAAC;IAC5B,aAAa,EAAE,GAAG,EAAE,CAAM;IAC1B;;OAEG;IACH,SAAS,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IACxD;;OAEG;IACH,SAAS,CAAC,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAExC;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAkC1B;IAED;;OAEG;IACH,SAAS,CAAC,eAAe,SAOxB;IAED;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAI1B;IAED;;;;OAIG;IACG,QAAQ,CAAC,IAAI,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBnD;IAED;;;;OAIG;IACH,IAAI,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAUhD;IAED;;;;OAIG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM;QAG1B,GAAG;QACH,MAAM;QACN,MAAM;QACN,QAAQ;MAKX;IAED;;;OAGG;IACH,iBAAiB,OAehB;CACF;eAEc,gBAAgB"}
|
|
@@ -2,7 +2,7 @@ import { CloudWatchLogs } from "@aws-sdk/client-cloudwatch-logs";
|
|
|
2
2
|
import { Service, ServiceParameters, useCoreEvents } from "@webda/core";
|
|
3
3
|
import { LogFilter, useWorkerOutput } from "@webda/workout";
|
|
4
4
|
import { randomUUID } from "node:crypto";
|
|
5
|
-
import { loadAWSParameters } from "./aws-parameters.js";
|
|
5
|
+
import { getAWSClientConfig, loadAWSParameters } from "./aws-parameters.js";
|
|
6
6
|
/**
|
|
7
7
|
* Send webda log to CloudWatch
|
|
8
8
|
*/
|
|
@@ -40,7 +40,7 @@ export class CloudWatchLogger extends Service {
|
|
|
40
40
|
throw Error("Require a log group `logGroupName` parameter");
|
|
41
41
|
}
|
|
42
42
|
this._logStreamName = (this.parameters.logStreamNamePrefix || "") + randomUUID();
|
|
43
|
-
this._cloudwatch = new CloudWatchLogs(this.parameters);
|
|
43
|
+
this._cloudwatch = new CloudWatchLogs(getAWSClientConfig(this.parameters));
|
|
44
44
|
const res = await this._cloudwatch.describeLogGroups({
|
|
45
45
|
logGroupNamePrefix: this._logGroupName
|
|
46
46
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudwatchlogger.service.js","sourceRoot":"","sources":["../../src/services/cloudwatchlogger.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,
|
|
1
|
+
{"version":3,"file":"cloudwatchlogger.service.js","sourceRoot":"","sources":["../../src/services/cloudwatchlogger.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DynamoDBDocument } from "@aws-sdk/lib-dynamodb";
|
|
2
|
-
import { MemoryRepository, Store, StoreParameters } from "@webda/core";
|
|
2
|
+
import { MemoryRepository, SecretString, Store, StoreParameters } from "@webda/core";
|
|
3
3
|
import type { ModelClass, Repository } from "@webda/core";
|
|
4
4
|
import * as WebdaQL from "@webda/ql";
|
|
5
5
|
import { WorkerOutput } from "@webda/workout";
|
|
@@ -30,11 +30,13 @@ export declare class DynamoStoreParameters extends StoreParameters implements AW
|
|
|
30
30
|
endpoint?: string;
|
|
31
31
|
/**
|
|
32
32
|
* Static credentials, default to the AWS environment variables
|
|
33
|
+
*
|
|
34
|
+
* Can be encrypted with `webda config encrypt`
|
|
33
35
|
*/
|
|
34
36
|
credentials?: {
|
|
35
|
-
accessKeyId: string;
|
|
36
|
-
secretAccessKey: string;
|
|
37
|
-
sessionToken?: string;
|
|
37
|
+
accessKeyId: string | SecretString;
|
|
38
|
+
secretAccessKey: string | SecretString;
|
|
39
|
+
sessionToken?: string | SecretString;
|
|
38
40
|
};
|
|
39
41
|
/**
|
|
40
42
|
* AWS region
|
|
@@ -199,6 +201,18 @@ export declare class DynamoRepository<T extends ModelClass> extends MemoryReposi
|
|
|
199
201
|
* @returns the items and the residual filter
|
|
200
202
|
*/
|
|
201
203
|
find(query: WebdaQL.Query): Promise<DynamoFindResult<InstanceType<T>>>;
|
|
204
|
+
/**
|
|
205
|
+
* Delete in bulk: the generic fallback (matching keys collected up to LIMIT, then deleted one by one with
|
|
206
|
+
* this repository's `delete`), no per-object event. A native DynamoDB batch write is a follow-up.
|
|
207
|
+
* @override
|
|
208
|
+
*/
|
|
209
|
+
deleteMany(statement: string | WebdaQL.Query, params?: WebdaQL.QueryParameters): Promise<number>;
|
|
210
|
+
/**
|
|
211
|
+
* Update in bulk: the generic fallback (matching keys collected up to LIMIT, then patched one by one with
|
|
212
|
+
* this repository's `patch`), no per-object event. A native DynamoDB batch write is a follow-up.
|
|
213
|
+
* @override
|
|
214
|
+
*/
|
|
215
|
+
updateMany(statement: string | WebdaQL.Query, params?: WebdaQL.QueryParameters): Promise<number>;
|
|
202
216
|
/**
|
|
203
217
|
* Query the table
|
|
204
218
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamodb.service.d.ts","sourceRoot":"","sources":["../../src/services/dynamodb.service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAGL,gBAAgB,EAChB,KAAK,EAEL,eAAe,EAKhB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"dynamodb.service.d.ts","sourceRoot":"","sources":["../../src/services/dynamodb.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ import { ConditionalCheckFailedException, DynamoDB, DynamoDBClient } from "@aws-
|
|
|
36
36
|
import { DynamoDBDocument } from "@aws-sdk/lib-dynamodb";
|
|
37
37
|
import { EventRepository, InstanceCache, MemoryRepository, Store, StoreNotFoundError, StoreParameters, UpdateConditionFailError, useModel, useModelMetadata, WebdaError } from "@webda/core";
|
|
38
38
|
import * as WebdaQL from "@webda/ql";
|
|
39
|
-
import { loadAWSParameters } from "./aws-parameters.js";
|
|
39
|
+
import { getAWSClientConfig, loadAWSParameters } from "./aws-parameters.js";
|
|
40
40
|
/**
|
|
41
41
|
* Name of the DynamoDB hash key attribute
|
|
42
42
|
*/
|
|
@@ -710,6 +710,22 @@ export class DynamoRepository extends MemoryRepository {
|
|
|
710
710
|
: undefined
|
|
711
711
|
};
|
|
712
712
|
}
|
|
713
|
+
/**
|
|
714
|
+
* Delete in bulk: the generic fallback (matching keys collected up to LIMIT, then deleted one by one with
|
|
715
|
+
* this repository's `delete`), no per-object event. A native DynamoDB batch write is a follow-up.
|
|
716
|
+
* @override
|
|
717
|
+
*/
|
|
718
|
+
async deleteMany(statement, params) {
|
|
719
|
+
return this.deleteManyByKey(statement, params);
|
|
720
|
+
}
|
|
721
|
+
/**
|
|
722
|
+
* Update in bulk: the generic fallback (matching keys collected up to LIMIT, then patched one by one with
|
|
723
|
+
* this repository's `patch`), no per-object event. A native DynamoDB batch write is a follow-up.
|
|
724
|
+
* @override
|
|
725
|
+
*/
|
|
726
|
+
async updateMany(statement, params) {
|
|
727
|
+
return this.updateManyByKey(statement, params);
|
|
728
|
+
}
|
|
713
729
|
/**
|
|
714
730
|
* Query the table
|
|
715
731
|
*
|
|
@@ -720,7 +736,10 @@ export class DynamoRepository extends MemoryRepository {
|
|
|
720
736
|
* @returns the results and the continuation token
|
|
721
737
|
*/
|
|
722
738
|
async query(query) {
|
|
723
|
-
|
|
739
|
+
// A query object built or changed by code goes back through the grammar before reaching the backend
|
|
740
|
+
const parsed = typeof query === "string" ? WebdaQL.parse(query) : WebdaQL.normalizeQuery(query);
|
|
741
|
+
// DELETE / UPDATE go to deleteMany / updateMany; a field list is not a projection here
|
|
742
|
+
WebdaQL.assertFilterQuery(parsed);
|
|
724
743
|
const limit = parsed.limit ?? 1000;
|
|
725
744
|
const ids = this.buildClassFilterIdentifiers();
|
|
726
745
|
const results = [];
|
|
@@ -753,6 +772,7 @@ export class DynamoRepository extends MemoryRepository {
|
|
|
753
772
|
*/
|
|
754
773
|
async *iterate(query) {
|
|
755
774
|
const parsed = WebdaQL.parse(query);
|
|
775
|
+
WebdaQL.assertFilterQuery(parsed);
|
|
756
776
|
if (!parsed.limit) {
|
|
757
777
|
parsed.limit = 100;
|
|
758
778
|
}
|
|
@@ -809,7 +829,7 @@ let DynamoStore = (() => {
|
|
|
809
829
|
*/
|
|
810
830
|
resolve() {
|
|
811
831
|
super.resolve();
|
|
812
|
-
this._client = DynamoDBDocument.from(new DynamoDBClient(this.parameters), {
|
|
832
|
+
this._client = DynamoDBDocument.from(new DynamoDBClient(getAWSClientConfig(this.parameters)), {
|
|
813
833
|
marshallOptions: {
|
|
814
834
|
removeUndefinedValues: true,
|
|
815
835
|
convertClassInstanceToMap: true
|