Skip to content

Commit a121680

Browse files
committed
fix(object): change user-agent
1 parent c4b4c7e commit a121680

File tree

39 files changed

+20270
-20157
lines changed

39 files changed

+20270
-20157
lines changed

internal/services/object/helpers_object.go

+15
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,23 @@ func (r *scalewayResolver) ResolveEndpoint(ctx context.Context, params s3.Endpoi
4747
return s3.NewDefaultEndpointResolverV2().ResolveEndpoint(ctx, params)
4848
}
4949

50+
type userAgentRoundTripper struct {
51+
defaultRoundTripper http.RoundTripper
52+
userAgent string
53+
}
54+
55+
func (r *userAgentRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
56+
req.Header.Set("User-Agent", r.userAgent)
57+
58+
return r.defaultRoundTripper.RoundTrip(req)
59+
}
60+
5061
func newS3Client(ctx context.Context, region, accessKey, secretKey string, httpClient *http.Client) (*s3.Client, error) {
5162
endpoint := "https://s3." + region + ".scw.cloud"
63+
httpClient.Transport = &userAgentRoundTripper{
64+
defaultRoundTripper: httpClient.Transport,
65+
userAgent: "Scaleway Terraform Provider",
66+
}
5267
cfg, err := config.LoadDefaultConfig(ctx,
5368
config.WithRegion(region),
5469
config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(accessKey, secretKey, "")),

internal/services/object/testdata/data-source-object-bucket-basic.cassette.yaml

+1,332-1,326
Large diffs are not rendered by default.

internal/services/object/testdata/data-source-object-bucket-policy-basic.cassette.yaml

+311-309
Large diffs are not rendered by default.

internal/services/object/testdata/data-source-object-bucket-project-id-allowed.cassette.yaml

+582-580
Large diffs are not rendered by default.

internal/services/object/testdata/data-source-object-bucket-project-id-forbidden.cassette.yaml

+157-155
Large diffs are not rendered by default.

internal/services/object/testdata/object-basic.cassette.yaml

+819-819
Large diffs are not rendered by default.

internal/services/object/testdata/object-bucket-acl-basic.cassette.yaml

+398-390
Large diffs are not rendered by default.

internal/services/object/testdata/object-bucket-acl-grantee-with-owner.cassette.yaml

+215-211
Large diffs are not rendered by default.

internal/services/object/testdata/object-bucket-acl-grantee.cassette.yaml

+407-403
Large diffs are not rendered by default.

internal/services/object/testdata/object-bucket-acl-remove.cassette.yaml

+774-766
Large diffs are not rendered by default.

internal/services/object/testdata/object-bucket-acl-with-bucket-name.cassette.yaml

+327-319
Large diffs are not rendered by default.

internal/services/object/testdata/object-bucket-basic.cassette.yaml

+1,483-1,473
Large diffs are not rendered by default.

internal/services/object/testdata/object-bucket-cors-delete.cassette.yaml

+194-192
Large diffs are not rendered by default.

internal/services/object/testdata/object-bucket-cors-empty-origin.cassette.yaml

+30-28
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ interactions:
99
content_length: 0
1010
transfer_encoding: []
1111
trailer: {}
12-
host: tf-tests-scaleway-object-cors-empty-origin-4394142740433594719.s3.nl-ams.scw.cloud
12+
host: tf-tests-scaleway-object-cors-empty-origin-7036798744782526031.s3.nl-ams.scw.cloud
1313
remote_addr: ""
1414
request_uri: ""
1515
body: ""
@@ -18,16 +18,16 @@ interactions:
1818
Accept-Encoding:
1919
- identity
2020
Amz-Sdk-Invocation-Id:
21-
- 85480de2-6b52-4a23-9ae6-b0b0aa16c00d
21+
- 2db27929-f1de-4b22-ac98-cbcb5b0c185f
2222
Amz-Sdk-Request:
2323
- attempt=1; max=3
2424
User-Agent:
25-
- m/E aws-sdk-go-v2/1.32.3 os/macos lang/go#1.23.2 md/GOOS#darwin md/GOARCH#arm64 api/s3#1.66.2
25+
- Scaleway Terraform Provider
2626
X-Amz-Content-Sha256:
2727
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
2828
X-Amz-Date:
29-
- 20241210T162225Z
30-
url: https://tf-tests-scaleway-object-cors-empty-origin-4394142740433594719.s3.nl-ams.scw.cloud/
29+
- 20250210T135834Z
30+
url: https://tf-tests-scaleway-object-cors-empty-origin-7036798744782526031.s3.nl-ams.scw.cloud/
3131
method: PUT
3232
response:
3333
proto: HTTP/2.0
@@ -42,16 +42,16 @@ interactions:
4242
Content-Length:
4343
- "0"
4444
Date:
45-
- Tue, 10 Dec 2024 16:22:25 GMT
45+
- Mon, 10 Feb 2025 13:58:35 GMT
4646
Location:
47-
- /tf-tests-scaleway-object-cors-empty-origin-4394142740433594719
47+
- /tf-tests-scaleway-object-cors-empty-origin-7036798744782526031
4848
X-Amz-Id-2:
49-
- txg24b4dac137244a1f89f0-0067586ac1
49+
- txg0fc0e724da774a3983fa-0067aa060b
5050
X-Amz-Request-Id:
51-
- txg24b4dac137244a1f89f0-0067586ac1
51+
- txg0fc0e724da774a3983fa-0067aa060b
5252
status: 200 OK
5353
code: 200
54-
duration: 660.656542ms
54+
duration: 762.493708ms
5555
- id: 1
5656
request:
5757
proto: HTTP/1.1
@@ -60,7 +60,7 @@ interactions:
6060
content_length: 0
6161
transfer_encoding: []
6262
trailer: {}
63-
host: tf-tests-scaleway-object-cors-empty-origin-4394142740433594719.s3.nl-ams.scw.cloud
63+
host: tf-tests-scaleway-object-cors-empty-origin-7036798744782526031.s3.nl-ams.scw.cloud
6464
remote_addr: ""
6565
request_uri: ""
6666
body: ""
@@ -69,18 +69,20 @@ interactions:
6969
Accept-Encoding:
7070
- identity
7171
Amz-Sdk-Invocation-Id:
72-
- 4909e127-5710-48e0-9914-2a750cfd52d2
72+
- 38502a8d-5eb4-453c-9144-cae36dd27c8e
7373
Amz-Sdk-Request:
7474
- attempt=1; max=3
7575
User-Agent:
76-
- m/E aws-sdk-go-v2/1.32.3 os/macos lang/go#1.23.2 md/GOOS#darwin md/GOARCH#arm64 api/s3#1.66.2
76+
- Scaleway Terraform Provider
7777
X-Amz-Acl:
7878
- private
79+
X-Amz-Checksum-Crc32:
80+
- AAAAAA==
7981
X-Amz-Content-Sha256:
8082
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
8183
X-Amz-Date:
82-
- 20241210T162226Z
83-
url: https://tf-tests-scaleway-object-cors-empty-origin-4394142740433594719.s3.nl-ams.scw.cloud/?acl=
84+
- 20250210T135835Z
85+
url: https://tf-tests-scaleway-object-cors-empty-origin-7036798744782526031.s3.nl-ams.scw.cloud/?acl=
8486
method: PUT
8587
response:
8688
proto: HTTP/2.0
@@ -95,14 +97,14 @@ interactions:
9597
Content-Length:
9698
- "0"
9799
Date:
98-
- Tue, 10 Dec 2024 16:22:26 GMT
100+
- Mon, 10 Feb 2025 13:58:35 GMT
99101
X-Amz-Id-2:
100-
- txgcd1edfe40ca54c8b8a64-0067586ac2
102+
- txg48e430ac45a04b309424-0067aa060b
101103
X-Amz-Request-Id:
102-
- txgcd1edfe40ca54c8b8a64-0067586ac2
104+
- txg48e430ac45a04b309424-0067aa060b
103105
status: 200 OK
104106
code: 200
105-
duration: 126.430583ms
107+
duration: 164.459042ms
106108
- id: 2
107109
request:
108110
proto: HTTP/1.1
@@ -111,7 +113,7 @@ interactions:
111113
content_length: 0
112114
transfer_encoding: []
113115
trailer: {}
114-
host: tf-tests-scaleway-object-cors-empty-origin-4394142740433594719.s3.nl-ams.scw.cloud
116+
host: tf-tests-scaleway-object-cors-empty-origin-7036798744782526031.s3.nl-ams.scw.cloud
115117
remote_addr: ""
116118
request_uri: ""
117119
body: ""
@@ -120,16 +122,16 @@ interactions:
120122
Accept-Encoding:
121123
- identity
122124
Amz-Sdk-Invocation-Id:
123-
- 0160983b-335a-4521-9f19-6420036bcad0
125+
- 688ac5b2-1d02-4d6f-9070-71d679e4c754
124126
Amz-Sdk-Request:
125127
- attempt=1; max=3
126128
User-Agent:
127-
- m/E aws-sdk-go-v2/1.32.3 os/macos lang/go#1.23.2 md/GOOS#darwin md/GOARCH#arm64 api/s3#1.66.2
129+
- Scaleway Terraform Provider
128130
X-Amz-Content-Sha256:
129131
- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
130132
X-Amz-Date:
131-
- 20241210T162226Z
132-
url: https://tf-tests-scaleway-object-cors-empty-origin-4394142740433594719.s3.nl-ams.scw.cloud/
133+
- 20250210T135836Z
134+
url: https://tf-tests-scaleway-object-cors-empty-origin-7036798744782526031.s3.nl-ams.scw.cloud/
133135
method: DELETE
134136
response:
135137
proto: HTTP/2.0
@@ -142,11 +144,11 @@ interactions:
142144
body: ""
143145
headers:
144146
Date:
145-
- Tue, 10 Dec 2024 16:22:26 GMT
147+
- Mon, 10 Feb 2025 13:58:36 GMT
146148
X-Amz-Id-2:
147-
- txg8fce169d1bf5492e9279-0067586ac2
149+
- txge92899dd8b1c45c89f0f-0067aa060c
148150
X-Amz-Request-Id:
149-
- txg8fce169d1bf5492e9279-0067586ac2
151+
- txge92899dd8b1c45c89f0f-0067aa060c
150152
status: 204 No Content
151153
code: 204
152-
duration: 191.374541ms
154+
duration: 177.008959ms

0 commit comments

Comments
 (0)