dxfl 0.4.1 → 0.4.2-alpha

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.4.2-alpha
+
+- Temporarily disabling CORS configuration
+
 # v0.4.1
 
 - Define required node version

package/dist/deploy.js

@@ -13,7 +13,7 @@ import { PromisePool } from "@supercharge/promise-pool";
 import { deleteBucketFile, deleteBucketFiles, getBucketCredentials, getBucket, getBucketFiles, putEmptyObjectRedirect, uploadFile, } from "./bucket.js";
 import { ErrorMsg } from "./error.js";
 import { confirmationPrompt, filterMap, formatBytesHuman, formatCount, getFileMd5, sum, } from "./utils.js";
-import { equalBucketRedirect, equalCorsRules, getBucketConfig, putBucketWebsiteConfig, putCorsRules, readConfigFile, } from "./website_config.js";
+import { equalBucketRedirect, getBucketConfig, putBucketWebsiteConfig, readConfigFile, } from "./website_config.js";
 // Walks through the local directory at path `dir`, and for each file it contains, returns :
 // - `localPath`: its path on the local filesystem (includes `dir`). On windows, this path
 //    will typically use `\` as separator.
@@ -189,7 +189,11 @@ function printPlan(plan, details) {
     const oredirects_updated = plan.redirects.filter(r => r.action == "update");
     const oredirects_deleted = plan.redirects.filter(r => r.action == "delete");
     // check whether CORS rules changed
-    const cors_changed = !equalCorsRules(plan.cors_rules.from, plan.cors_rules.to);
+    // const cors_changed = !equalCorsRules(
+    // 	plan.cors_rules.from,
+    // 	plan.cors_rules.to,
+    // );
+    const cors_changed = false;
     // print
     if (details == "summary") {
         const sizeRemote = sum([...plan.remoteFiles.values()].map(f => { var _a; return (_a = f.size) !== null && _a !== void 0 ? _a : 0; }));
@@ -313,9 +317,9 @@ function applyDeployPlan(bucket, plan) {
         // Apply bucket redirects & global config
         yield putBucketWebsiteConfig(bucket, plan.index_page.to, plan.error_page.to, plan.bucket_redirects.to);
         // Apply CORS rules
-        if (!equalCorsRules(plan.cors_rules.from, plan.cors_rules.to)) {
-            yield putCorsRules(bucket, plan.cors_rules.to);
-        }
+        // if (!equalCorsRules(plan.cors_rules.from, plan.cors_rules.to)) {
+        // 	await putCorsRules(bucket, plan.cors_rules.to);
+        // }
     });
 }
 export function deploy(website, localFolder, options) {

package/dist/index.js

@@ -6,7 +6,7 @@ import { deploy } from "./deploy.js";
 import { empty } from "./empty.js";
 import { vhostsList } from "./vhosts.js";
 import { inspect } from "./inspect.js";
-program.name("dxfl").description("Deuxfleurs CLI tool").version("0.4.1");
+program.name("dxfl").description("Deuxfleurs CLI tool").version("0.4.2-alpha");
 program
     .command("login")
     .description("Link your Deuxfleurs account with this tool.")

package/dist/website_config.js

@@ -12,7 +12,7 @@ import TOML from "smol-toml";
 import URI from "fast-uri";
 import { z as zod } from "zod";
 import { fromError as zodError } from "zod-validation-error";
-import { GetBucketCorsCommand, GetBucketWebsiteCommand, PutBucketWebsiteCommand, PutBucketCorsCommand, } from "@aws-sdk/client-s3";
+import { GetBucketWebsiteCommand, PutBucketWebsiteCommand, PutBucketCorsCommand, } from "@aws-sdk/client-s3";
 import { ErrorMsg, withErrorMsg, wrapS3Call } from "./error.js";
 import { getBucketFilesDetails } from "./bucket.js";
 ////////////// Utilities
@@ -324,12 +324,14 @@ export function getBucketConfig(bucket, files) {
         // - A Head command for each file in the bucket to collect object redirects.
         //   (This can become relatively slow for buckets with thousands of files,
         //    but I don't know of a better way.)
-        var _a, _b, _c, _d, _e, _f;
-        const [website, cors, details] = yield Promise.all([
+        var _a, _b;
+        const [website, details] = yield Promise.all([
             // 204 "No Content" is returned when there is no existing website config
             wrapS3Call(`read the bucket website config`, [200, 204], () => bucket.client.send(new GetBucketWebsiteCommand({ Bucket: bucket.name }))),
             // 204 "No Content" is returned when there are no existing CORS rules
-            wrapS3Call(`read the bucket CORS config`, [200, 204], () => bucket.client.send(new GetBucketCorsCommand({ Bucket: bucket.name }))),
+            // wrapS3Call(`read the bucket CORS config`, [200, 204], () =>
+            // 	bucket.client.send(new GetBucketCorsCommand({ Bucket: bucket.name })),
+            // ),
             getBucketFilesDetails(bucket, files),
         ]);
         // Collect object redirects
@@ -340,7 +342,8 @@ export function getBucketConfig(bucket, files) {
             }
         }
         // Interpret bucket redirects
-        if (website.RedirectAllRequestsTo) {
+        if (website.RedirectAllRequestsTo &&
+            "HostName" in website.RedirectAllRequestsTo) {
             // NB: garage does not currently support RedirectAllRequestsTo so this should never happen
             throw new ErrorMsg(`remote website configuration: RedirectAllRequestsTo is specified; ` +
                 `this is currently unsupported by dxfl`);
@@ -414,16 +417,16 @@ export function getBucketConfig(bucket, files) {
         }
         // Interpret CORS rules
         let cors_rules = [];
-        if (cors.CORSRules) {
-            for (const rule of cors.CORSRules) {
-                cors_rules.push({
-                    allowed_origins: (_c = rule.AllowedOrigins) !== null && _c !== void 0 ? _c : [],
-                    allowed_methods: (_d = rule.AllowedMethods) !== null && _d !== void 0 ? _d : [],
-                    allowed_headers: (_e = rule.AllowedHeaders) !== null && _e !== void 0 ? _e : [],
-                    expose_headers: (_f = rule.ExposeHeaders) !== null && _f !== void 0 ? _f : [],
-                });
-            }
-        }
+        // if (cors.CORSRules) {
+        // 	for (const rule of cors.CORSRules) {
+        // 		cors_rules.push({
+        // 			allowed_origins: rule.AllowedOrigins ?? [],
+        // 			allowed_methods: rule.AllowedMethods ?? [],
+        // 			allowed_headers: rule.AllowedHeaders ?? [],
+        // 			expose_headers: rule.ExposeHeaders ?? [],
+        // 		});
+        // 	}
+        // }
         return {
             index_page,
             error_page,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxfl",
-  "version": "0.4.1",
+  "version": "0.4.2-alpha",
   "description": "",
   "license": "EUPL-1.2",
   "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",