Merge branch 'master' into v1.6368.0

Author: yfodil

go.mod

@@ -23,7 +23,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.33.0.20250407124844-38ab1ca8e81d
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250408082303-4ecf08b8a1ef
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6

go.sum

@@ -462,8 +462,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.33.0.20250407124844-38ab1ca8e81d h1:EjD1RHPgsTomVw0lKgZu6YHK4ZMSBkSjeFrirnvWBcw=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250407124844-38ab1ca8e81d/go.mod h1:792k1RTU+5JeMXm35/e2Wgp71qPH/DmDoZrRc+EFZDk=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250408082303-4ecf08b8a1ef h1:e0aETjcCykw59oyfal17KonPnJjnIsYKt4y9GHrwYjM=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250408082303-4ecf08b8a1ef/go.mod h1:ILAZV9jmsf+YmJ8UGNpZ9rUnKtHs5EqnBFv47qqYcaU=
 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=

internal/namespaces/documentdb/v1beta1/documentdb_cli.go

@@ -1360,7 +1360,7 @@ func documentDbSettingDelete() *core.Command {
 func documentDbSettingSet() *core.Command {
 	return &core.Command{
 		Short:     `Set Database Instance advanced settings`,
-		Long:      `Update an advanced setting for a Database Instance. Settings added upon database engine initalization can only be defined once, and cannot, therefore, be updated.`,
+		Long:      `Update an advanced setting for a Database Instance. Settings added upon database engine initialization can only be defined once, and cannot, therefore, be updated.`,
 		Namespace: "document-db",
 		Resource:  "setting",
 		Verb:      "set",

internal/namespaces/function/v1beta1/function_cli.go

@@ -451,7 +451,7 @@ func functionFunctionList() *core.Command {
 			},
 			{
 				Name:       "organization-id",
-				Short:      `UUID of the Organziation the function belongs to`,
+				Short:      `UUID of the Organization the function belongs to`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -540,7 +540,7 @@ func functionFunctionCreate() *core.Command {
 			},
 			{
 				Name:       "min-scale",
-				Short:      `Minumum number of instances to scale the function to`,
+				Short:      `Minimum number of instances to scale the function to`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -663,7 +663,7 @@ func functionFunctionUpdate() *core.Command {
 			},
 			{
 				Name:       "min-scale",
-				Short:      `Minumum number of instances to scale the function to`,
+				Short:      `Minimum number of instances to scale the function to`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -894,7 +894,7 @@ func functionFunctionGetDownloadURL() *core.Command {
 		ArgSpecs: core.ArgSpecs{
 			{
 				Name:       "function-id",
-				Short:      `UUID of the function to get the the download URL for`,
+				Short:      `UUID of the function to get the download URL for`,
 				Required:   true,
 				Deprecated: false,
 				Positional: true,
@@ -1142,7 +1142,7 @@ func functionDomainList() *core.Command {
 			},
 			{
 				Name:       "function-id",
-				Short:      `UUID of the function the domain is assoicated with`,
+				Short:      `UUID of the function the domain is associated with`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -1361,7 +1361,7 @@ func functionTokenList() *core.Command {
 			},
 			{
 				Name:       "function-id",
-				Short:      `UUID of the function the token is assoicated with`,
+				Short:      `UUID of the function the token is associated with`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,

internal/namespaces/iam/v1alpha1/iam_cli.go

@@ -1175,7 +1175,7 @@ func iamGroupCreate() *core.Command {
 func iamGroupGet() *core.Command {
 	return &core.Command{
 		Short:     `Get a group`,
-		Long:      `Retrive information about a given group, specified by the ` + "`" + `group_id` + "`" + ` parameter. The group's full details, including ` + "`" + `user_ids` + "`" + ` and ` + "`" + `application_ids` + "`" + ` are returned in the response.`,
+		Long:      `Retrieve information about a given group, specified by the ` + "`" + `group_id` + "`" + ` parameter. The group's full details, including ` + "`" + `user_ids` + "`" + ` and ` + "`" + `application_ids` + "`" + ` are returned in the response.`,
 		Namespace: "iam",
 		Resource:  "group",
 		Verb:      "get",
@@ -1301,7 +1301,7 @@ func iamGroupSetMembers() *core.Command {
 func iamGroupAddMember() *core.Command {
 	return &core.Command{
 		Short:     `Add a user or an application to a group`,
-		Long:      `Add a user or an application to a group. You can specify a ` + "`" + `user_id` + "`" + ` and and ` + "`" + `application_id` + "`" + ` in the body of your request. Note that you can only add one of each per request.`,
+		Long:      `Add a user or an application to a group. You can specify a ` + "`" + `user_id` + "`" + ` and ` + "`" + `application_id` + "`" + ` in the body of your request. Note that you can only add one of each per request.`,
 		Namespace: "iam",
 		Resource:  "group",
 		Verb:      "add-member",
@@ -1385,7 +1385,7 @@ func iamGroupAddMembers() *core.Command {
 func iamGroupRemoveMember() *core.Command {
 	return &core.Command{
 		Short:     `Remove a user or an application from a group`,
-		Long:      `Remove a user or an application from a group. You can specify a ` + "`" + `user_id` + "`" + ` and and ` + "`" + `application_id` + "`" + ` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding.`,
+		Long:      `Remove a user or an application from a group. You can specify a ` + "`" + `user_id` + "`" + ` and ` + "`" + `application_id` + "`" + ` in the body of your request. Note that you can only remove one of each per request. Removing a user from a group means that any permissions given to them via the group (i.e. from an attached policy) will no longer apply. Be sure you want to remove these permissions from the user before proceeding.`,
 		Namespace: "iam",
 		Resource:  "group",
 		Verb:      "remove-member",
@@ -2170,7 +2170,7 @@ func iamAPIKeyCreate() *core.Command {
 func iamAPIKeyGet() *core.Command {
 	return &core.Command{
 		Short:     `Get an API key`,
-		Long:      `Retrive information about an API key, specified by the ` + "`" + `access_key` + "`" + ` parameter. The API key's details, including either the ` + "`" + `user_id` + "`" + ` or ` + "`" + `application_id` + "`" + ` of its bearer are returned in the response. Note that the string value for the ` + "`" + `secret_key` + "`" + ` is nullable, and therefore is not displayed in the response. The ` + "`" + `secret_key` + "`" + ` value is only displayed upon API key creation.`,
+		Long:      `Retrieve information about an API key, specified by the ` + "`" + `access_key` + "`" + ` parameter. The API key's details, including either the ` + "`" + `user_id` + "`" + ` or ` + "`" + `application_id` + "`" + ` of its bearer are returned in the response. Note that the string value for the ` + "`" + `secret_key` + "`" + ` is nullable, and therefore is not displayed in the response. The ` + "`" + `secret_key` + "`" + ` value is only displayed upon API key creation.`,
 		Namespace: "iam",
 		Resource:  "api-key",
 		Verb:      "get",

internal/namespaces/inference/v1beta1/inference_cli.go

@@ -637,8 +637,8 @@ func inferenceACLSet() *core.Command {
 
 func inferenceACLDelete() *core.Command {
 	return &core.Command{
-		Short:     `Delete an exising ACL`,
-		Long:      `Delete an exising ACL.`,
+		Short:     `Delete an existing ACL`,
+		Long:      `Delete an existing ACL.`,
 		Namespace: "inference",
 		Resource:  "acl",
 		Verb:      "delete",

internal/namespaces/instance/v1/custom_server.go

@@ -120,15 +120,28 @@ func serversMarshalerFunc(i interface{}, opt *human.MarshalOpt) (string, error)
 	return human.Marshal(humanServers, opt)
 }
 
+type customVolume struct {
+	ID               string     `json:"id"`
+	Name             string     `json:"name"`
+	Size             scw.Size   `json:"size"`
+	VolumeType       string     `json:"volume_type"`
+	IOPS             string     `json:"iops"`
+	State            string     `json:"state"`
+	CreationDate     *time.Time `json:"creation_date"`
+	ModificationDate *time.Time `json:"modification_date"`
+	Boot             bool       `json:"boot"`
+	Zone             string     `json:"zone"`
+}
+
 // orderVolumes return an ordered slice based on the volume map key "0", "1", "2",...
-func orderVolumes(v map[string]*instance.VolumeServer) []*instance.VolumeServer {
+func orderVolumes(v map[string]*customVolume) []*customVolume {
 	indexes := []string(nil)
 	for index := range v {
 		indexes = append(indexes, index)
 	}
 	sort.Strings(indexes)
 
-	orderedVolumes := make([]*instance.VolumeServer, 0, len(indexes))
+	orderedVolumes := make([]*customVolume, 0, len(indexes))
 	for _, index := range indexes {
 		orderedVolumes = append(orderedVolumes, v[index])
 	}
@@ -407,13 +420,61 @@ func serverGetBuilder(c *core.Command) *core.Command {
 			})
 		}
 
+		volumes := map[string]*customVolume{}
+		blockAPI := block.NewAPI(client)
+
+		for _, volume := range getServerResp.Server.Volumes {
+			customVol := &customVolume{
+				ID:   volume.ID,
+				Zone: volume.Zone.String(),
+				Boot: volume.Boot,
+			}
+
+			blockVol, _ := blockAPI.GetVolume(&block.GetVolumeRequest{
+				VolumeID: volume.ID,
+				Zone:     volume.Zone,
+			})
+			if blockVol != nil {
+				customVol.Name = blockVol.Name
+				customVol.Size = blockVol.Size
+				customVol.VolumeType = blockVol.Type
+				customVol.State = blockVol.Status.String()
+				customVol.CreationDate = blockVol.CreatedAt
+				customVol.ModificationDate = blockVol.UpdatedAt
+				if blockVol.Specs != nil && blockVol.Specs.PerfIops != nil {
+					switch *blockVol.Specs.PerfIops {
+					case 5000:
+						customVol.IOPS = "5K"
+					case 15000:
+						customVol.IOPS = "15K"
+					}
+				}
+			} else {
+				instanceVol, err := instance.NewAPI(client).GetVolume(&instance.GetVolumeRequest{
+					VolumeID: volume.ID,
+					Zone:     volume.Zone,
+				})
+				if err != nil {
+					return nil, err
+				}
+				customVol.Name = instanceVol.Volume.Name
+				customVol.Size = instanceVol.Volume.Size
+				customVol.VolumeType = instanceVol.Volume.VolumeType.String()
+				customVol.State = instanceVol.Volume.State.String()
+				customVol.CreationDate = instanceVol.Volume.CreationDate
+				customVol.ModificationDate = instanceVol.Volume.ModificationDate
+			}
+
+			volumes[volume.ID] = customVol
+		}
+
 		return &struct {
 			*instance.Server
-			Volumes     []*instance.VolumeServer
+			Volumes     []*customVolume
 			PrivateNics []customNICs `json:"private_nics"`
 		}{
 			getServerResp.Server,
-			orderVolumes(getServerResp.Server.Volumes),
+			orderVolumes(volumes),
 			nics,
 		}, nil
 	}

internal/namespaces/instance/v1/instance_cli.go

@@ -96,8 +96,8 @@ func GetGeneratedCommands() *core.Commands {
 }
 func instanceRoot() *core.Command {
 	return &core.Command{
-		Short:     `This API allows you to manage your Instances`,
-		Long:      `This API allows you to manage your Instances.`,
+		Short:     `This API allows you to manage your CPU and GPU Instances`,
+		Long:      `This API allows you to manage your CPU and GPU Instances.`,
 		Namespace: "instance",
 	}
 }
@@ -675,6 +675,7 @@ func instanceServerUpdate() *core.Command {
 			},
 			{
 				Name:       "protected",
+				Short:      `True to activate server protection option`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,

internal/namespaces/instance/v1/testdata/test-create-server-scratch-storage-default-scratch-storage.golden

@@ -70,6 +70,7 @@ SecurityGroup.Name            Default security group
 StateDetail                   -
 Arch                          x86_64
 Zone                          fr-par-2
+EndOfService                  false
 🟩🟩🟩 JSON STDOUT 🟩🟩🟩
 {
   "id": "9851b09c-1c2b-4fef-bc06-7ce31ff3188a",
@@ -189,5 +190,6 @@ Zone                          fr-par-2
   "private_nics": [],
   "zone": "fr-par-2",
   "admin_password_encryption_ssh_key_id": null,
-  "admin_password_encrypted_value": null
+  "admin_password_encrypted_value": null,
+  "end_of_service": false
 }

internal/namespaces/instance/v1/testdata/test-create-server-simple-default.golden

@@ -39,6 +39,7 @@ SecurityGroup.Name      Default security group
 StateDetail             -
 Arch                    x86_64
 Zone                    fr-par-1
+EndOfService            false
 🟩🟩🟩 JSON STDOUT 🟩🟩🟩
 {
   "id": "cf1cfe02-38f9-4fce-bc1c-ab61925cff05",
@@ -116,5 +117,6 @@ Zone                    fr-par-1
   "private_nics": [],
   "zone": "fr-par-1",
   "admin_password_encryption_ssh_key_id": null,
-  "admin_password_encrypted_value": null
+  "admin_password_encrypted_value": null,
+  "end_of_service": false
 }