@webda/aws 1.6.0-beta.3 → 2.0.0-beta.2

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.
Files changed (82) hide show
  1. package/lib/deployers/cloudformation.d.ts +8 -7
  2. package/lib/deployers/cloudformation.js +85 -75
  3. package/lib/deployers/cloudformation.js.map +1 -1
  4. package/lib/deployers/cloudformation.spec.d.ts +1 -0
  5. package/lib/deployers/cloudformation.spec.js +547 -0
  6. package/lib/deployers/cloudformation.spec.js.map +1 -0
  7. package/lib/deployers/index.d.ts +8 -7
  8. package/lib/deployers/index.js +99 -94
  9. package/lib/deployers/index.js.map +1 -1
  10. package/lib/deployers/index.spec.d.ts +8 -0
  11. package/lib/deployers/index.spec.js +628 -0
  12. package/lib/deployers/index.spec.js.map +1 -0
  13. package/lib/deployers/lambdapackager.d.ts +1 -0
  14. package/lib/deployers/lambdapackager.js +25 -1
  15. package/lib/deployers/lambdapackager.js.map +1 -1
  16. package/lib/deployers/lambdapackager.spec.d.ts +1 -0
  17. package/lib/deployers/lambdapackager.spec.js +76 -0
  18. package/lib/deployers/lambdapackager.spec.js.map +1 -0
  19. package/lib/index.js +5 -1
  20. package/lib/index.js.map +1 -1
  21. package/lib/index.spec.d.ts +10 -0
  22. package/lib/index.spec.js +86 -0
  23. package/lib/index.spec.js.map +1 -0
  24. package/lib/services/aws-mixin.d.ts +22 -1
  25. package/lib/services/aws-mixin.js +18 -20
  26. package/lib/services/aws-mixin.js.map +1 -1
  27. package/lib/services/cloudwatchlogger.d.ts +19 -8
  28. package/lib/services/cloudwatchlogger.js +39 -29
  29. package/lib/services/cloudwatchlogger.js.map +1 -1
  30. package/lib/services/cloudwatchlogger.spec.d.ts +1 -0
  31. package/lib/services/cloudwatchlogger.spec.js +147 -0
  32. package/lib/services/cloudwatchlogger.spec.js.map +1 -0
  33. package/lib/services/dynamodb.d.ts +49 -17
  34. package/lib/services/dynamodb.js +221 -80
  35. package/lib/services/dynamodb.js.map +1 -1
  36. package/lib/services/dynamodb.spec.d.ts +23 -0
  37. package/lib/services/dynamodb.spec.js +410 -0
  38. package/lib/services/dynamodb.spec.js.map +1 -0
  39. package/lib/services/index.d.ts +1 -1
  40. package/lib/services/index.js +6 -2
  41. package/lib/services/index.js.map +1 -1
  42. package/lib/services/lambdacaller.d.ts +26 -10
  43. package/lib/services/lambdacaller.js +10 -18
  44. package/lib/services/lambdacaller.js.map +1 -1
  45. package/lib/services/lambdacaller.spec.d.ts +1 -0
  46. package/lib/services/lambdacaller.spec.js +104 -0
  47. package/lib/services/lambdacaller.spec.js.map +1 -0
  48. package/lib/services/lambdaserver.d.ts +11 -4
  49. package/lib/services/lambdaserver.js +52 -46
  50. package/lib/services/lambdaserver.js.map +1 -1
  51. package/lib/services/lambdaserver.spec.d.ts +1 -0
  52. package/lib/services/lambdaserver.spec.js +449 -0
  53. package/lib/services/lambdaserver.spec.js.map +1 -0
  54. package/lib/services/route53.d.ts +4 -4
  55. package/lib/services/route53.js +34 -44
  56. package/lib/services/route53.js.map +1 -1
  57. package/lib/services/route53.spec.d.ts +1 -0
  58. package/lib/services/route53.spec.js +109 -0
  59. package/lib/services/route53.spec.js.map +1 -0
  60. package/lib/services/s3binary.d.ts +33 -53
  61. package/lib/services/s3binary.js +115 -242
  62. package/lib/services/s3binary.js.map +1 -1
  63. package/lib/services/s3binary.spec.d.ts +1 -0
  64. package/lib/services/s3binary.spec.js +336 -0
  65. package/lib/services/s3binary.spec.js.map +1 -0
  66. package/lib/services/secretsmanager.d.ts +23 -10
  67. package/lib/services/secretsmanager.js +13 -27
  68. package/lib/services/secretsmanager.js.map +1 -1
  69. package/lib/services/secretsmanager.spec.d.ts +1 -0
  70. package/lib/services/secretsmanager.spec.js +109 -0
  71. package/lib/services/secretsmanager.spec.js.map +1 -0
  72. package/lib/services/sqsqueue.d.ts +22 -7
  73. package/lib/services/sqsqueue.js +23 -36
  74. package/lib/services/sqsqueue.js.map +1 -1
  75. package/lib/services/sqsqueue.spec.d.ts +1 -0
  76. package/lib/services/sqsqueue.spec.js +206 -0
  77. package/lib/services/sqsqueue.spec.js.map +1 -0
  78. package/lib/shell.d.ts +1 -1
  79. package/lib/shell.js +4 -1
  80. package/lib/shell.js.map +1 -1
  81. package/package.json +27 -14
  82. package/webda.module.json +285 -12
