Merge pull request #17 from redbadger/reorg

reorg components and wits

.github/workflows/wasm-components.yml

@@ -40,9 +40,9 @@ jobs:
           sudo apt install fish
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@1.84.1
         with:
-          targets: wasm32-wasip2
+          targets: wasm32-wasip1,wasm32-wasip2
           components: rustfmt
 
       - name: Install wash
@@ -52,7 +52,7 @@ jobs:
 
       - name: Check
         shell: bash
-        working-directory: wasm-components/rust
+        working-directory: wasm-components
         run: |
           cargo fmt --all --check
 
@@ -70,7 +70,7 @@ jobs:
 
       # - name: Run tests
       #   shell: bash
-      #   working-directory: wasm-components/rust
+      #   working-directory: wasm-components
       #   run: |
       #     rm .cargo/config.toml # so we don't attempt to execute wasm directly
       #     cargo nextest run --all-features

platform-wasmcloud/build_and_sign.fish

@@ -2,7 +2,7 @@
 
 set SCRIPT_DIR (dirname (realpath (status -f)))
 set OUTPUT_DIR $SCRIPT_DIR/signed/
-set COMPONENT_DIR (realpath $SCRIPT_DIR/../wasm-components/rust)
+set COMPONENT_DIR (realpath $SCRIPT_DIR/../wasm-components)
 set INPUT_DIR $COMPONENT_DIR/target/wasm32-wasip2/release/
 
 mkdir -p $OUTPUT_DIR

wasm-components/rust/data-init/src/lib.rs → wasm-components/data-init/src/lib.rs

@@ -1,5 +1,5 @@
 wit_bindgen::generate!({
-    world: "platform-poc:di/di",
+    world: "platform-poc:data-init/data-init-service",
     generate_all,
 });
 

wasm-components/rust/data-init/wasmcloud.toml → wasm-components/data-init/wasmcloud.toml

@@ -6,7 +6,3 @@ type = "component"
 [component]
 wit_world = "data-init"
 wasm_target = "wasm32-wasi"
-
-[[registry.pull.sources]]
-target = "platform-poc:data-init"
-source = "file://../../wit/data-init"

wasm-components/data-init/wit/world.wit

@@ -0,0 +1,9 @@
+package platform-poc:data-init@0.1.0;
+
+world data-init-service {
+  import wasmcloud:postgres/query@0.1.1-draft;
+  import wasi:keyvalue/store@0.2.0-draft;
+  import wasi:logging/logging@0.1.0-draft;
+
+  export init-funcs;
+}

wasm-components/rust/http-controller/src/lib.rs → wasm-components/http-controller/src/lib.rs

@@ -1,5 +1,5 @@
 wit_bindgen::generate!({
-    world: "platform-poc:http-controller/http-controller",
+    world: "platform-poc:http-controller/service",
     generate_all,
 });
 

wasm-components/http-controller/wasmcloud.lock

@@ -0,0 +1,48 @@
+# This file is automatically generated.
+# It is not intended for manual editing.
+version = 1
+
+[[packages]]
+name = "wasi:http"
+registry = "wasi.dev"
+
+[[packages.versions]]
+requirement = "=0.2.2"
+version = "0.2.2"
+digest = "sha256:a1f129cdf1fde55ec2d4ae8d998c39a7e5cf7544a8bd84a831054ac0d2ac64dd"
+
+[[packages]]
+name = "wasi:keyvalue"
+registry = "wasi.dev"
+
+[[packages.versions]]
+requirement = "=0.2.0-draft"
+version = "0.2.0-draft"
+digest = "sha256:f5afa14646d3f32cee23106add8d7da53774083fef32f5648176aee7be61d36b"
+
+[[packages]]
+name = "wasi:logging"
+registry = "wasi.dev"
+
+[[packages.versions]]
+requirement = "=0.1.0-draft"
+version = "0.1.0-draft"
+digest = "sha256:09621a45b12b0a9cddc798517f778aac0e5ae4bd234077b3d70758d6cf625580"
+
+[[packages]]
+name = "wasmcloud:messaging"
+registry = "wasmcloud.com"
+
+[[packages.versions]]
+requirement = "=0.2.0"
+version = "0.2.0"
+digest = "sha256:bd2182f0a304b9a54a6b363f2f655422c8c0f00a03073c0195f1614a92dfdc7b"
+
+[[packages]]
+name = "wasmcloud:postgres"
+registry = "wasmcloud.com"
+
+[[packages.versions]]
+requirement = "=0.1.1-draft"
+version = "0.1.1-draft"
+digest = "sha256:8bb72ea90cecb5c87e463da8c1a7642b61a44e6c7993fcab6112c03f44a9140a"

wasm-components/rust/http-controller/wasmcloud.toml → wasm-components/http-controller/wasmcloud.toml

@@ -9,16 +9,16 @@ wasm_target = "wasm32-wasi"
 
 [[registry.pull.sources]]
 target = "platform-poc:data-init"
-source = "file://../../wit/data-init"
+source = "file://../data-init/wit"
 
 [[registry.pull.sources]]
 target = "platform-poc:inventory"
