@budibase/server 2.0.40-alpha.3 → 2.1.0

package/coverage/lcov-report/utilities/scriptRunner.js.html

@@ -142,7 +142,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Nov 01 2022 10:59:02 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 01 2022 08:30:09 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/security.js.html

@@ -283,7 +283,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Nov 01 2022 10:59:02 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 01 2022 08:30:09 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/statusCodes.js.html

@@ -91,7 +91,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Nov 01 2022 10:59:02 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 01 2022 08:30:09 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Nov 01 2022 10:59:02 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 01 2022 08:30:09 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -322,7 +322,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Nov 01 2022 10:59:02 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 01 2022 08:30:09 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Nov 01 2022 10:59:02 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 01 2022 08:30:09 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -223,7 +223,7 @@ exports.publicApiUserFix = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Nov 01 2022 10:59:02 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 01 2022 08:30:09 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -589,7 +589,7 @@ exports.generateApiKey = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Nov 01 2022 10:59:02 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 01 2022 08:30:09 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/dist/integrations/elasticsearch.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const elasticsearch_1 = require("@elastic/elasticsearch");
+const { Client } = require("@elastic/elasticsearch");
 const SCHEMA = {
     docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
     description: "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
@@ -22,21 +22,6 @@ const SCHEMA = {
             required: true,
             default: "http://localhost:9200",
         },
-        ssl: {
-            type: types_1.DatasourceFieldType.BOOLEAN,
-            default: false,
-            required: false,
-        },
-        rejectUnauthorized: {
-            type: types_1.DatasourceFieldType.BOOLEAN,
-            default: true,
-            required: false,
-        },
-        ca: {
-            type: types_1.DatasourceFieldType.LONGFORM,
-            default: false,
-            required: false,
-        },
     },
     query: {
         create: {
@@ -91,16 +76,7 @@ const SCHEMA = {
 class ElasticSearchIntegration {
     constructor(config) {
         this.config = config;
-        const clientConfig = {
-            node: this.config.url,
-        };
-        if (this.config.ssl) {
-            clientConfig.ssl = {
-                rejectUnauthorized: this.config.rejectUnauthorized,
-                ca: this.config.ca || undefined,
-            };
-        }
-        this.client = new elasticsearch_1.Client(clientConfig);
+        this.client = new Client({ node: config.url });
     }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/integrations/s3.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const AWS = require("aws-sdk");
-const csv = require("csvtojson");
 const SCHEMA = {
     docs: "https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html",
     description: "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.",
@@ -42,106 +41,16 @@ const SCHEMA = {
         },
     },
     query: {
-        create: {
-            type: types_1.QueryType.FIELDS,
-            fields: {
-                bucket: {
-                    display: "New Bucket",
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                location: {
-                    required: true,
-                    default: "us-east-1",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantFullControl: {
-                    display: "Grant full control",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantRead: {
-                    display: "Grant read",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantReadAcp: {
-                    display: "Grant read ACP",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantWrite: {
-                    display: "Grant write",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantWriteAcp: {
-                    display: "Grant write ACP",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-            },
-        },
         read: {
             type: types_1.QueryType.FIELDS,
             fields: {
                 bucket: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                delimiter: {
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                marker: {
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                maxKeys: {
-                    type: types_1.DatasourceFieldType.NUMBER,
-                    display: "Max Keys",
-                },
-                prefix: {
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-            },
-        },
-        readCsv: {
-            displayName: "Read CSV",
-            type: types_1.QueryType.FIELDS,
-            fields: {
-                bucket: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                key: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-            },
-        },
-        delete: {
-            type: types_1.QueryType.FIELDS,
-            fields: {
-                bucket: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                delete: {
-                    type: types_1.DatasourceFieldType.JSON,
+                    type: "string",
                     required: true,
                 },
             },
         },
     },
-    extra: {
-        acl: {
-            required: false,
-            displayName: "ACL",
-            type: types_1.DatasourceFieldType.LIST,
-            data: {
-                create: [
-                    "private",
-                    "public-read",
-                    "public-read-write",
-                    "authenticated-read",
-                ],
-            },
-        },
-    },
 };
 class S3Integration {
     constructor(config) {
@@ -154,81 +63,16 @@ class S3Integration {
         }
         this.client = new AWS.S3(this.config);
     }
-    create(query) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            let params = {
-                Bucket: query.bucket,
-                ACL: (_a = query.extra) === null || _a === void 0 ? void 0 : _a.acl,
-                GrantFullControl: query.grantFullControl,
-                GrantRead: query.grantRead,
-                GrantReadACP: query.grantReadAcp,
-                GrantWrite: query.grantWrite,
-                GrantWriteACP: query.grantWriteAcp,
-            };
-            if (query.location) {
-                params["CreateBucketConfiguration"] = {
-                    LocationConstraint: query.location,
-                };
-            }
-            return yield this.client.createBucket(params).promise();
-        });
-    }
     read(query) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.client
                 .listObjects({
                 Bucket: query.bucket,
-                Delimiter: query.delimiter,
-                Marker: query.marker,
-                MaxKeys: query.maxKeys,
-                Prefix: query.prefix,
             })
                 .promise();
             return response.Contents;
         });
     }
-    readCsv(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stream = this.client
-                .getObject({
-                Bucket: query.bucket,
-                Key: query.key,
-            })
-                .createReadStream();
-            let csvError = false;
-            return new Promise((resolve, reject) => {
-                stream.on("error", (err) => {
-                    reject(err);
-                });
-                const response = csv()
-                    .fromStream(stream)
-                    .on("error", () => {
-                    csvError = true;
-                });
-                stream.on("finish", () => {
-                    resolve(response);
-                });
-            }).catch(err => {
-                if (csvError) {
-                    throw new Error("Could not read CSV");
-                }
-                else {
-                    throw err;
-                }
-            });
-        });
-    }
-    delete(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.client
-                .deleteObjects({
-                Bucket: query.bucket,
-                Delete: JSON.parse(query.delete),
-            })
-                .promise();
-        });
-    }
 }
 exports.default = {
     schema: SCHEMA,

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.0.40-alpha.2",
+    "version": "2.0.40",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.0.40-alpha.2",
-        "@budibase/client": "2.0.40-alpha.2",
-        "@budibase/pro": "2.0.40-alpha.2",
-        "@budibase/string-templates": "2.0.40-alpha.2",
-        "@budibase/types": "2.0.40-alpha.2",
+        "@budibase/backend-core": "^2.0.40",
+        "@budibase/client": "^2.0.40",
+        "@budibase/pro": "2.0.40",
+        "@budibase/string-templates": "^2.0.40",
+        "@budibase/types": "^2.0.40",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",