access key: ignore in matcher rather than replacing in cassette

Mia-Cross · Mia-Cross · commit 723eac436d6d · 2025-08-12T19:01:15.000+02:00
diff --git a/core/testdata/test-check-api-key-basic.cassette.yaml b/core/testdata/test-check-api-key-basic.cassette.yaml
@@ -12,44 +12,44 @@ interactions:
         host: api.scaleway.com
         remote_addr: ""
         request_uri: ""
-        body: '{"access_key":"SCW2DWFM69FT5GRJARV0", "secret_key":null, "description":"my prod API key", "created_at":"2025-07-29T18:35:44.750352Z", "updated_at":"2025-07-29T18:35:44.750352Z", "expires_at":"2026-07-29T18:35:44.583Z", "default_project_id":"19a4819b-24bf-4d44-969f-935ef0061b71", "editable":true, "deletable":true, "managed":false, "creation_ip":"51.159.46.153", "user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+        body: '{"access_key":"SCW2DWFM69FT5GRJARV0","secret_key":null,"description":"my prod API key","created_at":"2025-07-29T18:35:44.750352Z","updated_at":"2025-07-29T18:35:44.750352Z","expires_at":"2026-07-29T18:35:44.583Z","default_project_id":"19a4819b-24bf-4d44-969f-935ef0061b71","editable":true,"deletable":true,"managed":false,"creation_ip":"51.159.46.153","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
         form: {}
         headers:
             User-Agent:
                 - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.24.1; linux; amd64) cli-e2e-test
-        url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
+        url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCW2DWFM69FT5GRJARV0
         method: GET
       response:
         proto: HTTP/2.0
         proto_major: 2
         proto_minor: 0
         transfer_encoding: []
         trailer: {}
-        content_length: 412
+        content_length: 401
         uncompressed: false
