Merge branch 'scaleway:master' into master

Author: scaleway-bot

cmd/scw/testdata/test-all-usage-jobs-run-list-usage.golden

@@ -10,6 +10,7 @@ ARGS:
   [job-definition-id]   
   [project-id]          
   [state]                (unknown_state | queued | scheduled | running | succeeded | failed | canceled | internal_error)
+  [states.{index}]       (unknown_state | queued | scheduled | running | succeeded | failed | canceled | internal_error)
   [organization-id]     
   [region=fr-par]       Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
 

cmd/scw/testdata/test-all-usage-mongodb-instance-create-usage.cassette.yaml

@@ -0,0 +1,38 @@
+---
+version: 1
+interactions:
+- request:
+    body: '{"versions":[{"version":"7.0.12", "end_of_life_at":"2026-01-02T15:04:05Z",
+      "available_settings":[]}], "total_count":1}'
+    form: {}
+    headers:
+      User-Agent:
+      - scaleway-sdk-go/v1.0.0-beta.33.0.20250516160029-3f13aad4f58a (go1.24.2; darwin;
+        amd64) cli-e2e-test
+    url: https://api.scaleway.com/mongodb/v1alpha1/regions/fr-par/versions
+    method: GET
+  response:
+    body: '{"versions":[{"version":"7.0.12", "end_of_life_at":"2026-01-02T15:04:05Z",
+      "available_settings":[]}], "total_count":1}'
+    headers:
+      Content-Length:
+      - "118"
+      Content-Security-Policy:
+      - default-src 'none'; frame-ancestors 'none'
+      Content-Type:
+      - application/json
+      Date:
+      - Mon, 19 May 2025 22:36:36 GMT
+      Server:
+      - Scaleway API Gateway (fr-par-3;edge01)
+      Strict-Transport-Security:
+      - max-age=63072000
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Request-Id:
+      - aaaacbf5-1f08-4d9c-8a96-c7519a551691
+    status: 200 OK
+    code: 200
+    duration: ""

cmd/scw/testdata/test-all-usage-mongodb-instance-create-usage.golden

@@ -8,7 +8,7 @@ USAGE:
 ARGS:
   [project-id]                                             Project ID to use. If none is passed the default project ID will be used
   [name=<generated>]                                       Name of the Database Instance
-  version=                                                 Version of the MongoDB® engine
+  version=7.0.12                                           Version of the MongoDB® engine
   [tags.{index}]                                           Tags to apply to the Database Instance
   node-number=1                                            Number of node to use for the Database Instance
   node-type                                                Type of node to use for the Database Instance
@@ -21,6 +21,7 @@ ARGS:
 
 FLAGS:
   -h, --help   help for create
+  -w, --wait   wait until the instance is ready
 
 GLOBAL FLAGS:
   -c, --config string    The path to the config file

cmd/scw/testdata/test-all-usage-mongodb-instance-usage.golden

@@ -14,6 +14,9 @@ AVAILABLE COMMANDS:
   update          Update a MongoDB® Database Instance
   upgrade         Upgrade a Database Instance
 
+WORKFLOW COMMANDS:
+  wait            Wait for an instance to reach a stable state
+
 FLAGS:
   -h, --help   help for instance
 

cmd/scw/testdata/test-all-usage-mongodb-instance-wait-usage.golden

@@ -0,0 +1,24 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Wait for an instance to reach a stable state. This is similar to using --wait flag.
+
+USAGE:
+  scw mongodb instance wait <instance-id ...> [arg=value ...]
+
+EXAMPLES:
+  Wait for an instance to reach a stable state
+    scw mongodb instance wait 11111111-1111-1111-1111-111111111111
+
+ARGS:
+  instance-id       ID of the instance you want to wait for.
+  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams)
+  [timeout=20m0s]   Timeout of the wait
+
+FLAGS:
+  -h, --help   help for wait
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use

docs/commands/jobs.md

@@ -218,6 +218,7 @@ scw jobs run list [arg=value ...]
 | job-definition-id |  |  |
 | project-id |  |  |
 | state | One of: `unknown_state`, `queued`, `scheduled`, `running`, `succeeded`, `failed`, `canceled`, `internal_error` |  |
+| states.{index} | One of: `unknown_state`, `queued`, `scheduled`, `running`, `succeeded`, `failed`, `canceled`, `internal_error` |  |
 | organization-id |  |  |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
 

docs/commands/mongodb.md

