serverless-plugin-datadog 3.1.2 → 3.4.0
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +24 -26
- package/dist/env.d.ts +17 -0
- package/dist/env.d.ts.map +1 -0
- package/dist/env.js +63 -0
- package/dist/env.js.map +1 -0
- package/dist/forwarder.d.ts +14 -0
- package/dist/forwarder.d.ts.map +1 -0
- package/dist/forwarder.js +87 -0
- package/dist/forwarder.js.map +1 -0
- package/dist/index.d.ts +10 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +161 -0
- package/dist/index.js.map +1 -0
- package/dist/layer.d.ts +26 -0
- package/dist/layer.d.ts.map +1 -0
- package/dist/layer.js +65 -0
- package/dist/layer.js.map +1 -0
- package/dist/layers.json +156 -0
- package/dist/package.json +2 -2
- package/dist/src/env.d.ts +2 -1
- package/dist/src/env.d.ts.map +1 -1
- package/dist/src/env.js +10 -0
- package/dist/src/env.js.map +1 -1
- package/dist/src/index.d.ts +1 -9
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +21 -5
- package/dist/src/index.js.map +1 -1
- package/dist/src/layer.d.ts +11 -2
- package/dist/src/layer.d.ts.map +1 -1
- package/dist/src/layer.js +52 -19
- package/dist/src/layer.js.map +1 -1
- package/dist/src/layers-gov.json +20 -14
- package/dist/src/layers.json +210 -147
- package/dist/src/serverless_monitors.js +3 -3
- package/dist/src/serverless_monitors.js.map +1 -1
- package/dist/templates/node-es6-template.d.ts +2 -0
- package/dist/templates/node-es6-template.d.ts.map +1 -0
- package/dist/templates/node-es6-template.js +25 -0
- package/dist/templates/node-es6-template.js.map +1 -0
- package/dist/templates/node-js-template.d.ts +2 -0
- package/dist/templates/node-js-template.d.ts.map +1 -0
- package/dist/templates/node-js-template.js +24 -0
- package/dist/templates/node-js-template.js.map +1 -0
- package/dist/templates/node-ts-template.d.ts +2 -0
- package/dist/templates/node-ts-template.d.ts.map +1 -0
- package/dist/templates/node-ts-template.js +26 -0
- package/dist/templates/node-ts-template.js.map +1 -0
- package/dist/templates/python-template.d.ts +2 -0
- package/dist/templates/python-template.d.ts.map +1 -0
- package/dist/templates/python-template.js +25 -0
- package/dist/templates/python-template.js.map +1 -0
- package/dist/tracing.d.ts +9 -0
- package/dist/tracing.d.ts.map +1 -0
- package/dist/tracing.js +36 -0
- package/dist/tracing.js.map +1 -0
- package/dist/util.d.ts +9 -0
- package/dist/util.d.ts.map +1 -0
- package/dist/util.js +72 -0
- package/dist/util.js.map +1 -0
- package/dist/wrapper.d.ts +11 -0
- package/dist/wrapper.d.ts.map +1 -0
- package/dist/wrapper.js +57 -0
- package/dist/wrapper.js.map +1 -0
- package/dist/yarn.lock +3703 -0
- package/package.json +2 -2
package/dist/layers.json
ADDED
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
{
|
|
2
|
+
"regions": {
|
|
3
|
+
"us-east-2": {
|
|
4
|
+
"nodejs8.10": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node8-10:18",
|
|
5
|
+
"nodejs10.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node10-x:29",
|
|
6
|
+
"nodejs12.x": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Node12-x:29",
|
|
7
|
+
"python2.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python27:21",
|
|
8
|
+
"python3.6": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python36:21",
|
|
9
|
+
"python3.7": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python37:21",
|
|
10
|
+
"python3.8": "arn:aws:lambda:us-east-2:464622532012:layer:Datadog-Python38:21"
|
|
11
|
+
},
|
|
12
|
+
"us-east-1": {
|
|
13
|
+
"nodejs8.10": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node8-10:18",
|
|
14
|
+
"nodejs10.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node10-x:29",
|
|
15
|
+
"nodejs12.x": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node12-x:29",
|
|
16
|
+
"python2.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python27:21",
|
|
17
|
+
"python3.6": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python36:21",
|
|
18
|
+
"python3.7": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python37:21",
|
|
19
|
+
"python3.8": "arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python38:21"
|
|
20
|
+
},
|
|
21
|
+
"us-west-1": {
|
|
22
|
+
"nodejs8.10": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node8-10:18",
|
|
23
|
+
"nodejs10.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node10-x:29",
|
|
24
|
+
"nodejs12.x": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Node12-x:29",
|
|
25
|
+
"python2.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python27:21",
|
|
26
|
+
"python3.6": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python36:21",
|
|
27
|
+
"python3.7": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python37:21",
|
|
28
|
+
"python3.8": "arn:aws:lambda:us-west-1:464622532012:layer:Datadog-Python38:21"
|
|
29
|
+
},
|
|
30
|
+
"us-west-2": {
|
|
31
|
+
"nodejs8.10": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node8-10:18",
|
|
32
|
+
"nodejs10.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node10-x:29",
|
|
33
|
+
"nodejs12.x": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Node12-x:29",
|
|
34
|
+
"python2.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python27:21",
|
|
35
|
+
"python3.6": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python36:21",
|
|
36
|
+
"python3.7": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python37:21",
|
|
37
|
+
"python3.8": "arn:aws:lambda:us-west-2:464622532012:layer:Datadog-Python38:21"
|
|
38
|
+
},
|
|
39
|
+
"ap-east-1": {
|
|
40
|
+
"nodejs10.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node10-x:29",
|
|
41
|
+
"nodejs12.x": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Node12-x:29",
|
|
42
|
+
"python2.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python27:21",
|
|
43
|
+
"python3.6": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python36:21",
|
|
44
|
+
"python3.7": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python37:21",
|
|
45
|
+
"python3.8": "arn:aws:lambda:ap-east-1:464622532012:layer:Datadog-Python38:21"
|
|
46
|
+
},
|
|
47
|
+
"ap-south-1": {
|
|
48
|
+
"nodejs8.10": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node8-10:18",
|
|
49
|
+
"nodejs10.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node10-x:29",
|
|
50
|
+
"nodejs12.x": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Node12-x:29",
|
|
51
|
+
"python2.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python27:21",
|
|
52
|
+
"python3.6": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python36:21",
|
|
53
|
+
"python3.7": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python37:21",
|
|
54
|
+
"python3.8": "arn:aws:lambda:ap-south-1:464622532012:layer:Datadog-Python38:21"
|
|
55
|
+
},
|
|
56
|
+
"ap-northeast-2": {
|
|
57
|
+
"nodejs8.10": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node8-10:18",
|
|
58
|
+
"nodejs10.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node10-x:29",
|
|
59
|
+
"nodejs12.x": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Node12-x:29",
|
|
60
|
+
"python2.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python27:21",
|
|
61
|
+
"python3.6": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python36:21",
|
|
62
|
+
"python3.7": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python37:21",
|
|
63
|
+
"python3.8": "arn:aws:lambda:ap-northeast-2:464622532012:layer:Datadog-Python38:21"
|
|
64
|
+
},
|
|
65
|
+
"ap-southeast-1": {
|
|
66
|
+
"nodejs8.10": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node8-10:18",
|
|
67
|
+
"nodejs10.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node10-x:29",
|
|
68
|
+
"nodejs12.x": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Node12-x:29",
|
|
69
|
+
"python2.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python27:21",
|
|
70
|
+
"python3.6": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python36:21",
|
|
71
|
+
"python3.7": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python37:21",
|
|
72
|
+
"python3.8": "arn:aws:lambda:ap-southeast-1:464622532012:layer:Datadog-Python38:21"
|
|
73
|
+
},
|
|
74
|
+
"ap-southeast-2": {
|
|
75
|
+
"nodejs8.10": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node8-10:18",
|
|
76
|
+
"nodejs10.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node10-x:29",
|
|
77
|
+
"nodejs12.x": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Node12-x:29",
|
|
78
|
+
"python2.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python27:21",
|
|
79
|
+
"python3.6": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python36:21",
|
|
80
|
+
"python3.7": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python37:21",
|
|
81
|
+
"python3.8": "arn:aws:lambda:ap-southeast-2:464622532012:layer:Datadog-Python38:21"
|
|
82
|
+
},
|
|
83
|
+
"ap-northeast-1": {
|
|
84
|
+
"nodejs8.10": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node8-10:18",
|
|
85
|
+
"nodejs10.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node10-x:29",
|
|
86
|
+
"nodejs12.x": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Node12-x:29",
|
|
87
|
+
"python2.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python27:21",
|
|
88
|
+
"python3.6": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python36:21",
|
|
89
|
+
"python3.7": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python37:21",
|
|
90
|
+
"python3.8": "arn:aws:lambda:ap-northeast-1:464622532012:layer:Datadog-Python38:21"
|
|
91
|
+
},
|
|
92
|
+
"ca-central-1": {
|
|
93
|
+
"nodejs8.10": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node8-10:18",
|
|
94
|
+
"nodejs10.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node10-x:29",
|
|
95
|
+
"nodejs12.x": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Node12-x:29",
|
|
96
|
+
"python2.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python27:21",
|
|
97
|
+
"python3.6": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python36:21",
|
|
98
|
+
"python3.7": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python37:21",
|
|
99
|
+
"python3.8": "arn:aws:lambda:ca-central-1:464622532012:layer:Datadog-Python38:21"
|
|
100
|
+
},
|
|
101
|
+
"eu-north-1": {
|
|
102
|
+
"nodejs8.10": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node8-10:18",
|
|
103
|
+
"nodejs10.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node10-x:29",
|
|
104
|
+
"nodejs12.x": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Node12-x:29",
|
|
105
|
+
"python2.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python27:21",
|
|
106
|
+
"python3.6": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python36:21",
|
|
107
|
+
"python3.7": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python37:21",
|
|
108
|
+
"python3.8": "arn:aws:lambda:eu-north-1:464622532012:layer:Datadog-Python38:21"
|
|
109
|
+
},
|
|
110
|
+
"eu-central-1": {
|
|
111
|
+
"nodejs8.10": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node8-10:18",
|
|
112
|
+
"nodejs10.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node10-x:29",
|
|
113
|
+
"nodejs12.x": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Node12-x:29",
|
|
114
|
+
"python2.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python27:21",
|
|
115
|
+
"python3.6": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python36:21",
|
|
116
|
+
"python3.7": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python37:21",
|
|
117
|
+
"python3.8": "arn:aws:lambda:eu-central-1:464622532012:layer:Datadog-Python38:21"
|
|
118
|
+
},
|
|
119
|
+
"eu-west-1": {
|
|
120
|
+
"nodejs8.10": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node8-10:18",
|
|
121
|
+
"nodejs10.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node10-x:29",
|
|
122
|
+
"nodejs12.x": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Node12-x:29",
|
|
123
|
+
"python2.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python27:21",
|
|
124
|
+
"python3.6": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python36:21",
|
|
125
|
+
"python3.7": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python37:21",
|
|
126
|
+
"python3.8": "arn:aws:lambda:eu-west-1:464622532012:layer:Datadog-Python38:21"
|
|
127
|
+
},
|
|
128
|
+
"eu-west-2": {
|
|
129
|
+
"nodejs8.10": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node8-10:18",
|
|
130
|
+
"nodejs10.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node10-x:29",
|
|
131
|
+
"nodejs12.x": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Node12-x:29",
|
|
132
|
+
"python2.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python27:21",
|
|
133
|
+
"python3.6": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python36:21",
|
|
134
|
+
"python3.7": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python37:21",
|
|
135
|
+
"python3.8": "arn:aws:lambda:eu-west-2:464622532012:layer:Datadog-Python38:21"
|
|
136
|
+
},
|
|
137
|
+
"eu-west-3": {
|
|
138
|
+
"nodejs8.10": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node8-10:18",
|
|
139
|
+
"nodejs10.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node10-x:29",
|
|
140
|
+
"nodejs12.x": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Node12-x:29",
|
|
141
|
+
"python2.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python27:21",
|
|
142
|
+
"python3.6": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python36:21",
|
|
143
|
+
"python3.7": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python37:21",
|
|
144
|
+
"python3.8": "arn:aws:lambda:eu-west-3:464622532012:layer:Datadog-Python38:21"
|
|
145
|
+
},
|
|
146
|
+
"sa-east-1": {
|
|
147
|
+
"nodejs8.10": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node8-10:18",
|
|
148
|
+
"nodejs10.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node10-x:27",
|
|
149
|
+
"nodejs12.x": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Node12-x:27",
|
|
150
|
+
"python2.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python27:21",
|
|
151
|
+
"python3.6": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python36:21",
|
|
152
|
+
"python3.7": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python37:21",
|
|
153
|
+
"python3.8": "arn:aws:lambda:sa-east-1:464622532012:layer:Datadog-Python38:21"
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "serverless-plugin-datadog",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.4.0",
|
|
4
4
|
"description": "Serverless plugin to automatically instrument python and node functions with datadog tracing",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"repository": "https://github.com/DataDog/serverless-plugin-datadog",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"mock-fs": "4.13.0",
|
|
27
27
|
"nock": "^13.0.5",
|
|
28
28
|
"prettier": "^2.2.1",
|
|
29
|
-
"serverless": "2.
|
|
29
|
+
"serverless": "2.63.0",
|
|
30
30
|
"ts-jest": "^26.4.4",
|
|
31
31
|
"tslint": "^6.1.3",
|
|
32
32
|
"typescript": "^4.1.3"
|
package/dist/src/env.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { FunctionInfo } from "layer";
|
|
1
|
+
import { FunctionInfo } from "./layer";
|
|
2
2
|
import Service from "serverless/classes/Service";
|
|
3
3
|
export interface Configuration {
|
|
4
4
|
enabled?: boolean;
|
|
5
5
|
addLayers: boolean;
|
|
6
6
|
apiKey?: string;
|
|
7
|
+
apiKeySecretArn?: string;
|
|
7
8
|
apiKMSKey?: string;
|
|
8
9
|
captureLambdaPayload?: boolean;
|
|
9
10
|
monitorsApiKey?: string;
|
package/dist/src/env.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAA8B,MAAM,SAAS,CAAC;AACnE,OAAO,OAAO,MAAM,4BAA4B,CAAC;AAEjD,MAAM,WAAW,aAAa;IAE5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,SAAS,EAAE,OAAO,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,kBAAkB,EAAE,OAAO,CAAC;IAE5B,iBAAiB,EAAE,OAAO,CAAC;IAE3B,eAAe,EAAE,OAAO,CAAC;IAEzB,YAAY,EAAE,OAAO,CAAC;IAEtB,YAAY,EAAE,OAAO,CAAC;IAGtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IAInB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAI7B,UAAU,EAAE,OAAO,CAAC;IAEpB,gBAAgB,EAAE,OAAO,CAAC;IAG1B,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,QAAQ,CAAC,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAA;KAAE,EAAE,CAAC;IAGtD,qBAAqB,EAAE,OAAO,CAAC;IAE/B,wBAAwB,EAAE,OAAO,CAAC;IAGlC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAaD,eAAO,MAAM,oBAAoB,EAAE,aAgBlC,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,QA0ClF;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAczD;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,QAgB3D;AAiBD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,WAehD"}
|
package/dist/src/env.js
CHANGED
|
@@ -8,9 +8,11 @@
|
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.hasWebpackPlugin = exports.forceExcludeDepsFromWebpack = exports.getConfig = exports.setEnvConfiguration = exports.defaultConfiguration = void 0;
|
|
11
|
+
const layer_1 = require("./layer");
|
|
11
12
|
const webpackPluginName = "serverless-webpack";
|
|
12
13
|
const apiKeyEnvVar = "DD_API_KEY";
|
|
13
14
|
const apiKeyKMSEnvVar = "DD_KMS_API_KEY";
|
|
15
|
+
const apiKeySecretArnEnvVar = "DD_API_KEY_SECRET_ARN";
|
|
14
16
|
const siteURLEnvVar = "DD_SITE";
|
|
15
17
|
const logLevelEnvVar = "DD_LOG_LEVEL";
|
|
16
18
|
const logForwardingEnvVar = "DD_FLUSH_TO_LOG";
|
|
@@ -46,6 +48,14 @@ function setEnvConfiguration(config, handlers) {
|
|
|
46
48
|
if (config.apiKMSKey !== undefined && environment[apiKeyKMSEnvVar] === undefined) {
|
|
47
49
|
environment[apiKeyKMSEnvVar] = config.apiKMSKey;
|
|
48
50
|
}
|
|
51
|
+
if (config.apiKeySecretArn !== undefined && environment[apiKeySecretArnEnvVar] === undefined) {
|
|
52
|
+
const isNode = layer_1.runtimeLookup[handler.runtime] === layer_1.RuntimeType.NODE;
|
|
53
|
+
const isSendingSynchronousMetrics = !config.addExtension && !config.flushMetricsToLogs;
|
|
54
|
+
if (isSendingSynchronousMetrics && isNode) {
|
|
55
|
+
throw new Error(`\`apiKeySecretArn\` is not supported for Node runtimes when using Synchronous Metrics. Use either \`apiKey\` or \`apiKmsKey\`.`);
|
|
56
|
+
}
|
|
57
|
+
environment[apiKeySecretArnEnvVar] = config.apiKeySecretArn;
|
|
58
|
+
}
|
|
49
59
|
if (environment[siteURLEnvVar] === undefined) {
|
|
50
60
|
environment[siteURLEnvVar] = config.site;
|
|
51
61
|
}
|
package/dist/src/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/env.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -1,10 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export interface ExtendedFunctionDefinition extends FunctionDefinition {
|
|
3
|
-
tags?: {
|
|
4
|
-
[key: string]: string;
|
|
5
|
-
};
|
|
6
|
-
environment?: {
|
|
7
|
-
[key: string]: string;
|
|
8
|
-
};
|
|
9
|
-
}
|
|
1
|
+
export {};
|
|
10
2
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":""}
|
package/dist/src/index.js
CHANGED
|
@@ -246,6 +246,7 @@ function configHasOldProperties(obj) {
|
|
|
246
246
|
}
|
|
247
247
|
}
|
|
248
248
|
function validateConfiguration(config) {
|
|
249
|
+
checkForMultipleApiKeys(config);
|
|
249
250
|
const siteList = [
|
|
250
251
|
"datadoghq.com",
|
|
251
252
|
"datadoghq.eu",
|
|
@@ -253,15 +254,12 @@ function validateConfiguration(config) {
|
|
|
253
254
|
"us5.datadoghq.com",
|
|
254
255
|
"ddog-gov.com",
|
|
255
256
|
];
|
|
256
|
-
if (config.apiKey !== undefined && config.apiKMSKey !== undefined) {
|
|
257
|
-
throw new Error("`apiKey` and `apiKMSKey` should not be set at the same time.");
|
|
258
|
-
}
|
|
259
257
|
if (config.site !== undefined && !siteList.includes(config.site.toLowerCase())) {
|
|
260
258
|
throw new Error("Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, or ddog-gov.com.");
|
|
261
259
|
}
|
|
262
260
|
if (config.addExtension) {
|
|
263
|
-
if (config.apiKey === undefined && config.apiKMSKey === undefined) {
|
|
264
|
-
throw new Error("When `addExtension` is true, `apiKey` or `
|
|
261
|
+
if (config.apiKey === undefined && config.apiKMSKey === undefined && config.apiKeySecretArn === undefined) {
|
|
262
|
+
throw new Error("When `addExtension` is true, `apiKey`, `apiKMSKey`, or `apiKeySecretArn` must also be set.");
|
|
265
263
|
}
|
|
266
264
|
}
|
|
267
265
|
if (config.monitors) {
|
|
@@ -270,6 +268,24 @@ function validateConfiguration(config) {
|
|
|
270
268
|
}
|
|
271
269
|
}
|
|
272
270
|
}
|
|
271
|
+
function checkForMultipleApiKeys(config) {
|
|
272
|
+
let multipleApiKeysMessage;
|
|
273
|
+
if (config.apiKey !== undefined && config.apiKMSKey !== undefined && config.apiKeySecretArn !== undefined) {
|
|
274
|
+
multipleApiKeysMessage = "`apiKey`, `apiKMSKey`, and `apiKeySecretArn`";
|
|
275
|
+
}
|
|
276
|
+
else if (config.apiKey !== undefined && config.apiKMSKey !== undefined) {
|
|
277
|
+
multipleApiKeysMessage = "`apiKey` and `apiKMSKey`";
|
|
278
|
+
}
|
|
279
|
+
else if (config.apiKey !== undefined && config.apiKeySecretArn !== undefined) {
|
|
280
|
+
multipleApiKeysMessage = "`apiKey` and `apiKeySecretArn`";
|
|
281
|
+
}
|
|
282
|
+
else if (config.apiKMSKey !== undefined && config.apiKeySecretArn !== undefined) {
|
|
283
|
+
multipleApiKeysMessage = "`apiKMSKey` and `apiKeySecretArn`";
|
|
284
|
+
}
|
|
285
|
+
if (multipleApiKeysMessage) {
|
|
286
|
+
throw new Error(`${multipleApiKeysMessage} should not be set at the same time.`);
|
|
287
|
+
}
|
|
288
|
+
}
|
|
273
289
|
function setDatadogForwarder(config) {
|
|
274
290
|
const forwarderArn = config.forwarderArn;
|
|
275
291
|
const forwarder = config.forwarder;
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,sDAAwC;AACxC,6DAA+C;AAC/C,kDAA0C;AAE1C,+BAAqH;AACrH,mCAAiH;AACjH,uCAAuD;AACvD,uCAA6C;AAC7C,2CAAyG;AACzG,qCAAwD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,sDAAwC;AACxC,6DAA+C;AAC/C,kDAA0C;AAE1C,+BAAqH;AACrH,mCAAiH;AACjH,uCAAuD;AACvD,uCAA6C;AAC7C,2CAAyG;AACzG,qCAAwD;AACxD,yCAAyC;AACzC,iEAAkE;AAElE,IAAK,OAIJ;AAJD,WAAK,OAAO;IACV,8BAAmB,CAAA;IACnB,sBAAW,CAAA;IACX,mCAAwB,CAAA;AAC1B,CAAC,EAJI,OAAO,KAAP,OAAO,QAIX;AAED,MAAM,CAAC,OAAO,GAAG,MAAM,gBAAgB;IA8BrC,YAAoB,UAAsB,EAAE,CAAqB;QAA7C,eAAU,GAAV,UAAU,CAAY;QA7BnC,UAAK,GAAG;YACb,0BAA0B,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;YAChE,6BAA6B,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;YACpE,uCAAuC,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;YAC7E,yCAAyC,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;YAC/E,0BAA0B,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;YACjE,wCAAwC,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;YAC/E,2BAA2B,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;YAClE,qCAAqC,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5E,qBAAqB,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;YAClD,yBAAyB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;SAChE,CAAC;QAEK,aAAQ,GAAG;YAChB,OAAO,EAAE;gBACP,QAAQ,EAAE;oBACR,KAAK,EAAE;wBACL,eAAe,EAAE,CAAC,MAAM,CAAC;wBACzB,KAAK,EAAE,8EAA8E;qBACtF;oBACD,QAAQ,EAAE;wBACR,eAAe,EAAE,CAAC,MAAM,CAAC;wBACzB,KAAK,EAAE,8EAA8E;qBACtF;iBACF;gBACD,eAAe,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC;gBACtC,KAAK,EAAE,qDAAqD;aAC7D;SACF,CAAC;IACkE,CAAC;IAEvD,qBAAqB;;YACjC,MAAM,MAAM,GAAG,IAAA,eAAS,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK;gBAAE,OAAO;YACrC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;YACrE,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAC/B,qBAAqB,CAAC,MAAM,CAAC,CAAC;YAE9B,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YAChE,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAEvF,IAAA,yBAAmB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAEtC,MAAM,SAAS,GAAG,EAAE,OAAO,kCAAO,MAAM,CAAC,OAAO,GAAK,SAAS,CAAC,OAAO,CAAE,EAAE,CAAC;YAC3E,IAAI,MAAM,CAAC,SAAS,EAAE;gBACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;gBACrE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBAChC,IAAA,gCAAwB,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;gBACvE,IAAI,IAAA,sBAAgB,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;oBAC7C,IAAA,iCAA2B,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;iBACtD;aACF;iBAAM;gBACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,kFAAkF,CAAC,CAAC;aAC7G;YAED,IAAI,MAAM,CAAC,YAAY,EAAE;gBACvB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;gBAC9E,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBAChC,IAAA,2BAAmB,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;aACnE;iBAAM;gBACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;aACnE;YAED,IAAI,WAAW,GAAG,qBAAW,CAAC,IAAI,CAAC;YACnC,IAAI,MAAM,CAAC,iBAAiB,IAAI,MAAM,CAAC,eAAe,EAAE;gBACtD,WAAW,GAAG,qBAAW,CAAC,MAAM,CAAC;aAClC;iBAAM,IAAI,MAAM,CAAC,eAAe,EAAE;gBACjC,WAAW,GAAG,qBAAW,CAAC,QAAQ,CAAC;aACpC;iBAAM,IAAI,MAAM,CAAC,iBAAiB,EAAE;gBACnC,WAAW,GAAG,qBAAW,CAAC,IAAI,CAAC;aAChC;YACD,IAAA,uBAAa,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC;KAAA;IAEa,oBAAoB;;YAChC,MAAM,MAAM,GAAG,IAAA,eAAS,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK;gBAAE,OAAO;YAErC,wEAAwE;YACxE,MAAM,gBAAgB,GAAG;gBACvB,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;gBAC7C,oBAAoB,EAAE,MAAM,CAAC,qBAAqB;gBAClD,uBAAuB,EAAE,MAAM,CAAC,wBAAwB;aACzD,CAAC;YAEF,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;YAChE,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;YAEvF,IAAI,mBAAmB,CAAC;YACxB,mBAAmB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAClD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YACrD,IAAI,mBAAmB,EAAE;gBACvB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,MAAM,GAAG,MAAM,IAAA,+CAAmC,EACtD,IAAI,CAAC,UAAU,CAAC,OAAO,EACvB,GAAG,EACH,mBAAmB,EACnB,gBAAgB,EAChB,QAAQ,CACT,CAAC;gBACF,IAAI,MAAM,CAAC,wBAAwB,EAAE;oBACnC,MAAM,IAAA,iDAAqC,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,mBAAmB,CAAC,CAAC;iBAChG;gBACD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBAChC;aACF;YAED,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;YAE1C,IAAA,0BAAgB,EAAC,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;YACnE,IAAI,MAAM,CAAC,kBAAkB,KAAK,KAAK,EAAE;gBACvC,MAAM,IAAA,uBAAc,EAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC9D;iBAAM;gBACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,sEAAsE,CAAC,CAAC;aACjG;QACH,CAAC;KAAA;IAEa,WAAW;;YACvB,MAAM,MAAM,GAAG,IAAA,eAAS,EAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YACzD,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YAE1D,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK;gBAAE,OAAO;YACrC,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,EAAE;gBACrE,MAAM,qBAAqB,GAAG,MAAM,IAAA,+CAAwB,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC9E,IAAI;oBACF,MAAM,aAAa,GAAG,MAAM,IAAA,sBAAW,EACrC,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,cAAc,EACrB,qBAAqB,EACrB,OAAO,EACP,GAAG,CACJ,CAAC;oBACF,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;wBACxC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;qBACvC;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;iBACtE;aACF;YACD,OAAO,IAAA,qBAAY,EAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC;KAAA;IAEO,gBAAgB,CAAC,QAAwB;QAC/C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAW,CAAC,WAAW,EAAE;gBAC5C,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;oBACjC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,4CAA4C,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;iBACrF;qBAAM;oBACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CACrB,2CAA2C,OAAO,CAAC,IAAI,iBAAiB,OAAO,CAAC,OAAO,EAAE,CAC1F,CAAC;iBACH;aACF;SACF;IACH,CAAC;IAED;;;;OAIG;IACK,OAAO,CAAC,QAAwB,EAAE,UAAmB;QAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAe,CAAC;QACzD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,yBAAyB,sBAAO,MAAM,CAAC,CAAC;QAEhE,IAAI,UAAU,EAAE;YACd,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;SAChE;QAED,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;;;YAC/B,MAAA,OAAO,CAAC,IAAI,oCAAZ,OAAO,CAAC,IAAI,GAAK,EAAE,EAAC;YAEpB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,sBAAO,EAAE,CAAC;YAE7C,IAAI,UAAU,EAAE;gBACd,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAG,OAAO,CAAC,OAAO,CAAC,CAAA,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,SAAS,0CAAG,OAAO,CAAC,OAAO,CAAC,CAAA,EAAE;oBAC/E,YAAA,OAAO,CAAC,IAAI,OAAC,OAAO,CAAC,OAAO,8CAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,cAAc,EAAE,EAAC;iBAC5E;gBAED,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAG,OAAO,CAAC,GAAG,CAAC,CAAA,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,SAAS,0CAAG,OAAO,CAAC,GAAG,CAAC,CAAA,EAAE;oBACvE,YAAA,OAAO,CAAC,IAAI,OAAC,OAAO,CAAC,GAAG,8CAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAC;iBAC7E;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,SAAS,sBAAsB,CAAC,GAAQ;IACtC,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,IAAI,OAAO,GAAG,wDAAwD,CAAC;IAEvE,IAAI,GAAG,CAAC,yBAAyB,EAAE;QACjC,OAAO,IAAI,4BAA4B,CAAC;QACxC,gBAAgB,GAAG,IAAI,CAAC;KACzB;IACD,IAAI,GAAG,CAAC,sBAAsB,EAAE;QAC9B,OAAO,IAAI,yBAAyB,CAAC;QACrC,gBAAgB,GAAG,IAAI,CAAC;KACzB;IAED,IAAI,GAAG,CAAC,wBAAwB,EAAE;QAChC,OAAO,IAAI,2BAA2B,CAAC;QACvC,gBAAgB,GAAG,IAAI,CAAC;KACzB;IAED,IAAI,gBAAgB,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,OAAO,GAAG,qFAAqF,CAAC,CAAC;KAClH;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAqB;IAClD,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,QAAQ,GAAa;QACzB,eAAe;QACf,cAAc;QACd,mBAAmB;QACnB,mBAAmB;QACnB,cAAc;KACf,CAAC;IACF,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE;QAC9E,MAAM,IAAI,KAAK,CACb,+HAA+H,CAChI,CAAC;KACH;IACD,IAAI,MAAM,CAAC,YAAY,EAAE;QACvB,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,eAAe,KAAK,SAAS,EAAE;YACzG,MAAM,IAAI,KAAK,CAAC,4FAA4F,CAAC,CAAC;SAC/G;KACF;IACD,IAAI,MAAM,CAAC,QAAQ,EAAE;QACnB,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE;YAC9E,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAC;SAC3G;KACF;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,MAAqB;IACpD,IAAI,sBAAsB,CAAC;IAC3B,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,eAAe,KAAK,SAAS,EAAE;QACzG,sBAAsB,GAAG,8CAA8C,CAAC;KACzE;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE;QACxE,sBAAsB,GAAG,0BAA0B,CAAC;KACrD;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,eAAe,KAAK,SAAS,EAAE;QAC9E,sBAAsB,GAAG,gCAAgC,CAAC;KAC3D;SAAM,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,eAAe,KAAK,SAAS,EAAE;QACjF,sBAAsB,GAAG,mCAAmC,CAAC;KAC9D;IAED,IAAI,sBAAsB,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,GAAG,sBAAsB,sCAAsC,CAAC,CAAC;KAClF;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAqB;IAChD,MAAM,YAAY,GAAuB,MAAM,CAAC,YAAY,CAAC;IAC7D,MAAM,SAAS,GAAuB,MAAM,CAAC,SAAS,CAAC;IACvD,IAAI,YAAY,IAAI,SAAS,EAAE;QAC7B,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAC;KACH;SAAM,IAAI,YAAY,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE;QAChE,OAAO,YAAY,CAAC;KACrB;SAAM,IAAI,SAAS,KAAK,SAAS,IAAI,YAAY,KAAK,SAAS,EAAE;QAChE,OAAO,SAAS,CAAC;KAClB;AACH,CAAC"}
|
package/dist/src/layer.d.ts
CHANGED
|
@@ -8,9 +8,15 @@ export declare enum RuntimeType {
|
|
|
8
8
|
export interface FunctionInfo {
|
|
9
9
|
name: string;
|
|
10
10
|
type: RuntimeType;
|
|
11
|
-
handler:
|
|
11
|
+
handler: ExtendedFunctionDefinition;
|
|
12
12
|
runtime?: string;
|
|
13
13
|
}
|
|
14
|
+
export declare const X86_64_ARCHITECTURE = "x86_64";
|
|
15
|
+
export declare const ARM64_ARCHITECTURE = "arm64";
|
|
16
|
+
export declare const DEFAULT_ARCHITECTURE = "x86_64";
|
|
17
|
+
export interface ExtendedFunctionDefinition extends FunctionDefinition {
|
|
18
|
+
architecture?: string;
|
|
19
|
+
}
|
|
14
20
|
export interface LayerJSON {
|
|
15
21
|
regions: {
|
|
16
22
|
[region: string]: {
|
|
@@ -21,9 +27,12 @@ export interface LayerJSON {
|
|
|
21
27
|
export declare const runtimeLookup: {
|
|
22
28
|
[key: string]: RuntimeType;
|
|
23
29
|
};
|
|
30
|
+
export declare const armRuntimeKeys: {
|
|
31
|
+
[key: string]: string;
|
|
32
|
+
};
|
|
24
33
|
export declare function findHandlers(service: Service, exclude: string[], defaultRuntime?: string): FunctionInfo[];
|
|
25
34
|
export declare function applyLambdaLibraryLayers(service: Service, handlers: FunctionInfo[], layers: LayerJSON): void;
|
|
26
35
|
export declare function applyExtensionLayer(service: Service, handlers: FunctionInfo[], layers: LayerJSON): void;
|
|
27
|
-
export declare function pushLayerARN(
|
|
36
|
+
export declare function pushLayerARN(layerARN: string, currentLayers: string[]): string[];
|
|
28
37
|
export declare function isFunctionDefinitionHandler(funcDef: FunctionDefinition): funcDef is FunctionDefinitionHandler;
|
|
29
38
|
//# sourceMappingURL=layer.d.ts.map
|
package/dist/src/layer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer.d.ts","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,OAAO,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"layer.d.ts","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,OAAO,MAAM,4BAA4B,CAAC;AACjD,oBAAY,WAAW;IACrB,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,WAAW,IAAA;CACZ;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,0BAA0B,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAC5C,eAAO,MAAM,kBAAkB,UAAU,CAAC;AAC1C,eAAO,MAAM,oBAAoB,WAAsB,CAAC;AAGxD,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE;QACP,CAAC,MAAM,EAAE,MAAM,GACX;YACE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACvC,GACD,SAAS,CAAC;KACf,CAAC;CACH;AAED,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;CASvD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAInD,CAAC;AAEF,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAgBzG;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,QA0BrG;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,QA0BhG;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAIhF;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,IAAI,yBAAyB,CAE7G"}
|
package/dist/src/layer.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isFunctionDefinitionHandler = exports.pushLayerARN = exports.applyExtensionLayer = exports.applyLambdaLibraryLayers = exports.findHandlers = exports.runtimeLookup = exports.RuntimeType = void 0;
|
|
4
|
-
const extensionLayerKey = "extension";
|
|
3
|
+
exports.isFunctionDefinitionHandler = exports.pushLayerARN = exports.applyExtensionLayer = exports.applyLambdaLibraryLayers = exports.findHandlers = exports.armRuntimeKeys = exports.runtimeLookup = exports.DEFAULT_ARCHITECTURE = exports.ARM64_ARCHITECTURE = exports.X86_64_ARCHITECTURE = exports.RuntimeType = void 0;
|
|
5
4
|
var RuntimeType;
|
|
6
5
|
(function (RuntimeType) {
|
|
7
6
|
RuntimeType[RuntimeType["NODE"] = 0] = "NODE";
|
|
8
7
|
RuntimeType[RuntimeType["PYTHON"] = 1] = "PYTHON";
|
|
9
8
|
RuntimeType[RuntimeType["UNSUPPORTED"] = 2] = "UNSUPPORTED";
|
|
10
9
|
})(RuntimeType = exports.RuntimeType || (exports.RuntimeType = {}));
|
|
10
|
+
exports.X86_64_ARCHITECTURE = "x86_64";
|
|
11
|
+
exports.ARM64_ARCHITECTURE = "arm64";
|
|
12
|
+
exports.DEFAULT_ARCHITECTURE = exports.X86_64_ARCHITECTURE;
|
|
11
13
|
exports.runtimeLookup = {
|
|
12
14
|
"nodejs10.x": RuntimeType.NODE,
|
|
13
15
|
"nodejs12.x": RuntimeType.NODE,
|
|
@@ -18,6 +20,11 @@ exports.runtimeLookup = {
|
|
|
18
20
|
"python3.8": RuntimeType.PYTHON,
|
|
19
21
|
"python3.9": RuntimeType.PYTHON,
|
|
20
22
|
};
|
|
23
|
+
exports.armRuntimeKeys = {
|
|
24
|
+
"python3.8": "python3.8-arm",
|
|
25
|
+
"python3.9": "python3.9-arm",
|
|
26
|
+
extension: "extension-arm",
|
|
27
|
+
};
|
|
21
28
|
function findHandlers(service, exclude, defaultRuntime) {
|
|
22
29
|
return Object.entries(service.functions)
|
|
23
30
|
.map(([name, handler]) => {
|
|
@@ -35,6 +42,7 @@ function findHandlers(service, exclude, defaultRuntime) {
|
|
|
35
42
|
}
|
|
36
43
|
exports.findHandlers = findHandlers;
|
|
37
44
|
function applyLambdaLibraryLayers(service, handlers, layers) {
|
|
45
|
+
var _a, _b;
|
|
38
46
|
const { region } = service.provider;
|
|
39
47
|
const regionRuntimes = layers.regions[region];
|
|
40
48
|
if (regionRuntimes === undefined) {
|
|
@@ -45,16 +53,21 @@ function applyLambdaLibraryLayers(service, handlers, layers) {
|
|
|
45
53
|
continue;
|
|
46
54
|
}
|
|
47
55
|
const { runtime } = handler;
|
|
48
|
-
const
|
|
49
|
-
let
|
|
56
|
+
const architecture = (_b = (_a = handler.handler.architecture) !== null && _a !== void 0 ? _a : service.provider.architecture) !== null && _b !== void 0 ? _b : exports.DEFAULT_ARCHITECTURE;
|
|
57
|
+
let runtimeKey = runtime;
|
|
58
|
+
if (architecture === exports.ARM64_ARCHITECTURE && runtime && runtime in exports.armRuntimeKeys) {
|
|
59
|
+
runtimeKey = exports.armRuntimeKeys[runtime];
|
|
60
|
+
removePreviousLayer(service, handler, regionRuntimes[runtime]);
|
|
61
|
+
}
|
|
62
|
+
const lambdaLayerARN = runtimeKey !== undefined ? regionRuntimes[runtimeKey] : undefined;
|
|
50
63
|
if (lambdaLayerARN) {
|
|
51
|
-
|
|
52
|
-
setLayers(handler, currentLayers);
|
|
64
|
+
addLayer(service, handler, lambdaLayerARN);
|
|
53
65
|
}
|
|
54
66
|
}
|
|
55
67
|
}
|
|
56
68
|
exports.applyLambdaLibraryLayers = applyLambdaLibraryLayers;
|
|
57
69
|
function applyExtensionLayer(service, handlers, layers) {
|
|
70
|
+
var _a, _b;
|
|
58
71
|
const { region } = service.provider;
|
|
59
72
|
const regionRuntimes = layers.regions[region];
|
|
60
73
|
if (regionRuntimes === undefined) {
|
|
@@ -64,34 +77,54 @@ function applyExtensionLayer(service, handlers, layers) {
|
|
|
64
77
|
if (handler.type === RuntimeType.UNSUPPORTED) {
|
|
65
78
|
continue;
|
|
66
79
|
}
|
|
80
|
+
const architecture = (_b = (_a = handler.handler.architecture) !== null && _a !== void 0 ? _a : service.provider.architecture) !== null && _b !== void 0 ? _b : exports.DEFAULT_ARCHITECTURE;
|
|
67
81
|
let extensionLayerARN;
|
|
82
|
+
let extensionLayerKey = "extension";
|
|
83
|
+
if (architecture === exports.ARM64_ARCHITECTURE) {
|
|
84
|
+
removePreviousLayer(service, handler, regionRuntimes[extensionLayerKey]);
|
|
85
|
+
extensionLayerKey = exports.armRuntimeKeys[extensionLayerKey];
|
|
86
|
+
}
|
|
68
87
|
extensionLayerARN = regionRuntimes[extensionLayerKey];
|
|
69
|
-
let currentLayers = getLayers(service, handler);
|
|
70
88
|
if (extensionLayerARN) {
|
|
71
|
-
|
|
72
|
-
setLayers(handler, currentLayers);
|
|
89
|
+
addLayer(service, handler, extensionLayerARN);
|
|
73
90
|
}
|
|
74
91
|
}
|
|
75
92
|
}
|
|
76
93
|
exports.applyExtensionLayer = applyExtensionLayer;
|
|
77
|
-
function pushLayerARN(
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
return currentLayers;
|
|
94
|
+
function pushLayerARN(layerARN, currentLayers) {
|
|
95
|
+
const layerSet = new Set(currentLayers);
|
|
96
|
+
layerSet.add(layerARN);
|
|
97
|
+
return Array.from(layerSet);
|
|
84
98
|
}
|
|
85
99
|
exports.pushLayerARN = pushLayerARN;
|
|
86
100
|
function isFunctionDefinitionHandler(funcDef) {
|
|
87
101
|
return typeof funcDef.handler === "string";
|
|
88
102
|
}
|
|
89
103
|
exports.isFunctionDefinitionHandler = isFunctionDefinitionHandler;
|
|
104
|
+
function addLayer(service, handler, layerArn) {
|
|
105
|
+
setLayers(handler, pushLayerARN(layerArn, getLayers(service, handler)));
|
|
106
|
+
}
|
|
90
107
|
function getLayers(service, handler) {
|
|
91
108
|
const functionLayersList = handler.handler.layers || [];
|
|
92
|
-
const
|
|
93
|
-
|
|
94
|
-
|
|
109
|
+
const serviceLayersList = service.provider.layers || [];
|
|
110
|
+
// Function-level layers override service-level layers
|
|
111
|
+
// Append to the function-level layers if other function-level layers are present
|
|
112
|
+
// If service-level layers are present
|
|
113
|
+
// Set them at the function level, as our layers are runtime-dependent and could vary
|
|
114
|
+
// between functions in the same project
|
|
115
|
+
if (functionLayersList.length > 0 || serviceLayersList.length === 0) {
|
|
116
|
+
return functionLayersList;
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
return serviceLayersList;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
function removePreviousLayer(service, handler, previousLayer) {
|
|
123
|
+
let layersList = getLayers(service, handler);
|
|
124
|
+
if (new Set(layersList).has(previousLayer)) {
|
|
125
|
+
layersList = layersList === null || layersList === void 0 ? void 0 : layersList.filter((layer) => layer !== previousLayer);
|
|
126
|
+
}
|
|
127
|
+
setLayers(handler, layersList);
|
|
95
128
|
}
|
|
96
129
|
function setLayers(handler, layers) {
|
|
97
130
|
handler.handler.layers = layers;
|
package/dist/src/layer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":";;;AASA,
|
|
1
|
+
{"version":3,"file":"layer.js","sourceRoot":"","sources":["../../src/layer.ts"],"names":[],"mappings":"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"}
|
package/dist/src/layers-gov.json
CHANGED
|
@@ -2,25 +2,31 @@
|
|
|
2
2
|
"regions": {
|
|
3
3
|
"us-gov-west-1": {
|
|
4
4
|
"nodejs10.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node10-x:59",
|
|
5
|
-
"nodejs12.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node12-x:
|
|
6
|
-
"nodejs14.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node14-x:
|
|
5
|
+
"nodejs12.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node12-x:66",
|
|
6
|
+
"nodejs14.x": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Node14-x:66",
|
|
7
7
|
"python2.7": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python27:49",
|
|
8
|
-
"python3.6": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python36:
|
|
9
|
-
"python3.7": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python37:
|
|
10
|
-
"python3.8": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python38:
|
|
11
|
-
"python3.
|
|
12
|
-
"
|
|
8
|
+
"python3.6": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python36:50",
|
|
9
|
+
"python3.7": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python37:50",
|
|
10
|
+
"python3.8": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python38:50",
|
|
11
|
+
"python3.8-arm": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python38-ARM:50",
|
|
12
|
+
"python3.9": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python39:50",
|
|
13
|
+
"python3.9-arm": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Python39-ARM:50",
|
|
14
|
+
"extension": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Extension:16",
|
|
15
|
+
"extension-arm": "arn:aws-us-gov:lambda:us-gov-west-1:002406178527:layer:Datadog-Extension-ARM:16"
|
|
13
16
|
},
|
|
14
17
|
"us-gov-east-1": {
|
|
15
18
|
"nodejs10.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node10-x:59",
|
|
16
|
-
"nodejs12.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node12-x:
|
|
17
|
-
"nodejs14.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node14-x:
|
|
19
|
+
"nodejs12.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node12-x:66",
|
|
20
|
+
"nodejs14.x": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Node14-x:66",
|
|
18
21
|
"python2.7": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python27:49",
|
|
19
|
-
"python3.6": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python36:
|
|
20
|
-
"python3.7": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python37:
|
|
21
|
-
"python3.8": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python38:
|
|
22
|
-
"python3.
|
|
23
|
-
"
|
|
22
|
+
"python3.6": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python36:50",
|
|
23
|
+
"python3.7": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python37:50",
|
|
24
|
+
"python3.8": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python38:50",
|
|
25
|
+
"python3.8-arm": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python38-ARM:50",
|
|
26
|
+
"python3.9": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python39:50",
|
|
27
|
+
"python3.9-arm": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Python39-ARM:50",
|
|
28
|
+
"extension": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Extension:16",
|
|
29
|
+
"extension-arm": "arn:aws-us-gov:lambda:us-gov-east-1:002406178527:layer:Datadog-Extension-ARM:16"
|
|
24
30
|
}
|
|
25
31
|
}
|
|
26
32
|
}
|