-        body: '{"access_key":"SCW2DWFM69FT5GRJARV0", "secret_key":null, "description":"my prod API key", "created_at":"2025-07-29T18:35:44.750352Z", "updated_at":"2025-07-29T18:35:44.750352Z", "expires_at":"2026-07-29T18:35:44.583Z", "default_project_id":"19a4819b-24bf-4d44-969f-935ef0061b71", "editable":true, "deletable":true, "managed":false, "creation_ip":"51.159.46.153", "user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+        body: '{"access_key":"SCW2DWFM69FT5GRJARV0","secret_key":null,"description":"my prod API key","created_at":"2025-07-29T18:35:44.750352Z","updated_at":"2025-07-29T18:35:44.750352Z","expires_at":"2026-07-29T18:35:44.583Z","default_project_id":"19a4819b-24bf-4d44-969f-935ef0061b71","editable":true,"deletable":true,"managed":false,"creation_ip":"51.159.46.153","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
         headers:
             Content-Length:
-                - "412"
+                - "401"
             Content-Security-Policy:
                 - default-src 'none'; frame-ancestors 'none'
             Content-Type:
                 - application/json
             Date:
-                - Thu, 07 Aug 2025 13:42:47 GMT
+                - Tue, 12 Aug 2025 16:43:02 GMT
             Server:
-                - Scaleway API Gateway (fr-par-3;edge02)
+                - Scaleway API Gateway (fr-par-1;edge03)
             Strict-Transport-Security:
                 - max-age=63072000
             X-Content-Type-Options:
                 - nosniff
             X-Frame-Options:
                 - DENY
             X-Request-Id:
-                - 24b5e550-70fe-4efa-8fcc-6c470623e1d3
+                - 15f679ca-1508-4748-8c4e-069bf6426da7
         status: 200 OK
         code: 200
-        duration: 250.591893ms
+        duration: 209.763373ms
     - id: 1
       request:
         proto: HTTP/1.1
@@ -61,7 +61,7 @@ interactions:
         host: api.scaleway.com
         remote_addr: ""
         request_uri: ""
-        body: '{"access_key":"SCWKRVBK27JW6A8AYM6Y", "secret_key":"11111111-1111-1111-1111-111111111111", "description":"test-cli-TestCheckAPIKey", "created_at":"2025-08-07T13:42:47.083089Z", "updated_at":"2025-08-07T13:42:47.083089Z", "expires_at":"2025-08-07T14:42:47.020954Z", "default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552", "editable":true, "deletable":true, "managed":false, "creation_ip":"92.170.169.4", "user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+        body: '{"access_key":"SCWFF2WDKB95P8D78Y5Y","secret_key":"11111111-1111-1111-1111-111111111111","description":"test-cli-TestCheckAPIKey","created_at":"2025-08-12T16:43:02.293611Z","updated_at":"2025-08-12T16:43:02.293611Z","expires_at":"2025-08-12T17:43:02.157196Z","default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552","editable":true,"deletable":true,"managed":false,"creation_ip":"51.159.73.9","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
         form: {}
         headers:
             Content-Type:
@@ -76,31 +76,31 @@ interactions:
         proto_minor: 0
         transfer_encoding: []
         trailer: {}
-        content_length: 457
+        content_length: 445
         uncompressed: false
-        body: '{"access_key":"SCWKRVBK27JW6A8AYM6Y", "secret_key":"11111111-1111-1111-1111-111111111111", "description":"test-cli-TestCheckAPIKey", "created_at":"2025-08-07T13:42:47.083089Z", "updated_at":"2025-08-07T13:42:47.083089Z", "expires_at":"2025-08-07T14:42:47.020954Z", "default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552", "editable":true, "deletable":true, "managed":false, "creation_ip":"92.170.169.4", "user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+        body: '{"access_key":"SCWFF2WDKB95P8D78Y5Y","secret_key":"11111111-1111-1111-1111-111111111111","description":"test-cli-TestCheckAPIKey","created_at":"2025-08-12T16:43:02.293611Z","updated_at":"2025-08-12T16:43:02.293611Z","expires_at":"2025-08-12T17:43:02.157196Z","default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552","editable":true,"deletable":true,"managed":false,"creation_ip":"51.159.73.9","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
         headers:
             Content-Length:
-                - "457"
+                - "445"
             Content-Security-Policy:
                 - default-src 'none'; frame-ancestors 'none'
             Content-Type:
                 - application/json
             Date:
-                - Thu, 07 Aug 2025 13:42:47 GMT
+                - Tue, 12 Aug 2025 16:43:02 GMT
             Server:
-                - Scaleway API Gateway (fr-par-3;edge02)
+                - Scaleway API Gateway (fr-par-1;edge03)
             Strict-Transport-Security:
                 - max-age=63072000
             X-Content-Type-Options:
                 - nosniff
             X-Frame-Options:
                 - DENY
             X-Request-Id:
-                - d63c5db0-f502-4fa0-b0d0-9cf73c4a4d86
+                - f492dd3e-e41a-4abd-96a4-2203fadc9c47
         status: 200 OK
         code: 200
-        duration: 86.259571ms
+        duration: 165.475914ms
     - id: 2
       request:
         proto: HTTP/1.1
@@ -112,44 +112,44 @@ interactions:
         host: api.scaleway.com
         remote_addr: ""
         request_uri: ""
-        body: '{"access_key":"SCWKRVBK27JW6A8AYM6Y", "secret_key":null, "description":"test-cli-TestCheckAPIKey", "created_at":"2025-08-07T13:42:47.083089Z", "updated_at":"2025-08-07T13:42:47.083089Z", "expires_at":"2025-08-07T14:42:47.020954Z", "default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552", "editable":true, "deletable":true, "managed":false, "creation_ip":"92.170.169.4", "user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+        body: '{"access_key":"SCWFF2WDKB95P8D78Y5Y","secret_key":null,"description":"test-cli-TestCheckAPIKey","created_at":"2025-08-12T16:43:02.293611Z","updated_at":"2025-08-12T16:43:02.293611Z","expires_at":"2025-08-12T17:43:02.157196Z","default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552","editable":true,"deletable":true,"managed":false,"creation_ip":"51.159.73.9","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
         form: {}
         headers:
             User-Agent:
                 - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.24.1; linux; amd64) scaleway-cli/0.0.0+test
-        url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
+        url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWFF2WDKB95P8D78Y5Y
         method: GET
       response:
         proto: HTTP/2.0
         proto_major: 2
         proto_minor: 0
         transfer_encoding: []
         trailer: {}
-        content_length: 423
+        content_length: 411
         uncompressed: false
-        body: '{"access_key":"SCWKRVBK27JW6A8AYM6Y", "secret_key":null, "description":"test-cli-TestCheckAPIKey", "created_at":"2025-08-07T13:42:47.083089Z", "updated_at":"2025-08-07T13:42:47.083089Z", "expires_at":"2025-08-07T14:42:47.020954Z", "default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552", "editable":true, "deletable":true, "managed":false, "creation_ip":"92.170.169.4", "user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
+        body: '{"access_key":"SCWFF2WDKB95P8D78Y5Y","secret_key":null,"description":"test-cli-TestCheckAPIKey","created_at":"2025-08-12T16:43:02.293611Z","updated_at":"2025-08-12T16:43:02.293611Z","expires_at":"2025-08-12T17:43:02.157196Z","default_project_id":"fa1e3217-dc80-42ac-85c3-3f034b78b552","editable":true,"deletable":true,"managed":false,"creation_ip":"51.159.73.9","user_id":"77e7fa85-f305-4ea2-afea-09571a039336"}'
         headers:
             Content-Length:
-                - "423"
+                - "411"
             Content-Security-Policy:
                 - default-src 'none'; frame-ancestors 'none'
             Content-Type:
                 - application/json
             Date:
-                - Thu, 07 Aug 2025 13:42:47 GMT
+                - Tue, 12 Aug 2025 16:43:02 GMT
             Server:
-                - Scaleway API Gateway (fr-par-3;edge02)
+                - Scaleway API Gateway (fr-par-1;edge03)
             Strict-Transport-Security:
                 - max-age=63072000
             X-Content-Type-Options:
                 - nosniff
             X-Frame-Options:
                 - DENY
             X-Request-Id:
-                - 3480e36b-cd93-4a29-8a74-10b8062c5da0
+                - 0445bc26-dbc8-49a4-9415-070a57762ed5
         status: 200 OK
         code: 200
-        duration: 53.637556ms
+        duration: 46.380661ms
     - id: 3
       request:
         proto: HTTP/1.1
@@ -166,7 +166,7 @@ interactions:
         headers:
             User-Agent:
                 - scaleway-sdk-go/v1.0.0-beta.7+dev (go1.24.1; linux; amd64) cli-e2e-test
-        url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
+        url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWFF2WDKB95P8D78Y5Y
         method: DELETE
       response:
         proto: HTTP/2.0
@@ -183,17 +183,17 @@ interactions:
             Content-Type:
                 - application/json
             Date:
-                - Thu, 07 Aug 2025 13:42:47 GMT
+                - Tue, 12 Aug 2025 16:43:02 GMT
             Server:
-                - Scaleway API Gateway (fr-par-3;edge02)
+                - Scaleway API Gateway (fr-par-1;edge03)
             Strict-Transport-Security:
                 - max-age=63072000
             X-Content-Type-Options:
                 - nosniff
             X-Frame-Options:
                 - DENY
             X-Request-Id:
-                - dea17aab-1ff8-46dd-9470-14c2e8283e8d
+                - 078cf58c-49f5-4df4-b013-b81141cbee8a
         status: 204 No Content
         code: 204
-        duration: 70.680285ms
+        duration: 69.571016ms
diff --git a/core/testing_recorder.go b/core/testing_recorder.go
@@ -20,17 +20,13 @@ func cassetteRequestFilter(i *cassette.Interaction) error {
 	delete(i.Request.Headers, "X-Auth-Token")
 	orgIDRegex := regexp.MustCompile(`(.+)organization_id=[0-9a-f-]{36}(.+)`)
 	tokenRegex := regexp.MustCompile(`^https://api\.scaleway\.com/account/v1/tokens/[0-9a-f-]{36}$`)
-	accessKeyRegex := regexp.MustCompile(`(.+)?SCW[0-9A-Z]{17}(.+)?`)
 
 	i.Request.URL = orgIDRegex.ReplaceAllString(
 		i.Request.URL,
 		"${1}organization_id=11111111-1111-1111-1111-111111111111${2}")
 	i.Request.URL = tokenRegex.ReplaceAllString(
 		i.Request.URL,
 		"api.scaleway.com/account/v1/tokens/11111111-1111-1111-1111-111111111111")
-	i.Request.URL = accessKeyRegex.ReplaceAllString(
-		i.Request.URL,
-		"${1}SCWXXXXXXXXXXXXXXXXX${2}")
 
 	return nil
 }
@@ -69,6 +65,10 @@ func cassetteMatcher(r *http.Request, i cassette.Request) bool {
 	r.URL.Path = regexp.MustCompile(`pack\.local/builder/[0-9a-f]{20}`).
 		ReplaceAllString(r.URL.Path, "pack.local/builder/11111111111111111111")
 
+	r.URL.RawQuery = regexp.MustCompile(`(.+)?SCW[0-9A-Z]{17}(.+)?`).ReplaceAllString(
+		r.URL.RawQuery,
+		"${1}SCWXXXXXXXXXXXXXXXXX${2}")
+
 	// Read body
 	if r.Body != nil && r.Body != http.NoBody {
 		reqBody, err := io.ReadAll(r.Body)
