Skip to content

Commit 3469680

Browse files
Mia-CrossMia-Cross
committed
fix TestCheckAPIKey
1 parent fbfd5d7 commit 3469680

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

‎core/testdata/test-check-api-key-basic.cassette.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ interactions:
1717
headers:
1818
User-Agent:
1919
- scaleway-sdk-go/v1.0.0-beta.7+dev (go1.24.1; linux; amd64) cli-e2e-test
20-
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCW2DWFM69FT5GRJARV0
20+
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
2121
method: GET
2222
response:
2323
proto: HTTP/2.0
@@ -36,7 +36,7 @@ interactions:
3636
Content-Type:
3737
- application/json
3838
Date:
39-
- Wed, 06 Aug 2025 18:36:56 GMT
39+
- Thu, 07 Aug 2025 13:42:47 GMT
4040
Server:
4141
- Scaleway API Gateway (fr-par-3;edge02)
4242
Strict-Transport-Security:
@@ -46,10 +46,10 @@ interactions:
4646
X-Frame-Options:
4747
- DENY
4848
X-Request-Id:
49-
- ee728da1-59aa-42dc-90f3-3fb27c43b4a7
49+
- 24b5e550-70fe-4efa-8fcc-6c470623e1d3
5050
status: 200 OK
5151
code: 200
52-
duration: 263.424341ms
52+
duration: 250.591893ms
5353
- id: 1
5454
request:
5555
proto: HTTP/1.1
@@ -61,7 +61,7 @@ interactions:
6161
host: api.scaleway.com
6262
remote_addr: ""
6363
request_uri: ""
64-
body: '{"access_key":"SCWN8XYH10FBMF8K2BXR", "secret_key":"11111111-1111-1111-1111-111111111111", "description":"test-cli-TestCheckAPIKey", "created_at":"2025-08-06T18:36:56.366513Z", "updated_at":"2025-08-06T18:36:56.366513Z", "expires_at":"2025-08-06T19:36:56.292041Z", "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"}'
64+
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"}'
6565
form: {}
6666
headers:
6767
Content-Type:
@@ -78,7 +78,7 @@ interactions:
7878
trailer: {}
7979
content_length: 457
8080
uncompressed: false
81-
body: '{"access_key":"SCWN8XYH10FBMF8K2BXR", "secret_key":"11111111-1111-1111-1111-111111111111", "description":"test-cli-TestCheckAPIKey", "created_at":"2025-08-06T18:36:56.366513Z", "updated_at":"2025-08-06T18:36:56.366513Z", "expires_at":"2025-08-06T19:36:56.292041Z", "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"}'
81+
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"}'
8282
headers:
8383
Content-Length:
8484
- "457"
@@ -87,7 +87,7 @@ interactions:
8787
Content-Type:
8888
- application/json
8989
Date:
90-
- Wed, 06 Aug 2025 18:36:56 GMT
90+
- Thu, 07 Aug 2025 13:42:47 GMT
9191
Server:
9292
- Scaleway API Gateway (fr-par-3;edge02)
9393
Strict-Transport-Security:
@@ -97,10 +97,10 @@ interactions:
9797
X-Frame-Options:
9898
- DENY
9999
X-Request-Id:
100-
- e40d9432-aa17-4dc7-947a-4fc29bcd7958
100+
- d63c5db0-f502-4fa0-b0d0-9cf73c4a4d86
101101
status: 200 OK
102102
code: 200
103-
duration: 100.968822ms
103+
duration: 86.259571ms
104104
- id: 2
105105
request:
106106
proto: HTTP/1.1
@@ -112,12 +112,12 @@ interactions:
112112
host: api.scaleway.com
113113
remote_addr: ""
114114
request_uri: ""
115-
body: '{"access_key":"SCWN8XYH10FBMF8K2BXR", "secret_key":null, "description":"test-cli-TestCheckAPIKey", "created_at":"2025-08-06T18:36:56.366513Z", "updated_at":"2025-08-06T18:36:56.366513Z", "expires_at":"2025-08-06T19:36:56.292041Z", "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"}'
115+
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"}'
116116
form: {}
117117
headers:
118118
User-Agent:
119119
- scaleway-sdk-go/v1.0.0-beta.7+dev (go1.24.1; linux; amd64) scaleway-cli/0.0.0+test
120-
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWN8XYH10FBMF8K2BXR
120+
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
121121
method: GET
122122
response:
123123
proto: HTTP/2.0
@@ -127,7 +127,7 @@ interactions:
127127
trailer: {}
128128
content_length: 423
129129
uncompressed: false
130-
body: '{"access_key":"SCWN8XYH10FBMF8K2BXR", "secret_key":null, "description":"test-cli-TestCheckAPIKey", "created_at":"2025-08-06T18:36:56.366513Z", "updated_at":"2025-08-06T18:36:56.366513Z", "expires_at":"2025-08-06T19:36:56.292041Z", "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"}'
130+
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"}'
131131
headers:
132132
Content-Length:
133133
- "423"
@@ -136,7 +136,7 @@ interactions:
136136
Content-Type:
137137
- application/json
138138
Date:
139-
- Wed, 06 Aug 2025 18:36:56 GMT
139+
- Thu, 07 Aug 2025 13:42:47 GMT
140140
Server:
141141
- Scaleway API Gateway (fr-par-3;edge02)
142142
Strict-Transport-Security:
@@ -146,10 +146,10 @@ interactions:
146146
X-Frame-Options:
147147
- DENY
148148
X-Request-Id:
149-
- f734475b-5c13-43dc-9ef1-09643587f023
149+
- 3480e36b-cd93-4a29-8a74-10b8062c5da0
150150
status: 200 OK
151151
code: 200
152-
duration: 56.639979ms
152+
duration: 53.637556ms
153153
- id: 3
154154
request:
155155
proto: HTTP/1.1
@@ -166,7 +166,7 @@ interactions:
166166
headers:
167167
User-Agent:
168168
- scaleway-sdk-go/v1.0.0-beta.7+dev (go1.24.1; linux; amd64) cli-e2e-test
169-
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWN8XYH10FBMF8K2BXR
169+
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
170170
method: DELETE
171171
response:
172172
proto: HTTP/2.0
@@ -183,17 +183,17 @@ interactions:
183183
Content-Type:
184184
- application/json
185185
Date:
186-
- Wed, 06 Aug 2025 18:37:38 GMT
186+
- Thu, 07 Aug 2025 13:42:47 GMT
187187
Server:
188-
- Scaleway API Gateway (fr-par-3;edge03)
188+
- Scaleway API Gateway (fr-par-3;edge02)
189189
Strict-Transport-Security:
190190
- max-age=63072000
191191
X-Content-Type-Options:
192192
- nosniff
193193
X-Frame-Options:
194194
- DENY
195195
X-Request-Id:
196-
- a54e53b3-2240-4721-88c0-962114af3e48
196+
- dea17aab-1ff8-46dd-9470-14c2e8283e8d
197197
status: 204 No Content
198198
code: 204
199-
duration: 163.801034ms
199+
duration: 70.680285ms

‎core/testing_recorder.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@ func cassetteRequestFilter(i *cassette.Interaction) error {
2020
delete(i.Request.Headers, "X-Auth-Token")
2121
orgIDRegex := regexp.MustCompile(`(.+)organization_id=[0-9a-f-]{36}(.+)`)
2222
tokenRegex := regexp.MustCompile(`^https://api\.scaleway\.com/account/v1/tokens/[0-9a-f-]{36}$`)
23+
accessKeyRegex := regexp.MustCompile(`(.+)?SCW[0-9A-Z]{17}(.+)?`)
2324

2425
i.Request.URL = orgIDRegex.ReplaceAllString(
2526
i.Request.URL,
2627
"${1}organization_id=11111111-1111-1111-1111-111111111111${2}")
2728
i.Request.URL = tokenRegex.ReplaceAllString(
2829
i.Request.URL,
2930
"api.scaleway.com/account/v1/tokens/11111111-1111-1111-1111-111111111111")
31+
i.Request.URL = accessKeyRegex.ReplaceAllString(
32+
i.Request.URL,
33+
"${1}SCWXXXXXXXXXXXXXXXXX${2}")
3034

3135
return nil
3236
}

0 commit comments

Comments
 (0)