Skip to content

Commit 5cb9272

Browse files
authored
chore: change naming for Scaleway Object Storage (#4236)
1 parent a3664b3 commit 5cb9272

13 files changed

+30
-27
lines changed

cmd/scw/testdata/test-all-usage-instance-snapshot-export-usage.golden

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
Export a snapshot to a specified S3 bucket in the same region.
3+
Export a snapshot to a specified Object Storage bucket in the same region.
44

55
USAGE:
66
scw instance snapshot export [arg=value ...]
77

88
EXAMPLES:
9-
Export a snapshot to an S3 bucket
9+
Export a snapshot to an Object Storage bucket
1010
scw instance snapshot export zone=fr-par-1 snapshot-id=11111111-1111-1111-1111-111111111111 bucket=my-bucket key=my-qcow2-file-name
1111

1212
ARGS:
13-
[bucket] S3 bucket name
14-
[key] S3 object key
13+
[bucket] Object Storage bucket name
14+
[key] Object key
1515
snapshot-id Snapshot ID
1616
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | fr-par-3 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
1717

cmd/scw/testdata/test-all-usage-iot-route-create-usage.golden

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Multiple kinds of routes can be created, such as:
66
<b>You need to manage the database by yourself</b>.
77
- REST Route.
88
Create a route that will call a REST API on received subscribed MQTT messages.
9-
- S3 Routes.
10-
Create a route that will put subscribed MQTT messages into an S3 bucket.
9+
- Amazon S3 Routes.
10+
Create a route that will put subscribed MQTT messages into an Object Storage bucket.
1111
You need to create the bucket yourself and grant write access.
1212
Granting can be done with s3cmd (`s3cmd setacl s3://<my-bucket> --acl-grant=write:555c69c3-87d0-4bf8-80f1-99a2f757d031:555c69c3-87d0-4bf8-80f1-99a2f757d031`).
1313

cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ARGS:
4141
[timeout-tunnel=15m] Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout)
4242
[on-marked-down-action] Action to take when a backend server is marked as down (on_marked_down_action_none | shutdown_sessions)
4343
[proxy-protocol] Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software (proxy_protocol_unknown | proxy_protocol_none | proxy_protocol_v1 | proxy_protocol_v2 | proxy_protocol_v2_ssl | proxy_protocol_v2_ssl_cn)
44-
[failover-host] Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud
44+
[failover-host] Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud
4545
[ssl-bridging] Defines whether to enable SSL bridging between the Load Balancer and backend servers
4646
[ignore-ssl-server-verify] Defines whether the server certificate verification should be ignored
4747
[redispatch-attempt-count] Whether to use another backend server on each attempt

cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARGS:
1818
[timeout-tunnel=15m] Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout)
1919
[on-marked-down-action] Action to take when a backend server is marked as down (on_marked_down_action_none | shutdown_sessions)
2020
[proxy-protocol] Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software (proxy_protocol_unknown | proxy_protocol_none | proxy_protocol_v1 | proxy_protocol_v2 | proxy_protocol_v2_ssl | proxy_protocol_v2_ssl_cn)
21-
[failover-host] Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud
21+
[failover-host] Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud
2222
[ssl-bridging] Defines whether to enable SSL bridging between the Load Balancer and backend servers
2323
[ignore-ssl-server-verify] Defines whether the server certificate verification should be ignored
2424
[redispatch-attempt-count] Whether to use another backend server on each attempt

docs/commands/instance.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -2531,7 +2531,7 @@ scw instance snapshot delete 11111111-1111-1111-1111-111111111111 zone=fr-par-1
25312531

25322532
### Export a snapshot
25332533

2534-
Export a snapshot to a specified S3 bucket in the same region.
2534+
Export a snapshot to a specified Object Storage bucket in the same region.
25352535

25362536
**Usage:**
25372537

@@ -2544,16 +2544,16 @@ scw instance snapshot export [arg=value ...]
25442544

