Merge branch 'scaleway:master' into master

Author: scaleway-bot

.github/workflows/unit-tests.yaml renamed to .github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Build
 
 permissions:
   contents: read
@@ -8,16 +8,9 @@ on:
   merge_group:
 
 jobs:
-  os-tests:
-    strategy:
-      matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.platform }}
+  native-binary:
+    runs-on: ubuntu-latest
     steps:
-      - name: Set git to use LF to avoid problem with goldens on windows
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
       # Checkout should always be before setup-go to ensure caching is working
       - name: Checkout
         uses: actions/checkout@v5
@@ -31,31 +24,14 @@ jobs:
         run: |
           go mod tidy
           git diff --exit-code
-      - name: Run unit tests
-        run: go tool gotestsum --format github-actions
-      - name: Execute main binary # Test the runtime for potential panics.
-        run: go run cmd/scw/main.go -h
-
-  build-tests:
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout should always be before setup-go to ensure caching is working
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 1
-      - name: Install Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: stable
       - name: Build binaries
         run: ./scripts/build.sh
       - name: Print binaries size
         run: ls -lh ./bin
       - name: Check binary size
         run: ./scripts/check-size.sh ./bin/*linux-x86_64
 
-  docker-tests:
+  docker:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout

.github/workflows/tests.yml

@@ -0,0 +1,86 @@
+name: Tests
+
+permissions:
+  contents: read
+
+on:
+  pull_request:
+  merge_group:
+
+jobs:
+  namespaces:
+    strategy:
+      matrix:
+        platform:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+        products:
+          - account
+          - applesilicon
+          - baremetal
+          - billing
+          - block
+          - cockpit
+          - container
+          - dedibox
+          - domain
+          - edge_services
+          - flexibleip
+          - function
+          - iam
+          - inference
+          - init
+          - instance
+          - iot
+          - ipam
+          - jobs
+          - k8s
+          - key_manager
+          - lb
+          - login
+          - marketplace
+          - mnq
+          - mongodb
+          - object
+          - rdb
+          - redis
+          - registry
+          - serverless_sqldb
+          - secret
+          - tem
+          - vpc
+          - vpcgw
+          - webhosting
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Set git to use LF to avoid problem with goldens on windows
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+      # Checkout should always be before setup-go to ensure caching is working
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 1
+      - name: Install Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: stable
+      - name: Run tests
+        run: go tool gotestsum --format github-actions -- -v ./internal/namespaces/${{ matrix.products }}/...
+      - name: Execute main binary # Test the runtime for potential panics.
+        run: go run cmd/scw/main.go -h
+  others:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 1
+      - name: Install Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: stable
+      - name: Run tests outside of products namespaces
+        run: go list ./... | grep -v 'internal/namespaces' | xargs go tool gotestsum --format github-actions -- -v

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 | ddl_datalab | kafka_cluster | bgp_endpoint | scbl_sedb_cluster)
-  [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 | kafka_cluster | bgp_endpoint | scbl_sedb_cluster)
+  [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 | kafka_cluster | bgp_endpoint | scbl_sedb_cluster | dtwh_deployment)
+  [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 | kafka_cluster | bgp_endpoint | scbl_sedb_cluster | dtwh_deployment)
   [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

core/testing.go

@@ -316,9 +316,9 @@ var foldersUsingVCRv4 = []string{
 }
 
 func folderUsesVCRv4(fullFolderPath string) bool {
-	fullPathSplit := strings.Split(fullFolderPath, "/")
+	fullPathSplit := strings.Split(fullFolderPath, string(os.PathSeparator))
 
-	folder := fullPathSplit[len(fullPathSplit)-1]
+	folder := fullPathSplit[len(fullPathSplit)-2]
 	for _, migratedFolder := range foldersUsingVCRv4 {
 		if migratedFolder == folder {
 			return true

docs/commands/ipam.md

@@ -111,8 +111,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`, `ddl_datalab`, `kafka_cluster`, `bgp_endpoint`, `scbl_sedb_cluster` | 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`, `kafka_cluster`, `bgp_endpoint`, `scbl_sedb_cluster` | 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`, `kafka_cluster`, `bgp_endpoint`, `scbl_sedb_cluster`, `dtwh_deployment` | 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`, `kafka_cluster`, `bgp_endpoint`, `scbl_sedb_cluster`, `dtwh_deployment` | 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 |

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/buildkit v0.25.2
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251029154854-a599ef194f4a
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251112085626-07500e4c9ab7
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/pflag v1.0.10

go.sum

@@ -464,8 +464,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.35.0.20251029154854-a599ef194f4a h1:hV/QEq3wgx5brT5CQQstOJ3XoT2/oBT4rSTGixl/Kig=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251029154854-a599ef194f4a/go.mod h1:SVm1Zk6UpZtqZN6KtEQpjC+v+Lir4tyVfhQTU19q3PA=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251112085626-07500e4c9ab7 h1:wNX0zhJJSya6OpoA7LYiJFm6ghM7vr2OjO2M53v9AdM=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251112085626-07500e4c9ab7/go.mod h1:BBENv1W9QH4COViJkDJB/0D1T6CweMAkDP7XehRsHQ8=
 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/instance/v1/custom_image_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func Test_ImageCreate(t *testing.T) {
-	t.Run("Create simple image", core.Test(&core.TestConfig{
+	t.Run("Simple", core.Test(&core.TestConfig{
 		BeforeFunc: core.BeforeFuncCombine(
 			core.ExecStoreBeforeCmd(
 				"Server",
@@ -68,7 +68,7 @@ func Test_ImageCreate(t *testing.T) {
 }
 
 func Test_ImageDelete(t *testing.T) {
-	t.Run("simple", core.Test(&core.TestConfig{
+	t.Run("Simple", core.Test(&core.TestConfig{
 		BeforeFunc: createImage("Image"),
 		Commands:   instance.GetCommands(),
 		Cmd:        "scw instance image delete {{ .Image.Image.ID }} with-snapshots=true",