Skip to content

Commit 657d24d

Browse files
jremy42jremy42
authored
Merge branch 'master' into feat/cookbook-db-migration
2 parents f5eaad3 + 7a6ff47 commit 657d24d

File tree

62 files changed

+22952
-14413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+22952
-14413
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
# Initializes the CodeQL tools for scanning.
5050
- name: Initialize CodeQL
51-
uses: github/codeql-action/init@v3
51+
uses: github/codeql-action/init@v4
5252
with:
5353
languages: ${{ matrix.language }}
5454
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
5959
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6060
# If this step fails, then you should remove it and run the build manually (see below)
6161
- name: Autobuild
62-
uses: github/codeql-action/autobuild@v3
62+
uses: github/codeql-action/autobuild@v4
6363

6464
# ℹ️ Command-line programs to run using the OS shell.
6565
# 📚 https://git.io/JvXDl
@@ -73,4 +73,4 @@ jobs:
7373
# make release
7474

7575
- name: Perform CodeQL Analysis
76-
uses: github/codeql-action/analyze@v3
76+
uses: github/codeql-action/analyze@v4

‎cmd/scw/testdata/test-all-usage-audit-trail-event-list-usage.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ USAGE:
77

88
ARGS:
99
[project-id] (Optional) ID of the Project containing the Audit Trail events
10-
[resource-type] (Optional) Type of the Scaleway resource (unknown_type | secm_secret | secm_secret_version | kube_cluster | kube_pool | kube_node | kube_acl | keym_key | iam_user | iam_application | iam_group | iam_policy | iam_api_key | iam_ssh_key | iam_rule | iam_saml | iam_saml_certificate | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | account_project | instance_server | instance_placement_group | instance_security_group | instance_volume | instance_snapshot | instance_image | apple_silicon_server | baremetal_server | baremetal_setting | ipam_ip | sbs_volume | sbs_snapshot | load_balancer_lb | load_balancer_ip | load_balancer_frontend | load_balancer_backend | load_balancer_route | load_balancer_acl | load_balancer_certificate | sfs_filesystem | vpc_private_network)
10+
[resource-type] (Optional) Type of the Scaleway resource (unknown_type | secm_secret | secm_secret_version | kube_cluster | kube_pool | kube_node | kube_acl | keym_key | iam_user | iam_application | iam_group | iam_policy | iam_api_key | iam_ssh_key | iam_rule | iam_saml | iam_saml_certificate | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | account_project | instance_server | instance_placement_group | instance_security_group | instance_volume | instance_snapshot | instance_image | apple_silicon_server | baremetal_server | baremetal_setting | ipam_ip | sbs_volume | sbs_snapshot | load_balancer_lb | load_balancer_ip | load_balancer_frontend | load_balancer_backend | load_balancer_route | load_balancer_acl | load_balancer_certificate | sfs_filesystem | vpc_private_network | edge_services_plan | edge_services_pipeline | edge_services_dns_stage | edge_services_tls_stage | edge_services_cache_stage | edge_services_route_stage | edge_services_route_rules | edge_services_waf_stage | edge_services_backend_stage)
1111
[method-name] (Optional) Name of the method of the API call performed
1212
[status] (Optional) HTTP status code of the request. Returns either `200` if the request was successful or `403` if the permission was denied
1313
[recorded-after] (Optional) The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default

‎core/testing.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ var DefaultRetryInterval *time.Duration
312312

313313
var foldersUsingVCRv4 = []string{
314314
"instance",
315+
"k8s",
315316
}
316317

