feat(wasm): add default organization id to run config (#3218)

Author: Codelax

internal/platform/web/web.go

@@ -7,9 +7,10 @@ import (
 )
 
 type Platform struct {
-	UserAgent        string
-	JWT              string
-	DefaultProjectID string
+	UserAgent             string
+	JWT                   string
+	DefaultProjectID      string
+	DefaultOrganizationID string
 }
 
 func (p *Platform) CreateClient(client *http.Client, _ string, _ string) (*scw.Client, error) {
@@ -27,6 +28,10 @@ func (p *Platform) CreateClient(client *http.Client, _ string, _ string) (*scw.C
 		opts = append(opts, scw.WithDefaultProjectID(p.DefaultProjectID))
 	}
 
+	if p.DefaultOrganizationID != "" {
+		opts = append(opts, scw.WithDefaultOrganizationID(p.DefaultOrganizationID))
+	}
+
 	return scw.NewClient(opts...)
 }
 

internal/wasm/run.go

@@ -21,8 +21,9 @@ func getCommands() *core.Commands {
 }
 
 type RunConfig struct {
-	JWT              string `js:"jwt"`
-	DefaultProjectID string `js:"defaultProjectID"`
+	JWT                   string `js:"jwt"`
+	DefaultProjectID      string `js:"defaultProjectID"`
+	DefaultOrganizationID string `js:"defaultOrganizationID"`
 }
 
 type RunResponse struct {
@@ -40,8 +41,9 @@ func runCommand(cfg *RunConfig, args []string, stdout io.Writer, stderr io.Write
 		Stderr:    stderr,
 		Stdin:     nil,
 		Platform: &web.Platform{
-			JWT:              cfg.JWT,
-			DefaultProjectID: cfg.DefaultProjectID,
+			JWT:                   cfg.JWT,
+			DefaultProjectID:      cfg.DefaultProjectID,
+			DefaultOrganizationID: cfg.DefaultOrganizationID,
 		},
 	})
 

wasm/cli.d.ts

@@ -1,6 +1,7 @@
 export type RunConfig = {
     jwt: string
     defaultProjectID: string
+    defaultOrganizationID: string
 }
 
 export type RunResponse = {

wasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/scaleway-cli-wasm",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "",
   "type": "module",
   "main": "index.js",

wasm/src/cli.test.ts

@@ -14,6 +14,18 @@ import {loadWasmBinary} from "./utils";
 const CLI_PACKAGE = 'scw'
 const CLI_CALLBACK = 'cliLoaded'
 
+const emptyConfig = (
+    override?: {
+        jwt?: string,
+        defaultProjectID?: string,
+        defaultOrganizationID?: string
+    }
+): RunConfig => ({
+    jwt: override?.jwt || "",
+    defaultProjectID: override?.defaultProjectID || "",
+    defaultOrganizationID: override?.defaultOrganizationID || "",
+})
+
 describe('With wasm CLI', async () => {
     let cli: CLI
 
@@ -24,10 +36,7 @@ describe('With wasm CLI', async () => {
 
     const run = async (expected: string | RegExp, command: string[], runCfg: RunConfig | null = null) => {
         if (runCfg === null) {
-            runCfg = {
-                jwt: "",
-                defaultProjectID: ""
-            }
+            runCfg = emptyConfig()
         }
 
         const resp = await cli.run(runCfg, command)
@@ -37,10 +46,7 @@ describe('With wasm CLI', async () => {
 
     const runWithError = async (expected: string | RegExp, command: string[], runCfg: RunConfig | null = null) => {
         if (runCfg === null) {
-            runCfg = {
-                jwt: "",
-                defaultProjectID: "",
-            }
+            runCfg = emptyConfig()
         }
         const resp = await cli.run(runCfg, command)
         expect(resp.exitCode).toBeGreaterThan(0)
@@ -49,10 +55,7 @@ describe('With wasm CLI', async () => {
 
     const complete = async (expected: string[], command: string[], runCfg: RunConfig | null = null) => {
         if (runCfg === null) {
-            runCfg = {
-                jwt: "",
-                defaultProjectID: ""
-            }
+            runCfg = emptyConfig()
         }
         let toComplete = command.pop() || ""
 
@@ -74,25 +77,19 @@ describe('With wasm CLI', async () => {
     it('can complete', async () => complete(['server', 'image', 'volume'], ['instance', '']))
 
     it('can configure terminal size', async () => {
-        const runCfg = {
-            jwt: "",
-            defaultProjectID: ""
-        }
+        const runCfg = emptyConfig()
 
         await cli.configureOutput({width: 100, color: false})
         const resp = await cli.run(runCfg, ['marketplace', 'image', 'list'])
-        console.log(resp)
         expect(resp.exitCode).toBe(0)
+
         const lines = resp.stdout.split("\n")
         expect(lines.length).toBeGreaterThan(1)
         expect(lines[2].length).toBeLessThan(100)
     })
 
     it('can enable colors', async () => {
-        const runCfg = {
-            jwt: "",
-            defaultProjectID: ""
-        }
+        const runCfg = emptyConfig()
 
         await cli.configureOutput({width: 100, color: false})
         const resp = await cli.run(runCfg, ['invalid'])