@@ -13,6 +13,7 @@ This API allows you to manage your Managed Databases for MongoDB®.
   - [List MongoDB® Database Instances](#list-mongodb®-database-instances)
   - [Update a MongoDB® Database Instance](#update-a-mongodb®-database-instance)
   - [Upgrade a Database Instance](#upgrade-a-database-instance)
+  - [Wait for an instance to reach a stable state](#wait-for-an-instance-to-reach-a-stable-state)
 - [Node types management commands](#node-types-management-commands)
   - [List available node types](#list-available-node-types)
 - [Snapshot management commands](#snapshot-management-commands)
@@ -240,6 +241,37 @@ scw mongodb instance upgrade <instance-id ...> [arg=value ...]
 
 
 
+### Wait for an instance to reach a stable state
+
+Wait for an instance to reach a stable state. This is similar to using --wait flag.
+
+**Usage:**
+
+```
+scw mongodb instance wait <instance-id ...> [arg=value ...]
+```
+
+
+**Args:**
+
+| Name |   | Description |
+|------|---|-------------|
+| instance-id | Required | ID of the instance you want to wait for. |
+| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams` | Region to target. If none is passed will use default region from the config |
+| timeout | Default: `20m0s` | Timeout of the wait |
+
+
+**Examples:**
+
+
+Wait for an instance to reach a stable state
+```
+scw mongodb instance wait 11111111-1111-1111-1111-111111111111
+```
+
+
+
+
 ## Node types management commands
 
 Two node type ranges are available:

internal/namespaces/jobs/v1alpha1/jobs_cli.go

@@ -836,6 +836,22 @@ func jobsRunList() *core.Command {
 					"internal_error",
 				},
 			},
+			{
+				Name:       "states.{index}",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+				EnumValues: []string{
+					"unknown_state",
+					"queued",
+					"scheduled",
+					"running",
+					"succeeded",
+					"failed",
+					"canceled",
+					"internal_error",
+				},
+			},
 			{
 				Name:       "organization-id",
 				Required:   false,

internal/namespaces/mongodb/v1alpha1/custom.go

@@ -26,5 +26,9 @@ func GetCommands() *core.Commands {
 
 	cmds.MustFind("mongodb", "instance", "create").Override(instanceCreateBuilder)
 
+	cmds.Merge(core.NewCommands(
+		instanceWaitCommand(),
+	))
+
 	return cmds
 }

internal/namespaces/mongodb/v1alpha1/custom_instance.go

@@ -2,7 +2,9 @@ package mongodb
 
 import (
 	"context"
+	"reflect"
 	"strings"
+	"time"
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/core"
@@ -11,6 +13,10 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
+const (
+	instanceActionTimeout = 20 * time.Minute
+)
+
 var instanceStatusMarshalSpecs = human.EnumMarshalSpecs{
 	mongodb.InstanceStatusConfiguring: &human.EnumMarshalSpec{
 		Attribute: color.FgBlue,
@@ -53,6 +59,18 @@ func instanceCreateBuilder(c *core.Command) *core.Command {
 	c.ArgSpecs.GetByName("volume.volume-type").Default = core.DefaultValueSetter("sbs_5k")
 	c.ArgSpecs.GetByName("node-type").AutoCompleteFunc = autoCompleteNodeType
 
+	c.WaitFunc = func(ctx context.Context, _, respI interface{}) (interface{}, error) {
+		getResp := respI.(*mongodb.Instance)
+		api := mongodb.NewAPI(core.ExtractClient(ctx))
+
+		return api.WaitForInstance(&mongodb.WaitForInstanceRequest{
+			InstanceID:    getResp.ID,
+			Region:        getResp.Region,
+			Timeout:       scw.TimeDurationPtr(instanceActionTimeout),
+			RetryInterval: core.DefaultRetryInterval,
+		})
+	}
+
 	return c
 }
 
@@ -105,3 +123,47 @@ func autoCompleteNodeType(
 
 	return suggestions
 }
+
+type serverWaitRequest struct {
+	InstanceID string
+	Region     scw.Region
+	Timeout    time.Duration
+}
+
+func instanceWaitCommand() *core.Command {
+	return &core.Command{
+		Short:     `Wait for an instance to reach a stable state`,
+		Long:      `Wait for an instance to reach a stable state. This is similar to using --wait flag.`,
+		Namespace: "mongodb",
+		Resource:  "instance",
+		Verb:      "wait",
+		Groups:    []string{"workflow"},
+		ArgsType:  reflect.TypeOf(serverWaitRequest{}),
+		Run: func(ctx context.Context, argsI interface{}) (i interface{}, err error) {
+			api := mongodb.NewAPI(core.ExtractClient(ctx))
+
+			return api.WaitForInstance(&mongodb.WaitForInstanceRequest{
+				Region:        argsI.(*serverWaitRequest).Region,
+				InstanceID:    argsI.(*serverWaitRequest).InstanceID,
+				Timeout:       scw.TimeDurationPtr(argsI.(*serverWaitRequest).Timeout),
+				RetryInterval: core.DefaultRetryInterval,
+			})
+		},
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "instance-id",
+				Short:      `ID of the instance you want to wait for.`,
+				Required:   true,
+				Positional: true,
+			},
+			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms),
+			core.WaitTimeoutArgSpec(instanceActionTimeout),
+		},
+		Examples: []*core.Example{
+			{
+				Short:    "Wait for an instance to reach a stable state",
+				ArgsJSON: `{"instance_id": "11111111-1111-1111-1111-111111111111"}`,
+			},
+		},
+	}
+}