Merge pull request #1865 from itowlson/templates-redirect-make-it-new…

…able

Make `redirect` template newable

crates/templates/src/manager.rs

@@ -1033,18 +1033,23 @@ mod tests {
         let temp_dir = tempdir().unwrap();
         let store = TemplateStore::new(temp_dir.path());
         let manager = TemplateManager { store };
-        let source = TemplateSource::File(project_root());
+        let source1 = TemplateSource::File(test_data_root());
+        let source2 = TemplateSource::File(project_root());
 
         manager
-            .install(&source, &InstallOptions::default(), &DiscardingReporter)
+            .install(&source1, &InstallOptions::default(), &DiscardingReporter)
+            .await
+            .unwrap();
+        manager
+            .install(&source2, &InstallOptions::default(), &DiscardingReporter)
             .await
             .unwrap();
 
         let dummy_dir = temp_dir.path().join("dummy");
         let manifest_path = dummy_dir.join("ignored_spin.toml");
         let add_component = TemplateVariantInfo::AddComponent { manifest_path };
 
-        let redirect = manager.get("redirect").unwrap().unwrap();
+        let redirect = manager.get("add-only-redirect").unwrap().unwrap();
         assert!(!redirect.supports_variant(&TemplateVariantInfo::NewApplication));
         assert!(redirect.supports_variant(&add_component));
 

crates/templates/tests/templates/add-only-redirect/metadata/snippets/component.txt

@@ -0,0 +1,6 @@
+[[component]]
+source = { url = "https://github.com/fermyon/spin-redirect/releases/download/v0.1.0/redirect.wasm", digest = "sha256:8bee959843f28fef2a02164f5840477db81d350877e1c22cb524f41363468e52" }
+id = "{{ project-name | kebab_case }}"
+environment = { DESTINATION = "{{ redirect-to }}" }
+[component.trigger]
+route = "{{ redirect-from }}"

crates/templates/tests/templates/add-only-redirect/metadata/spin-template.toml

@@ -0,0 +1,16 @@
+manifest_version = "1"
+id = "add-only-redirect"
+description = "Redirects a HTTP route"
+trigger_type = "http"
+tags = ["redirect"]
+
+[new_application]
+supported = false
+
+[add_component]
+[add_component.snippets]
+component = "component.txt"
+
+[parameters]
+redirect-from = { type = "string", prompt = "Redirect from", pattern = "^/\\S*$" }
+redirect-to = { type = "string", prompt = "Redirect to", pattern = "^/\\S*$" }

templates/redirect/content/.gitignore

@@ -0,0 +1 @@
+.spin/

templates/redirect/content/spin.toml

@@ -0,0 +1,13 @@
+spin_manifest_version = "1"
+authors = ["{{authors}}"]
+description = "{{project-description}}"
+name = "{{project-name}}"
+trigger = { type = "http", base = "{{http-base}}" }
+version = "0.1.0"
+
+[[component]]
+source = { url = "https://github.com/fermyon/spin-redirect/releases/download/v0.1.0/redirect.wasm", digest = "sha256:8bee959843f28fef2a02164f5840477db81d350877e1c22cb524f41363468e52" }
+id = "{{ project-name  | kebab_case }}"
+environment = { DESTINATION = "{{ redirect-to }}" }
+[component.trigger]
+route = "{{ redirect-from }}"

templates/redirect/metadata/snippets/component.txt

@@ -1,6 +1,6 @@
 [[component]]
 source = { url = "https://github.com/fermyon/spin-redirect/releases/download/v0.1.0/redirect.wasm", digest = "sha256:8bee959843f28fef2a02164f5840477db81d350877e1c22cb524f41363468e52" }
-id = "{{ project-name }}"
+id = "{{ project-name | kebab_case }}"
 environment = { DESTINATION = "{{ redirect-to }}" }
 [component.trigger]
 route = "{{ redirect-from }}"

templates/redirect/metadata/spin-template.toml

@@ -4,13 +4,14 @@ description = "Redirects a HTTP route"
 trigger_type = "http"
 tags = ["redirect"]
 
-[new_application]
-supported = false
-
 [add_component]
+skip_files = ["spin.toml"]
+skip_parameters = ["project-description", "http-base"]
 [add_component.snippets]
 component = "component.txt"
 
 [parameters]
+project-description = { type = "string",  prompt = "Description", default = "" }
+http-base = { type = "string", prompt = "HTTP base", default = "/", pattern = "^/\\S*$" }
 redirect-from = { type = "string", prompt = "Redirect from", pattern = "^/\\S*$" }
-redirect-to = { type = "string", prompt = "Redirect to", pattern = "^/\\S*$" }
+redirect-to = { type = "string", prompt = "Redirect to" }