Skip to content

Commit 76f569c

Browse files
authored
feat(wasm): add api-url to run config (#3221)
1 parent d35348a commit 76f569c

File tree

5 files changed

+12
-2
lines changed

5 files changed

+12
-2
lines changed

internal/platform/web/web.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ type Platform struct {
1111
JWT string
1212
DefaultProjectID string
1313
DefaultOrganizationID string
14+
APIUrl string
1415
}
1516

1617
func (p *Platform) CreateClient(client *http.Client, _ string, _ string) (*scw.Client, error) {
@@ -32,6 +33,10 @@ func (p *Platform) CreateClient(client *http.Client, _ string, _ string) (*scw.C
3233
opts = append(opts, scw.WithDefaultOrganizationID(p.DefaultOrganizationID))
3334
}
3435

36+
if p.APIUrl != "" {
37+
opts = append(opts, scw.WithAPIURL(p.APIUrl))
38+
}
39+
3540
return scw.NewClient(opts...)
3641
}
3742

internal/wasm/run.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ type RunConfig struct {
2424
JWT string `js:"jwt"`
2525
DefaultProjectID string `js:"defaultProjectID"`
2626
DefaultOrganizationID string `js:"defaultOrganizationID"`
27+
APIUrl string `js:"apiUrl"`
2728
}
2829

2930
type RunResponse struct {
@@ -44,6 +45,7 @@ func runCommand(cfg *RunConfig, args []string, stdout io.Writer, stderr io.Write
4445
JWT: cfg.JWT,
4546
DefaultProjectID: cfg.DefaultProjectID,
4647
DefaultOrganizationID: cfg.DefaultOrganizationID,
48+
APIUrl: cfg.APIUrl,
4749
},
4850
})
4951

wasm/cli.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export type RunConfig = {
22
jwt: string
33
defaultProjectID: string
44
defaultOrganizationID: string
5+
apiUrl: string
56
}
67

78
export type RunResponse = {

wasm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@scaleway/scaleway-cli-wasm",
3-
"version": "0.0.10",
3+
"version": "0.0.11",
44
"description": "",
55
"type": "module",
66
"main": "index.js",

wasm/src/cli.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ const emptyConfig = (
1818
override?: {
1919
jwt?: string,
2020
defaultProjectID?: string,
21-
defaultOrganizationID?: string
21+
defaultOrganizationID?: string,
22+
apiUrl?: string
2223
}
2324
): RunConfig => ({
2425
jwt: override?.jwt || "",
2526
defaultProjectID: override?.defaultProjectID || "",
2627
defaultOrganizationID: override?.defaultOrganizationID || "",
28+
apiUrl: override?.apiUrl || ""
2729
})
2830

2931
describe('With wasm CLI', async () => {

0 commit comments

Comments
 (0)