Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions packages/serverless-offline-sqs/src/sqs-event-definition.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ class SQSEventDefinition {

if (typeof rawSqsEventDefinition === 'string') {
queueName = extractQueueNameFromARN(rawSqsEventDefinition);
} else if (typeof rawSqsEventDefinition.arn === 'string') {
queueName = extractQueueNameFromARN(rawSqsEventDefinition.arn);
} else if (typeof rawSqsEventDefinition.queueName === 'string') {
queueName = rawSqsEventDefinition.queueName;
}

this.enabled = isNil(enabled) ? true : enabled;
this.enabled = true;
} else {
if (typeof rawSqsEventDefinition.arn === 'string') {
queueName = extractQueueNameFromARN(rawSqsEventDefinition.arn);
} else if (typeof rawSqsEventDefinition.queueName === 'string') {
queueName = rawSqsEventDefinition.queueName;
}

this.enabled = isNil(rawSqsEventDefinition.enabled) ? true : enabled;
}

this.arn = `arn:aws:sqs:${region}:${accountId}:${queueName}`;
this.queueName = queueName;
Expand Down
4 changes: 2 additions & 2 deletions packages/serverless-offline-sqs/src/sqs.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ class SQS {
async _sqsEvent(functionKey, sqsEvent) {
const {enabled, arn, queueName, batchSize} = sqsEvent;

if (!enabled) return;

if (this.options.autoCreate) await this._createQueue(sqsEvent);

if (!enabled) return;

const {QueueUrl} = await this.client.getQueueUrl({QueueName: queueName}).promise();

const job = async () => {
Expand Down