@webda/gcp 3.2.8 → 3.4.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.
- package/lib/services/kms.d.ts +38 -0
- package/lib/services/kms.js +78 -0
- package/lib/services/kms.js.map +1 -0
- package/lib/services/kms.spec.d.ts +1 -0
- package/lib/services/kms.spec.js +53 -0
- package/lib/services/kms.spec.js.map +1 -0
- package/lib/services/pubsub.d.ts +6 -0
- package/lib/services/pubsub.js +26 -6
- package/lib/services/pubsub.js.map +1 -1
- package/lib/services/pubsub.spec.js +28 -1
- package/lib/services/pubsub.spec.js.map +1 -1
- package/lib/services/storage.js +1 -5
- package/lib/services/storage.js.map +1 -1
- package/package.json +6 -5
- package/webda.module.json +55 -4
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { KeyManagementServiceClient } from "@google-cloud/kms";
|
|
2
|
+
import { DeepPartial, Service, ServiceParameters } from "@webda/core";
|
|
3
|
+
/**
|
|
4
|
+
* Parameters for the KMS Service
|
|
5
|
+
*/
|
|
6
|
+
export declare class KMSServiceParameters extends ServiceParameters {
|
|
7
|
+
/**
|
|
8
|
+
* Encryption key to use by default
|
|
9
|
+
* @default WEBDA_GCP_KMS_KEY env variable
|
|
10
|
+
*/
|
|
11
|
+
defaultKey?: string;
|
|
12
|
+
constructor(params: any);
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Expose KMS Service
|
|
16
|
+
*
|
|
17
|
+
* @WebdaModda GoogleCloudKMS
|
|
18
|
+
*/
|
|
19
|
+
export declare class GCPKMSService<T extends KMSServiceParameters> extends Service<T> {
|
|
20
|
+
client: KeyManagementServiceClient;
|
|
21
|
+
/**
|
|
22
|
+
* @override
|
|
23
|
+
*/
|
|
24
|
+
loadParameters(params: DeepPartial<ServiceParameters>): ServiceParameters;
|
|
25
|
+
/**
|
|
26
|
+
* Encrypt a data with GCP KMS given key or defaultKey
|
|
27
|
+
* @param data
|
|
28
|
+
* @param key
|
|
29
|
+
* @returns
|
|
30
|
+
*/
|
|
31
|
+
encrypt(data: string, key?: string): Promise<string>;
|
|
32
|
+
/**
|
|
33
|
+
* Decrypt a data previously encrypted with this service
|
|
34
|
+
* @param data
|
|
35
|
+
* @returns
|
|
36
|
+
*/
|
|
37
|
+
decrypt(data: string): Promise<string>;
|
|
38
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { KeyManagementServiceClient } from "@google-cloud/kms";
|
|
2
|
+
import { CryptoService, Service, ServiceParameters } from "@webda/core";
|
|
3
|
+
/**
|
|
4
|
+
* Encrypter for GCP KMS
|
|
5
|
+
*/
|
|
6
|
+
const encrypter = {
|
|
7
|
+
encrypt: async (data, key) => {
|
|
8
|
+
key ?? (key = process.env.WEBDA_GCP_KMS_KEY);
|
|
9
|
+
// Only the odd elements are dynamic
|
|
10
|
+
const infos = key.split("/").filter((i, ind) => ind % 2 === 1);
|
|
11
|
+
const client = new KeyManagementServiceClient();
|
|
12
|
+
// Encode the infos in base64
|
|
13
|
+
// Add the encrypted info after a : separator
|
|
14
|
+
return (Buffer.from(infos.join(":")).toString("base64") +
|
|
15
|
+
":" +
|
|
16
|
+
(await client.encrypt({
|
|
17
|
+
name: key,
|
|
18
|
+
plaintext: Buffer.from(data)
|
|
19
|
+
}))[0].ciphertext);
|
|
20
|
+
},
|
|
21
|
+
decrypt: async (data) => {
|
|
22
|
+
// Get the info
|
|
23
|
+
const info = data.substring(0, data.indexOf(":"));
|
|
24
|
+
const infos = Buffer.from(info, "base64").toString().split(":");
|
|
25
|
+
if (infos.length !== 4) {
|
|
26
|
+
throw new Error("Invalid KMS encryption");
|
|
27
|
+
}
|
|
28
|
+
const client = new KeyManagementServiceClient();
|
|
29
|
+
return (await client.decrypt({
|
|
30
|
+
name: `projects/${infos[0]}/locations/${infos[1]}/keyRings/${infos[2]}/cryptoKeys/${infos[3]}`,
|
|
31
|
+
ciphertext: Buffer.from(data.substring(data.indexOf(":") + 1))
|
|
32
|
+
}))[0].plaintext;
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
/**
|
|
36
|
+
* Register the encrypter
|
|
37
|
+
*/
|
|
38
|
+
CryptoService.registerEncrypter("gcp", encrypter);
|
|
39
|
+
/**
|
|
40
|
+
* Parameters for the KMS Service
|
|
41
|
+
*/
|
|
42
|
+
export class KMSServiceParameters extends ServiceParameters {
|
|
43
|
+
constructor(params) {
|
|
44
|
+
super(params);
|
|
45
|
+
this.defaultKey ?? (this.defaultKey = process.env.WEBDA_GCP_KMS_KEY);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Expose KMS Service
|
|
50
|
+
*
|
|
51
|
+
* @WebdaModda GoogleCloudKMS
|
|
52
|
+
*/
|
|
53
|
+
export class GCPKMSService extends Service {
|
|
54
|
+
/**
|
|
55
|
+
* @override
|
|
56
|
+
*/
|
|
57
|
+
loadParameters(params) {
|
|
58
|
+
return new KMSServiceParameters(params);
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Encrypt a data with GCP KMS given key or defaultKey
|
|
62
|
+
* @param data
|
|
63
|
+
* @param key
|
|
64
|
+
* @returns
|
|
65
|
+
*/
|
|
66
|
+
encrypt(data, key) {
|
|
67
|
+
return encrypter.encrypt(data, key || this.parameters.defaultKey);
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Decrypt a data previously encrypted with this service
|
|
71
|
+
* @param data
|
|
72
|
+
* @returns
|
|
73
|
+
*/
|
|
74
|
+
decrypt(data) {
|
|
75
|
+
return encrypter.decrypt(data);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=kms.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"kms.js","sourceRoot":"","sources":["../../src/services/kms.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
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;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
import { KeyManagementServiceClient } from "@google-cloud/kms";
|
|
8
|
+
import { suite, test } from "@testdeck/mocha";
|
|
9
|
+
import { WebdaSimpleTest } from "@webda/core/lib/test.js";
|
|
10
|
+
import * as assert from "assert";
|
|
11
|
+
import * as sinon from "sinon";
|
|
12
|
+
import { GCPKMSService } from "./kms.js";
|
|
13
|
+
let KMSTest = class KMSTest extends WebdaSimpleTest {
|
|
14
|
+
async test() {
|
|
15
|
+
sinon.stub(KeyManagementServiceClient.prototype, "encrypt").callsFake(() => {
|
|
16
|
+
return [
|
|
17
|
+
{
|
|
18
|
+
ciphertext: "ciphertext"
|
|
19
|
+
}
|
|
20
|
+
];
|
|
21
|
+
});
|
|
22
|
+
sinon.stub(KeyManagementServiceClient.prototype, "decrypt").callsFake(() => {
|
|
23
|
+
return [
|
|
24
|
+
{
|
|
25
|
+
plaintext: "plaintext"
|
|
26
|
+
}
|
|
27
|
+
];
|
|
28
|
+
});
|
|
29
|
+
let service = await this.registerService(new GCPKMSService(this.webda, "KMSService", {
|
|
30
|
+
defaultKey: "projects/my-project/locations/us-east1/keyRings/my-key-ring/cryptoKeys/my-key"
|
|
31
|
+
}))
|
|
32
|
+
.resolve()
|
|
33
|
+
.init();
|
|
34
|
+
let encoded = await service.encrypt("test");
|
|
35
|
+
assert.deepStrictEqual(Buffer.from(encoded.split(":")[0], "base64").toString().split(":"), [
|
|
36
|
+
"my-project",
|
|
37
|
+
"us-east1",
|
|
38
|
+
"my-key-ring",
|
|
39
|
+
"my-key"
|
|
40
|
+
]);
|
|
41
|
+
assert.strictEqual(encoded.split(":").pop(), "ciphertext");
|
|
42
|
+
let decoded = await service.decrypt(encoded);
|
|
43
|
+
assert.strictEqual(decoded, "plaintext");
|
|
44
|
+
assert.rejects(() => service.decrypt(Buffer.from("test:plop").toString("base64") + ":test"));
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
__decorate([
|
|
48
|
+
test
|
|
49
|
+
], KMSTest.prototype, "test", null);
|
|
50
|
+
KMSTest = __decorate([
|
|
51
|
+
suite
|
|
52
|
+
], KMSTest);
|
|
53
|
+
//# sourceMappingURL=kms.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"kms.spec.js","sourceRoot":"","sources":["../../src/services/kms.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,eAAe;IAE7B,AAAN,KAAK,CAAC,IAAI;QACR,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;YACzE,OAAO;gBACL;oBACE,UAAU,EAAE,YAAY;iBACzB;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;YACzE,OAAO;gBACL;oBACE,SAAS,EAAE,WAAW;iBACvB;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CACtC,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,EAAE;YAC1C,UAAU,EAAE,+EAA+E;SAC5F,CAAC,CACH;aACE,OAAO,EAAE;aACT,IAAI,EAAE,CAAC;QACV,IAAI,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACzF,YAAY;YACZ,UAAU;YACV,aAAa;YACb,QAAQ;SACT,CAAC,CAAC;QACH,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;QAC3D,IAAI,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACzC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAC/F,CAAC;CACF,CAAA;AAlCO;IADL,IAAI;mCAkCJ;AAnCG,OAAO;IADZ,KAAK;GACA,OAAO,CAoCZ"}
|
package/lib/services/pubsub.d.ts
CHANGED
|
@@ -27,6 +27,12 @@ export default class GCPPubSubService<T = any, K extends GCPPubSubParameters = G
|
|
|
27
27
|
* @override
|
|
28
28
|
*/
|
|
29
29
|
sendMessage(event: T): Promise<void>;
|
|
30
|
+
size(): Promise<number>;
|
|
31
|
+
/**
|
|
32
|
+
* Get the subscription name
|
|
33
|
+
* @returns
|
|
34
|
+
*/
|
|
35
|
+
getSubscriptionName(): string;
|
|
30
36
|
/**
|
|
31
37
|
* @override
|
|
32
38
|
*/
|
package/lib/services/pubsub.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PubSub } from "@google-cloud/pubsub";
|
|
2
|
-
import { CancelablePromise, PubSubService, ServiceParameters } from "@webda/core";
|
|
2
|
+
import { CancelablePromise, Core, PubSubService, ServiceParameters } from "@webda/core";
|
|
3
3
|
export class GCPPubSubParameters extends ServiceParameters {
|
|
4
4
|
}
|
|
5
5
|
/***
|
|
@@ -22,30 +22,50 @@ export default class GCPPubSubService extends PubSubService {
|
|
|
22
22
|
* @override
|
|
23
23
|
*/
|
|
24
24
|
async sendMessage(event) {
|
|
25
|
+
this.metrics.messages_sent.inc();
|
|
25
26
|
await this.pubsub.topic(this.parameters.topic).publishMessage({ data: Buffer.from(JSON.stringify(event)) });
|
|
26
27
|
}
|
|
28
|
+
async size() {
|
|
29
|
+
return 0;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Get the subscription name
|
|
33
|
+
* @returns
|
|
34
|
+
*/
|
|
35
|
+
getSubscriptionName() {
|
|
36
|
+
return `${this.getName()}-${Core.getMachineId()}`;
|
|
37
|
+
}
|
|
27
38
|
/**
|
|
28
39
|
* @override
|
|
29
40
|
*/
|
|
30
41
|
consume(callback, eventPrototype, onBind) {
|
|
31
|
-
const subscriptionName =
|
|
42
|
+
const subscriptionName = this.getSubscriptionName();
|
|
32
43
|
let subscription;
|
|
33
44
|
const messageHandler = async (message) => {
|
|
45
|
+
this.metrics.messages_received.inc();
|
|
46
|
+
const end = this.metrics.processing_duration.startTimer();
|
|
34
47
|
try {
|
|
35
48
|
await callback(this.unserialize(message.data.toString(), eventPrototype));
|
|
36
49
|
message.ack();
|
|
37
50
|
}
|
|
38
51
|
catch (err) {
|
|
52
|
+
this.metrics.errors.inc();
|
|
39
53
|
this.log("ERROR", `${this.getName()} consume message error`, err);
|
|
40
54
|
}
|
|
55
|
+
finally {
|
|
56
|
+
end();
|
|
57
|
+
}
|
|
41
58
|
};
|
|
42
59
|
return new CancelablePromise(async (_resolve, reject) => {
|
|
43
60
|
try {
|
|
44
61
|
subscription = this.pubsub.subscription(subscriptionName);
|
|
45
|
-
const [
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
62
|
+
const [exists] = await subscription.exists();
|
|
63
|
+
if (!exists) {
|
|
64
|
+
const [result] = await this.pubsub
|
|
65
|
+
.topic(this.parameters.topic)
|
|
66
|
+
.createSubscription(subscriptionName, this.parameters.subscriptionOptions);
|
|
67
|
+
subscription = result;
|
|
68
|
+
}
|
|
49
69
|
// Receive callbacks for new messages on the subscription
|
|
50
70
|
subscription.on("message", messageHandler);
|
|
51
71
|
// Receive callbacks for errors on the subscription
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/services/pubsub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,MAAM,EAAgB,MAAM,sBAAsB,CAAC;AAChG,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/services/pubsub.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,39 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
4
4
|
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;
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
|
+
import { PubSub } from "@google-cloud/pubsub";
|
|
7
8
|
import { suite, test } from "@testdeck/mocha";
|
|
8
|
-
import { WaitFor, WaitLinearDelay } from "@webda/core";
|
|
9
|
+
import { Core, WaitFor, WaitLinearDelay } from "@webda/core";
|
|
9
10
|
import { WebdaTest } from "@webda/core/lib/test.js";
|
|
10
11
|
import * as assert from "assert";
|
|
11
12
|
import * as sinon from "sinon";
|
|
12
13
|
let GCPPubSubTest = class GCPPubSubTest extends WebdaTest {
|
|
14
|
+
constructor() {
|
|
15
|
+
super(...arguments);
|
|
16
|
+
this.subscriptions = [];
|
|
17
|
+
}
|
|
18
|
+
async after() {
|
|
19
|
+
await super.after();
|
|
20
|
+
const pubsub = new PubSub();
|
|
21
|
+
for (let subscription of this.subscriptions) {
|
|
22
|
+
try {
|
|
23
|
+
const [exists] = await pubsub.subscription(subscription).exists();
|
|
24
|
+
if (exists) {
|
|
25
|
+
await pubsub.subscription(subscription).delete();
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
catch (err) { }
|
|
29
|
+
}
|
|
30
|
+
}
|
|
13
31
|
async basic() {
|
|
14
32
|
let pubsub = this.webda.getService("pubsub");
|
|
33
|
+
let subscriptionCount = 1;
|
|
34
|
+
assert.strictEqual(pubsub.getSubscriptionName(), `${pubsub.getName()}-${Core.getMachineId()}`);
|
|
35
|
+
sinon.stub(pubsub, "getSubscriptionName").callsFake(() => {
|
|
36
|
+
const name = `test-${Core.getMachineId()}-${subscriptionCount++}`;
|
|
37
|
+
this.subscriptions.push(name);
|
|
38
|
+
return name;
|
|
39
|
+
});
|
|
15
40
|
let counter = 0;
|
|
16
41
|
let consumers = [];
|
|
17
42
|
let subscription;
|
|
@@ -28,6 +53,8 @@ let GCPPubSubTest = class GCPPubSubTest extends WebdaTest {
|
|
|
28
53
|
}));
|
|
29
54
|
});
|
|
30
55
|
await pubsub.sendMessage("plop");
|
|
56
|
+
// This is not logical w/o subscription value
|
|
57
|
+
assert.strictEqual(await pubsub.size(), 0);
|
|
31
58
|
await WaitFor(async (resolve) => {
|
|
32
59
|
if (counter === 2) {
|
|
33
60
|
resolve();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.spec.js","sourceRoot":"","sources":["../../src/services/pubsub.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAqB,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"pubsub.spec.js","sourceRoot":"","sources":["../../src/services/pubsub.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/services/storage.js
CHANGED
|
@@ -110,11 +110,7 @@ export default class Storage extends CloudBinary {
|
|
|
110
110
|
async _cleanUsage(hash, uuid, property) {
|
|
111
111
|
const suffix = property ? `${property}_${uuid}` : `_${uuid}`;
|
|
112
112
|
let files = (await this.getStorageBucket().getFiles({ prefix: this._getKey(hash, "") }))[0];
|
|
113
|
-
await Promise.all(files
|
|
114
|
-
.filter(f => f.name.endsWith(suffix))
|
|
115
|
-
.map(f => {
|
|
116
|
-
f.delete();
|
|
117
|
-
}));
|
|
113
|
+
await Promise.all(files.filter(f => f.name.endsWith(suffix)).map(f => f.delete()));
|
|
118
114
|
// If no more usage, delete the data
|
|
119
115
|
files = files.filter(f => !f.name.endsWith(suffix));
|
|
120
116
|
if (files.length == 1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/services/storage.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb,OAAO,
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/services/storage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webda/gcp",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.4.0",
|
|
4
4
|
"description": "Webda GCP Services implementation",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -33,9 +33,10 @@
|
|
|
33
33
|
"homepage": "https://github.com/loopingz/webda.io#readme",
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@google-cloud/firestore": "^7.0.0",
|
|
36
|
+
"@google-cloud/kms": "^4.0.1",
|
|
36
37
|
"@google-cloud/pubsub": "^4.0.1",
|
|
37
38
|
"@google-cloud/storage": "~7.7.0",
|
|
38
|
-
"@webda/core": "^3.
|
|
39
|
+
"@webda/core": "^3.13.0",
|
|
39
40
|
"mime-types": "^2.1.35"
|
|
40
41
|
},
|
|
41
42
|
"c8": {
|
|
@@ -57,8 +58,8 @@
|
|
|
57
58
|
"devDependencies": {
|
|
58
59
|
"@testdeck/mocha": "^0.3.2",
|
|
59
60
|
"@types/node": "18.11.13",
|
|
60
|
-
"@webda/async": "^3.
|
|
61
|
-
"@webda/shell": "^3.
|
|
61
|
+
"@webda/async": "^3.5.1",
|
|
62
|
+
"@webda/shell": "^3.9.1",
|
|
62
63
|
"sinon": "^17.0.0",
|
|
63
64
|
"uuid": "^9.0.0"
|
|
64
65
|
},
|
|
@@ -72,5 +73,5 @@
|
|
|
72
73
|
"@webda/shell"
|
|
73
74
|
]
|
|
74
75
|
},
|
|
75
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "f0a5fb3352ec67e923be51b7c49c8e9c653d4630"
|
|
76
77
|
}
|
package/webda.module.json
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
"deployers": {},
|
|
4
4
|
"moddas": {
|
|
5
5
|
"Webda/GoogleCloudFireStore": "lib/services/firestore:default",
|
|
6
|
+
"Webda/GoogleCloudKMS": "lib/services/kms:GCPKMSService",
|
|
6
7
|
"Webda/GoogleCloudPubSub": "lib/services/pubsub:default",
|
|
7
8
|
"Webda/GoogleCloudQueue": "lib/services/queue:default",
|
|
8
9
|
"Webda/GoogleCloudStorage": "lib/services/storage:default"
|
|
@@ -115,6 +116,10 @@
|
|
|
115
116
|
},
|
|
116
117
|
"description": "Model Aliases to allow easier rename of Model"
|
|
117
118
|
},
|
|
119
|
+
"noCache": {
|
|
120
|
+
"type": "boolean",
|
|
121
|
+
"description": "Disable default memory cache"
|
|
122
|
+
},
|
|
118
123
|
"collection": {
|
|
119
124
|
"type": "string",
|
|
120
125
|
"description": "Collection to use"
|
|
@@ -202,6 +207,34 @@
|
|
|
202
207
|
},
|
|
203
208
|
"title": "FireStore"
|
|
204
209
|
},
|
|
210
|
+
"Webda/GoogleCloudKMS": {
|
|
211
|
+
"type": "object",
|
|
212
|
+
"properties": {
|
|
213
|
+
"type": {
|
|
214
|
+
"type": "string",
|
|
215
|
+
"description": "Type of the service"
|
|
216
|
+
},
|
|
217
|
+
"url": {
|
|
218
|
+
"type": "string",
|
|
219
|
+
"description": "URL on which to serve the content"
|
|
220
|
+
},
|
|
221
|
+
"defaultKey": {
|
|
222
|
+
"type": "string",
|
|
223
|
+
"description": "Encryption key to use by default",
|
|
224
|
+
"default": "WEBDA_GCP_KMS_KEY env variable"
|
|
225
|
+
},
|
|
226
|
+
"openapi": {
|
|
227
|
+
"type": "object",
|
|
228
|
+
"additionalProperties": true
|
|
229
|
+
}
|
|
230
|
+
},
|
|
231
|
+
"required": [
|
|
232
|
+
"type"
|
|
233
|
+
],
|
|
234
|
+
"description": "Parameters for the KMS Service",
|
|
235
|
+
"$schema": "http://json-schema.org/draft-07/schema#",
|
|
236
|
+
"title": "GCPKMSService"
|
|
237
|
+
},
|
|
205
238
|
"Webda/GoogleCloudPubSub": {
|
|
206
239
|
"type": "object",
|
|
207
240
|
"properties": {
|
|
@@ -244,7 +277,7 @@
|
|
|
244
277
|
"retry": {
|
|
245
278
|
"anyOf": [
|
|
246
279
|
{
|
|
247
|
-
"$ref": "#/definitions/Partial%3Cclass-657338214-
|
|
280
|
+
"$ref": "#/definitions/Partial%3Cclass-657338214-822-3488-657338214-0-17392%3E"
|
|
248
281
|
},
|
|
249
282
|
{
|
|
250
283
|
"type": "null"
|
|
@@ -358,7 +391,16 @@
|
|
|
358
391
|
"currentRetryAttempt": {
|
|
359
392
|
"type": "number"
|
|
360
393
|
},
|
|
361
|
-
"shouldRetryFn": {}
|
|
394
|
+
"shouldRetryFn": {},
|
|
395
|
+
"maxRetryDelay": {
|
|
396
|
+
"type": "number"
|
|
397
|
+
},
|
|
398
|
+
"retryDelayMultiplier": {
|
|
399
|
+
"type": "number"
|
|
400
|
+
},
|
|
401
|
+
"totalTimeout": {
|
|
402
|
+
"type": "number"
|
|
403
|
+
}
|
|
362
404
|
}
|
|
363
405
|
}
|
|
364
406
|
}
|
|
@@ -557,6 +599,13 @@
|
|
|
557
599
|
}
|
|
558
600
|
],
|
|
559
601
|
"description": "BigQueryConfig state"
|
|
602
|
+
},
|
|
603
|
+
"useTableSchema": {
|
|
604
|
+
"type": [
|
|
605
|
+
"boolean",
|
|
606
|
+
"null"
|
|
607
|
+
],
|
|
608
|
+
"description": "BigQueryConfig useTableSchema"
|
|
560
609
|
}
|
|
561
610
|
},
|
|
562
611
|
"description": "Properties of a BigQueryConfig."
|
|
@@ -1182,7 +1231,7 @@
|
|
|
1182
1231
|
}
|
|
1183
1232
|
}
|
|
1184
1233
|
},
|
|
1185
|
-
"Partial<class-657338214-
|
|
1234
|
+
"Partial<class-657338214-822-3488-657338214-0-17392>": {
|
|
1186
1235
|
"type": "object",
|
|
1187
1236
|
"properties": {
|
|
1188
1237
|
"retryCodes": {
|
|
@@ -1236,7 +1285,9 @@
|
|
|
1236
1285
|
"retryDelayMultiplier",
|
|
1237
1286
|
"maxRetryDelayMillis"
|
|
1238
1287
|
]
|
|
1239
|
-
}
|
|
1288
|
+
},
|
|
1289
|
+
"shouldRetryFn": {},
|
|
1290
|
+
"getResumptionRequestFn": {}
|
|
1240
1291
|
}
|
|
1241
1292
|
},
|
|
1242
1293
|
"google.pubsub.v1.BigQueryConfig.State": {
|