chore: change naming for Scaleway Object Storage (scaleway#4236)

scaleway-bot · web-flow · commit 5cb92726b273 · 2024-10-29T15:16:31.000Z
diff --git a/cmd/scw/testdata/test-all-usage-instance-snapshot-export-usage.golden b/cmd/scw/testdata/test-all-usage-instance-snapshot-export-usage.golden
@@ -1,17 +1,17 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Export a snapshot to a specified S3 bucket in the same region.
+Export a snapshot to a specified Object Storage bucket in the same region.
 
 USAGE:
   scw instance snapshot export [arg=value ...]
 
 EXAMPLES:
-  Export a snapshot to an S3 bucket
+  Export a snapshot to an Object Storage bucket
     scw instance snapshot export zone=fr-par-1 snapshot-id=11111111-1111-1111-1111-111111111111 bucket=my-bucket key=my-qcow2-file-name
 
 ARGS:
-  [bucket]          S3 bucket name
-  [key]             S3 object key
+  [bucket]          Object Storage bucket name
+  [key]             Object key
   snapshot-id       Snapshot ID
   [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)
 
diff --git a/cmd/scw/testdata/test-all-usage-iot-route-create-usage.golden b/cmd/scw/testdata/test-all-usage-iot-route-create-usage.golden
@@ -6,8 +6,8 @@ Multiple kinds of routes can be created, such as:
   <b>You need to manage the database by yourself</b>.
 - REST Route.
   Create a route that will call a REST API on received subscribed MQTT messages.
-- S3 Routes.
-  Create a route that will put subscribed MQTT messages into an S3 bucket.
+- Amazon S3 Routes.
+  Create a route that will put subscribed MQTT messages into an Object Storage bucket.
   You need to create the bucket yourself and grant write access.
   Granting can be done with s3cmd (`s3cmd setacl s3://<my-bucket> --acl-grant=write:555c69c3-87d0-4bf8-80f1-99a2f757d031:555c69c3-87d0-4bf8-80f1-99a2f757d031`).
 
diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden b/cmd/scw/testdata/test-all-usage-lb-backend-create-usage.golden
@@ -41,7 +41,7 @@ ARGS:
   [timeout-tunnel=15m]                        Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout)
   [on-marked-down-action]                     Action to take when a backend server is marked as down (on_marked_down_action_none | shutdown_sessions)
   [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)
