Merge pull request #1238 from fibonacci1729/fix-spin-tomls

chore: update examples and templates to spin_manifest_version

crates/templates/Cargo.toml

@@ -26,6 +26,7 @@ regex = "1.5.4"
 semver = "1.0"
 serde = { version = "1.0", features = [ "derive" ] }
 sha2 = "0.10.1"
+spin-loader = { path = "../loader" }
 tempfile = "3.3.0"
 tokio = { version = "1.23", features = [ "fs", "process", "rt", "macros" ] }
 toml = "0.5"

crates/templates/src/app_info.rs

@@ -2,18 +2,36 @@
 // interest to the template system. spin_loader does too
 // much processing to fit our needs here.
 
-use std::path::{Path, PathBuf};
-
 use anyhow::Context;
+use spin_loader::local::config::FixedStringVersion;
+use std::path::{Path, PathBuf};
 
 use crate::store::TemplateLayout;
 
 #[derive(Debug, serde::Deserialize)]
-#[serde(tag = "spin_version")]
+#[serde(untagged)]
 pub(crate) enum AppInfo {
- /// A manifest with API version 1.
- #[serde(rename = "1")]
- V1(AppInfoV1),
+ V1Old {
+ #[allow(dead_code)]
+ spin_version: FixedStringVersion<1>,
+ #[serde(flatten)]
+ manifest: AppInfoV1,
+ },
+ V1New {
+ #[allow(dead_code)]
+ spin_manifest_version: FixedStringVersion<1>,
+ #[serde(flatten)]
+ manifest: AppInfoV1,
+ },
+}
+
+impl AppInfo {
+ pub fn as_v1(&self) -> &AppInfoV1 {
+ match self {
+ AppInfo::V1New { manifest, .. } => manifest,
+ AppInfo::V1Old { manifest, .. } => manifest,
+ }
+ }
 }
 
 #[derive(Debug, serde::Deserialize)]
@@ -28,12 +46,12 @@ pub(crate) struct TriggerInfo {
 }
 
 impl AppInfo {
- pub(crate) fn from_layout(layout: &TemplateLayout) -> Option<anyhow::Result<AppInfo>> {
+ pub fn from_layout(layout: &TemplateLayout) -> Option<anyhow::Result<AppInfo>> {
  Self::layout_manifest_path(layout)
  .map(|manifest_path| Self::from_existent_file(&manifest_path))
  }
 
- pub(crate) fn from_file(manifest_path: &Path) -> Option<anyhow::Result<AppInfo>> {
+ pub fn from_file(manifest_path: &Path) -> Option<anyhow::Result<AppInfo>> {
  if manifest_path.exists() {
  Some(Self::from_existent_file(manifest_path))
  } else {
@@ -56,9 +74,7 @@ impl AppInfo {
  toml::from_str(&manifest_text).context("Can't parse manifest file")
  }
 
- pub(crate) fn trigger_type(&self) -> &str {
- match self {
- Self::V1(info) => &info.trigger.trigger_type,
- }
+ pub fn trigger_type(&self) -> &str {
+ &self.as_v1().trigger.trigger_type
  }
 }

examples/config-rust/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A Spin Rust application demonstrating the config sdk."
 name = "spin-config-rust"

examples/config-tinygo/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple Spin application written in (Tiny)Go."
 name = "spin-config-tinygo"

examples/http-cpp/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple application that returns hello."
 name = "spin-hello-world"

examples/http-rust-outbound-http/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple application that makes an outbound http call."
 name = "spin-outbound-http"

examples/http-rust/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple application that returns hello."
 name = "spin-hello-world"

examples/http-tinygo-outbound-http/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple Spin application written in (Tiny)Go that performs outbound HTTP requests."
 name = "spin-tinygo-outbound-http"

examples/http-tinygo/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple Spin application written in (Tiny)Go."
 name = "spin-hello-tinygo"

examples/redis-rust/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A redis application."
 name = "spin-redis"

examples/rust-key-value/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A simple application that exercises key-value storage."
 name = "spin-key-value"

examples/rust-outbound-mysql/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["itowlson <[email protected]>"]
 description = "Demo of calling MySQL from a Spin application"
 name = "rust-outbound-mysql"

examples/rust-outbound-pg/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 name = "rust-outbound-pg-example"
 trigger = { type = "http", base = "/" }

examples/rust-outbound-redis/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 name = "rust-outbound-redis-example"
 trigger = { type = "http", base = "/" }

examples/spin-timer/app-example/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["itowlson <[email protected]>"]
 description = ""
 name = "goodbye"

examples/spin-wagi-http/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A hello world application that serves content from a C++ program and a Rust program"
 name = "spin-wagi-hello"

examples/tinygo-key-value/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 name = "tinygo-key-value-example"
 trigger = { type = "http", base = "/" }

examples/tinygo-outbound-redis/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 name = "tinygo-outbound-redis-example"
 trigger = { type = "http", base = "/" }

examples/tinygo-redis/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A redis application."
 name = "spin-redis"

examples/wagi-http-rust/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "An application that returns the arguments the program started with, the environment variables set, and current time"
 name = "wagi-hello-world"

templates/http-c/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/http-empty/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/http-go/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/http-grain/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/http-php/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/http-rust/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/http-swift/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/http-zig/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/redis-go/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/redis-rust/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"

templates/static-fileserver/content/spin.toml

@@ -1,4 +1,4 @@
-spin_version = "1"
+spin_manifest_version = "1"
 authors = ["{{authors}}"]
 description = "{{project-description}}"
 name = "{{project-name}}"