317318
func folderUsesVCRv4(fullFolderPath string) bool {

‎docs/commands/audit-trail.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ scw audit-trail event list [arg=value ...]
2929
| Name | | Description |
3030
|------|---|-------------|
3131
| project-id | | (Optional) ID of the Project containing the Audit Trail events |
32-
| resource-type | One of: `unknown_type`, `secm_secret`, `secm_secret_version`, `kube_cluster`, `kube_pool`, `kube_node`, `kube_acl`, `keym_key`, `iam_user`, `iam_application`, `iam_group`, `iam_policy`, `iam_api_key`, `iam_ssh_key`, `iam_rule`, `iam_saml`, `iam_saml_certificate`, `secret_manager_secret`, `secret_manager_version`, `key_manager_key`, `account_user`, `account_organization`, `account_project`, `instance_server`, `instance_placement_group`, `instance_security_group`, `instance_volume`, `instance_snapshot`, `instance_image`, `apple_silicon_server`, `baremetal_server`, `baremetal_setting`, `ipam_ip`, `sbs_volume`, `sbs_snapshot`, `load_balancer_lb`, `load_balancer_ip`, `load_balancer_frontend`, `load_balancer_backend`, `load_balancer_route`, `load_balancer_acl`, `load_balancer_certificate`, `sfs_filesystem`, `vpc_private_network` | (Optional) Type of the Scaleway resource |
32+
| resource-type | One of: `unknown_type`, `secm_secret`, `secm_secret_version`, `kube_cluster`, `kube_pool`, `kube_node`, `kube_acl`, `keym_key`, `iam_user`, `iam_application`, `iam_group`, `iam_policy`, `iam_api_key`, `iam_ssh_key`, `iam_rule`, `iam_saml`, `iam_saml_certificate`, `secret_manager_secret`, `secret_manager_version`, `key_manager_key`, `account_user`, `account_organization`, `account_project`, `instance_server`, `instance_placement_group`, `instance_security_group`, `instance_volume`, `instance_snapshot`, `instance_image`, `apple_silicon_server`, `baremetal_server`, `baremetal_setting`, `ipam_ip`, `sbs_volume`, `sbs_snapshot`, `load_balancer_lb`, `load_balancer_ip`, `load_balancer_frontend`, `load_balancer_backend`, `load_balancer_route`, `load_balancer_acl`, `load_balancer_certificate`, `sfs_filesystem`, `vpc_private_network`, `edge_services_plan`, `edge_services_pipeline`, `edge_services_dns_stage`, `edge_services_tls_stage`, `edge_services_cache_stage`, `edge_services_route_stage`, `edge_services_route_rules`, `edge_services_waf_stage`, `edge_services_backend_stage` | (Optional) Type of the Scaleway resource |
3333
| method-name | | (Optional) Name of the method of the API call performed |
3434
| status | | (Optional) HTTP status code of the request. Returns either `200` if the request was successful or `403` if the permission was denied |
3535
| recorded-after | | (Optional) The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default |

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25.0
44

55
require (
66
github.com/aws/aws-sdk-go-v2 v1.39.5
7-
github.com/aws/aws-sdk-go-v2/service/s3 v1.89.0
7+
github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1
88
github.com/buildpacks/pack v0.38.2
99
github.com/c-bata/go-prompt v0.2.6
1010
github.com/charmbracelet/bubbletea v1.3.10
@@ -58,16 +58,16 @@ require (
5858
github.com/aws/aws-sdk-go-v2/config v1.31.6 // indirect
5959
github.com/aws/aws-sdk-go-v2/credentials v1.18.10 // indirect
6060
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
61-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 // indirect
62-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 // indirect
61+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.12 // indirect
62+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.12 // indirect
6363
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
64-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 // indirect
64+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12 // indirect
6565
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect
6666
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect
6767
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
68-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 // indirect
69-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 // indirect
68+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.12 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12 // indirect
7171
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
7272
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
7373
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,28 +71,28 @@ github.com/aws/aws-sdk-go-v2/credentials v1.18.10 h1:xdJnXCouCx8Y0NncgoptztUocIY
7171
github.com/aws/aws-sdk-go-v2/credentials v1.18.10/go.mod h1:7tQk08ntj914F/5i9jC4+2HQTAuJirq7m1vZVIhEkWs=
7272
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 h1:wbjnrrMnKew78/juW7I2BtKQwa1qlf6EjQgS69uYY14=
7373
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6/go.mod h1:AtiqqNrDioJXuUgz3+3T0mBWN7Hro2n9wll2zRUc0ww=
74-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11 h1:7AANQZkF3ihM8fbdftpjhken0TP9sBzFbV/Ze/Y4HXA=
75-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.11/go.mod h1:NTF4QCGkm6fzVwncpkFQqoquQyOolcyXfbpC98urj+c=
76-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11 h1:ShdtWUZT37LCAA4Mw2kJAJtzaszfSHFb5n25sdcv4YE=
77-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.11/go.mod h1:7bUb2sSr2MZ3M/N+VyETLTQtInemHXb/Fl3s8CLzm0Y=
74+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.12 h1:p/9flfXdoAnwJnuW9xHEAFY22R3A6skYkW19JFF9F+8=
75+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.12/go.mod h1:ZTLHakoVCTtW8AaLGSwJ3LXqHD9uQKnOcv1TrpO6u2k=
76+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.12 h1:2lTWFvRcnWFFLzHWmtddu5MTchc5Oj2OOey++99tPZ0=
77+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.12/go.mod h1:hI92pK+ho8HVcWMHKHrK3Uml4pfG7wvL86FzO0LVtQQ=
7878
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
7979
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
80-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11 h1:bKgSxk1TW//00PGQqYmrq83c+2myGidEclp+t9pPqVI=
81-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.11/go.mod h1:vrPYCQ6rFHL8jzQA8ppu3gWX18zxjLIDGTeqDxkBmSI=
80+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12 h1:itu4KHu8JK/N6NcLIISlf3LL1LccMqruLUXZ9y7yBZw=
81+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12/go.mod h1:i+6vTU3xziikTY3vcox23X8pPGW5X3wVgd1VZ7ha+x8=
8282
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE=
8383
github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8=
8484
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274=
8585
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA=
8686
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 h1:xtuxji5CS0JknaXoACOunXOYOQzgfTvGAc9s2QdCJA4=
8787
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2/go.mod h1:zxwi0DIR0rcRcgdbl7E2MSOvxDyyXGBlScvBkARFaLQ=
88-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2 h1:DGFpGybmutVsCuF6vSuLZ25Vh55E3VmsnJmFfjeBx4M=
89-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.2/go.mod h1:hm/wU1HDvXCFEDzOLorQnZZ/CVvPXvWEmHMSmqgQRuA=
90-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11 h1:GpMf3z2KJa4RnJ0ew3Hac+hRFYLZ9DDjfgXjuW+pB54=
91-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.11/go.mod h1:6MZP3ZI4QQsgUCFTwMZA2V0sEriNQ8k2hmoHF3qjimQ=
92-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11 h1:weapBOuuFIBEQ9OX/NVW3tFQCvSutyjZYk/ga5jDLPo=
93-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.11/go.mod h1:3C1gN4FmIVLwYSh8etngUS+f1viY6nLCDVtZmrFbDy0=
94-
github.com/aws/aws-sdk-go-v2/service/s3 v1.89.0 h1:JbCUlVDEjmhpvpIgXP9QN+/jW61WWWj99cGmxMC49hM=
95-
github.com/aws/aws-sdk-go-v2/service/s3 v1.89.0/go.mod h1:UHKgcRSx8PVtvsc1Poxb/Co3PD3wL7P+f49P0+cWtuY=
88+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3 h1:NEe7FaViguRQEm8zl8Ay/kC/QRsMtWUiCGZajQIsLdc=
89+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3/go.mod h1:JLuCKu5VfiLBBBl/5IzZILU7rxS0koQpHzMOCzycOJU=
90+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.12 h1:MM8imH7NZ0ovIVX7D2RxfMDv7Jt9OiUXkcQ+GqywA7M=
91+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.12/go.mod h1:gf4OGwdNkbEsb7elw2Sy76odfhwNktWII3WgvQgQQ6w=
92+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12 h1:R3uW0iKl8rgNEXNjVGliW/oMEh9fO/LlUEV8RvIFr1I=
93+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12/go.mod h1:XEttbEr5yqsw8ebi7vlDoGJJjMXRez4/s9pibpJyL5s=
94+
github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1 h1:Dq82AV+Qxpno/fG162eAhnD8d48t9S+GZCfz7yv1VeA=
95+
github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1/go.mod h1:MbKLznDKpf7PnSonNRUVYZzfP0CeLkRIUexeblgKcU4=
9696
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg=
9797
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE=
9898
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA=

‎internal/namespaces/audit_trail/v1alpha1/audit_trail_cli.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,15 @@ func auditTrailEventList() *core.Command {
121121
"load_balancer_certificate",
122122
"sfs_filesystem",
123123
"vpc_private_network",
124+
"edge_services_plan",
125+
"edge_services_pipeline",
126+
"edge_services_dns_stage",
127+
"edge_services_tls_stage",
128+
"edge_services_cache_stage",
129+
"edge_services_route_stage",
130+
"edge_services_route_rules",
131+
"edge_services_waf_stage",
132+
"edge_services_backend_stage",
124133
},
125134
},
126135
{

‎internal/namespaces/instance/v1/custom_image_test.go‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,10 @@ func Test_ImageList(t *testing.T) {
171171
core.TestCheckGolden(),
172172
core.TestCheckExitCode(0),
173173
),
174-
AfterFunc: deleteImage("Image"),
174+
AfterFunc: core.AfterFuncCombine(
175+
deleteImage("Image"),
176+
deleteServer("Server"),
177+
),
175178
}))
176179

