Merge pull request #2388 from itowlson/templates-now-add-statis-fs-is-all-wrong

Fix `spin add static-fileserver` putting the asset directory in the wrong place

Author: itowlson

crates/templates/src/reader.rs

@@ -56,6 +56,15 @@ pub(crate) enum RawExtraOutput {
 #[serde(deny_unknown_fields, rename_all = "snake_case")]
 pub(crate) struct RawCreateDir {
     pub path: String,
+    pub at: Option<CreateLocation>,
+}
+
+#[derive(Debug, Deserialize, Clone, Copy, Default)]
+#[serde(deny_unknown_fields, rename_all = "snake_case")]
+pub(crate) enum CreateLocation {
+    #[default]
+    Component,
+    Manifest,
 }
 
 pub(crate) fn parse_manifest_toml(text: impl AsRef<str>) -> anyhow::Result<RawTemplateManifest> {

crates/templates/src/run.rs

@@ -301,9 +301,20 @@ impl Run {
 
     fn extra_operation(&self, extra: &ExtraOutputAction) -> anyhow::Result<RenderOperation> {
         match extra {
-            ExtraOutputAction::CreateDirectory(_, template) => {
+            ExtraOutputAction::CreateDirectory(_, template, at) => {
+                let component_path = self.options.output_path.clone();
+                let base_path = match at {
+                    crate::reader::CreateLocation::Component => component_path,
+                    crate::reader::CreateLocation::Manifest => match &self.options.variant {
+                        TemplateVariantInfo::NewApplication => component_path,
+                        TemplateVariantInfo::AddComponent { manifest_path } => manifest_path
+                            .parent()
+                            .map(|p| p.to_owned())
+                            .unwrap_or(component_path),
+                    },
+                };
                 Ok(RenderOperation::CreateDirectory(
-                    self.options.output_path.clone(),
+                    base_path,
                     template.clone(),
                 ))
             }

crates/templates/src/template.rs

@@ -118,13 +118,19 @@ pub(crate) struct TemplateParameter {
 }
 
 pub(crate) enum ExtraOutputAction {
-    CreateDirectory(String, std::sync::Arc<liquid::Template>),
+    CreateDirectory(
+        String,
+        std::sync::Arc<liquid::Template>,
+        crate::reader::CreateLocation,
+    ),
 }
 
 impl std::fmt::Debug for ExtraOutputAction {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::CreateDirectory(orig, _) => f.debug_tuple("CreateDirectory").field(orig).finish(),
+            Self::CreateDirectory(orig, ..) => {
+                f.debug_tuple("CreateDirectory").field(orig).finish()
+            }
         }
     }
 }
@@ -501,7 +507,11 @@ impl ExtraOutputAction {
                     liquid::Parser::new().parse(&create.path).with_context(|| {
                         format!("Template error: output {id} is not a valid template")
                     })?;
-                Self::CreateDirectory(create.path.clone(), std::sync::Arc::new(path_template))
+                Self::CreateDirectory(
+                    create.path.clone(),
+                    std::sync::Arc::new(path_template),
+                    create.at.unwrap_or_default(),
+                )
             }
         })
     }

crates/templates/src/test_built_ins/mod.rs

@@ -61,7 +61,7 @@ async fn new_fileserver_creates_assets_dir() -> anyhow::Result<()> {
 }
 
 #[tokio::test]
-async fn add_fileserver_creates_assets_dir() -> anyhow::Result<()> {
+async fn add_fileserver_creates_assets_dir_next_to_manifest() -> anyhow::Result<()> {
     let built_ins_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../..");
     let built_ins_src = TemplateSource::File(built_ins_dir);
 
@@ -116,12 +116,12 @@ async fn add_fileserver_creates_assets_dir() -> anyhow::Result<()> {
 
     // Finally!
     assert!(
-        app_dir.path().join("fs").exists(),
-        "<app_dir>/fs should have been created"
+        !app_dir.path().join("fs").exists(),
+        "<app_dir>/fs should not have been created"
     );
     assert!(
-        app_dir.path().join("fs").join("moarassets").exists(),
-        "<app_dir>/fs/moarassets should have been created"
+        app_dir.path().join("moarassets").exists(),
+        "<app_dir>/moarassets should have been created"
     );
     Ok(())
 }

templates/static-fileserver/metadata/spin-template.toml

@@ -16,4 +16,4 @@ http-path = { type = "string", prompt = "HTTP path", default = "/static/...", pa
 files-path = { type = "string", prompt = "Directory containing the files to serve", default = "assets", pattern = "^\\S+$" }
 
 [outputs]
-create_asset_directory = { action = "create_dir", path = "{{ files-path }}" }
+create_asset_directory = { action = "create_dir", path = "{{ files-path }}", at = "manifest" }