Merge branch 'scaleway:master' into master

scaleway-bot · web-flow · commit a98ed41ad6ce · 2025-04-07T20:10:15.000+02:00
diff --git a/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden b/cmd/scw/testdata/test-all-usage-iam-group-add-member-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-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.
+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.
 
 USAGE:
   scw iam group add-member <group-id ...> [arg=value ...]
diff --git a/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden b/cmd/scw/testdata/test-all-usage-iam-group-remove-member-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-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.
+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.
 
 USAGE:
   scw iam group remove-member <group-id ...> [arg=value ...]
diff --git a/cmd/scw/testdata/test-all-usage-instance-usage.golden b/cmd/scw/testdata/test-all-usage-instance-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-This API allows you to manage your Instances.
+This API allows you to manage your CPU and GPU Instances.
 
 USAGE:
   scw instance <command>
diff --git a/cmd/scw/testdata/test-all-usage-interlink-link-create-usage.golden b/cmd/scw/testdata/test-all-usage-interlink-link-create-usage.golden
@@ -13,6 +13,7 @@ ARGS:
   bandwidth-mbps    Desired bandwidth for the link. Must be compatible with available link bandwidths and remaining bandwidth capacity of the connection
   [connection-id]   If set, creates a self-hosted link using this dedicated physical connection. As the customer, specify the ID of the physical connection you already have for this link.
   [partner-id]      If set, creates a hosted link on a partner's connection. Specify the ID of the chosen partner, who already has a shared connection with available bandwidth.
+  [peer-asn]        For self-hosted links we need the peer AS Number to establish BGP session. If not given, a default one will be assigned.
   [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-interlink-link-update-usage.golden b/cmd/scw/testdata/test-all-usage-interlink-link-update-usage.golden
@@ -9,6 +9,7 @@ ARGS:
   link-id           ID of the link to update
   [name]            Name of the link
   [tags.{index}]    List of tags to apply to the link
+  [peer-asn]        For self-hosted links, AS Number to establish BGP session.
   [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-main-usage-usage.golden b/cmd/scw/testdata/test-main-usage-usage.golden
@@ -12,7 +12,7 @@ BAREMETAL COMMANDS:
   fip           This API allows you to manage your Elastic Metal servers' flexible public IP addresses
 
 COMPUTE COMMANDS:
-  instance      This API allows you to manage your Instances
+  instance      This API allows you to manage your CPU and GPU Instances
   marketplace   This API allows you to find available images for use when launching a Scaleway Instance
 
 CONFIGURATION COMMANDS:
diff --git a/docs/commands/iam.md b/docs/commands/iam.md
@@ -306,7 +306,7 @@ Groups management commands.
 
 ### Add a user or an application to a group
 
-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.
+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.
 
 **Usage:**
 
@@ -453,7 +453,7 @@ scw iam group list [arg=value ...]
 
 ### Remove a user or an application from a group
 
-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.
+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.
 
 **Usage:**
 
diff --git a/docs/commands/instance.md b/docs/commands/instance.md
@@ -1,6 +1,6 @@
 <!-- DO NOT EDIT: this file is automatically generated using scw-doc-gen -->
 # Documentation for `scw instance`
-This API allows you to manage your Instances.
+This API allows you to manage your CPU and GPU Instances.
   
 - [Image management commands](#image-management-commands)
   - [Create an Instance image](#create-an-instance-image)
diff --git a/docs/commands/interlink.md b/docs/commands/interlink.md
@@ -112,6 +112,7 @@ scw interlink link create [arg=value ...]
 | bandwidth-mbps | Required | Desired bandwidth for the link. Must be compatible with available link bandwidths and remaining bandwidth capacity of the connection |
 | connection-id |  | If set, creates a self-hosted link using this dedicated physical connection. As the customer, specify the ID of the physical connection you already have for this link. |
 | partner-id |  | If set, creates a hosted link on a partner's connection. Specify the ID of the chosen partner, who already has a shared connection with available bandwidth. |
+| peer-asn |  | For self-hosted links we need the peer AS Number to establish BGP session. If not given, a default one will be assigned. |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 
 
@@ -289,6 +290,7 @@ scw interlink link update <link-id ...> [arg=value ...]
 | link-id | Required | ID of the link to update |
 | name |  | Name of the link |
 | tags.{index} |  | List of tags to apply to the link |
+| peer-asn |  | For self-hosted links, AS Number to establish BGP session. |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 
 
diff --git a/internal/namespaces/iam/v1alpha1/iam_cli.go b/internal/namespaces/iam/v1alpha1/iam_cli.go
@@ -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",
diff --git a/internal/namespaces/instance/v1/custom_server.go b/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
 	}
diff --git a/internal/namespaces/instance/v1/instance_cli.go b/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",
 	}
 }
diff --git a/internal/namespaces/instance/v1/testdata/test-get-server-simple.cassette.yaml b/internal/namespaces/instance/v1/testdata/test-get-server-simple.cassette.yaml
diff --git a/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden b/internal/namespaces/instance/v1/testdata/test-get-server-simple.golden
diff --git a/internal/namespaces/interlink/v1beta1/interlink_cli.go b/internal/namespaces/interlink/v1beta1/interlink_cli.go
