Merge branch 'add_validate_config' of github.com:yfodil/scaleway-cli into add_validate_config

Author: yfodil

.github/workflows/unit-tests.yaml

@@ -46,6 +46,10 @@ jobs:
           fetch-depth: 1
       - name: Build binaries
         run: ./scripts/build.sh
+      - name: Print binaries size
+        run: ls -lh ./bin
+      - name: Check binary size
+        run: ./scripts/check-size.sh ./bin/*linux-x86_64
 
   docker-tests:
     runs-on: ubuntu-latest

.github/workflows/wasm.yml

@@ -0,0 +1,30 @@
+name: WebAssembly
+
+on:
+  pull_request:
+  merge_group:
+
+jobs:
+  build-and-test:
+    strategy:
+      matrix:
+        go-version: [1.19.x]
+        platform: [ubuntu-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 6.0.2
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+      - name: Build
+        run: ./scripts/build-wasm.sh
+      - name: Run npm package tests
+        run: ./scripts/run-tests-wasm.sh

.goreleaser.yml

@@ -22,6 +22,7 @@ builds:
       - goos: darwin
         goarch: 386
     ldflags:
+      - -s -w
       - -X main.Version={{ .Version }}
       - -X main.BuildDate={{ .Date }}
       - -X main.GitBranch={{ .Branch }}

README.md

@@ -120,6 +120,7 @@ To enable beta features, you can set `SCW_ENABLE_BETA=1` in your environment.
 | `applesilicon` | Apple silicon API                       | [CLI](./docs/commands/apple-silicon.md) / [API](https://developers.scaleway.com/en/products/apple-silicon/api/) |
 | `autocomplete` | Autocomplete related commands           | [CLI](./docs/commands/autocomplete.md)                                                                          |
 | `baremetal`    | Baremetal API                           | [CLI](./docs/commands/baremetal.md) / [API](https://developers.scaleway.com/en/products/baremetal/api/)         |
+| `billing`      | Billing API                             | [CLI](./docs/commands/billing.md) / [API](https://developers.scaleway.com/en/products/billing/api/)             |
 | `cockpit`      | Cockpit API                             | [CLI](./docs/commands/cockpit.md) / [API](https://developers.scaleway.com/en/products/cockpit/api/)             |
 | `config`       | Config file management                  | [CLI](./docs/commands/config.md)                                                                                |
 | `container`    | Serverless Container API                | [CLI](./docs/commands/container.md) / [API](https://developers.scaleway.com/en/products/containers/api/)        |

cmd/scw-wasm/args.go

@@ -0,0 +1,24 @@
+//go:build wasm && js
+
+package main
+
+import (
+	"os"
+)
+
+type Args struct {
+	callback     string
+	targetObject string
+}
+
+func getArgs() Args {
+	args := Args{}
+	if len(os.Args) > 0 {
+		args.callback = os.Args[0]
+	}
+	if len(os.Args) > 1 {
+		args.targetObject = os.Args[1]
+	}
+
+	return args
+}

cmd/scw-wasm/async.go

@@ -0,0 +1,47 @@
+//go:build wasm && js
+
+package main
+
+import (
+	"fmt"
+	"runtime/debug"
+	"syscall/js"
+
+	"github.com/scaleway/scaleway-cli/v2/internal/jshelpers"
+)
+
+type fn func(this js.Value, args []js.Value) (any, error)
+
+var (
+	jsErr     = js.Global().Get("Error")
+	jsPromise = js.Global().Get("Promise")
+)
+
+func asyncFunc(innerFunc fn) js.Func {
+	return js.FuncOf(func(this js.Value, args []js.Value) any {
+		handler := js.FuncOf(func(_ js.Value, promFn []js.Value) any {
+			resolve, reject := promFn[0], promFn[1]
+
+			go func() {
+				defer func() {
+					if r := recover(); r != nil {
+						reject.Invoke(jshelpers.NewError(
+							fmt.Sprintf("panic: %v\n%s", r, string(debug.Stack())),
+						))
+					}
+				}()
+
+				res, err := innerFunc(this, args)
+				if err != nil {
+					reject.Invoke(jshelpers.NewError(err.Error()))
+				} else {
+					resolve.Invoke(res)
+				}
+			}()
+
+			return nil
+		})
+
+		return jsPromise.New(handler)
+	})
+}

cmd/scw-wasm/main.go

@@ -0,0 +1,28 @@
+//go:build wasm && js
+
+package main
+
+import (
+	"syscall/js"
+
+	"github.com/scaleway/scaleway-cli/v2/internal/jshelpers"
+	"github.com/scaleway/scaleway-cli/v2/internal/wasm"
+)
+
+func main() {
+	args := getArgs()
+
+	if args.targetObject != "" {
+		cliPackage := js.ValueOf(map[string]any{})
+		cliPackage.Set("run", asyncFunc(jshelpers.AsFunction(wasm.Run)))
+		js.Global().Set(args.targetObject, cliPackage)
+	}
+
+	if args.callback != "" {
+		givenCallback := js.Global().Get(args.callback)
+		if !givenCallback.IsUndefined() {
+			givenCallback.Invoke()
+		}
+	}
+	<-make(chan struct{})
+}

cmd/scw-wasm/run.go

@@ -0,0 +1,31 @@
+//go:build wasm && js
+
+package main
+
+import (
+	"fmt"
+	"syscall/js"
+
+	"github.com/scaleway/scaleway-cli/v2/internal/jshelpers"
+	"github.com/scaleway/scaleway-cli/v2/internal/wasm"
+)
+
+func wasmRun(this js.Value, args []js.Value) (any, error) {
+	if len(args) < 2 {
+		return nil, fmt.Errorf("not enough arguments")
+	}
+
+	runCfg, err := jshelpers.AsObject[wasm.RunConfig](args[0])
+	if err != nil {
+		return nil, fmt.Errorf("invalid config given: %w", err)
+	}
+
+	givenArgs, err := jshelpers.AsSlice[string](args[1])
+	if err != nil {
+		return nil, fmt.Errorf("invalid args given: %w", err)
+	}
+
+	resp, err := wasm.Run(runCfg, givenArgs)
+
+	return jshelpers.FromObject(resp), nil
+}

cmd/scw/main.go

@@ -10,6 +10,7 @@ import (
 	"github.com/mattn/go-colorable"
 	"github.com/scaleway/scaleway-cli/v2/internal/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces"
+	"github.com/scaleway/scaleway-cli/v2/internal/platform/terminal"
 	"github.com/scaleway/scaleway-cli/v2/internal/sentry"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
@@ -76,6 +77,7 @@ func main() {
 		Stderr:    colorable.NewColorableStderr(),
 		Stdin:     os.Stdin,
 		BetaMode:  BetaMode,
+		Platform:  terminal.NewPlatform(buildInfo.GetUserAgent()),
 	})
 
 	os.Exit(exitCode)

cmd/scw/testdata/test-all-usage-account-project-create-usage.golden

@@ -6,9 +6,9 @@ USAGE:
   scw account project create [arg=value ...]
 
 ARGS:
-  [name]              Name of the Project
-  [description]       Description of the Project
-  [organization-id]   Organization ID to use. If none is passed the default organization ID will be used
+  [name=<generated>]   Name of the Project
+  [description]        Description of the Project
+  [organization-id]    Organization ID to use. If none is passed the default organization ID will be used
 
 FLAGS:
   -h, --help   help for create