Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ license = { workspace = true }

[workspace.package]
version = "3.3.0-pre0"
authors = ["Fermyon Engineering <[email protected]>"]
authors = ["Spin Framework Contributors"]
edition = "2021"
license = "Apache-2.0 WITH LLVM-exception"
homepage = "https://developer.fermyon.com/spin"
repository = "https://github.com/fermyon/spin"
homepage = "https://spinframework.dev"
repository = "https://github.com/spinframework/spin"
rust-version = "1.81"

[dependencies]
Expand Down
28 changes: 14 additions & 14 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ This document describes the governance of the Spin project.
The Spin project consists of several codebases with different release cycles. These codebases include:

- Core Spin:
- [Spin](https://github.com/fermyon/spin)
- [Spin](https://github.com/spinframework/spin)
- SDKs:
- [Spin Python SDK](https://github.com/fermyon/spin-python-sdk)
- [Spin JavaScript SDK](https://github.com/fermyon/spin-js-sdk)
- [Spin Rust SDK](https://github.com/fermyon/spin-rust-sdk)
- [Spin .NET SDK](https://github.com/fermyon/spin-dotnet-sdk)
- [Spin Go SDK](https://github.com/fermyon/spin-go-sdk)
- [Spin Python SDK](https://github.com/spinframework/spin-python-sdk)
- [Spin JavaScript SDK](https://github.com/spinframework/spin-js-sdk)
- [Spin Rust SDK](https://github.com/spinframework/spin-rust-sdk)
- [Spin .NET SDK](https://github.com/spinframework/spin-dotnet-sdk)
- [Spin Go SDK](https://github.com/spinframework/spin-go-sdk)
- Plugins:
- [Spin Plugins Index Repository](https://github.com/fermyon/spin-plugins)
- [Spin Plugins Index Repository](https://github.com/spinframework/spin-plugins)
- [Fermyon Platform Plugin](https://github.com/fermyon/platform-plugin)
- [Spin Test Plugin](https://github.com/fermyon/spin-test)
- [Spin Test Plugin](https://github.com/spinframework/spin-test)
- Triggers:
- [Spin Command Trigger](https://github.com/fermyon/spin-trigger-command)
- [Spin SQS Trigger](https://github.com/fermyon/spin-trigger-sqs)
- [Spin Cron Trigger](https://github.com/fermyon/spin-trigger-cron)
- [Spin Command Trigger](https://github.com/spinframework/spin-trigger-command)
- [Spin SQS Trigger](https://github.com/spinframework/spin-trigger-sqs)
- [Spin Cron Trigger](https://github.com/spinframework/spin-trigger-cron)
- Other
- [Spin Fileserver](https://github.com/fermyon/spin-fileserver)
- [Spin Fileserver](https://github.com/spinframework/spin-fileserver)

Each repository is subject to the same overall governance model, but has different teams of people (“maintainers”) with permissions and access to the repository. This is meant to increase diversity of maintainers in the Spin project and also increases the velocity of code changes. Major changes and features to the project including additions to the repository list above are to be proposed through the [Spin Improvement Proposal](docs/content/sips/index.md) process.

Expand All @@ -39,11 +39,11 @@ Changes to project maintainers use the following:
- Project maintainers MUST remain active on the project. If they are unresponsive for > 3 months, they will lose project maintainer-ship, unless the remaining project maintainers of the given project and the Spin Governance Committee agree to extend the period to be greater than 3 months.
- New maintainers MUST be nominated by existing maintainers. Maintainers are to discuss and agree in a private setting adding a new maintainer. Once a decision has been made, a maintainer may be added to the project via a pull request to the relevant MAINTAINERS.md file.
- A maintainer may be removed for a [code of conduct](CODE_OF_CONDUCT.md) violation by the Spin Governance Committee. Code of conduct violations may be submitted to any member(s) on the Spin Governance Committee by email. See email information on MAINTAINERS.md.
- When a project has no active maintainers, the maintainers of the [fermyon/spin Github repo](https://github.com/fermyon/spin) become responsible for it, and may archive the project, or find new maintainers.
- When a project has no active maintainers, the maintainers of the [spinframework/spin Github repo](https://github.com/spinframework/spin) become responsible for it, and may archive the project, or find new maintainers.

## Spin Governance Committee

The project maintainers for [github.com/fermyon/spin](http://github.com/fermyon/spin) also serve as the Spin Governance Committee and have the following additional responsibilities:
The project maintainers for [github.com/spinframework/spin](https://github.com/spinframework/spin) also serve as the Spin Governance Committee and have the following additional responsibilities:

- Maintaining the mission, vision, values, and scope of the project
- Refining this governance document
Expand Down
6 changes: 3 additions & 3 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ Taking these considerations into account and feedback from the community, the Sp

1. Composition and polyglot development experience

WebAssembly components unlock a new opportunity as it relates to the polyglot development experience. In Spin, we seek to enable the polyglot re-use of components, allowing developers to specify how to use components written in various languages as libraries to fulfill dependencies in their Spin components as specified in the [Component Dependencies SIP](https://github.com/fermyon/spin/pull/2543). We’ll use this as the foundational work to then iterate on the polyglot development experience.
WebAssembly components unlock a new opportunity as it relates to the polyglot development experience. In Spin, we seek to enable the polyglot re-use of components, allowing developers to specify how to use components written in various languages as libraries to fulfill dependencies in their Spin components as specified in the [Component Dependencies SIP](https://github.com/spinframework/spin/pull/2543). We’ll use this as the foundational work to then iterate on the polyglot development experience.

2. Building a composable runtime

There are currently some assumptions baked into the Spin runtime about the functionality provided by underlying host environments, however it’s likely a host environment may offer a subset of the capabilities assumed in the Spin runtime today or an entirely custom set of capabilities. Modularizing the Spin runtime allows it to be more readily extendable and customizable based on host environment. This requires breaking changes and a major code refactor, so this work will also be the basis for a Spin 3.0 release. See the [Spin Factors SIP](https://github.com/fermyon/spin/pull/2518) for an overview.
There are currently some assumptions baked into the Spin runtime about the functionality provided by underlying host environments, however it’s likely a host environment may offer a subset of the capabilities assumed in the Spin runtime today or an entirely custom set of capabilities. Modularizing the Spin runtime allows it to be more readily extendable and customizable based on host environment. This requires breaking changes and a major code refactor, so this work will also be the basis for a Spin 3.0 release. See the [Spin Factors SIP](https://github.com/spinframework/spin/pull/2518) for an overview.

3. Spin application development experience improvements

It has become increasingly clear that there is interest in scenarios where Spin is used as a developer tool to build applications that target runtimes other than the Spin runtime (example: [NGINX Unit](https://unit.nginx.org/news/2024/fermyon-spin-rust-sdk/)). Right now, there are implicit assumptions made about the target environment both by the Spin CLI and the Spin SDKs. To support these scenarios, there will need to be work done around modularizing SDKs and building tooling that validates a Spin application can be run with a specific target environment. Foundational work for these efforts is described in the [Spin Build Target Check SIP](https://github.com/fermyon/spin/pull/2556) and is an ongoing effort.
It has become increasingly clear that there is interest in scenarios where Spin is used as a developer tool to build applications that target runtimes other than the Spin runtime (example: [NGINX Unit](https://unit.nginx.org/news/2024/fermyon-spin-rust-sdk/)). Right now, there are implicit assumptions made about the target environment both by the Spin CLI and the Spin SDKs. To support these scenarios, there will need to be work done around modularizing SDKs and building tooling that validates a Spin application can be run with a specific target environment. Foundational work for these efforts is described in the [Spin Build Target Check SIP](https://github.com/spinframework/spin/pull/2556) and is an ongoing effort.
2 changes: 1 addition & 1 deletion crates/componentize/src/bugs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl std::fmt::Display for WasiLibc377Bug {
f,
"This Wasm module appears to have been compiled with wasi-sdk version <19 \
which contains a critical memory safety bug. For more information, see: \
https://github.com/fermyon/spin/issues/2552"
https://github.com/spinframework/spin/issues/2552"
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ impl Default for Config {
inner.epoch_interruption(true);
inner.wasm_component_model(true);
// If targeting musl, disable native unwind to address this issue:
// https://github.com/fermyon/spin/issues/2889
// https://github.com/spinframework/spin/issues/2889
// TODO: remove this when wasmtime is updated to >= v27.0.0
#[cfg(all(target_os = "linux", target_env = "musl"))]
inner.native_unwind_info(false);
Expand Down
2 changes: 1 addition & 1 deletion crates/plugins/src/lookup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const PLUGINS_REPO_LOCAL_DIRECTORY: &str = ".spin-plugins";
// Name of directory containing the installed manifests
pub(crate) const PLUGINS_REPO_MANIFESTS_DIRECTORY: &str = "manifests";

pub(crate) const SPIN_PLUGINS_REPO: &str = "https://github.com/fermyon/spin-plugins/";
pub(crate) const SPIN_PLUGINS_REPO: &str = "https://github.com/spinframework/spin-plugins/";

/// Looks up plugin manifests in centralized spin plugin repository.
pub struct PluginLookup {
Expand Down
2 changes: 1 addition & 1 deletion crates/plugins/src/manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::PluginStore;

/// Expected schema of a plugin manifest. Should match the latest Spin plugin
/// manifest JSON schema:
/// <https://github.com/fermyon/spin-plugins/tree/main/json-schema>
/// <https://github.com/spinframework/spin-plugins/tree/main/json-schema>
#[derive(Serialize, Debug, Deserialize, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct PluginManifest {
Expand Down
2 changes: 1 addition & 1 deletion crates/trigger-http/src/spin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl HttpExecutor for SpinHttpExecutor {

// Preparing to remove the params field. We are leaving it in place for now
// to avoid breaking the ABI, but no longer pass or accept values in it.
// https://github.com/fermyon/spin/issues/663
// https://github.com/spinframework/spin/issues/663
let params = vec![];

let uri = match parts.uri.path_and_query() {
Expand Down
2 changes: 1 addition & 1 deletion cross/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl@sha256:7ad32efcae37c178fed63da301ff982d2430f15fc7d39e6c0b28124e14fac394

## as per analysis done in https://github.com/fermyon/spin/pull/2287#issuecomment-1970145410 we need
## as per analysis done in https://github.com/spinframework/spin/pull/2287#issuecomment-1970145410 we need
## to disable the cmake config in cross-rs. Setting CROSS_SYSROOT=/ seems to have done the trick

ENV CROSS_SYSROOT=/
Expand Down
2 changes: 1 addition & 1 deletion cross/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ These intrinsics are missing for `aarch64` in `gcc < 10.3`, while `cross-rs` shi

The code in this folder does a feature check and patches the `arm_neon.h` header with polyfills if the functions are missing.

See https://github.com/fermyon/spin/issues/1786 for the upstream issue.
See https://github.com/spinframework/spin/issues/1786 for the upstream issue.
2 changes: 1 addition & 1 deletion deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The production version of the website is deployed whenever commits are pushed to

## Manual Deploys

Deployments may also be [triggered manually](https://github.com/fermyon/spin/actions/workflows/deploy-website.yml), providing a choice of `ref` and `sha`.
Deployments may also be [triggered manually](https://github.com/spinframework/spin/actions/workflows/deploy-website.yml), providing a choice of `ref` and `sha`.

## Nomad jobs

Expand Down
2 changes: 1 addition & 1 deletion deploy/spin-docs.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ job "spin-docs" {
}

artifact {
source = "https://github.com/fermyon/spin/releases/download/v2.0.1/spin-v2.0.1-linux-amd64.tar.gz"
source = "https://github.com/spinframework/spin/releases/download/v2.0.1/spin-v2.0.1-linux-amd64.tar.gz"
options {
checksum = "sha256:686bb12b9244ed33bf54a53e62303879036632b476ad09a728172b260f26c8e7"
}
Expand Down
4 changes: 2 additions & 2 deletions docs/content/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ title = "Introducing Spin"
template = "main"
date = "2022-03-14T00:22:56Z"
[extra]
url = "https://github.com/fermyon/spin/blob/main/docs/content/index.md"
url = "https://github.com/spinframework/spin/blob/main/docs/content/index.md"

---

The documentation on this site has been moved to [The Fermyon Developer Home](https://developer.fermyon.com).
The documentation on this site has been moved to [spinframework.dev](https://spinframework.dev).
4 changes: 2 additions & 2 deletions docs/content/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Ensure that CI/CD is green for this commit, specifically the [Build](https://git

1. Once the version bump PR is approved and merged, confirm that CI is green for that merge commit.

1. Create a new tag from the merge commit. The tag should begin with a `v`, followed by the version number, e.g. `v2.0.0`. Then, push the tag to the `fermyon/spin` origin repo.
1. Create a new tag from the merge commit. The tag should begin with a `v`, followed by the version number, e.g. `v2.0.0`. Then, push the tag to the `spinframework/spin` origin repo.

As an example, via the `git` CLI:

Expand All @@ -67,7 +67,7 @@ Ensure that CI/CD is green for this commit, specifically the [Build](https://git
# Create a GPG-signed and annotated tag
git tag -s -m "Spin v2.0.0" v2.0.0

# Push the tag to the remote corresponding to fermyon/spin (here 'origin')
# Push the tag to the remote corresponding to spinframework/spin (here 'origin')
git push origin v2.0.0
```

Expand Down
14 changes: 7 additions & 7 deletions docs/spin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -195,31 +195,31 @@ environment = { DESTINATION = "https://spinframework.dev/template-authoring" }

[component.redirect-sips-index]
source = "modules/redirect.wasm"
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/index.md" }
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/index.md" }

[component.redirect-sip001]
source = "modules/redirect.wasm"
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/001-spin-deploy.md" }
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/001-spin-deploy.md" }

[component.redirect-sip002]
source = "modules/redirect.wasm"
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/002-app-config.md" }
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/002-app-config.md" }

[component.redirect-sip003]
source = "modules/redirect.wasm"
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/003-trigger-executors.md" }
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/003-trigger-executors.md" }

[component.redirect-sip004]
source = "modules/redirect.wasm"
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/004-spin-build.md" }
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/004-spin-build.md" }

[component.redirect-sip005]
source = "modules/redirect.wasm"
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/005-manifest-redesign.md" }
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/005-manifest-redesign.md" }

[component.redirect-sip006]
source = "modules/redirect.wasm"
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/006-spin-plugins.md" }
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/006-spin-plugins.md" }

[component.redirect-contributing]
source = "modules/redirect.wasm"
Expand Down
10 changes: 5 additions & 5 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ languages, plus an example of writing [a custom Spin trigger](./spin-timer).
You can also find many more examples in the SDK repositories for various
languages, including:

- [Rust](https://github.com/fermyon/spin-rust-sdk/tree/stable/examples)
- [Go](https://github.com/fermyon/spin-go-sdk/tree/stable/examples)
- [Python](https://github.com/fermyon/spin-python-sdk/tree/stable/examples)
- [JavaScript and TypeScript](https://github.com/fermyon/spin-js-sdk/tree/stable/examples)
- [.NET](https://github.com/fermyon/spin-dotnet-sdk/tree/stable/samples)
- [Rust](https://github.com/spinframework/spin-rust-sdk/tree/stable/examples)
- [Go](https://github.com/spinframework/spin-go-sdk/tree/stable/examples)
- [Python](https://github.com/spinframework/spin-python-sdk/tree/stable/examples)
- [JavaScript and TypeScript](https://github.com/spinframework/spin-js-sdk/tree/stable/examples)
- [.NET](https://github.com/spinframework/spin-dotnet-sdk/tree/stable/samples)
2 changes: 1 addition & 1 deletion examples/http-cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ trigger](https://spin.fermyon.dev/http-trigger) implemented in C++.

### Building and Running

First install [Rust](https://rustup.rs) and [Spin](https://github.com/fermyon/spin).
First install [Rust](https://rustup.rs) and [Spin](https://github.com/spinframework/spin).

Next, grab the latest [WASI SDK](https://github.com/WebAssembly/wasi-sdk)
release and place it at /opt/wasi-sdk on your filesystem. For Linux, this would
Expand Down
18 changes: 9 additions & 9 deletions src/commands/templates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const UPGRADE_ONLY: &str = "GIT_URL";

const DEFAULT_TEMPLATES_INSTALL_PROMPT: &str =
"You don't have any templates yet. Would you like to install the default set?";
const DEFAULT_TEMPLATE_REPO: &str = "https://github.com/fermyon/spin";
const DEFAULT_TEMPLATE_REPO: &str = "https://github.com/spinframework/spin";

/// Commands for working with WebAssembly component templates.
#[derive(Subcommand, Debug)]
Expand Down Expand Up @@ -274,10 +274,10 @@ impl Upgrade {
let has_unorigined_default_templates = no_origin.iter().any(|t| t.id() == "http-rust");
let has_unorigined_js_templates = no_origin.iter().any(|t| t.id() == "http-js");
if has_unorigined_default_templates {
repos.insert("https://github.com/fermyon/spin");
repos.insert("https://github.com/spinframework/spin");
}
if has_unorigined_js_templates {
repos.insert("https://github.com/fermyon/spin-js-sdk");
repos.insert("https://github.com/spinframework/spin-js-sdk");
}

let mut sources = vec![];
Expand Down Expand Up @@ -654,16 +654,16 @@ mod tests {
#[test]
fn infers_github_url_if_needed() {
assert_eq!(
"https://github.com/fermyon/spin",
infer_github("fermyon/spin")
"https://github.com/spinframework/spin",
infer_github("spinframework/spin")
);
assert_eq!(
"https://github.com/fermyon/spin",
infer_github("/fermyon/spin")
"https://github.com/spinframework/spin",
infer_github("/spinframework/spin")
);
assert_eq!(
"https://github.com/fermyon/spin",
infer_github("https://github.com/fermyon/spin")
"https://github.com/spinframework/spin",
infer_github("https://github.com/spinframework/spin")
);
}
}
2 changes: 1 addition & 1 deletion templates/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bump-go-versions:
bump-rust-versions:
for dir in $$(ls -d *-rust) ; do \
cd $$dir/content ; \
sed -r -i.sed-bak -e 's%(spin-sdk = )(("[0-9]+.[0-9]+.[0-9]+(-rc.[0-9]+)?")|(\{ git = "https://github.com/fermyon/spin", branch = "main" \}))%spin-sdk = "${CRATES_IO_VERSION}"%g' Cargo.toml.tmpl ; \
sed -r -i.sed-bak -e 's%(spin-sdk = )(("[0-9]+.[0-9]+.[0-9]+(-rc.[0-9]+)?")|(\{ git = "https://github.com/spinframework/spin", branch = "main" \}))%spin-sdk = "${CRATES_IO_VERSION}"%g' Cargo.toml.tmpl ; \
rm *.sed-bak ; \
cd - 2>&1 >/dev/null ; \
done
Loading
Loading