177180
t.Run("With SBS root volume", core.Test(&core.TestConfig{
@@ -185,7 +188,10 @@ func Test_ImageList(t *testing.T) {
185188
core.TestCheckGolden(),
186189
core.TestCheckExitCode(0),
187190
),
188-
AfterFunc: deleteImage("ImageSBSRoot"),
191+
AfterFunc: core.AfterFuncCombine(
192+
deleteImage("ImageSBSRoot"),
193+
deleteServer("Server"),
194+
),
189195
}))
190196

191197
t.Run("With SBS additional volumes", core.Test(&core.TestConfig{
@@ -199,7 +205,10 @@ func Test_ImageList(t *testing.T) {
199205
core.TestCheckGolden(),
200206
core.TestCheckExitCode(0),
201207
),
202-
AfterFunc: deleteImage("ImageSBSAdditional"),
208+
AfterFunc: core.AfterFuncCombine(
209+
deleteImage("ImageSBSAdditional"),
210+
deleteServer("Server"),
211+
),
203212
}))
204213
}
205214

‎internal/namespaces/instance/v1/custom_privatenics_test.go‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/scaleway/scaleway-cli/v2/core"
77
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/instance/v1"
88
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/vpc/v2"
9+
"github.com/scaleway/scaleway-cli/v2/internal/testhelpers"
910
)
1011