25452545
| Name | | Description |
25462546
|------|---|-------------|
2547-
| bucket | | S3 bucket name |
2548-
| key | | S3 object key |
2547+
| bucket | | Object Storage bucket name |
2548+
| key | | Object key |
25492549
| snapshot-id | Required | Snapshot ID |
25502550
| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `fr-par-3`, `nl-ams-1`, `nl-ams-2`, `nl-ams-3`, `pl-waw-1`, `pl-waw-2`, `pl-waw-3` | Zone to target. If none is passed will use default zone from the config |
25512551

25522552

25532553
**Examples:**
25542554

25552555

2556-
Export a snapshot to an S3 bucket
2556+
Export a snapshot to an Object Storage bucket
25572557
```
25582558
scw instance snapshot export zone=fr-par-1 snapshot-id=11111111-1111-1111-1111-111111111111 bucket=my-bucket key=my-qcow2-file-name
25592559
```

docs/commands/iot.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,8 @@ Multiple kinds of routes can be created, such as:
590590
<b>You need to manage the database by yourself</b>.
591591
- REST Route.
592592
Create a route that will call a REST API on received subscribed MQTT messages.
593-
- S3 Routes.
594-
Create a route that will put subscribed MQTT messages into an S3 bucket.
593+
- Amazon S3 Routes.
594+
Create a route that will put subscribed MQTT messages into an Object Storage bucket.
595595
You need to create the bucket yourself and grant write access.
596596
Granting can be done with s3cmd (`s3cmd setacl s3://<my-bucket> --acl-grant=write:555c69c3-87d0-4bf8-80f1-99a2f757d031:555c69c3-87d0-4bf8-80f1-99a2f757d031`).
597597

docs/commands/lb.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ scw lb backend create [arg=value ...]
314314
| timeout-tunnel | Default: `15m` | Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout) |
315315
| on-marked-down-action | One of: `on_marked_down_action_none`, `shutdown_sessions` | Action to take when a backend server is marked as down |
316316
| proxy-protocol | One of: `proxy_protocol_unknown`, `proxy_protocol_none`, `proxy_protocol_v1`, `proxy_protocol_v2`, `proxy_protocol_v2_ssl`, `proxy_protocol_v2_ssl_cn` | Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software |
317-
| failover-host | | Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud |
317+
| failover-host | | Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud |
318318
| ssl-bridging | | Defines whether to enable SSL bridging between the Load Balancer and backend servers |
319319
| ignore-ssl-server-verify | | Defines whether the server certificate verification should be ignored |
320320
| redispatch-attempt-count | | Whether to use another backend server on each attempt |
@@ -488,7 +488,7 @@ scw lb backend update <backend-id ...> [arg=value ...]
488488
| timeout-tunnel | Default: `15m` | Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout) |
489489
| on-marked-down-action | One of: `on_marked_down_action_none`, `shutdown_sessions` | Action to take when a backend server is marked as down |
490490
| proxy-protocol | One of: `proxy_protocol_unknown`, `proxy_protocol_none`, `proxy_protocol_v1`, `proxy_protocol_v2`, `proxy_protocol_v2_ssl`, `proxy_protocol_v2_ssl_cn` | Protocol to use between the Load Balancer and backend servers. Allows the backend servers to be informed of the client's real IP address. The PROXY protocol must be supported by the backend servers' software |
491-
| failover-host | | Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud |
491+
| failover-host | | Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud |
492492
| ssl-bridging | | Defines whether to enable SSL bridging between the Load Balancer and backend servers |
493493
| ignore-ssl-server-verify | | Defines whether the server certificate verification should be ignored |
494494
| redispatch-attempt-count | | Whether to use another backend server on each attempt |

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/mattn/go-isatty v0.0.20
2727
github.com/moby/buildkit v0.13.2
2828
github.com/opencontainers/go-digest v1.0.0
29-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241025151430-736ebc291485
29+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241028153617-2a48843b5fcb
3030
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
3131
github.com/spf13/cobra v1.8.1
3232
github.com/spf13/pflag v1.0.5

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
465465
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
466466
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
467467
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
468-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241025151430-736ebc291485 h1:pio5yJbu5NPDTB4qRsQTf/w/9XwBZS/Vud0oXqVAZIA=
469-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241025151430-736ebc291485/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
468+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241028153617-2a48843b5fcb h1:OsRpbw60numCy/+3FS7UhZzkdiTu6OZwq29bb4b3gNo=
469+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241028153617-2a48843b5fcb/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
470470
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
471471
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
472472
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

