@hybridless/hybridless 0.0.84-alpha2 → 0.0.84-alpha5

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 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?: boolean | number; //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.
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?: boolean | number; //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.
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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
- "type": "boolean"
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-alpha2",
3
+ "version": "0.0.84-alpha5",
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.24",
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",
@@ -86,12 +86,11 @@ class FunctionBatchJobEvent extends FunctionContainerBaseEvent_1.FunctionContain
86
86
  const repoName = yield this.getContainerImageURL();
87
87
  return {
88
88
  Type: "AWS::Batch::JobDefinition",
89
- Properties: Object.assign(Object.assign(Object.assign({ Type: event.type || options_1.OFunctionBatchJobTypes.container, RetryStrategy: Object.assign({}, (event.retryCount ? { Attempts: this.func.funcOptions.timeout } : { Attempts: Globals_1.default.BatchJob_DefaultAttempts })) }, (event.propagateTags ? { PropagateTags: event.propagateTags } : {})), (event.tags ? { Tags: event.tags } : {})), { ContainerProperties: Object.assign({ Command: "Ref::inputEvent", Environment: Object.assign(Object.assign({}, this.plugin.getEnvironmentIvars()), this.getContainerEnvironments()), Parameters: {
90
- "inputEvent": "{}"
91
- }, JobRoleArn: (event.role || { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] }), Image: repoName, Privileged: false, ReadonlyRootFilesystem: false }, (event.memory || event.cpu ? {
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: { "inputEvent": "{}" }, JobRoleArn: (event.role || { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] }), Image: repoName, Privileged: false, ReadonlyRootFilesystem: false }, ((this.func.funcOptions.memory || event.memory) || event.cpu ? {
92
91
  ResourceRequirements: []
93
92
  .concat(event.cpu ? [{ Name: "VCPU", Value: event.cpu }] : [])
94
- .concat(event.memory ? [{ Name: "MEMORY", Value: event.memory }] : [])
93
+ .concat(event.memory ? [{ Name: "MEMORY", Value: event.memory || this.func.funcOptions.memory }] : [])
95
94
  } : {})) })
96
95
  };
97
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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"}