feat: use edgee-component toml to build

.github/workflows/check.yml

@@ -0,0 +1,32 @@
+name: Check
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up minimal stable Rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Install wasm tooling
+        run: CC=clang cargo install wasm-tools --locked
+
+      - name: "Set up TinyGo"
+        run: |
+            wget https://github.com/tinygo-org/tinygo/releases/download/v0.35.0/tinygo_0.35.0_amd64.deb
+            sudo dpkg -i tinygo_0.35.0_amd64.deb
+
+      - name: Build component
+        run: |
+            make build-no-edgee
+

Makefile

@@ -12,7 +12,10 @@ internal:
 	go run go.bytecodealliance.org/cmd/wit-bindgen-go generate -o internal/ ./wit
 setup: internal ## setup development environment
 
-build: setup ## build component
+build:
+	edgee components build
+
+build-no-edgee: setup
 	tinygo build -target=wasip2 -o dc_component.wasm --wit-package wit/ --wit-world data-collection ./
 
 clean: ## clean build artifacts

README.md

@@ -15,6 +15,7 @@ This is an example of a GoLang Edgee Component.
 
 ## Setup
 Requirements:
+- [edgee-cli] (https://github.com/edgee-cloud/edgee)
 - tinygo
 - wasm-tools
 

edgee-component.toml

@@ -0,0 +1,15 @@
+manifest_version = 1
+
+[package]
+name = "example-go-component"
+version = "1.0.0"
+category = "data-collection"
+subcategory = "analytics"
+description = "Example Go component for data collection"
+documentation = "https://github.com/edgee-cloud/example-go-component"
+repository = "https://github.com/edgee-cloud/example-go-component"
+wit-world-version = "0.4.0"
+
+[package.build]
+command = "go run go.bytecodealliance.org/cmd/wit-bindgen-go generate -o internal/ ./wit && tinygo build -target=wasip2 -o dc_component.wasm --wit-package wit/ --wit-world data-collection ./"
+output_path = "./dc_component.wasm"

go.mod

@@ -7,12 +7,12 @@ require (
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/regclient/regclient v0.7.2 // indirect
+	github.com/regclient/regclient v0.8.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/urfave/cli/v3 v3.0.0-beta1 // indirect
 	go.bytecodealliance.org v0.5.0 // indirect
 	go.bytecodealliance.org/cm v0.1.0 // indirect
-	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/mod v0.23.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
 )

go.sum

@@ -11,6 +11,8 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3I
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/regclient/regclient v0.7.2 h1:vcldDAwBMLtighYVMeb6qNt5+0hKg3AN2IkCc0JIJNM=
 github.com/regclient/regclient v0.7.2/go.mod h1:QlA7W9/pvmbblOXM4d49JgfuOTwVXcUMKt3bFuOSVIQ=
+github.com/regclient/regclient v0.8.1 h1:ZnEZHhdl8ZjLTerTxLL411IVIlNQQhrXzXs9xANEvic=
+github.com/regclient/regclient v0.8.1/go.mod h1:uGyetv0o6VLyRDjtfeBqp/QBwRLJ3Hcn07/+8QbhNcM=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -25,9 +27,13 @@ go.bytecodealliance.org/cm v0.1.0 h1:78Rk4d5rgir5Hm+LMFpDWhjmFBWrKDFPSKUwDBj+nwo
 go.bytecodealliance.org/cm v0.1.0/go.mod h1:NZ2UT0DyGhBfpIPOxPMCuG6g1YTR4YF3xweD7mHX5VQ=
 golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
 golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

wit/deps.lock

@@ -1,30 +1,30 @@
 [cli]
-url = "https://github.com/WebAssembly/wasi-cli/archive/refs/tags/v0.2.2.tar.gz"
-sha256 = "052c438d7606115bcfbe43094c55764c3396acfc8e4c69a6f54f7abcf8ef7c8c"
-sha512 = "cce72d006e639cacabbd01137af99029591403a9bf6db8475e87d82cd6f256fa2118f9d15d5d88a34cacfaeb8d472f21f0914b20c83f6da1771f763cad4e1379"
+url = "https://github.com/WebAssembly/wasi-cli/archive/refs/tags/v0.2.0.tar.gz"
+sha256 = "285865a31d777181b075f39e92bcfe59c89cd6bacce660be1b9a627646956258"
+sha512 = "da2622210a9e3eea82b99f1a5b8a44ce5443d009cb943f7bca0bf9cf4360829b289913d7ee727c011f0f72994ea7dc8e661ebcc0a6b34b587297d80cd9b3f7e8"
 deps = ["clocks", "filesystem", "io", "random", "sockets"]
 
 [clocks]
-sha256 = "c2da62619d1067646316e8592b583d77036d778e28b1154353e0825956b3d6aa"
-sha512 = "4d409fc38b31646fc5de70160e81bd3fa67f9c99b4d24543b4fd40a922c7545739869521b8a997efb675d0816de8b001b6af7950e0cb0bc823d89b9f07b286c4"
+sha256 = "468b4d12892fe926b8eb5d398dbf579d566c93231fa44f415440572c695b7613"
+sha512 = "e6b53a07221f1413953c9797c68f08b815fdaebf66419bbc1ea3e8b7dece73731062693634731f311a03957b268cf9cc509c518bd15e513c318aa04a8459b93a"
 
 [filesystem]
-sha256 = "69e220ec22593f097c7f486dd9e4f95576ef7056d3d531a86a277654872997ba"
-sha512 = "457c027aebd1430e924564b3bb2477bc163083cb1029105c1432cbdc165cdf3cce4ac62dbb8e43e3dec09e24a6b2029204212e2f0e3919137cb207165368e157"
+sha256 = "498c465cfd04587db40f970fff2185daa597d074c20b68a8bcbae558f261499b"
+sha512 = "ead452f9b7bfb88593a502ec00d76d4228003d51c40fd0408aebc32d35c94673551b00230d730873361567cc209ec218c41fb4e95bad194268592c49e7964347"
 
 [io]
-sha256 = "6d8dbfaaaa685167c1829616dc7265f5f3cb776845879555612d56544f6d9bfc"
-sha512 = "52219562c4183503169cd2947b8164e1c96974500a5adf15bbf382c5992a10a626cc89c3b319204aeda6698ce59cbca2c42f98f7fde296aa77b9db4b41154dbe"
+sha256 = "7210e5653539a15478f894d4da24cc69d61924cbcba21d2804d69314a88e5a4c"
+sha512 = "49184a1b0945a889abd52d25271172ed3dc2db6968fcdddb1bab7ee0081f4a3eeee0977ad2291126a37631c0d86eeea75d822fa8af224c422134500bf9f0f2bb"
 
 [protocols]
 url = "https://github.com/edgee-cloud/edgee-wit/archive/refs/tags/v0.4.0.tar.gz"
 sha256 = "8b5c8ea97c81d1d6cf4f227e75afb8c4dc5c0a411c3a0401fb7e4f7b745e21ba"
 sha512 = "16771cd12095409e7c4857a8f5c0b4ad680959e3c35dcd7999e11131bcce05d3b1a1b829daefceabbd853ae5b7f6453e3e359ddfbdebd6e2a94db6c55780368f"
 
 [random]
-sha256 = "b4bb285b1c51aac2f8911f6b44ba1587108a2b24f910fe4774414dc286678b66"
-sha512 = "bc2ffca0ae48f54977a763a70fcfcd5f4fca6b7c530916352f98c59627cc3f5899e47b6308bd9848b8c72e14db57e254757d580010a3d56e6888dafce3dcb679"
+sha256 = "7371d03c037d924caba2587fb2e7c5773a0d3c5fcecbf7971e0e0ba57973c53d"
+sha512 = "964c4e8925a53078e4d94ba907b54f89a0b7e154f46823a505391471466c17f53c8692682e5c85771712acd88b348686173fc07c53a3cfe3d301b8cd8ddd0de4"
 
 [sockets]
-sha256 = "f254783796170fdeac6756496cc6169903a88adeda7a5895265414bc63ba4d66"
-sha512 = "3f68e874beb0ac9729d1738546a430f2f8b369eb510d3cd6dfcfc41427acb52a82701d73584b8ab637b8c3908c5d4f7a7d4806032cc5d375643fad0ebf84e053"
+sha256 = "622bd28bbeb43736375dc02bd003fd3a016ff8ee91e14bab488325c6b38bf966"
+sha512 = "5a63c1f36de0c4548e1d2297bdbededb28721cbad94ef7825c469eae29d7451c97e00b4c1d6730ee1ec0c4a5aac922961a2795762d4a0c3bb54e30a391a84bae"

wit/deps.toml

@@ -1,2 +1,2 @@
 protocols="https://github.com/edgee-cloud/edgee-wit/archive/refs/tags/v0.4.0.tar.gz"
-cli="https://github.com/WebAssembly/wasi-cli/archive/refs/tags/v0.2.2.tar.gz"
+cli="https://github.com/WebAssembly/wasi-cli/archive/refs/tags/v0.2.0.tar.gz"

wit/deps/cli/command.wit

@@ -1,10 +1,7 @@
-package wasi:cli@0.2.2;
+package wasi:cli@0.2.0;
 
-@since(version = 0.2.0)
 world command {
-  @since(version = 0.2.0)
   include imports;
 
-  @since(version = 0.2.0)
   export run;
 }

wit/deps/cli/environment.wit

@@ -1,4 +1,3 @@
-@since(version = 0.2.0)
 interface environment {
   /// Get the POSIX-style environment variables.
   ///
@@ -8,15 +7,12 @@ interface environment {
   /// Morally, these are a value import, but until value imports are available
   /// in the component model, this import function should return the same
   /// values each time it is called.
-  @since(version = 0.2.0)
   get-environment: func() -> list<tuple<string, string>>;
 
   /// Get the POSIX-style arguments to the program.
-  @since(version = 0.2.0)
   get-arguments: func() -> list<string>;
 
   /// Return a path that programs should use as their initial current working
   /// directory, interpreting `.` as shorthand for this.
-  @since(version = 0.2.0)
   initial-cwd: func() -> option<string>;
 }

wit/deps/cli/exit.wit

@@ -1,17 +1,4 @@
-@since(version = 0.2.0)
 interface exit {
   /// Exit the current instance and any linked instances.
-  @since(version = 0.2.0)
   exit: func(status: result);
-
-  /// Exit the current instance and any linked instances, reporting the
-  /// specified status code to the host.
-  ///
-  /// The meaning of the code depends on the context, with 0 usually meaning
-  /// "success", and other values indicating various types of failure.
-  ///
-  /// This function does not return; the effect is analogous to a trap, but
-  /// without the connotation that something bad has happened.
-  @unstable(feature = cli-exit-with-code)
-  exit-with-code: func(status-code: u8);
 }

wit/deps/cli/imports.wit

@@ -1,36 +1,20 @@
-package wasi:cli@0.2.2;
+package wasi:cli@0.2.0;
 
-@since(version = 0.2.0)
 world imports {
-  @since(version = 0.2.0)
-  include wasi:clocks/imports@0.2.2;
-  @since(version = 0.2.0)
-  include wasi:filesystem/imports@0.2.2;
-  @since(version = 0.2.0)
-  include wasi:sockets/imports@0.2.2;
-  @since(version = 0.2.0)
-  include wasi:random/imports@0.2.2;
-  @since(version = 0.2.0)
-  include wasi:io/imports@0.2.2;
+  include wasi:clocks/imports@0.2.0;
+  include wasi:filesystem/imports@0.2.0;
+  include wasi:sockets/imports@0.2.0;
+  include wasi:random/imports@0.2.0;
+  include wasi:io/imports@0.2.0;
 
-  @since(version = 0.2.0)
   import environment;
-  @since(version = 0.2.0)
   import exit;
-  @since(version = 0.2.0)
   import stdin;
-  @since(version = 0.2.0)
   import stdout;
-  @since(version = 0.2.0)
   import stderr;
-  @since(version = 0.2.0)
   import terminal-input;
-  @since(version = 0.2.0)
   import terminal-output;
-  @since(version = 0.2.0)
   import terminal-stdin;
-  @since(version = 0.2.0)
   import terminal-stdout;
-  @since(version = 0.2.0)
   import terminal-stderr;
 }

wit/deps/cli/run.wit

@@ -1,6 +1,4 @@
-@since(version = 0.2.0)
 interface run {
   /// Run the program.
-  @since(version = 0.2.0)
   run: func() -> result;
 }

wit/deps/cli/stdio.wit

@@ -1,26 +1,17 @@
-@since(version = 0.2.0)
 interface stdin {
-  @since(version = 0.2.0)
-  use wasi:io/streams@0.2.2.{input-stream};
+  use wasi:io/streams@0.2.0.{input-stream};
 
-  @since(version = 0.2.0)
   get-stdin: func() -> input-stream;
 }
 
-@since(version = 0.2.0)
 interface stdout {
-  @since(version = 0.2.0)
-  use wasi:io/streams@0.2.2.{output-stream};
+  use wasi:io/streams@0.2.0.{output-stream};
 
-  @since(version = 0.2.0)
   get-stdout: func() -> output-stream;
 }
 
-@since(version = 0.2.0)
 interface stderr {
-  @since(version = 0.2.0)
-  use wasi:io/streams@0.2.2.{output-stream};
+  use wasi:io/streams@0.2.0.{output-stream};
 
-  @since(version = 0.2.0)
   get-stderr: func() -> output-stream;
 }

wit/deps/cli/terminal.wit

@@ -3,10 +3,8 @@
 /// In the future, this may include functions for disabling echoing,
 /// disabling input buffering so that keyboard events are sent through
 /// immediately, querying supported features, and so on.
-@since(version = 0.2.0)
 interface terminal-input {
     /// The input side of a terminal.
-    @since(version = 0.2.0)
     resource terminal-input;
 }
 
@@ -15,48 +13,37 @@ interface terminal-input {
 /// In the future, this may include functions for querying the terminal
 /// size, being notified of terminal size changes, querying supported
 /// features, and so on.
-@since(version = 0.2.0)
 interface terminal-output {
     /// The output side of a terminal.
-    @since(version = 0.2.0)
     resource terminal-output;
 }
 
 /// An interface providing an optional `terminal-input` for stdin as a
 /// link-time authority.
-@since(version = 0.2.0)
 interface terminal-stdin {
-    @since(version = 0.2.0)
     use terminal-input.{terminal-input};
 
     /// If stdin is connected to a terminal, return a `terminal-input` handle
     /// allowing further interaction with it.
-    @since(version = 0.2.0)
     get-terminal-stdin: func() -> option<terminal-input>;
 }
 
 /// An interface providing an optional `terminal-output` for stdout as a
 /// link-time authority.
-@since(version = 0.2.0)
 interface terminal-stdout {
-    @since(version = 0.2.0)
     use terminal-output.{terminal-output};
 
     /// If stdout is connected to a terminal, return a `terminal-output` handle
     /// allowing further interaction with it.
-    @since(version = 0.2.0)
     get-terminal-stdout: func() -> option<terminal-output>;
 }
 
 /// An interface providing an optional `terminal-output` for stderr as a
 /// link-time authority.
-@since(version = 0.2.0)
 interface terminal-stderr {
-    @since(version = 0.2.0)
     use terminal-output.{terminal-output};
 
     /// If stderr is connected to a terminal, return a `terminal-output` handle
     /// allowing further interaction with it.
-    @since(version = 0.2.0)
     get-terminal-stderr: func() -> option<terminal-output>;
 }