1112
func Test_ListNICs(t *testing.T) {
@@ -15,14 +16,18 @@ func Test_ListNICs(t *testing.T) {
1516
t.Run("Simple", core.Test(&core.TestConfig{
1617
Commands: cmds,
1718
BeforeFunc: core.BeforeFuncCombine(
18-
createPN(),
19+
testhelpers.CreatePN(),
1920
createServer("Server"),
2021
createNIC(),
2122
),
2223
Cmd: "scw instance private-nic list server-id={{ .Server.ID }}",
2324
Check: core.TestCheckCombine(
2425
core.TestCheckGolden(),
2526
),
27+
AfterFunc: core.AfterFuncCombine(
28+
deleteServer("Server"),
29+
testhelpers.DeletePN(),
30+
),
2631
}))
2732
}
2833

@@ -33,26 +38,34 @@ func Test_GetPrivateNIC(t *testing.T) {
3338
t.Run("Get from ID", core.Test(&core.TestConfig{
3439
Commands: cmds,
3540
BeforeFunc: core.BeforeFuncCombine(
36-
createPN(),
41+
testhelpers.CreatePN(),
3742
createServer("Server"),
3843
createNIC(),
3944
),
4045
Cmd: "scw instance private-nic get server-id={{ .Server.ID }} private-nic-id={{ .NIC.PrivateNic.ID }}",
4146
Check: core.TestCheckCombine(
4247
core.TestCheckGolden(),
4348
),
49+
AfterFunc: core.AfterFuncCombine(
50+
deleteServer("Server"),
51+
testhelpers.DeletePN(),
52+
),
4453
}))
4554

4655
t.Run("Get from MAC address", core.Test(&core.TestConfig{
4756
Commands: cmds,
4857
BeforeFunc: core.BeforeFuncCombine(
49-
createPN(),
58+
testhelpers.CreatePN(),
5059
createServer("Server"),
5160
createNIC(),
5261
),
5362
Cmd: "scw instance private-nic get server-id={{ .Server.ID }} private-nic-id={{ .NIC.PrivateNic.MacAddress }}",
5463
Check: core.TestCheckCombine(
5564
core.TestCheckGolden(),
5665
),
66+
AfterFunc: core.AfterFuncCombine(
67+
deleteServer("Server"),
68+
testhelpers.DeletePN(),
69+
),
5770
}))
5871
}

‎internal/namespaces/instance/v1/custom_server_action_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func Test_ServerBackup(t *testing.T) {
166166
"scw instance image delete {{ .CmdResult.Image.ID }} with-snapshots=true",
167167
),
168168
core.ExecAfterCmd(
169-
"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=local",
169+
"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=all",
170170
),
171171
),
172172
}))
@@ -189,7 +189,7 @@ func Test_ServerBackup(t *testing.T) {
189189
"scw instance image delete {{ .CmdResult.Image.ID }} with-snapshots=true",
190190
),
191191
core.ExecAfterCmd(
192-
"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=local",
192+
"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=all",
193193
),
194194
),
195195
}))
@@ -224,7 +224,7 @@ func Test_ServerAction(t *testing.T) {
224224
),
225225
AfterFunc: core.AfterFuncCombine(
226226
core.ExecAfterCmd(
227-
"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=local force-shutdown=true",
227+
"scw instance server delete {{ .Server.ID }} with-ip=true with-volumes=all force-shutdown=true",
228228
),
229229
),
230230
}))

0 commit comments

Comments
 (0)