@hybridless/hybridless 0.0.84-alpha3 → 0.0.84-alpha6
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 +2 -2
- package/options.json +72 -12
- package/package.json +2 -2
- package/resources/BaseEvents/FunctionContainerBaseEvent.js +1 -1
- package/resources/BaseEvents/FunctionContainerBaseEvent.js.map +1 -1
- package/resources/FunctionBatchJobEvent.js +2 -4
- package/resources/FunctionBatchJobEvent.js.map +1 -1
package/README.md
CHANGED
|
@@ -164,7 +164,7 @@ Human readable documentation will is available at [hybridless.com](https://docs.
|
|
|
164
164
|
metricDependsOn?: string | string[];
|
|
165
165
|
additionalDimension?: { dimension: string, target: string }[];
|
|
166
166
|
treatMissingData?: ' breaching' | 'notBreaching' | 'ignore' | 'missing'; //defaults to notBreaching
|
|
167
|
-
fillupMissingData?:
|
|
167
|
+
fillupMissingData?: any; //fillup value is used on absence of data. default to false, true uses '0', number can be specified instead if any other fillup values is needed.
|
|
168
168
|
};
|
|
169
169
|
scaleOut?: {
|
|
170
170
|
//scaling
|
|
@@ -186,7 +186,7 @@ Human readable documentation will is available at [hybridless.com](https://docs.
|
|
|
186
186
|
metricDependsOn?: string | string[];
|
|
187
187
|
additionalDimension?: { dimension: string, target: string }[];
|
|
188
188
|
treatMissingData?: ' breaching' | 'notBreaching' | 'ignore' | 'missing'; //defaults to notBreaching
|
|
189
|
-
fillupMissingData?:
|
|
189
|
+
fillupMissingData?: any; //fillup value is used on absence of data. default to false, true uses '0', number can be specified instead if any other fillup values is needed.
|
|
190
190
|
};
|
|
191
191
|
}
|
|
192
192
|
|
package/options.json
CHANGED
|
@@ -554,7 +554,12 @@
|
|
|
554
554
|
"type": "number"
|
|
555
555
|
},
|
|
556
556
|
"propagateTags": {
|
|
557
|
-
"
|
|
557
|
+
"enum": [
|
|
558
|
+
"OFF",
|
|
559
|
+
"SERVICE",
|
|
560
|
+
"TASK"
|
|
561
|
+
],
|
|
562
|
+
"type": "string"
|
|
558
563
|
},
|
|
559
564
|
"role": {
|
|
560
565
|
"type": "string"
|
|
@@ -1114,7 +1119,12 @@
|
|
|
1114
1119
|
"type": "number"
|
|
1115
1120
|
},
|
|
1116
1121
|
"propagateTags": {
|
|
1117
|
-
"
|
|
1122
|
+
"enum": [
|
|
1123
|
+
"OFF",
|
|
1124
|
+
"SERVICE",
|
|
1125
|
+
"TASK"
|
|
1126
|
+
],
|
|
1127
|
+
"type": "string"
|
|
1118
1128
|
},
|
|
1119
1129
|
"role": {
|
|
1120
1130
|
"type": "string"
|
|
@@ -1298,7 +1308,12 @@
|
|
|
1298
1308
|
"type": "array"
|
|
1299
1309
|
},
|
|
1300
1310
|
"propagateTags": {
|
|
1301
|
-
"
|
|
1311
|
+
"enum": [
|
|
1312
|
+
"OFF",
|
|
1313
|
+
"SERVICE",
|
|
1314
|
+
"TASK"
|
|
1315
|
+
],
|
|
1316
|
+
"type": "string"
|
|
1302
1317
|
},
|
|
1303
1318
|
"role": {
|
|
1304
1319
|
"type": "string"
|
|
@@ -1458,7 +1473,12 @@
|
|
|
1458
1473
|
"type": "array"
|
|
1459
1474
|
},
|
|
1460
1475
|
"propagateTags": {
|
|
1461
|
-
"
|
|
1476
|
+
"enum": [
|
|
1477
|
+
"OFF",
|
|
1478
|
+
"SERVICE",
|
|
1479
|
+
"TASK"
|
|
1480
|
+
],
|
|
1481
|
+
"type": "string"
|
|
1462
1482
|
},
|
|
1463
1483
|
"role": {
|
|
1464
1484
|
"type": "string"
|
|
@@ -1621,7 +1641,12 @@
|
|
|
1621
1641
|
"type": "array"
|
|
1622
1642
|
},
|
|
1623
1643
|
"propagateTags": {
|
|
1624
|
-
"
|
|
1644
|
+
"enum": [
|
|
1645
|
+
"OFF",
|
|
1646
|
+
"SERVICE",
|
|
1647
|
+
"TASK"
|
|
1648
|
+
],
|
|
1649
|
+
"type": "string"
|
|
1625
1650
|
},
|
|
1626
1651
|
"role": {
|
|
1627
1652
|
"type": "string"
|
|
@@ -1797,7 +1822,12 @@
|
|
|
1797
1822
|
"type": "array"
|
|
1798
1823
|
},
|
|
1799
1824
|
"propagateTags": {
|
|
1800
|
-
"
|
|
1825
|
+
"enum": [
|
|
1826
|
+
"OFF",
|
|
1827
|
+
"SERVICE",
|
|
1828
|
+
"TASK"
|
|
1829
|
+
],
|
|
1830
|
+
"type": "string"
|
|
1801
1831
|
},
|
|
1802
1832
|
"role": {
|
|
1803
1833
|
"type": "string"
|
|
@@ -4483,7 +4513,12 @@
|
|
|
4483
4513
|
"type": "number"
|
|
4484
4514
|
},
|
|
4485
4515
|
"propagateTags": {
|
|
4486
|
-
"
|
|
4516
|
+
"enum": [
|
|
4517
|
+
"OFF",
|
|
4518
|
+
"SERVICE",
|
|
4519
|
+
"TASK"
|
|
4520
|
+
],
|
|
4521
|
+
"type": "string"
|
|
4487
4522
|
},
|
|
4488
4523
|
"role": {
|
|
4489
4524
|
"type": "string"
|
|
@@ -5043,7 +5078,12 @@
|
|
|
5043
5078
|
"type": "number"
|
|
5044
5079
|
},
|
|
5045
5080
|
"propagateTags": {
|
|
5046
|
-
"
|
|
5081
|
+
"enum": [
|
|
5082
|
+
"OFF",
|
|
5083
|
+
"SERVICE",
|
|
5084
|
+
"TASK"
|
|
5085
|
+
],
|
|
5086
|
+
"type": "string"
|
|
5047
5087
|
},
|
|
5048
5088
|
"role": {
|
|
5049
5089
|
"type": "string"
|
|
@@ -5227,7 +5267,12 @@
|
|
|
5227
5267
|
"type": "array"
|
|
5228
5268
|
},
|
|
5229
5269
|
"propagateTags": {
|
|
5230
|
-
"
|
|
5270
|
+
"enum": [
|
|
5271
|
+
"OFF",
|
|
5272
|
+
"SERVICE",
|
|
5273
|
+
"TASK"
|
|
5274
|
+
],
|
|
5275
|
+
"type": "string"
|
|
5231
5276
|
},
|
|
5232
5277
|
"role": {
|
|
5233
5278
|
"type": "string"
|
|
@@ -5387,7 +5432,12 @@
|
|
|
5387
5432
|
"type": "array"
|
|
5388
5433
|
},
|
|
5389
5434
|
"propagateTags": {
|
|
5390
|
-
"
|
|
5435
|
+
"enum": [
|
|
5436
|
+
"OFF",
|
|
5437
|
+
"SERVICE",
|
|
5438
|
+
"TASK"
|
|
5439
|
+
],
|
|
5440
|
+
"type": "string"
|
|
5391
5441
|
},
|
|
5392
5442
|
"role": {
|
|
5393
5443
|
"type": "string"
|
|
@@ -5550,7 +5600,12 @@
|
|
|
5550
5600
|
"type": "array"
|
|
5551
5601
|
},
|
|
5552
5602
|
"propagateTags": {
|
|
5553
|
-
"
|
|
5603
|
+
"enum": [
|
|
5604
|
+
"OFF",
|
|
5605
|
+
"SERVICE",
|
|
5606
|
+
"TASK"
|
|
5607
|
+
],
|
|
5608
|
+
"type": "string"
|
|
5554
5609
|
},
|
|
5555
5610
|
"role": {
|
|
5556
5611
|
"type": "string"
|
|
@@ -5726,7 +5781,12 @@
|
|
|
5726
5781
|
"type": "array"
|
|
5727
5782
|
},
|
|
5728
5783
|
"propagateTags": {
|
|
5729
|
-
"
|
|
5784
|
+
"enum": [
|
|
5785
|
+
"OFF",
|
|
5786
|
+
"SERVICE",
|
|
5787
|
+
"TASK"
|
|
5788
|
+
],
|
|
5789
|
+
"type": "string"
|
|
5730
5790
|
},
|
|
5731
5791
|
"role": {
|
|
5732
5792
|
"type": "string"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hybridless/hybridless",
|
|
3
|
-
"version": "0.0.84-
|
|
3
|
+
"version": "0.0.84-alpha6",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@babel/core": "^7.17.7",
|
|
21
|
-
"@hybridless/serverless-ecs-plugin": "0.0.
|
|
21
|
+
"@hybridless/serverless-ecs-plugin": "0.0.25",
|
|
22
22
|
"babel-loader": "^8.2.3",
|
|
23
23
|
"bluebird": "^3.7.2",
|
|
24
24
|
"dockerode": "^3.3.1",
|
|
@@ -31,7 +31,7 @@ class FunctionContainerBaseEvent extends FunctionBaseEvent_1.FunctionBaseEvent {
|
|
|
31
31
|
this.plugin.depManager.enableMvn();
|
|
32
32
|
if (this.event.runtime && this.event.runtime.toLowerCase().indexOf('node') != -1 && !this.plugin.options.disableWebpack)
|
|
33
33
|
this.plugin.depManager.enableWebpack();
|
|
34
|
-
if (this.event.eventType != options_1.OFunctionEventType.lambda && this.event.eventType != options_1.OFunctionEventType.lambdaContainer) {
|
|
34
|
+
if (this.event.eventType != options_1.OFunctionEventType.lambda && this.event.eventType != options_1.OFunctionEventType.lambdaContainer && this.event.eventType != options_1.OFunctionEventType.job) {
|
|
35
35
|
this.plugin.depManager.enableECSPlugin();
|
|
36
36
|
}
|
|
37
37
|
resolve();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionContainerBaseEvent.js","sourceRoot":"","sources":["../../src/resources/BaseEvents/FunctionContainerBaseEvent.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAwD;AAIxD,2CAAmE;AAEnE,qCAAsC;AACtC,6BAA8B;AAC9B,uCAAwC;AAGxC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAE5C,MAAa,0BAA2B,SAAQ,qCAAiC;IAE/E,YAAmB,MAAkB,EAAE,IAAkB,EAAE,KAAqB,EAAE,KAAa;QAC7F,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;IACpC,CAAC;IAGY,MAAM;8DAAe,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;KAAA;IACjD,iBAAiB;;YAC5B,OAAO,IAAI,QAAQ,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC5C,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;gBACrH,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc;oBAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;gBAChK,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,4BAAkB,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,4BAAkB,CAAC,eAAe,EAAE;
|
|
1
|
+
{"version":3,"file":"FunctionContainerBaseEvent.js","sourceRoot":"","sources":["../../src/resources/BaseEvents/FunctionContainerBaseEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,12 +87,10 @@ class FunctionBatchJobEvent extends FunctionContainerBaseEvent_1.FunctionContain
|
|
|
87
87
|
return {
|
|
88
88
|
Type: "AWS::Batch::JobDefinition",
|
|
89
89
|
Properties: Object.assign(Object.assign(Object.assign(Object.assign({ Type: event.type || options_1.OFunctionBatchJobTypes.container, RetryStrategy: Object.assign({}, (event.retryCount ? { Attempts: event.retryCount } : { Attempts: Globals_1.default.BatchJob_DefaultAttempts })) }, (event.propagateTags ? { PropagateTags: event.propagateTags } : {})), (event.tags ? { Tags: event.tags } : {})), (this.func.funcOptions.timeout || event.timeout ?
|
|
90
|
-
{ Timeout: { AttemptDurationSeconds: event.timeout || this.func.funcOptions.timeout } } : {})), { ContainerProperties: Object.assign({ Command: "Ref::inputEvent", Environment: Object.assign(Object.assign({}, this.plugin.getEnvironmentIvars()), this.getContainerEnvironments()), Parameters: {
|
|
91
|
-
"inputEvent": "{}"
|
|
92
|
-
}, JobRoleArn: (event.role || { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] }), Image: repoName, Privileged: false, ReadonlyRootFilesystem: false }, (event.memory || event.cpu ? {
|
|
90
|
+
{ Timeout: { AttemptDurationSeconds: event.timeout || this.func.funcOptions.timeout } } : {})), { ContainerProperties: Object.assign({ Command: "Ref::inputEvent", Environment: Object.assign(Object.assign({}, this.plugin.getEnvironmentIvars()), this.getContainerEnvironments()), Parameters: { "inputEvent": "{}" }, JobRoleArn: (event.role || { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] }), Image: repoName, Privileged: false, ReadonlyRootFilesystem: false }, ((this.func.funcOptions.memory || event.memory) || event.cpu ? {
|
|
93
91
|
ResourceRequirements: []
|
|
94
92
|
.concat(event.cpu ? [{ Name: "VCPU", Value: event.cpu }] : [])
|
|
95
|
-
.concat(event.memory ? [{ Name: "MEMORY", Value: event.memory }] : [])
|
|
93
|
+
.concat(event.memory ? [{ Name: "MEMORY", Value: event.memory || this.func.funcOptions.memory }] : [])
|
|
96
94
|
} : {})) })
|
|
97
95
|
};
|
|
98
96
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionBatchJobEvent.js","sourceRoot":"","sources":["../src/resources/FunctionBatchJobEvent.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FunctionBatchJobEvent.js","sourceRoot":"","sources":["../src/resources/FunctionBatchJobEvent.ts"],"names":[],"mappings":"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"}
|