feat(s2s_vpn): support single tunnel ip auto-alloc (#5321)

Author: scaleway-bot

cmd/scw/testdata/test-all-usage-s2s-vpn-vpn-gateway-create-usage.golden

@@ -6,17 +6,21 @@ USAGE:
   scw s2s-vpn vpn-gateway create [arg=value ...]
 
 ARGS:
-  [project-id]                   Project ID to use. If none is passed the default project ID will be used
-  name                           Name of the VPN gateway
-  [tags.{index}]                 List of tags to apply to the VPN gateway
-  gateway-type                   VPN gateway type (commercial offer type)
-  [public-config.ipam-ipv4-id]   
-  [public-config.ipam-ipv6-id]   
-  private-network-id             ID of the Private Network to attach to the VPN gateway
-  [ipam-private-ipv4-id]         ID of the IPAM private IPv4 address to attach to the VPN gateway
-  [ipam-private-ipv6-id]         ID of the IPAM private IPv6 address to attach to the VPN gateway
-  [zone]                         Availability Zone where the VPN gateway should be provisioned. If no zone is specified, the VPN gateway will be automatically placed.
-  [region=fr-par]                Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  [project-id]                                             Project ID to use. If none is passed the default project ID will be used
+  name                                                     Name of the VPN gateway
+  [tags.{index}]                                           List of tags to apply to the VPN gateway
+  gateway-type                                             VPN gateway type (commercial offer type)
+  [public-config.ipam-ipv4-id]                             
+  [public-config.ipam-ipv6-id]                             
+  private-network-id                                       ID of the Private Network to attach to the VPN gateway
+  [public-tunnel-config.single-ipv4-tunnel.ipam-id]        
+  [public-tunnel-config.single-ipv6-tunnel.ipam-id]        
+  [public-tunnel-config.dual-ipv4v6-tunnel.ipam-ipv4-id]   
+  [public-tunnel-config.dual-ipv4v6-tunnel.ipam-ipv6-id]   
+  [ipam-private-ipv4-id]                                   ID of the IPAM private IPv4 address to attach to the VPN gateway
+  [ipam-private-ipv6-id]                                   ID of the IPAM private IPv6 address to attach to the VPN gateway
+  [zone]                                                   Availability Zone where the VPN gateway should be provisioned. If no zone is specified, the VPN gateway will be automatically placed.
+  [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 create

docs/commands/s2s-vpn.md

@@ -547,6 +547,10 @@ scw s2s-vpn vpn-gateway create [arg=value ...]
 | public-config.ipam-ipv4-id |  |  |
 | public-config.ipam-ipv6-id |  |  |
 | private-network-id | Required | ID of the Private Network to attach to the VPN gateway |
+| public-tunnel-config.single-ipv4-tunnel.ipam-id |  |  |
+| public-tunnel-config.single-ipv6-tunnel.ipam-id |  |  |
+| public-tunnel-config.dual-ipv4v6-tunnel.ipam-ipv4-id |  |  |
+| public-tunnel-config.dual-ipv4v6-tunnel.ipam-ipv6-id |  |  |
 | ipam-private-ipv4-id |  | ID of the IPAM private IPv4 address to attach to the VPN gateway |
 | ipam-private-ipv6-id |  | ID of the IPAM private IPv6 address to attach to the VPN gateway |
 | zone |  | Availability Zone where the VPN gateway should be provisioned. If no zone is specified, the VPN gateway will be automatically placed. |

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/buildkit v0.26.3
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260205134439-552c4fd7bb15
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260206103045-4df7d84ec970
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10

go.sum

@@ -468,8 +468,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
 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.36.0.20260205134439-552c4fd7bb15 h1:1TEkXowNZybCaCrgTA+id+AjsPGt3n0xiTPBuaUgoTo=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260205134439-552c4fd7bb15/go.mod h1:VbEqG0nAXcEFyHLKWwbhgbDNimnLf24Qat73/12DU9o=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260206103045-4df7d84ec970 h1:A/OcpyqcTj9J2al+2jXbAfcR5CHG6iKpxzWTaNUnj14=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260206103045-4df7d84ec970/go.mod h1:VbEqG0nAXcEFyHLKWwbhgbDNimnLf24Qat73/12DU9o=
 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.9.1 h1:nZZaNz4DiERIQguNy0cL5qTdn9lR8XKHf4RUyG1Sx3g=

internal/namespaces/s2s_vpn/v1alpha1/s2s_vpn_cli.go

@@ -341,6 +341,30 @@ func s2sVpnVpnGatewayCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "public-tunnel-config.single-ipv4-tunnel.ipam-id",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "public-tunnel-config.single-ipv6-tunnel.ipam-id",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "public-tunnel-config.dual-ipv4v6-tunnel.ipam-ipv4-id",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "public-tunnel-config.dual-ipv4v6-tunnel.ipam-ipv6-id",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "ipam-private-ipv4-id",
 				Short:      `ID of the IPAM private IPv4 address to attach to the VPN gateway`,