@@ -1,7 +1,24 @@
1
- import { ModdaDefinition, Queue, QueueParameters, MessageReceipt } from "@webda/core";
1
+ import { SQS } from "@aws-sdk/client-sqs";
2
+ import { MessageReceipt, Queue, QueueParameters } from "@webda/core";
2
3
  import { CloudFormationContributor } from ".";
3
4
  import CloudFormationDeployer from "../deployers/cloudformation";
4
- export declare class SQSQueueParameters extends QueueParameters {
5
+ declare const SQSQueueParameters_base: {
6
+ new (...args: any[]): {
7
+ endpoint?: string;
8
+ credentials?: {
9
+ accessKeyId: string;
10
+ secretAccessKey: string;
11
+ sessionToken?: string;
12
+ };
13
+ region?: string;
14
+ type: string; /**
15
+ * Implement SQS as queue for Webda
16
+ *
17
+ * @WebdaModda
18
+ */
19
+ };
20
+ } & typeof QueueParameters;
21
+ export declare class SQSQueueParameters extends SQSQueueParameters_base {
5
22
  /**
6
23
  * Time to wait pending for an item
7
24
  * @default 20
@@ -34,12 +51,14 @@ export declare class SQSQueueParameters extends QueueParameters {
34
51
  }
35
52
  /**
36
53
  * Implement SQS as queue for Webda
54
+ *
55
+ * @WebdaModda
37
56
  */
38
57
  export default class SQSQueue<T = any, K extends SQSQueueParameters = SQSQueueParameters> extends Queue<T, K> implements CloudFormationContributor {
39
58
  /**
40
59
  * AWS SQS Client
41
60
  */
42
- sqs: AWS.SQS;
61
+ sqs: SQS;
43
62
  /**
44
63
  * @inheritdoc
45
64
  */
@@ -91,9 +110,5 @@ export default class SQSQueue<T = any, K extends SQSQueueParameters = SQSQueuePa
91
110
  Resource: string[];
92
111
  };
93
112
  getCloudFormation(deployer: CloudFormationDeployer): {};
94
- /**
95
- * @inheritdoc
96
- */
97
- static getModda(): ModdaDefinition;
98
113
  }
99
114
  export { SQSQueue };
@@ -10,9 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.SQSQueue = exports.SQSQueueParameters = void 0;
13
+ const client_sqs_1 = require("@aws-sdk/client-sqs");
13
14
  const core_1 = require("@webda/core");
14
- const aws_mixin_1 = require("./aws-mixin");
15
- class SQSQueueParameters extends core_1.QueueParameters {
15
+ const crypto_1 = require("crypto");
16
+ const _1 = require(".");
17
+ class SQSQueueParameters extends (0, _1.AWSServiceParameters)(core_1.QueueParameters) {
16
18
  constructor(params) {
17
19
  var _a, _b;
18
20
  super(params);
@@ -23,6 +25,8 @@ class SQSQueueParameters extends core_1.QueueParameters {
23
25
  exports.SQSQueueParameters = SQSQueueParameters;
24
26
  /**
25
27
  * Implement SQS as queue for Webda
28
+ *
29
+ * @WebdaModda
26
30
  */
27
31
  class SQSQueue extends core_1.Queue {
28
32
  /**
@@ -40,9 +44,7 @@ class SQSQueue extends core_1.Queue {
40
44
  });
41
45
  return __awaiter(this, void 0, void 0, function* () {
42
46
  yield _super.init.call(this);
43
- this.sqs = new ((0, aws_mixin_1.GetAWS)(this.parameters).SQS)({
44
- endpoint: this.parameters.endpoint
45
- });
47
+ this.sqs = new client_sqs_1.SQS(this.parameters);
46
48
  });
47
49
  }
48
50
  /**
@@ -50,12 +52,10 @@ class SQSQueue extends core_1.Queue {
50
52
  */
51
53
  size() {
52
54
  return __awaiter(this, void 0, void 0, function* () {
53
- let res = yield this.sqs
54
- .getQueueAttributes({
55
+ let res = yield this.sqs.getQueueAttributes({
55
56
  AttributeNames: ["ApproximateNumberOfMessages", "ApproximateNumberOfMessagesNotVisible"],
56
57
  QueueUrl: this.parameters.queue
57
- })
58
- .promise();
58
+ });
59
59
  return (parseInt(res["Attributes"]["ApproximateNumberOfMessages"]) +
60
60
  parseInt(res["Attributes"]["ApproximateNumberOfMessagesNotVisible"]));
61
61
  });
@@ -65,13 +65,17 @@ class SQSQueue extends core_1.Queue {
65
65
  */
66
66
  sendMessage(params) {
67
67
  return __awaiter(this, void 0, void 0, function* () {
68
- var sqsParams = {};
69
- sqsParams.QueueUrl = this.parameters.queue;
68
+ var sqsParams = {
69
+ QueueUrl: this.parameters.queue,
70
+ MessageBody: JSON.stringify(params)
71
+ };
70
72
  if (this.parameters.MessageGroupId) {
71
73
  sqsParams.MessageGroupId = this.parameters.MessageGroupId;
72
74
  }
73
- sqsParams.MessageBody = JSON.stringify(params);
74
- yield this.sqs.sendMessage(sqsParams).promise();
75
+ if (this.parameters.queue.endsWith(".fifo")) {
76
+ sqsParams.MessageDeduplicationId = (0, crypto_1.createHash)("sha256").update(sqsParams.MessageBody).digest("hex");
77
+ }
78
+ yield this.sqs.sendMessage(sqsParams);
75
79
  });
76
80
  }
77
81
  /**
@@ -86,7 +90,7 @@ class SQSQueue extends core_1.Queue {
86
90
  AttributeNames: ["MessageGroupId"],
87
91
  MaxNumberOfMessages: this.parameters.maxConsumers > 10 ? 10 : this.parameters.maxConsumers
88
92
  };
89
- let data = yield this.sqs.receiveMessage(queueArg).promise();
93
+ let data = yield this.sqs.receiveMessage(queueArg);
90
94
  (_a = data.Messages) !== null && _a !== void 0 ? _a : (data.Messages = []);
91
95
  return data.Messages.map(m => ({ ReceiptHandle: m.ReceiptHandle, Message: this.unserialize(m.Body, proto) }));
92
96
  });
@@ -106,12 +110,10 @@ class SQSQueue extends core_1.Queue {
106
110
  */
107
111
  deleteMessage(receipt) {
108
112
  return __awaiter(this, void 0, void 0, function* () {
109
- yield this.sqs
110
- .deleteMessage({
113
+ yield this.sqs.deleteMessage({
111
114
  QueueUrl: this.parameters.queue,
112
115
  ReceiptHandle: receipt
113
- })
114
- .promise();
116
+ });
115
117
  });
116
118
  }
117
119
  /**
@@ -125,18 +127,15 @@ class SQSQueue extends core_1.Queue {
125
127
  __cleanWithRetry(fail) {
126
128
  return __awaiter(this, void 0, void 0, function* () {
127
129
  try {
128
- yield this.sqs
129
- .purgeQueue({
130
+ yield this.sqs.purgeQueue({
130
131
  QueueUrl: this.parameters.queue
131
- })
132
- .promise();
132
+ });
133
133
  }
134
134
  catch (err) {
135
- if (fail || err.code !== "AWS.SimpleQueueService.PurgeQueueInProgress") {
135
+ if (fail || err.name !== "AWS.SimpleQueueService.PurgeQueueInProgress") {
136
136
  throw err;
137
137
  }
138
138
  let delay = Math.floor(err.retryDelay * 1100);
139
- console.log("Retry PurgeQueue in ", delay);
140
139
  // 10% of margin
141
140
  return new Promise(resolve => {
142
141
  setTimeout(() => {
@@ -193,18 +192,6 @@ class SQSQueue extends core_1.Queue {
193
192
  // Add any Other resources with prefix of the service
194
193
  return resources;
195
194
  }
196
- /**
197
- * @inheritdoc
198
- */
199
- static getModda() {
200
- return {
201
- uuid: "Webda/SQSQueue",
202
- label: "SQS Queue",
203
- description: "Implements a Queue stored in SQS",
204
- documentation: "https://raw.githubusercontent.com/loopingz/webda/master/readmes/Binary.md",
205
- logo: "images/icons/sqs.png"
206
- };
207
- }
208
195
  }
209
196
  exports.default = SQSQueue;
210
197
  exports.SQSQueue = SQSQueue;
@@ -1 +1 @@
1
- {"version":3,"file":"sqsqueue.js","sourceRoot":"","sources":["../../src/services/sqsqueue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sqsqueue.js","sourceRoot":"","sources":["../../src/services/sqsqueue.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,206 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
19
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
20
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
21
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
22
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
23
+ };
24
+ var __importStar = (this && this.__importStar) || function (mod) {
25
+ if (mod && mod.__esModule) return mod;
26
+ var result = {};
27
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
28
+ __setModuleDefault(result, mod);
29
+ return result;
30
+ };
31
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
32
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
33
+ return new (P || (P = Promise))(function (resolve, reject) {
34
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
35
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
36
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
37
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
38
+ });
39
+ };
40
+ Object.defineProperty(exports, "__esModule", { value: true });
41
+ const client_sqs_1 = require("@aws-sdk/client-sqs");
42
+ const mocha_1 = require("@testdeck/mocha");
43
+ const queue_spec_1 = require("@webda/core/lib/queues/queue.spec");
44
+ const assert = __importStar(require("assert"));
45
+ const aws_sdk_client_mock_1 = require("aws-sdk-client-mock");
46
+ const path = __importStar(require("path"));
47
+ const index_spec_1 = require("../index.spec");
48
+ const sqsqueue_1 = require("./sqsqueue");
49
+ let SQSQueueTest = class SQSQueueTest extends queue_spec_1.QueueTest {
50
+ before() {
51
+ const _super = Object.create(null, {
52
+ before: { get: () => super.before }
53
+ });
54
+ return __awaiter(this, void 0, void 0, function* () {
55
+ process.env.AWS_ACCESS_KEY_ID = "plop";
56
+ process.env.AWS_SECRET_ACCESS_KEY = "plop";
57
+ process.env.AWS_DEFAULT_REGION = "us-east-1";
58
+ yield (0, index_spec_1.checkLocalStack)();
59
+ yield _super.before.call(this);
60
+ yield this.install();
61
+ });
62
+ }
63
+ tweakApp(app) {
64
+ const _super = Object.create(null, {
65
+ tweakApp: { get: () => super.tweakApp }
66
+ });
67
+ return __awaiter(this, void 0, void 0, function* () {
68
+ _super.tweakApp.call(this, app);
69
+ app.addService("test/awsevents", (yield Promise.resolve().then(() => __importStar(require(path.join(__dirname, ..."../../test/moddas/awsevents.js".split("/")))))).default);
70
+ });
71
+ }
72
+ install() {
73
+ return __awaiter(this, void 0, void 0, function* () {
74
+ var sqs = new client_sqs_1.SQS({
75
+ endpoint: "http://localhost:4566",
76
+ credentials: index_spec_1.defaultCreds,
77
+ region: "us-east-1"
78
+ });
79
+ try {
80
+ this.info = yield sqs.getQueueUrl({
81
+ QueueName: "webda-test",
82
+ QueueOwnerAWSAccountId: "000000000000"
83
+ });
84
+ }
85
+ catch (err) {
86
+ if (err.name === "AWS.SimpleQueueService.NonExistentQueue") {
87
+ yield sqs.createQueue({
88
+ QueueName: "webda-test"
89
+ });
90
+ this.info = yield sqs.getQueueUrl({
91
+ QueueName: "webda-test",
92
+ QueueOwnerAWSAccountId: "000000000000"
93
+ });
94
+ }
95
+ }
96
+ try {
97
+ this.info = yield sqs.getQueueUrl({
98
+ QueueName: "webda-test2.fifo",
99
+ QueueOwnerAWSAccountId: "000000000000"
100
+ });
101
+ }
102
+ catch (err) {
103
+ if (err.name === "AWS.SimpleQueueService.NonExistentQueue") {
104
+ yield sqs.createQueue({
105
+ QueueName: "webda-test2.fifo",
106
+ Attributes: {
107
+ FifoQueue: "true"
108
+ }
109
+ });
110
+ this.info = yield sqs.getQueueUrl({
111
+ QueueName: "webda-test2.fifo",
112
+ QueueOwnerAWSAccountId: "000000000000"
113
+ });
114
+ }
115
+ }
116
+ });
117
+ }
118
+ basic() {
119
+ return __awaiter(this, void 0, void 0, function* () {
120
+ let queue = this.webda.getService("sqsqueue");
121
+ queue.getParameters().queue = "http://localhost:4566/000000000000/webda-test";
122
+ yield queue.__clean();
123
+ // Update timeout to 80000ms as Purge can only be sent once every 60s
124
+ yield this.simple(queue, true);
125
+ queue.getParameters().CloudFormationSkip = true;
126
+ assert.deepStrictEqual(queue.getCloudFormation(null), {});
127
+ });
128
+ }
129
+ fifo() {
130
+ return __awaiter(this, void 0, void 0, function* () {
131
+ let queue = this.webda.getService("sqsqueue");
132
+ queue.getParameters().queue = "http://localhost:4566/000000000000/webda-test2.fifo";
133
+ queue.getParameters().MessageGroupId = "myGroup";
134
+ yield queue.sendMessage({});
135
+ });
136
+ }
137
+ ARN() {
138
+ let queue = this.webda.getService("sqsqueue");
139
+ let arn = queue.getARNPolicy();
140
+ assert.strictEqual(arn.Action.indexOf("sqs:SendMessage") >= 0, true);
141
+ assert.strictEqual(arn.Resource[0], "arn:aws:sqs:us-east-1:000000000000:webda-test");
142
+ }
143
+ getQueueInfos() {
144
+ let queue = this.webda.getService("sqsqueue");
145
+ queue.getParameters().queue = "none";
146
+ let error = false;
147
+ try {
148
+ let info = queue._getQueueInfosFromUrl();
149
+ }
150
+ catch (ex) {
151
+ error = true;
152
+ }
153
+ assert.strictEqual(error, true);
154
+ }
155
+ purgeQueueError() {
156
+ return __awaiter(this, void 0, void 0, function* () {
157
+ let queue = this.webda.getService("sqsqueue");
158
+ let mock = (0, aws_sdk_client_mock_1.mockClient)(client_sqs_1.SQS)
159
+ .on(client_sqs_1.PurgeQueueCommand)
160
+ .callsFake(() => __awaiter(this, void 0, void 0, function* () {
161
+ let error = new Error("AWS.SimpleQueueService.PurgeQueueInProgress");
162
+ error.name = "AWS.SimpleQueueService.PurgeQueueInProgress";
163
+ error.retryDelay = 1;
164
+ throw error;
165
+ }));
166
+ yield assert.rejects(() => queue.__clean(), /AWS.SimpleQueueService.PurgeQueueInProgress/);
167
+ mock.restore();
168
+ mock = (0, aws_sdk_client_mock_1.mockClient)(client_sqs_1.SQS)
169
+ .on(client_sqs_1.PurgeQueueCommand)
170
+ .callsFake(() => __awaiter(this, void 0, void 0, function* () {
171
+ throw new Error("Other");
172
+ }));
173
+ yield assert.rejects(() => queue.__clean(), /Other/);
174
+ mock.restore();
175
+ });
176
+ }
177
+ getMaxConsumers() {
178
+ let queue = new sqsqueue_1.SQSQueue(this.webda, "plop", { maxConsumers: 30 });
179
+ assert.strictEqual(queue.getMaxConsumers(), 3);
180
+ queue.getParameters().maxConsumers = 3;
181
+ assert.strictEqual(queue.getMaxConsumers(), 1);
182
+ }
183
+ };
184
+ __decorate([
185
+ mocha_1.test,
186
+ (0, mocha_1.timeout)(80000)
187
+ ], SQSQueueTest.prototype, "basic", null);
188
+ __decorate([
189
+ mocha_1.test
190
+ ], SQSQueueTest.prototype, "fifo", null);
191
+ __decorate([
192
+ mocha_1.test
193
+ ], SQSQueueTest.prototype, "ARN", null);
194
+ __decorate([
195
+ mocha_1.test
196
+ ], SQSQueueTest.prototype, "getQueueInfos", null);
197
+ __decorate([
198
+ mocha_1.test
199
+ ], SQSQueueTest.prototype, "purgeQueueError", null);
200
+ __decorate([
201
+ mocha_1.test
202
+ ], SQSQueueTest.prototype, "getMaxConsumers", null);
203
+ SQSQueueTest = __decorate([
204
+ mocha_1.suite
205
+ ], SQSQueueTest);
206
+ //# sourceMappingURL=sqsqueue.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sqsqueue.spec.js","sourceRoot":"","sources":["../../src/services/sqsqueue.spec.ts"],"names":[],"mappings":"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"}
package/lib/shell.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export declare class AWSShell {
2
- static shellCommand(Console: any, args: any): Promise<void | 1 | 0 | -1>;
2
+ static shellCommand(Console: any, args: any): Promise<void | 0 | 1 | -1>;
3
3
  }
4
4
  /**
5
5
  * Create the command line parser
package/lib/shell.js CHANGED
@@ -8,9 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
8
8
  step((generator = generator.apply(thisArg, _arguments || [])).next());
9
9
  });
10
10
  };
11
+ var __importDefault = (this && this.__importDefault) || function (mod) {
12
+ return (mod && mod.__esModule) ? mod : { "default": mod };
13
+ };
11
14
  Object.defineProperty(exports, "__esModule", { value: true });
12
15
  exports.yargs = exports.ShellCommand = exports.AWSShell = void 0;
13
- const cloudformation_1 = require("./deployers/cloudformation");
16
+ const cloudformation_1 = __importDefault(require("./deployers/cloudformation"));
14
17
  const dynamodb_1 = require("./services/dynamodb");
15
18
  const route53_1 = require("./services/route53");
16
19
  class AWSShell {
package/lib/shell.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"shell.js","sourceRoot":"","sources":["../src/shell.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAgE;AAChE,kDAAkD;AAClD,gDAAoD;AAEpD,MAAa,QAAQ;IACnB,MAAM,CAAO,YAAY,CAAC,OAAO,EAAE,IAAI;;YACrC,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YAC7B,QAAQ,OAAO,EAAE;gBACf,KAAK,MAAM;oBACT,OAAO,wBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC9C,KAAK,SAAS;oBACZ,OAAO,wBAAc,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC7C,KAAK,WAAW;oBACd,sBAAW,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;oBACzF,OAAO,CAAC,CAAC;gBACX;oBACE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,OAAO,EAAE,CAAC,CAAC;oBAC1D,OAAO,CAAC,CAAC;aACZ;QACH,CAAC;KAAA;CACF;AAhBD,4BAgBC;AAED;;;;;GAKG;AACH,SAAS,KAAK,CAAC,CAAC;IACd,OAAO,CAAC;SACL,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC;SACpC,OAAO,CAAC,sBAAsB,EAAE,sBAAsB,EAAE,EAAE,CAAC,EAAE;QAC5D,OAAO,EAAE;aACN,OAAO,CAAC,wBAAwB,EAAE,wCAAwC,CAAC;aAC3E,OAAO,CAAC,eAAe,EAAE,6CAA6C,CAAC,CAAC;IAC7E,CAAC,CAAC;SACD,OAAO,CAAC,uCAAuC,EAAE,sBAAsB,CAAC,CAAC;AAC9E,CAAC;AAIsB,sBAAK;AAF5B,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;AAElC,oCAAY"}
1
+ {"version":3,"file":"shell.js","sourceRoot":"","sources":["../src/shell.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gFAAgE;AAChE,kDAAkD;AAClD,gDAAoD;AAEpD,MAAa,QAAQ;IACnB,MAAM,CAAO,YAAY,CAAC,OAAO,EAAE,IAAI;;YACrC,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YAC7B,QAAQ,OAAO,EAAE;gBACf,KAAK,MAAM;oBACT,OAAO,wBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC9C,KAAK,SAAS;oBACZ,OAAO,wBAAc,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC7C,KAAK,WAAW;oBACd,sBAAW,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;oBACzF,OAAO,CAAC,CAAC;gBACX;oBACE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,OAAO,EAAE,CAAC,CAAC;oBAC1D,OAAO,CAAC,CAAC;aACZ;QACH,CAAC;KAAA;CACF;AAhBD,4BAgBC;AAED;;;;;GAKG;AACH,SAAS,KAAK,CAAC,CAAC;IACd,OAAO,CAAC;SACL,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC;SACpC,OAAO,CAAC,sBAAsB,EAAE,sBAAsB,EAAE,EAAE,CAAC,EAAE;QAC5D,OAAO,EAAE;aACN,OAAO,CAAC,wBAAwB,EAAE,wCAAwC,CAAC;aAC3E,OAAO,CAAC,eAAe,EAAE,6CAA6C,CAAC,CAAC;IAC7E,CAAC,CAAC;SACD,OAAO,CAAC,uCAAuC,EAAE,sBAAsB,CAAC,CAAC;AAC9E,CAAC;AAIsB,sBAAK;AAF5B,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;AAElC,oCAAY"}
package/package.json CHANGED
@@ -1,12 +1,11 @@
1
1
  {
2
2
  "name": "@webda/aws",
3
- "version": "1.6.0-beta.3",
3
+ "version": "2.0.0-beta.2",
4
4
  "description": "Webda AWS Services implementation",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
7
- "webda-module": "webda module --noCompile",
8
- "build": "tsc",
9
- "pretest": "tsc",
7
+ "build": "webda build",
8
+ "pretest": "webda build",
10
9
  "lint": "prettier --check src/**/*",
11
10
  "lint:fix": "prettier --write src/**/*",
12
11
  "test": "nyc mocha --recursive --exit --timeout=100000 -r ../../node_modules/ts-node/register src/**/*.spec.ts"
@@ -32,13 +31,26 @@
32
31
  },
33
32
  "homepage": "https://github.com/loopingz/webda.io#readme",
34
33
  "dependencies": {
35
- "@webda/core": "^1.6.0-beta.3",
36
- "aws-sdk": "^2.953.0",
34
+ "@aws-sdk/client-acm": "^3.58.0",
35
+ "@aws-sdk/client-api-gateway": "^3.58.0",
36
+ "@aws-sdk/client-cloudformation": "^3.58.0",
37
+ "@aws-sdk/client-cloudwatch-logs": "^3.58.0",
38
+ "@aws-sdk/client-dynamodb": "^3.58.0",
39
+ "@aws-sdk/client-ec2": "^3.58.0",
40
+ "@aws-sdk/client-lambda": "^3.58.0",
41
+ "@aws-sdk/client-route-53": "^3.58.0",
42
+ "@aws-sdk/client-s3": "^3.58.0",
43
+ "@aws-sdk/client-secrets-manager": "^3.58.0",
44
+ "@aws-sdk/client-sqs": "^3.58.0",
45
+ "@aws-sdk/client-sts": "^3.58.0",
46
+ "@aws-sdk/lib-dynamodb": "^3.58.0",
47
+ "@aws-sdk/s3-request-presigner": "^3.58.0",
48
+ "@webda/core": "^2.0.0-beta.2",
37
49
  "bluebird": "^3.7.2",
38
- "glob": "^7.1.7",
50
+ "glob": "^8.0.1",
39
51
  "iam-policy-optimizer": "^1.1.2",
40
52
  "uuid": "^8.3.2",
41
- "yaml": "^1.10.2"
53
+ "yaml": "^2.0.0"
42
54
  },
43
55
  "nyc": {
44
56
  "extends": "@istanbuljs/nyc-config-typescript",
@@ -58,12 +70,13 @@
58
70
  "access": "public"
59
71
  },
60
72
  "devDependencies": {
61
- "@testdeck/mocha": "^0.1.2",
73
+ "@testdeck/mocha": "^0.2.0",
74
+ "@types/aws-lambda": "^8.10.97",
62
75
  "@types/node": "14.0.0",
63
- "@webda/async": "^1.6.0-beta.3",
64
- "@webda/shell": "^1.6.0-beta.3",
65
- "aws-sdk-mock": "<5.5.0",
66
- "sinon": "^12.0.1"
76
+ "@webda/async": "^2.0.0-beta.2",
77
+ "@webda/shell": "^2.0.0-beta.2",
78
+ "aws-sdk-client-mock": "^0.6.2",
79
+ "sinon": "^14.0.0"
67
80
  },
68
- "gitHead": "81e1c4249e565e719784c0bbdf09f0a858416034"
81
+ "gitHead": "4928e6830cd4164166d00195ff2fef0d52bf0ba6"
69
82
  }