Skip to content

Commit 3edcea1

Browse files
authored
Merge branch 'master' into feat/edit-mode-for-pat-rules
2 parents 4e59461 + 6e869d9 commit 3edcea1

File tree

7 files changed

+828
-2271
lines changed

7 files changed

+828
-2271
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,8 @@ updates:
2222
directory: "/"
2323
schedule:
2424
interval: monthly
25+
26+
- package-ecosystem: npm
27+
directory: "/wasm"
28+
schedule:
29+
interval: monthly

internal/namespaces/function/v1beta1/custom_deploy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func Test_Deploy(t *testing.T) {
2626
t.Run("Simple", core.Test(&core.TestConfig{
2727
Commands: commands,
2828
Cmd: fmt.Sprintf(
29-
"scw function deploy name=%s runtime=go120 zip-file=%s",
29+
"scw function deploy name=%s runtime=go124 zip-file=%s",
3030
functionName,
3131
testZip,
3232
),

internal/namespaces/function/v1beta1/testdata/test-deploy-simple.cassette.yaml

Lines changed: 723 additions & 1971 deletions
Large diffs are not rendered by default.
Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3-
ID 4446ab71-78d6-4a19-b210-d7d96d2c4ed1
3+
ID 79a27f04-2519-49e1-9fe7-e40d77ab0089
44
Name cli-test-function-deploy
5-
NamespaceID 24360d69-3355-4708-84f8-1f71131cd23b
5+
NamespaceID 20e20ab3-5c55-443b-b892-d34eab9e0d29
66
Status ready
77
MinScale 0
88
MaxScale 5
9-
Runtime go120
9+
Runtime go124
1010
MemoryLimit 256
1111
CPULimit 140
1212
Timeout 5 minutes
1313
Handler Handle
1414
Privacy public
1515
Description -
16-
DomainName clitestfunctiondeploeqj6jxof-cli-test-function-deploy.functions.fnc.fr-par.scw.cloud
16+
DomainName clitestfunctiondeplozfc2btoz-cli-test-function-deploy.functions.fnc.fr-par.scw.cloud
1717
Region fr-par
1818
HTTPOption enabled
1919
RuntimeMessage -
20-
Sandbox unknown_sandbox
20+
Sandbox v2
21+
CreatedAt few seconds ago
22+
UpdatedAt few seconds ago
23+
ReadyAt few seconds ago
2124
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
2225
{
23-
"id": "4446ab71-78d6-4a19-b210-d7d96d2c4ed1",
26+
"id": "79a27f04-2519-49e1-9fe7-e40d77ab0089",
2427
"name": "cli-test-function-deploy",
25-
"namespace_id": "24360d69-3355-4708-84f8-1f71131cd23b",
28+
"namespace_id": "20e20ab3-5c55-443b-b892-d34eab9e0d29",
2629
"status": "ready",
2730
"environment_variables": {},
2831
"min_scale": 0,
2932
"max_scale": 5,
30-
"runtime": "go120",
33+
"runtime": "go124",
3134
"memory_limit": 256,
3235
"cpu_limit": 140,
3336
"timeout": "300.000000000s",
@@ -36,14 +39,14 @@ Sandbox unknown_sandbox
3639
"build_message": null,
3740
"privacy": "public",
3841
"description": "",
39-
"domain_name": "clitestfunctiondeploeqj6jxof-cli-test-function-deploy.functions.fnc.fr-par.scw.cloud",
42+
"domain_name": "clitestfunctiondeplozfc2btoz-cli-test-function-deploy.functions.fnc.fr-par.scw.cloud",
4043
"secret_environment_variables": [],
4144
"region": "fr-par",
4245
"http_option": "enabled",
4346
"runtime_message": "",
44-
"sandbox": "unknown_sandbox",
45-
"created_at": null,
46-
"updated_at": null,
47-
"ready_at": null,
48-
"tags": null
47+
"sandbox": "v2",
48+
"created_at": "1970-01-01T00:00:00.0Z",
49+
"updated_at": "1970-01-01T00:00:00.0Z",
50+
"ready_at": "1970-01-01T00:00:00.0Z",
51+
"tags": []
4952
}

internal/namespaces/interlink/v1beta1/interlink_cli.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"reflect"
99

1010
"github.com/scaleway/scaleway-cli/v2/core"
11-
"github.com/scaleway/scaleway-sdk-go/api/interlink/v1beta1"
11+
interlink "github.com/scaleway/scaleway-sdk-go/api/interlink/v1beta1"
1212
"github.com/scaleway/scaleway-sdk-go/scw"
1313
)
1414

wasm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Scaleway",
1414
"devDependencies": {
1515
"@vitest/browser": "^0.34.4",
16-
"prettier": "3.0.3",
16+
"prettier": "3.5.3",
1717
"typescript": "^5.0.4",
1818
"vitest": "^0.34.4"
1919
},

0 commit comments

Comments
 (0)