@friggframework/devtools 2.0.0--canary.653.af34bd7.0 → 2.0.0--canary.651.a7237ae.0
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.
|
@@ -32,10 +32,6 @@ const {
|
|
|
32
32
|
const {
|
|
33
33
|
nestedNodeModulesExcludes,
|
|
34
34
|
} = require('../shared/utilities/nested-node-modules');
|
|
35
|
-
const {
|
|
36
|
-
INTEGRATION_QUEUE_MAX_RECEIVE_COUNT,
|
|
37
|
-
QUEUE_MAX_RECEIVE_COUNT_ENV,
|
|
38
|
-
} = require('@friggframework/core/queues/queue-delivery');
|
|
39
35
|
|
|
40
36
|
class IntegrationBuilder extends InfrastructureBuilder {
|
|
41
37
|
constructor() {
|
|
@@ -573,7 +569,7 @@ class IntegrationBuilder extends InfrastructureBuilder {
|
|
|
573
569
|
MessageRetentionPeriod: 345600, // 4 days (SQS default)
|
|
574
570
|
VisibilityTimeout: 1800,
|
|
575
571
|
RedrivePolicy: {
|
|
576
|
-
maxReceiveCount:
|
|
572
|
+
maxReceiveCount: 3,
|
|
577
573
|
deadLetterTargetArn: {
|
|
578
574
|
'Fn::GetAtt': ['InternalErrorQueue', 'Arn'],
|
|
579
575
|
},
|
|
@@ -581,14 +577,6 @@ class IntegrationBuilder extends InfrastructureBuilder {
|
|
|
581
577
|
},
|
|
582
578
|
};
|
|
583
579
|
|
|
584
|
-
const queueWorker = result.functions[`${integrationName}QueueWorker`];
|
|
585
|
-
queueWorker.environment = {
|
|
586
|
-
...queueWorker.environment,
|
|
587
|
-
[QUEUE_MAX_RECEIVE_COUNT_ENV]: String(
|
|
588
|
-
INTEGRATION_QUEUE_MAX_RECEIVE_COUNT
|
|
589
|
-
),
|
|
590
|
-
};
|
|
591
|
-
|
|
592
580
|
// Add queue URL to environment
|
|
593
581
|
this.setQueueUrlEnvironment(
|
|
594
582
|
integrationName,
|
|
@@ -4,10 +4,6 @@
|
|
|
4
4
|
* Tests integration-specific Lambda functions and SQS queues
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
const {
|
|
8
|
-
INTEGRATION_QUEUE_MAX_RECEIVE_COUNT,
|
|
9
|
-
QUEUE_MAX_RECEIVE_COUNT_ENV,
|
|
10
|
-
} = require('@friggframework/core/queues/queue-delivery');
|
|
11
7
|
const { IntegrationBuilder } = require('./integration-builder');
|
|
12
8
|
const { ValidationResult } = require('../shared/base-builder');
|
|
13
9
|
|
|
@@ -211,54 +207,6 @@ describe('IntegrationBuilder', () => {
|
|
|
211
207
|
});
|
|
212
208
|
});
|
|
213
209
|
|
|
214
|
-
it('takes the redrive max receive count from the core runtime contract', async () => {
|
|
215
|
-
const result = await integrationBuilder.build(
|
|
216
|
-
{ integrations: [{ Definition: { name: 'test' } }] },
|
|
217
|
-
{}
|
|
218
|
-
);
|
|
219
|
-
|
|
220
|
-
expect(
|
|
221
|
-
result.resources.TestQueue.Properties.RedrivePolicy
|
|
222
|
-
.maxReceiveCount
|
|
223
|
-
).toBe(INTEGRATION_QUEUE_MAX_RECEIVE_COUNT);
|
|
224
|
-
});
|
|
225
|
-
|
|
226
|
-
it('tells the queue worker the max receive count of the queue it owns', async () => {
|
|
227
|
-
const result = await integrationBuilder.build(
|
|
228
|
-
{ integrations: [{ Definition: { name: 'test' } }] },
|
|
229
|
-
{}
|
|
230
|
-
);
|
|
231
|
-
|
|
232
|
-
expect(
|
|
233
|
-
result.functions.testQueueWorker.environment[
|
|
234
|
-
QUEUE_MAX_RECEIVE_COUNT_ENV
|
|
235
|
-
]
|
|
236
|
-
).toBe('3');
|
|
237
|
-
});
|
|
238
|
-
|
|
239
|
-
it('leaves the max receive count unset for an external queue', async () => {
|
|
240
|
-
const result = await integrationBuilder.build(
|
|
241
|
-
{
|
|
242
|
-
integrations: [
|
|
243
|
-
{
|
|
244
|
-
Definition: { name: 'test' },
|
|
245
|
-
ownership: { queue: 'external' },
|
|
246
|
-
queue: {
|
|
247
|
-
url: 'https://sqs.us-east-1.amazonaws.com/123456789012/test-queue',
|
|
248
|
-
},
|
|
249
|
-
},
|
|
250
|
-
],
|
|
251
|
-
},
|
|
252
|
-
{}
|
|
253
|
-
);
|
|
254
|
-
|
|
255
|
-
expect(
|
|
256
|
-
result.functions.testQueueWorker.environment?.[
|
|
257
|
-
QUEUE_MAX_RECEIVE_COUNT_ENV
|
|
258
|
-
]
|
|
259
|
-
).toBeUndefined();
|
|
260
|
-
});
|
|
261
|
-
|
|
262
210
|
it('should create queue worker function', async () => {
|
|
263
211
|
const appDefinition = {
|
|
264
212
|
integrations: [
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@friggframework/devtools",
|
|
3
3
|
"prettier": "@friggframework/prettier-config",
|
|
4
|
-
"version": "2.0.0--canary.
|
|
4
|
+
"version": "2.0.0--canary.651.a7237ae.0",
|
|
5
5
|
"bin": {
|
|
6
6
|
"frigg": "./frigg-cli/index.js"
|
|
7
7
|
},
|
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
"@babel/eslint-parser": "^7.18.9",
|
|
27
27
|
"@babel/parser": "^7.25.3",
|
|
28
28
|
"@babel/traverse": "^7.25.3",
|
|
29
|
-
"@friggframework/core": "2.0.0--canary.
|
|
30
|
-
"@friggframework/schemas": "2.0.0--canary.
|
|
31
|
-
"@friggframework/test": "2.0.0--canary.
|
|
29
|
+
"@friggframework/core": "2.0.0--canary.651.a7237ae.0",
|
|
30
|
+
"@friggframework/schemas": "2.0.0--canary.651.a7237ae.0",
|
|
31
|
+
"@friggframework/test": "2.0.0--canary.651.a7237ae.0",
|
|
32
32
|
"@hapi/boom": "^10.0.1",
|
|
33
33
|
"@inquirer/prompts": "^5.3.8",
|
|
34
34
|
"axios": "^1.18.0",
|
|
@@ -56,8 +56,8 @@
|
|
|
56
56
|
"validate-npm-package-name": "^5.0.0"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@friggframework/eslint-config": "2.0.0--canary.
|
|
60
|
-
"@friggframework/prettier-config": "2.0.0--canary.
|
|
59
|
+
"@friggframework/eslint-config": "2.0.0--canary.651.a7237ae.0",
|
|
60
|
+
"@friggframework/prettier-config": "2.0.0--canary.651.a7237ae.0",
|
|
61
61
|
"aws-sdk-client-mock": "^4.1.0",
|
|
62
62
|
"aws-sdk-client-mock-jest": "^4.1.0",
|
|
63
63
|
"jest": "^30.1.3",
|
|
@@ -89,5 +89,5 @@
|
|
|
89
89
|
"publishConfig": {
|
|
90
90
|
"access": "public"
|
|
91
91
|
},
|
|
92
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "a7237aea05d5b8afca7dc0c432d00e4221a9684c"
|
|
93
93
|
}
|