Merge branch 'scaleway:master' into master

scaleway-bot · web-flow · commit 699b1ad272dc · 2025-05-13T13:10:22.000+02:00
diff --git a/cmd/scw/testdata/test-all-usage-ipam-ip-list-usage.golden b/cmd/scw/testdata/test-all-usage-ipam-ip-list-usage.golden
@@ -16,8 +16,8 @@ ARGS:
   [resource-name]            Attached resource name to filter for, only IPs attached to a resource with this string within their name will be returned.
   [resource-id]              Resource ID to filter for. Only IPs attached to this resource will be returned
   [resource-ids.{index}]     Resource IDs to filter for. Only IPs attached to at least one of these resources will be returned
-  [resource-type]            Resource type to filter for. Only IPs attached to this type of resource will be returned (unknown_type | custom | instance_server | instance_ip | instance_private_nic | lb_server | fip_ip | vpc_gateway | vpc_gateway_network | k8s_node | k8s_cluster | rdb_instance | redis_cluster | baremetal_server | baremetal_private_nic | llm_deployment | mgdb_instance | apple_silicon_server | apple_silicon_private_nic | serverless_container | serverless_function | vpn_gateway)
-  [resource-types.{index}]   Resource types to filter for. Only IPs attached to these types of resources will be returned (unknown_type | custom | instance_server | instance_ip | instance_private_nic | lb_server | fip_ip | vpc_gateway | vpc_gateway_network | k8s_node | k8s_cluster | rdb_instance | redis_cluster | baremetal_server | baremetal_private_nic | llm_deployment | mgdb_instance | apple_silicon_server | apple_silicon_private_nic | serverless_container | serverless_function | vpn_gateway)
+  [resource-type]            Resource type to filter for. Only IPs attached to this type of resource will be returned (unknown_type | custom | instance_server | instance_ip | instance_private_nic | lb_server | fip_ip | vpc_gateway | vpc_gateway_network | k8s_node | k8s_cluster | rdb_instance | redis_cluster | baremetal_server | baremetal_private_nic | llm_deployment | mgdb_instance | apple_silicon_server | apple_silicon_private_nic | serverless_container | serverless_function | vpn_gateway | ddl_datalab)
+  [resource-types.{index}]   Resource types to filter for. Only IPs attached to these types of resources will be returned (unknown_type | custom | instance_server | instance_ip | instance_private_nic | lb_server | fip_ip | vpc_gateway | vpc_gateway_network | k8s_node | k8s_cluster | rdb_instance | redis_cluster | baremetal_server | baremetal_private_nic | llm_deployment | mgdb_instance | apple_silicon_server | apple_silicon_private_nic | serverless_container | serverless_function | vpn_gateway | ddl_datalab)
   [mac-address]              MAC address to filter for. Only IPs attached to a resource with this MAC address will be returned
   [tags.{index}]             Tags to filter for, only IPs with one or more matching tags will be returned
   [is-ipv6]                  Defines whether to filter only for IPv4s or IPv6s
diff --git a/cmd/scw/testdata/test-all-usage-lb-route-create-usage.golden b/cmd/scw/testdata/test-all-usage-lb-route-create-usage.golden
@@ -11,6 +11,7 @@ ARGS:
   [match.sni]                Server Name Indication (SNI) value to match
   [match.host-header]        HTTP host header to match
   [match.match-subdomains]   If true, all subdomains will match
+  [match.path-begin]         Path begin value to match
   [zone=fr-par-1]            Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-lb-route-update-usage.golden b/cmd/scw/testdata/test-all-usage-lb-route-update-usage.golden
@@ -11,6 +11,7 @@ ARGS:
   [match.sni]                Server Name Indication (SNI) value to match
   [match.host-header]        HTTP host header to match
   [match.match-subdomains]   If true, all subdomains will match
+  [match.path-begin]         Path begin value to match
   [zone=fr-par-1]            Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | nl-ams-2 | nl-ams-3 | pl-waw-1 | pl-waw-2 | pl-waw-3)
 
 FLAGS:
diff --git a/docs/commands/ipam.md b/docs/commands/ipam.md
@@ -110,8 +110,8 @@ scw ipam ip list [arg=value ...]
 | resource-name |  | Attached resource name to filter for, only IPs attached to a resource with this string within their name will be returned. |
 | resource-id |  | Resource ID to filter for. Only IPs attached to this resource will be returned |
 | resource-ids.{index} |  | Resource IDs to filter for. Only IPs attached to at least one of these resources will be returned |