-source = "file://../../wit/inventory"
+source = "file://../inventory-service/wit"
 
 [[registry.pull.sources]]
 target = "platform-poc:orders"
-source = "file://../../wit/orders"
+source = "file://../orders-service/wit"
 
 [[registry.pull.sources]]
 target = "platform-poc:products"
-source = "file://../../wit/products"
+source = "file://../products-service/wit"

wasm-components/rust/http-controller/wit/world.wit → wasm-components/http-controller/wit/world.wit

@@ -1,6 +1,6 @@
 package platform-poc:http-controller;
 
-world http-controller {
+world service {
   import wasi:logging/logging@0.1.0-draft;
 
   import platform-poc:products/products@0.1.0;

wasm-components/rust/inventory-service/src/lib.rs → wasm-components/inventory-service/src/lib.rs

@@ -1,5 +1,5 @@
 wit_bindgen::generate!({
-    world: "platform-poc:inventory-service/inventory-service",
+    world: "platform-poc:inventory/service",
     generate_all,
 });
 

wasm-components/inventory-service/wasmcloud.toml

@@ -0,0 +1,8 @@
+name = "inventory-service"
+version = "0.1.0"
+language = "rust"
+type = "component"
+
+[component]
+wit_world = "inventory-service"
+wasm_target = "wasm32-wasi"

wasm-components/inventory-service/wit/world.wit

@@ -0,0 +1,8 @@
+package platform-poc:inventory@0.1.0;
+
+world service {
+  import wasmcloud:postgres/query@0.1.1-draft;
+  import wasi:logging/logging@0.1.0-draft;
+
+  export inventory;
+}

wasm-components/rust/notification-service/src/lib.rs → wasm-components/notification-service/src/lib.rs

@@ -1,5 +1,5 @@
 wit_bindgen::generate!({
-    world: "platform-poc:notification-service/notification-service",
+    world: "platform-poc:notification/service",
     generate_all,
 });
 

wasm-components/rust/notification-service/wit/world.wit → wasm-components/notification-service/wit/world.wit

@@ -1,6 +1,6 @@
-package platform-poc:notification-service;
+package platform-poc:notification@0.1.0;
 
-world notification-service {
+world service {
   import wasi:logging/logging@0.1.0-draft;
 
   export wasmcloud:messaging/handler@0.2.0;

wasm-components/rust/orders-service/src/lib.rs → wasm-components/orders-service/src/lib.rs

@@ -1,5 +1,5 @@
 wit_bindgen::generate!({
-    world: "platform-poc:orders-service/orders-service",
+    world: "platform-poc:orders/service",
     generate_all,
 });
 

wasm-components/rust/inventory-service/wasmcloud.toml → wasm-components/orders-service/wasmcloud.toml

@@ -1,12 +1,12 @@
-name = "inventory-service"
+name = "orders-service"
 version = "0.1.0"
 language = "rust"
 type = "component"
 
 [component]
-wit_world = "inventory-service"
+wit_world = "orders-service"
 wasm_target = "wasm32-wasi"
 
 [[registry.pull.sources]]
 target = "platform-poc:inventory"
-source = "file://../../wit/inventory"
+source = "file://../inventory-service/wit"

wasm-components/rust/orders-service/wit/world.wit → wasm-components/orders-service/wit/world.wit

@@ -1,11 +1,11 @@
-package platform-poc:orders-service;
+package platform-poc:orders@0.1.0;
 
-world orders-service {
+world service {
   import wasi:logging/logging@0.1.0-draft;
   import wasmcloud:postgres/query@0.1.1-draft;
   import wasmcloud:messaging/consumer@0.2.0;
 
   import platform-poc:inventory/inventory@0.1.0;
 
-  export platform-poc:orders/orders@0.1.0;
+  export orders;
 }

wasm-components/rust/products-service/src/lib.rs → wasm-components/products-service/src/lib.rs

@@ -1,5 +1,5 @@
 wit_bindgen::generate!({
-    world: "platform-poc:products-service/products-service",
+    world: "platform-poc:products/service",
     generate_all,
 });
 

wasm-components/rust/products-service/wasmcloud.toml → wasm-components/products-service/wasmcloud.toml

@@ -6,7 +6,3 @@ type = "component"
 [component]
 wit_world = "products-service"
 wasm_target = "wasm32-wasi"
-
-[[registry.pull.sources]]
-target = "platform-poc:products"
-source = "file://../../wit/products"

wasm-components/products-service/wit/world.wit

@@ -0,0 +1,8 @@
+package platform-poc:products@0.1.0;
+
+world service {
+  import wasi:keyvalue/store@0.2.0-draft;
+  import wasi:logging/logging@0.1.0-draft;
+
+  export products;
+}

wasm-components/rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+components = ["rust-src"]
+targets = ["wasm32-wasip2"]

wasm-components/rust/scripts/clean.fish → wasm-components/scripts/clean.fish

@@ -2,3 +2,4 @@
 
 cargo clean
 fd --type dir deps -x rm -rf
+rm -rf */build