Merge branch 'scaleway:master' into master

scaleway-bot · web-flow · commit 0121b5f35e4a · 2025-06-10T20:10:57.000+02:00
diff --git a/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-create-usage.golden
@@ -22,6 +22,7 @@ ARGS:
   [http-option=enabled]                          Configure how HTTP and HTTPS requests are handled (unknown_http_option | enabled | redirected)
   [sandbox]                                      Execution environment of the function (unknown_sandbox | v1 | v2)
   [tags.{index}]                                 Tags of the Serverless Function
+  [private-network-id]                           ID of the Private Network the function is connected to.
   [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-function-function-update-usage.golden b/cmd/scw/testdata/test-all-usage-function-function-update-usage.golden
@@ -22,6 +22,7 @@ ARGS:
   [http-option]                                  Configure how HTTP and HTTPS requests are handled (unknown_http_option | enabled | redirected)
   [sandbox]                                      Execution environment of the function (unknown_sandbox | v1 | v2)
   [tags.{index}]                                 Tags of the Serverless Function
+  [private-network-id]                           ID of the Private Network the function is connected to.
   [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-function-namespace-create-usage.golden b/cmd/scw/testdata/test-all-usage-function-namespace-create-usage.golden
@@ -13,6 +13,7 @@ ARGS:
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
   [tags.{index}]                                 Tags of the Serverless Function Namespace
+  [activate-vpc-integration]                     Activate VPC integration for the namespace.
   [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-instance-server-attach-filesystem-usage.golden b/cmd/scw/testdata/test-all-usage-instance-server-attach-filesystem-usage.golden
@@ -0,0 +1,21 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Attach a filesystem volume to an Instance.
+
+USAGE:
+  scw instance server attach-filesystem [arg=value ...]
+
+ARGS:
+  server-id         
+  [filesystem-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)
+
+FLAGS:
+  -h, --help   help for attach-filesystem
+
+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
+      --web              open console page for the current ressource
diff --git a/cmd/scw/testdata/test-all-usage-instance-server-detach-filesystem-usage.golden b/cmd/scw/testdata/test-all-usage-instance-server-detach-filesystem-usage.golden
@@ -0,0 +1,21 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Detach a filesystem volume to an Instance.
+
+USAGE:
+  scw instance server detach-filesystem [arg=value ...]
+
+ARGS:
+  server-id         
+  [filesystem-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)
+
+FLAGS:
+  -h, --help   help for detach-filesystem
+
+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
+      --web              open console page for the current ressource
diff --git a/cmd/scw/testdata/test-all-usage-instance-server-usage.golden b/cmd/scw/testdata/test-all-usage-instance-server-usage.golden
@@ -9,12 +9,14 @@ USAGE:
 
 AVAILABLE COMMANDS:
   action               Perform a raw API action on a server
+  attach-filesystem    Attach a filesystem volume to an Instance
   attach-ip            Attach an IP to a server
   attach-volume        Attach a volume to a server
   backup               Backup server
   console              Connect to the serial console of an instance
   create               Create server
   delete               Delete server
+  detach-filesystem    Detach a filesystem volume to an Instance
   detach-ip            Detach an IP from a server
   detach-volume        Detach a volume from its server
   enable-routed-ip     Migrate server to IP mobility
diff --git a/cmd/scw/testdata/test-all-usage-interlink-link-detach-policy-usage.golden b/cmd/scw/testdata/test-all-usage-interlink-link-detach-policy-usage.golden
@@ -6,8 +6,9 @@ USAGE:
   scw interlink link detach_policy <link-id ...> [arg=value ...]
 
 ARGS:
-  link-id           ID of the link to detach a routing policy from
-  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  link-id             ID of the link to detach a routing policy from
+  routing-policy-id   ID of the routing policy to be detached
+  [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
 FLAGS:
   -h, --help   help for detach_policy
diff --git a/cmd/scw/testdata/test-all-usage-interlink-routing-policy-create-usage.golden b/cmd/scw/testdata/test-all-usage-interlink-routing-policy-create-usage.golden
@@ -11,6 +11,7 @@ ARGS:
   [tags.{index}]                List of tags to apply to the routing policy
   [prefix-filter-in.{index}]    IP prefixes to accept from the peer (ranges of route announcements to accept)
   [prefix-filter-out.{index}]   IP prefix filters to advertise to the peer (ranges of routes to advertise)
+  [is-ipv6]                     IP prefixes version of the routing policy
   [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-routing-policy-list-usage.golden b/cmd/scw/testdata/test-all-usage-interlink-routing-policy-list-usage.golden
@@ -10,6 +10,7 @@ ARGS:
   [project-id]        Project ID to filter for
   [name]              Routing policy name to filter for
   [tags.{index}]      Tags to filter for
+  [ipv6]              Filter for the routing policies based on IP prefixes version
   [organization-id]   Organization ID to filter for
   [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
 
diff --git a/docs/commands/function.md b/docs/commands/function.md
@@ -305,6 +305,7 @@ scw function function create [arg=value ...]
 | http-option | Default: `enabled`<br />One of: `unknown_http_option`, `enabled`, `redirected` | Configure how HTTP and HTTPS requests are handled |
 | sandbox | One of: `unknown_sandbox`, `v1`, `v2` | Execution environment of the function |
 | tags.{index} |  | Tags of the Serverless Function |
+| private-network-id |  | ID of the Private Network the function is connected to. |
 | 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 |
 
 
@@ -465,6 +466,7 @@ scw function function update <function-id ...> [arg=value ...]
 | http-option | One of: `unknown_http_option`, `enabled`, `redirected` | Configure how HTTP and HTTPS requests are handled |
 | sandbox | One of: `unknown_sandbox`, `v1`, `v2` | Execution environment of the function |
 | tags.{index} |  | Tags of the Serverless Function |
+| private-network-id |  | ID of the Private Network the function is connected to. |
 | 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 |
 
 
@@ -496,6 +498,7 @@ scw function namespace create [arg=value ...]
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
 | tags.{index} |  | Tags of the Serverless Function Namespace |
+| activate-vpc-integration |  | Activate VPC integration for the namespace. |
 | 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/docs/commands/instance.md b/docs/commands/instance.md
@@ -50,12 +50,14 @@ This API allows you to manage your CPU and GPU Instances.
   - [Update security group rule](#update-security-group-rule)
 - [Instance management commands](#instance-management-commands)
   - [Perform a raw API action on a server](#perform-a-raw-api-action-on-a-server)
+  - [Attach a filesystem volume to an Instance](#attach-a-filesystem-volume-to-an-instance)
   - [Attach an IP to a server](#attach-an-ip-to-a-server)
   - [Attach a volume to a server](#attach-a-volume-to-a-server)
   - [Backup server](#backup-server)
   - [Connect to the serial console of an instance](#connect-to-the-serial-console-of-an-instance)
   - [Create server](#create-server)
   - [Delete server](#delete-server)
+  - [Detach a filesystem volume to an Instance](#detach-a-filesystem-volume-to-an-instance)
   - [Detach an IP from a server](#detach-an-ip-from-a-server)
   - [Detach a volume from its server](#detach-a-volume-from-its-server)
   - [Migrate server to IP mobility](#migrate-server-to-ip-mobility)
@@ -1569,6 +1571,27 @@ scw instance server action 11111111-1111-1111-1111-111111111111 action=poweron
 
 
 
+### Attach a filesystem volume to an Instance
+
+Attach a filesystem volume to an Instance.
+
+**Usage:**
+
+```
+scw instance server attach-filesystem [arg=value ...]
+```
+
+
+**Args:**
+
+| Name |   | Description |
+|------|---|-------------|
+| server-id | Required |  |
+| filesystem-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 |
+
+
+
 ### Attach an IP to a server
 
 
@@ -1820,6 +1843,27 @@ scw instance server delete 11111111-1111-1111-1111-111111111111 zone=fr-par-1
 
 
 
+### Detach a filesystem volume to an Instance
+
+Detach a filesystem volume to an Instance.
+
+**Usage:**
+
+```
+scw instance server detach-filesystem [arg=value ...]
+```
+
+
+**Args:**
+
+| Name |   | Description |
+|------|---|-------------|
+| server-id | Required |  |
+| filesystem-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 |
+
+
+
 ### Detach an IP from a server
 
 
diff --git a/docs/commands/interlink.md b/docs/commands/interlink.md
@@ -153,6 +153,7 @@ scw interlink link detach_policy <link-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | link-id | Required | ID of the link to detach a routing policy from |
+| routing-policy-id | Required | ID of the routing policy to be detached |
 | 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 |
 
 
@@ -416,6 +417,7 @@ scw interlink routing-policy create [arg=value ...]
 | tags.{index} |  | List of tags to apply to the routing policy |
 | prefix-filter-in.{index} |  | IP prefixes to accept from the peer (ranges of route announcements to accept) |
 | prefix-filter-out.{index} |  | IP prefix filters to advertise to the peer (ranges of routes to advertise) |
+| is-ipv6 |  | IP prefixes version of the routing policy |
 | 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 |
 
 
@@ -479,6 +481,7 @@ scw interlink routing-policy list [arg=value ...]
 | project-id |  | Project ID to filter for |
 | name |  | Routing policy name to filter for |
 | tags.{index} |  | Tags to filter for |
+| ipv6 |  | Filter for the routing policies based on IP prefixes version |
 | organization-id |  | Organization ID to filter for |
 | 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 |
 
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.24.0
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.36.3
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1
 	github.com/buildpacks/pack v0.34.2
 	github.com/c-bata/go-prompt v0.2.6
 	github.com/charmbracelet/bubbletea v1.3.5
diff --git a/go.sum b/go.sum
@@ -90,8 +90,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0 h1:fV4XIU5sn/x8gjRouoJpDVHj+ExJaUk4prYF+eb6qTs=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.80.0/go.mod h1:qbn305Je/IofWBJ4bJz/Q7pDEtnnoInw/dGt71v6rHE=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1 h1:xYEAf/6QHiTZDccKnPMbsMwlau13GsDsTgdue3wmHGw=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.80.1/go.mod h1:qbn305Je/IofWBJ4bJz/Q7pDEtnnoInw/dGt71v6rHE=
 github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 h1:XOPfar83RIRPEzfihnp+U6udOveKZJvPQ76SKWrLRHc=
 github.com/aws/aws-sdk-go-v2/service/sso v1.20.2/go.mod h1:Vv9Xyk1KMHXrR3vNQe8W5LMFdTjSeWk0gBZBzvf3Qa0=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 h1:pi0Skl6mNl2w8qWZXcdOyg197Zsf4G97U7Sso9JXGZE=
diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go
@@ -324,6 +324,13 @@ func functionNamespaceCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "activate-vpc-integration",
+				Short:      `Activate VPC integration for the namespace.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
@@ -728,6 +735,13 @@ func functionFunctionCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "private-network-id",
+				Short:      `ID of the Private Network the function is connected to.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
@@ -917,6 +931,13 @@ func functionFunctionUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "private-network-id",
+				Short:      `ID of the Private Network the function is connected to.`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionNlAms,
diff --git a/internal/namespaces/instance/v1/instance_cli.go b/internal/namespaces/instance/v1/instance_cli.go
@@ -43,6 +43,8 @@ func GetGeneratedCommands() *core.Commands {
 		instanceUserDataSet(),
 		instanceUserDataGet(),
 		instanceServerGetCompatibleTypes(),
+		instanceServerAttachFilesystem(),
+		instanceServerDetachFilesystem(),
 		instanceImageList(),
 		instanceImageGet(),
 		instanceImageCreate(),
@@ -1142,6 +1144,96 @@ If the specified Instance offer is flagged as end of service, the best compatibl
 	}
 }
 
+func instanceServerAttachFilesystem() *core.Command {
+	return &core.Command{
+		Short:     `Attach a filesystem volume to an Instance`,
+		Long:      `Attach a filesystem volume to an Instance.`,
+		Namespace: "instance",
+		Resource:  "server",
+		Verb:      "attach-filesystem",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(instance.AttachServerFileSystemRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "server-id",
+				Required:   true,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "filesystem-id",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			core.ZoneArgSpec(
+				scw.ZoneFrPar1,
+				scw.ZoneFrPar2,
+				scw.ZoneFrPar3,
+				scw.ZoneNlAms1,
+				scw.ZoneNlAms2,
+				scw.ZoneNlAms3,
+				scw.ZonePlWaw1,
+				scw.ZonePlWaw2,
+				scw.ZonePlWaw3,
+			),
+		},
+		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
+			request := args.(*instance.AttachServerFileSystemRequest)
+
+			client := core.ExtractClient(ctx)
+			api := instance.NewAPI(client)
+
+			return api.AttachServerFileSystem(request)
+		},
+	}
+}
+
+func instanceServerDetachFilesystem() *core.Command {
+	return &core.Command{
+		Short:     `Detach a filesystem volume to an Instance`,
+		Long:      `Detach a filesystem volume to an Instance.`,
+		Namespace: "instance",
+		Resource:  "server",
+		Verb:      "detach-filesystem",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(instance.DetachServerFileSystemRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "server-id",
+				Required:   true,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "filesystem-id",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			core.ZoneArgSpec(
+				scw.ZoneFrPar1,
+				scw.ZoneFrPar2,
+				scw.ZoneFrPar3,
+				scw.ZoneNlAms1,
+				scw.ZoneNlAms2,
+				scw.ZoneNlAms3,
+				scw.ZonePlWaw1,
+				scw.ZonePlWaw2,
+				scw.ZonePlWaw3,
+			),
+		},
+		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
+			request := args.(*instance.DetachServerFileSystemRequest)
+
+			client := core.ExtractClient(ctx)
+			api := instance.NewAPI(client)
+
+			return api.DetachServerFileSystem(request)
+		},
+	}
+}
+
 func instanceImageList() *core.Command {
 	return &core.Command{
 		Short:     `List Instance images`,
diff --git a/internal/namespaces/interlink/v1beta1/interlink_cli.go b/internal/namespaces/interlink/v1beta1/interlink_cli.go