internal/namespaces/container/v1beta1/testdata/test-create-simple.golden

+3
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,8 @@ Region fr-par
4545
"sandbox": "unknown_sandbox",
4646
"local_storage_limit": 0,
4747
"scaling_option": null,
48+
"created_at": null,
49+
"updated_at": null,
50+
"ready_at": null,
4851
"region": "fr-par"
4952
}

internal/namespaces/instance/v1/instance_cli.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ func instanceSnapshotDelete() *core.Command {
16051605
func instanceSnapshotExport() *core.Command {
16061606
return &core.Command{
16071607
Short: `Export a snapshot`,
1608-
Long: `Export a snapshot to a specified S3 bucket in the same region.`,
1608+
Long: `Export a snapshot to a specified Object Storage bucket in the same region.`,
16091609
Namespace: "instance",
16101610
Resource: "snapshot",
16111611
Verb: "export",
@@ -1614,14 +1614,14 @@ func instanceSnapshotExport() *core.Command {
16141614
ArgSpecs: core.ArgSpecs{
16151615
{
16161616
Name: "bucket",
1617-
Short: `S3 bucket name`,
1617+
Short: `Object Storage bucket name`,
16181618
Required: false,
16191619
Deprecated: false,
16201620
Positional: false,
16211621
},
16221622
{
16231623
Name: "key",
1624-
Short: `S3 object key`,
1624+
Short: `Object key`,
16251625
Required: false,
16261626
Deprecated: false,
16271627
Positional: false,
@@ -1645,7 +1645,7 @@ func instanceSnapshotExport() *core.Command {
16451645
},
16461646
Examples: []*core.Example{
16471647
{
1648-
Short: "Export a snapshot to an S3 bucket",
1648+
Short: "Export a snapshot to an Object Storage bucket",
16491649
ArgsJSON: `{"bucket":"my-bucket","key":"my-qcow2-file-name","snapshot_id":"11111111-1111-1111-1111-111111111111","zone":"fr-par-1"}`,
16501650
},
16511651
},

internal/namespaces/iot/v1/iot_cli.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1173,8 +1173,8 @@ func iotRouteCreate() *core.Command {
11731173
<b>You need to manage the database by yourself</b>.
11741174
- REST Route.
11751175
Create a route that will call a REST API on received subscribed MQTT messages.
1176-
- S3 Routes.
1177-
Create a route that will put subscribed MQTT messages into an S3 bucket.
1176+
- Amazon S3 Routes.
1177+
Create a route that will put subscribed MQTT messages into an Object Storage bucket.
11781178
You need to create the bucket yourself and grant write access.
11791179
Granting can be done with s3cmd (` + "`" + `s3cmd setacl s3://<my-bucket> --acl-grant=write:555c69c3-87d0-4bf8-80f1-99a2f757d031:555c69c3-87d0-4bf8-80f1-99a2f757d031` + "`" + `).`,
11801180
Namespace: "iot",

internal/namespaces/lb/v1/lb_cli.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ func lbBackendCreate() *core.Command {
10411041
},
10421042
{
10431043
Name: "failover-host",
1044-
Short: `Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud`,
1044+
Short: `Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud`,
10451045
Required: false,
10461046
Deprecated: false,
10471047
Positional: false,
@@ -1242,7 +1242,7 @@ func lbBackendUpdate() *core.Command {
12421242
},
12431243
{
12441244
Name: "failover-host",
1245-
Short: `Scaleway S3 bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud`,
1245+
Short: `Scaleway Object Storage bucket website to be served as failover if all backend servers are down, e.g. failover-website.s3-website.fr-par.scw.cloud`,
12461246
Required: false,
12471247
Deprecated: false,
12481248
Positional: false,

0 commit comments

Comments
 (0)