-  [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
+  [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
   [ssl-bridging]                              Defines whether to enable SSL bridging between the Load Balancer and backend servers
   [ignore-ssl-server-verify]                  Defines whether the server certificate verification should be ignored
   [redispatch-attempt-count]                  Whether to use another backend server on each attempt
diff --git a/cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden b/cmd/scw/testdata/test-all-usage-lb-backend-update-usage.golden
@@ -18,7 +18,7 @@ ARGS:
   [timeout-tunnel=15m]            Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout)
   [on-marked-down-action]         Action to take when a backend server is marked as down (on_marked_down_action_none | shutdown_sessions)
   [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)
-  [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
+  [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
   [ssl-bridging]                  Defines whether to enable SSL bridging between the Load Balancer and backend servers
   [ignore-ssl-server-verify]      Defines whether the server certificate verification should be ignored
   [redispatch-attempt-count]      Whether to use another backend server on each attempt
diff --git a/docs/commands/instance.md b/docs/commands/instance.md
@@ -2531,7 +2531,7 @@ scw instance snapshot delete 11111111-1111-1111-1111-111111111111 zone=fr-par-1
 
 ### Export a snapshot
 
-Export a snapshot to a specified S3 bucket in the same region.
+Export a snapshot to a specified Object Storage bucket in the same region.
 
 **Usage:**
 
@@ -2544,16 +2544,16 @@ scw instance snapshot export [arg=value ...]
 
 | Name |   | Description |
 |------|---|-------------|
-| bucket |  | S3 bucket name |
-| key |  | S3 object key |
+| bucket |  | Object Storage bucket name |
+| key |  | Object key |
 | snapshot-id | Required | Snapshot ID |
 | 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 |
 
 
 **Examples:**
 
 
-Export a snapshot to an S3 bucket
+Export a snapshot to an Object Storage bucket
 ```
 scw instance snapshot export zone=fr-par-1 snapshot-id=11111111-1111-1111-1111-111111111111 bucket=my-bucket key=my-qcow2-file-name
 ```
diff --git a/docs/commands/iot.md b/docs/commands/iot.md
@@ -590,8 +590,8 @@ Multiple kinds of routes can be created, such as:
   <b>You need to manage the database by yourself</b>.
 - REST Route.
   Create a route that will call a REST API on received subscribed MQTT messages.
-- S3 Routes.
-  Create a route that will put subscribed MQTT messages into an S3 bucket.
+- Amazon S3 Routes.
+  Create a route that will put subscribed MQTT messages into an Object Storage bucket.
   You need to create the bucket yourself and grant write access.
   Granting can be done with s3cmd (`s3cmd setacl s3://<my-bucket> --acl-grant=write:555c69c3-87d0-4bf8-80f1-99a2f757d031:555c69c3-87d0-4bf8-80f1-99a2f757d031`).
 
diff --git a/docs/commands/lb.md b/docs/commands/lb.md
@@ -314,7 +314,7 @@ scw lb backend create [arg=value ...]
 | timeout-tunnel | Default: `15m` | Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout) |
 | on-marked-down-action | One of: `on_marked_down_action_none`, `shutdown_sessions` | Action to take when a backend server is marked as down |
 | 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 |
-| 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 |
+| 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 |
 | ssl-bridging |  | Defines whether to enable SSL bridging between the Load Balancer and backend servers |
 | ignore-ssl-server-verify |  | Defines whether the server certificate verification should be ignored |
 | redispatch-attempt-count |  | Whether to use another backend server on each attempt |
@@ -488,7 +488,7 @@ scw lb backend update <backend-id ...> [arg=value ...]
 | timeout-tunnel | Default: `15m` | Maximum allowed tunnel inactivity time after Websocket is established (takes precedence over client and server timeout) |
 | on-marked-down-action | One of: `on_marked_down_action_none`, `shutdown_sessions` | Action to take when a backend server is marked as down |
 | 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 |
-| 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 |
+| 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 |
 | ssl-bridging |  | Defines whether to enable SSL bridging between the Load Balancer and backend servers |
 | ignore-ssl-server-verify |  | Defines whether the server certificate verification should be ignored |
 | redispatch-attempt-count |  | Whether to use another backend server on each attempt |
diff --git a/go.mod b/go.mod
@@ -26,7 +26,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/buildkit v0.13.2
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241025151430-736ebc291485
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241028153617-2a48843b5fcb
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
diff --git a/go.sum b/go.sum
@@ -465,8 +465,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241025151430-736ebc291485 h1:pio5yJbu5NPDTB4qRsQTf/w/9XwBZS/Vud0oXqVAZIA=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241025151430-736ebc291485/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241028153617-2a48843b5fcb h1:OsRpbw60numCy/+3FS7UhZzkdiTu6OZwq29bb4b3gNo=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241028153617-2a48843b5fcb/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
 github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
 github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
 github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=
diff --git a/internal/namespaces/container/v1beta1/testdata/test-create-simple.golden b/internal/namespaces/container/v1beta1/testdata/test-create-simple.golden
@@ -45,5 +45,8 @@ Region             fr-par
   "sandbox": "unknown_sandbox",
   "local_storage_limit": 0,
   "scaling_option": null,
+  "created_at": null,
+  "updated_at": null,
+  "ready_at": null,
   "region": "fr-par"
 }
diff --git a/internal/namespaces/instance/v1/instance_cli.go b/internal/namespaces/instance/v1/instance_cli.go
@@ -1605,7 +1605,7 @@ func instanceSnapshotDelete() *core.Command {
 func instanceSnapshotExport() *core.Command {
 	return &core.Command{
 		Short:     `Export a snapshot`,
-		Long:      `Export a snapshot to a specified S3 bucket in the same region.`,
+		Long:      `Export a snapshot to a specified Object Storage bucket in the same region.`,
 		Namespace: "instance",
 		Resource:  "snapshot",
 		Verb:      "export",
@@ -1614,14 +1614,14 @@ func instanceSnapshotExport() *core.Command {
 		ArgSpecs: core.ArgSpecs{
 			{
 				Name:       "bucket",
-				Short:      `S3 bucket name`,
+				Short:      `Object Storage bucket name`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
 			},
 			{
 				Name:       "key",
-				Short:      `S3 object key`,
+				Short:      `Object key`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -1645,7 +1645,7 @@ func instanceSnapshotExport() *core.Command {
 		},
 		Examples: []*core.Example{
 			{
-				Short:    "Export a snapshot to an S3 bucket",
+				Short:    "Export a snapshot to an Object Storage bucket",
 				ArgsJSON: `{"bucket":"my-bucket","key":"my-qcow2-file-name","snapshot_id":"11111111-1111-1111-1111-111111111111","zone":"fr-par-1"}`,
 			},
 		},
diff --git a/internal/namespaces/iot/v1/iot_cli.go b/internal/namespaces/iot/v1/iot_cli.go
@@ -1173,8 +1173,8 @@ func iotRouteCreate() *core.Command {
   <b>You need to manage the database by yourself</b>.
 - REST Route.
   Create a route that will call a REST API on received subscribed MQTT messages.
-- S3 Routes.
-  Create a route that will put subscribed MQTT messages into an S3 bucket.
+- Amazon S3 Routes.
+  Create a route that will put subscribed MQTT messages into an Object Storage bucket.
   You need to create the bucket yourself and grant write access.
   Granting can be done with s3cmd (` + "`" + `s3cmd setacl s3://<my-bucket> --acl-grant=write:555c69c3-87d0-4bf8-80f1-99a2f757d031:555c69c3-87d0-4bf8-80f1-99a2f757d031` + "`" + `).`,
 		Namespace: "iot",
diff --git a/internal/namespaces/lb/v1/lb_cli.go b/internal/namespaces/lb/v1/lb_cli.go
@@ -1041,7 +1041,7 @@ func lbBackendCreate() *core.Command {
 			},
 			{
 				Name:       "failover-host",
-				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`,
+				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`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -1242,7 +1242,7 @@ func lbBackendUpdate() *core.Command {
 			},
 			{
 				Name:       "failover-host",
-				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`,
+				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`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,

Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,8 @@ Region fr-par`
`45`	`45`	`"sandbox": "unknown_sandbox",`
`46`	`46`	`"local_storage_limit": 0,`
`47`	`47`	`"scaling_option": null,`
	`48`	`+ "created_at": null,`
	`49`	`+ "updated_at": null,`
	`50`	`+ "ready_at": null,`
`48`	`51`	`"region": "fr-par"`
`49`	`52`	`}`