fix e2e, enum lint & imporved dbg print

dfinity · Nov 14, 2023 · 124e7dc · 124e7dc
1 parent 77202d7
commit 124e7dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/e2e/tests-dfx/assetscanister.bash b/e2e/tests-dfx/assetscanister.bash
@@ -1484,38 +1484,33 @@ CHERRIES" "$stdout"
   "match": "nevermatchme",
   "cache": {
     "max_age": 2000
-  },
-  "allow_raw_access": true
+  }
 }'
   assert_match 'WARN: 4 unmatched configurations in .*/src/e2e_project_frontend/assets/somedir/.ic-assets.json config file:'
   assert_contains 'WARN: {
   "match": "nevermatchme",
   "headers": {},
-  "ignore": false,
-  "allow_raw_access": true
+  "ignore": false
 }
 WARN: {
   "match": "nevermatchmetoo",
   "headers": {},
-  "ignore": false,
-  "allow_raw_access": true
+  "ignore": false
 }
 WARN: {
   "match": "non-matcher",
   "headers": {
     "x-header": "x-value"
   },
-  "ignore": false,
-  "allow_raw_access": true
+  "ignore": false
 }'
   # splitting this up into two checks, because the order is different on macos vs ubuntu
   assert_contains 'WARN: {
   "match": "/thanks-for-not-stripping-forward-slash",
   "headers": {
     "x-header": "x-value"
   },
-  "ignore": false,
-  "allow_raw_access": true
+  "ignore": false
 }'
 }
 

diff --git a/src/canisters/frontend/ic-asset/src/asset/config.rs b/src/canisters/frontend/ic-asset/src/asset/config.rs
@@ -62,19 +62,14 @@ pub struct AssetConfigRule {
     allow_raw_access: Option<bool>,
 }
 
-#[derive(Deserialize, Debug, Clone, PartialEq, Eq)]
+#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Default)]
 enum Maybe<T> {
     Null,
+    #[default]
     Absent,
     Value(T),
 }
 
-impl<T> Default for Maybe<T> {
-    fn default() -> Self {
-        Self::Absent
-    }
-}
-
 impl AssetConfigRule {
     fn applies(&self, canonical_path: &Path) -> bool {
         // TODO: better dot files/dirs handling, awaiting upstream changes:
@@ -421,12 +416,6 @@ mod rule_utils {
                     s.push_str(&format!("  - HTTP cache max-age: {}\n", max_age));
                 }
             }
-            if let Some(aliasing) = self.enable_aliasing {
-                s.push_str(&format!(
-                    "  - URL path aliasing: {}\n",
-                    if aliasing { "enabled" } else { "disabled" }
-                ));
-            }
             if let Some(allow_raw_access) = self.allow_raw_access {
                 s.push_str(&format!(
                     "  - enable raw access: {}\n",
@@ -437,6 +426,12 @@ mod rule_utils {
                     }
                 ));
             }
+            if let Some(aliasing) = self.enable_aliasing {
+                s.push_str(&format!(
+                    "  - URL path aliasing: {}\n",
+                    if aliasing { "enabled" } else { "disabled" }
+                ));
+            }
             if let Some(ref headers) = self.headers {
                 for (key, value) in headers {
                     s.push_str(&format!(
@@ -937,7 +932,7 @@ mod with_tempdir {
             AssetConfig {
                 allow_raw_access: Some(true),
                 ..Default::default()
-            },
+            }
         );
     }