Merge pull request #3034 from michelleN/updatetemplates

rm Fermyon from template output and examples

Author: itowlson

README.md

@@ -73,12 +73,13 @@ That's it! Now that the application is running, use your browser or cURL in anot
 # Send a request to the application.
 $ curl -i 127.0.0.1:3000
 HTTP/1.1 200 OK
-foo: bar
-content-length: 14
-date: Thu, 13 Apr 2023 17:47:24 GMT
+content-type: text/plain
+transfer-encoding: chunked
+date: Sun, 02 Mar 2025 20:09:11 GMT
 
-Hello, Fermyon         
+Hello World!
 ```
+
 You can make the app do more by editting the `src/lib.rs` file in the `hello-rust` directory using your favorite editor or IDE. To learn more about writing Spin applications see [Writing Applications](https://developer.fermyon.com/spin/writing-apps) in the Spin documentation.  To learn how to publish and distribute your application see the [Publishing and Distribution](https://developer.fermyon.com/spin/distributing-apps) guide in the Spin documentation.
 
 For more information on the cli commands and subcommands see the [CLI Reference](https://developer.fermyon.com/common/cli-reference).

examples/http-cpp/lib.cpp

@@ -17,7 +17,7 @@ extern "C" void spin_http_handle_http_request(spin_http_request_t *request,
   header->f0 = header_name;
   header->f1 = header_value;
 
-  auto body_string = "Hello, Fermyon!\n";
+  auto body_string = "Hello World!\n";
   auto body_length = strlen(body_string);
   auto body = static_cast<uint8_t *>(malloc(body_length));
   memcpy(body, body_string, body_length);

examples/spin-timer/README.md

@@ -22,7 +22,7 @@ To test:
 ```toml
 name= "trigger-timer"
 description= "Run Spin components at timed intervals"
-homepage= "https://github.com/fermyon/spin/tree/main/examples/spin-timer"
+homepage= "https://github.com/spinframework/spin/tree/main/examples/spin-timer"
 version= "0.1.0"
 spin_compatibility= ">=2.0"
 license= "Apache-2.0"

examples/spin-timer/trigger-timer.json

@@ -1,7 +1,7 @@
 {
     "name": "trigger-timer",
     "description": "Run Spin components at timed intervals",
-    "homepage": "https://github.com/fermyon/spin/tree/main/examples/spin-timer",
+    "homepage": "https://github.com/spinframework/spin/tree/main/examples/spin-timer",
     "version": "0.1.0",
     "spinCompatibility": ">=2.2",
     "license": "Apache-2.0",

examples/spin-wagi-http/http-rust/src/lib.rs

@@ -8,5 +8,5 @@ fn goodbye_world(req: http::Request<()>) -> Result<http::Response<&'static str>>
     Ok(http::Response::builder()
         .status(200)
         .header("foo", "bar")
-        .body("Goodbye, Fermyon!\n")?)
+        .body("Goodbye, World!\n")?)
 }

examples/spin-wagi-http/wagi-http-cpp/main.cpp

@@ -1,7 +1,8 @@
-#include<iostream>
+#include <iostream>
 
-int main() {
-    std::cout << "Content-Type: application/text\n\nHello, Fermyon!\n" << std::endl;
+int main()
+{
+    std::cout << "Content-Type: application/text\n\nHello World!\n"
+              << std::endl;
     return 0;
-
 }

templates/http-go/content/main.go

@@ -10,6 +10,6 @@ import (
 func init() {
 	spinhttp.Handle(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "text/plain")
-		fmt.Fprintln(w, "Hello Fermyon!")
+		fmt.Fprintln(w, "Hello World!")
 	})
 }

templates/http-php/content/src/index.php

@@ -1 +1 @@
-<?php echo "Hello Fermyon Spin"; ?>
+<?php echo "Hello World!"; ?>

templates/http-rust/content/src/lib.rs

@@ -8,6 +8,6 @@ fn handle_{{project-name | snake_case}}(req: Request) -> anyhow::Result<impl Int
     Ok(Response::builder()
         .status(200)
         .header("content-type", "text/plain")
-        .body("Hello, Fermyon")
+        .body("Hello World!")
         .build())
 }

tests/integration.rs

@@ -185,7 +185,7 @@ mod integration_tests {
                 assert_spin_request(
                     spin,
                     Request::new(Method::Get, "/hello"),
-                    Response::new_with_body(200, "Hello, Fermyon!\n"),
+                    Response::new_with_body(200, "Hello World!\n"),
                 )?;
 
                 assert_eventually!(
@@ -321,8 +321,8 @@ mod integration_tests {
                     )
                 };
 
-                test("golang", "Hello Fermyon!\n")?;
-                test("rust", "Hello, Fermyon")?;
+                test("golang", "Hello World!\n")?;
+                test("rust", "Hello World!")?;
                 test("javascript", "Hello from JS-SDK")?;
                 test("typescript", "Hello from TS-SDK")?;
                 Ok(())
@@ -370,12 +370,12 @@ mod integration_tests {
                 assert_spin_request(
                     spin,
                     Request::new(Method::Get, "/outbound-allowed"),
-                    Response::new_with_body(200, "Hello, Fermyon!\n"),
+                    Response::new_with_body(200, "Hello World!\n"),
                 )?;
                 assert_spin_request(
                     spin,
                     Request::new(Method::Get, "/outbound-allowed-alt"),
-                    Response::new_with_body(200, "Hello, Fermyon!\n"),
+                    Response::new_with_body(200, "Hello World!\n"),
                 )?;
 
                 assert_spin_request(
@@ -403,7 +403,7 @@ mod integration_tests {
             &[],
             |_| Ok(()),
             HashMap::default(),
-            "Hello, Fermyon",
+            "Hello World!",
         )
     }
 
@@ -582,7 +582,7 @@ mod integration_tests {
             &[],
             prebuild,
             HashMap::default(),
-            "Hello Fermyon!\n",
+            "Hello World!\n",
         )
     }
 
@@ -666,7 +666,7 @@ mod integration_tests {
             |_| Ok(()),
             HashMap::default(),
             "/index.php",
-            "Hello Fermyon Spin",
+            "Hello World!",
         )
     }
 
@@ -749,7 +749,7 @@ mod integration_tests {
         assert_spin_request(
             env.runtime_mut(),
             Request::new(Method::Get, "/"),
-            Response::new_with_body(200, "Hello, Fermyon"),
+            Response::new_with_body(200, "Hello World!"),
         )?;
         Ok(())
     }
@@ -1456,7 +1456,7 @@ route = "/..."
                         &[("Host", "google.com")],
                         Some(""),
                     ),
-                    Response::new_with_body(200, "Hello, Fermyon!\n"),
+                    Response::new_with_body(200, "Hello World!\n"),
                 )?;
                 Ok(())
             },

tests/test-components/components/hello-world/src/lib.rs

@@ -7,5 +7,5 @@ fn hello_world(req: http::Request<()>) -> anyhow::Result<http::Response<&'static
     Ok(http::Response::builder()
         .status(200)
         .header("Content-Type", "text/plain")
-        .body("Hello, Fermyon!\n")?)
+        .body("Hello World!\n")?)
 }