-| resource-type | One of: `unknown_type`, `custom`, `instance_server`, `instance_ip`, `instance_private_nic`, `lb_server`, `fip_ip`, `vpc_gateway`, `vpc_gateway_network`, `k8s_node`, `k8s_cluster`, `rdb_instance`, `redis_cluster`, `baremetal_server`, `baremetal_private_nic`, `llm_deployment`, `mgdb_instance`, `apple_silicon_server`, `apple_silicon_private_nic`, `serverless_container`, `serverless_function`, `vpn_gateway` | Resource type to filter for. Only IPs attached to this type of resource will be returned |
-| resource-types.{index} | One of: `unknown_type`, `custom`, `instance_server`, `instance_ip`, `instance_private_nic`, `lb_server`, `fip_ip`, `vpc_gateway`, `vpc_gateway_network`, `k8s_node`, `k8s_cluster`, `rdb_instance`, `redis_cluster`, `baremetal_server`, `baremetal_private_nic`, `llm_deployment`, `mgdb_instance`, `apple_silicon_server`, `apple_silicon_private_nic`, `serverless_container`, `serverless_function`, `vpn_gateway` | Resource types to filter for. Only IPs attached to these types of resources will be returned |
+| resource-type | One of: `unknown_type`, `custom`, `instance_server`, `instance_ip`, `instance_private_nic`, `lb_server`, `fip_ip`, `vpc_gateway`, `vpc_gateway_network`, `k8s_node`, `k8s_cluster`, `rdb_instance`, `redis_cluster`, `baremetal_server`, `baremetal_private_nic`, `llm_deployment`, `mgdb_instance`, `apple_silicon_server`, `apple_silicon_private_nic`, `serverless_container`, `serverless_function`, `vpn_gateway`, `ddl_datalab` | Resource type to filter for. Only IPs attached to this type of resource will be returned |
+| resource-types.{index} | One of: `unknown_type`, `custom`, `instance_server`, `instance_ip`, `instance_private_nic`, `lb_server`, `fip_ip`, `vpc_gateway`, `vpc_gateway_network`, `k8s_node`, `k8s_cluster`, `rdb_instance`, `redis_cluster`, `baremetal_server`, `baremetal_private_nic`, `llm_deployment`, `mgdb_instance`, `apple_silicon_server`, `apple_silicon_private_nic`, `serverless_container`, `serverless_function`, `vpn_gateway`, `ddl_datalab` | Resource types to filter for. Only IPs attached to these types of resources will be returned |
 | mac-address |  | MAC address to filter for. Only IPs attached to a resource with this MAC address will be returned |
 | tags.{index} |  | Tags to filter for, only IPs with one or more matching tags will be returned |
 | is-ipv6 |  | Defines whether to filter only for IPv4s or IPv6s |
diff --git a/docs/commands/lb.md b/docs/commands/lb.md
@@ -1204,6 +1204,7 @@ scw lb route create [arg=value ...]
 | match.sni |  | Server Name Indication (SNI) value to match |
 | match.host-header |  | HTTP host header to match |
 | match.match-subdomains |  | If true, all subdomains will match |
+| match.path-begin |  | Path begin value to match |
 | zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `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 |
 
 
@@ -1289,6 +1290,7 @@ scw lb route update <route-id ...> [arg=value ...]
 | match.sni |  | Server Name Indication (SNI) value to match |
 | match.host-header |  | HTTP host header to match |
 | match.match-subdomains |  | If true, all subdomains will match |
+| match.path-begin |  | Path begin value to match |
 | zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `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 |
 
 
diff --git a/go.mod b/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.20250502141405-03137c13354a
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250507151153-c2221170c9cc
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
diff --git a/go.sum b/go.sum
@@ -466,8 +466,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.20250502141405-03137c13354a h1:vvx3QoLsyeqQKdV/rxf7Cp3BoA2kxUabjFp8pZ2JMoM=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250502141405-03137c13354a/go.mod h1:w4o02EHpO0CBGy2nehzWRaFQKd62G9HIf+Q07PDaUcE=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250507151153-c2221170c9cc h1:BG7CJh8I2AuyMP0ie6sOqAGYn5jifL4piKBZCva9C5M=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250507151153-c2221170c9cc/go.mod h1:qiGzapFyNPFwBBLJ+hTFykKSnU95n1zL64+o1ubmwf0=
 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=
diff --git a/internal/namespaces/ipam/v1/ipam_cli.go b/internal/namespaces/ipam/v1/ipam_cli.go
@@ -428,6 +428,7 @@ func ipamIPList() *core.Command {
 					"serverless_container",
 					"serverless_function",
 					"vpn_gateway",
+					"ddl_datalab",
 				},
 			},
 			{
@@ -459,6 +460,7 @@ func ipamIPList() *core.Command {
 					"serverless_container",
 					"serverless_function",
 					"vpn_gateway",
+					"ddl_datalab",
 				},
 			},
 			{
diff --git a/internal/namespaces/lb/v1/lb_cli.go b/internal/namespaces/lb/v1/lb_cli.go
@@ -2304,6 +2304,13 @@ func lbRouteCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "match.path-begin",
+				Short:      `Path begin value to match`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.ZoneArgSpec(
 				scw.ZoneFrPar1,
 				scw.ZoneFrPar2,
@@ -2410,6 +2417,13 @@ func lbRouteUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "match.path-begin",
+				Short:      `Path begin value to match`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.ZoneArgSpec(
 				scw.ZoneFrPar1,
 				scw.ZoneFrPar2,
