Skip to content

Commit 6ae4cf1

Browse files
sethvargosethvargo
committed
Add format_version argument
Relates to hashicorp/terraform#11640
1 parent 5679605 commit 6ae4cf1

File tree

7 files changed

+68
-66
lines changed

7 files changed

+68
-66
lines changed

‎fixtures/s3s/cleanup.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ interactions:
66
form: {}
77
headers:
88
Fastly-Key:
9-
- d631487398e146a8593ddd71d384c7e6
9+
- 2d150df799bdabefa664a2182f85820a
1010
User-Agent:
11-
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.6.2)
12-
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/607/logging/s3/test-s3
11+
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8rc2)
12+
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/615/logging/s3/test-s3
1313
method: DELETE
1414
response:
15-
body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ version =>
16-
607, name => test-s3, deleted => 0000-00-00 00:00:00, service => 7i6HN3TK9wS159v2gPAZ8A
17-
}''"}'
15+
body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ version =\u003e
16+
615, name =\u003e test-s3, deleted =\u003e 0000-00-00 00:00:00, service =\u003e
17+
7i6HN3TK9wS159v2gPAZ8A }''"}'
1818
headers:
1919
Accept-Ranges:
2020
- bytes
@@ -23,11 +23,11 @@ interactions:
2323
Content-Type:
2424
- application/json
2525
Date:
26-
- Wed, 29 Jun 2016 22:27:46 GMT
26+
- Sat, 04 Feb 2017 17:03:14 GMT
2727
Fastly-Ratelimit-Remaining:
28-
- "879"
28+
- "995"
2929
Fastly-Ratelimit-Reset:
30-
- "1467241200"
30+
- "1486231200"
3131
Status:
3232
- 404 Not Found
3333
Vary:
@@ -40,23 +40,23 @@ interactions:
4040
X-Cache-Hits:
4141
- 0, 0
4242
X-Served-By:
43-
- app-slwdc9051-SL, cache-ord1730-ORD
43+
- app-slwdc9050-SL, cache-iad2621-IAD
4444
status: 404 Not Found
4545
code: 404
4646
- request:
4747
body: ""
4848
form: {}
4949
headers:
5050
Fastly-Key:
51-
- d631487398e146a8593ddd71d384c7e6
51+
- 2d150df799bdabefa664a2182f85820a
5252
User-Agent:
53-
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.6.2)
54-
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/607/logging/s3/new-test-s3
53+
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8rc2)
54+
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/615/logging/s3/new-test-s3
5555
method: DELETE
5656
response:
57-
body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ version =>
58-
607, name => new-test-s3, deleted => 0000-00-00 00:00:00, service => 7i6HN3TK9wS159v2gPAZ8A
59-
}''"}'
57+
body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ version =\u003e
58+
615, name =\u003e new-test-s3, deleted =\u003e 0000-00-00 00:00:00, service
59+
=\u003e 7i6HN3TK9wS159v2gPAZ8A }''"}'
6060
headers:
6161
Accept-Ranges:
6262
- bytes
@@ -65,11 +65,11 @@ interactions:
6565
Content-Type:
6666
- application/json
6767
Date:
68-
- Wed, 29 Jun 2016 22:27:47 GMT
68+
- Sat, 04 Feb 2017 17:03:14 GMT
6969
Fastly-Ratelimit-Remaining:
70-
- "877"
70+
- "994"
7171
Fastly-Ratelimit-Reset:
72-
- "1467241200"
72+
- "1486231200"
7373
Status:
7474
- 404 Not Found
7575
Vary:
@@ -82,6 +82,6 @@ interactions:
8282
X-Cache-Hits:
8383
- 0, 0
8484
X-Served-By:
85-
- app-slwdc9051-SL, cache-ord1730-ORD
85+
- app-slwdc9050-SL, cache-iad2621-IAD
8686
status: 404 Not Found
8787
code: 404

‎fixtures/s3s/create.yaml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
version: 1
33
interactions:
44
- request:
5-
body: Service=7i6HN3TK9wS159v2gPAZ8A&Version=607&access_key=access_key&bucket_name=bucket-name&domain=s3-website-us-west-2.amazonaws.com&format=format&gzip_level=9&name=test-s3&path=%2Fpath&period=12&redundancy=reduced_redundancy&secret_key=secret_key&timestamp_format=%25Y
5+
body: Service=7i6HN3TK9wS159v2gPAZ8A&Version=615&access_key=access_key&bucket_name=bucket-name&domain=s3-website-us-west-2.amazonaws.com&format=format&format_version=2&gzip_level=9&name=test-s3&path=%2Fpath&period=12&redundancy=reduced_redundancy&secret_key=secret_key&timestamp_format=%25Y
66
form:
77
Service:
88
- 7i6HN3TK9wS159v2gPAZ8A
99
Version:
10-
- "607"
10+
- "615"
1111
access_key:
1212
- access_key
1313
bucket_name:
@@ -16,6 +16,8 @@ interactions:
1616
- s3-website-us-west-2.amazonaws.com
1717
format:
1818
- format
19+
format_version:
20+
- "2"
1921
gzip_level:
2022
- "9"
2123
name:
@@ -34,13 +36,13 @@ interactions:
3436
Content-Type:
3537
- application/x-www-form-urlencoded
3638
Fastly-Key:
37-
- d631487398e146a8593ddd71d384c7e6
39+
- 2d150df799bdabefa664a2182f85820a
3840
User-Agent:
39-
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.6.2)
40-
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/607/logging/s3
41+
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8rc2)
42+
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/615/logging/s3
4143
method: POST
4244
response:
43-
body: '{"access_key":"access_key","bucket_name":"bucket-name","domain":"s3-website-us-west-2.amazonaws.com","format":"format","gzip_level":"9","name":"test-s3","path":"/path","period":"12","redundancy":"reduced_redundancy","secret_key":"secret_key","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"607","format_version":"1","response_condition":"","server_side_encryption_kms_key_id":null,"public_key":null,"updated_at":"2016-06-29T22:27:43+00:00","message_type":"classic","server_side_encryption":null,"deleted_at":null,"created_at":"2016-06-29T22:27:43+00:00"}'
45+
body: '{"access_key":"access_key","bucket_name":"bucket-name","domain":"s3-website-us-west-2.amazonaws.com","format":"format","format_version":"2","gzip_level":"9","name":"test-s3","path":"/path","period":"12","redundancy":"reduced_redundancy","secret_key":"secret_key","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"615","placement":null,"response_condition":"","server_side_encryption_kms_key_id":null,"public_key":null,"updated_at":"2017-02-04T17:03:12+00:00","message_type":"classic","server_side_encryption":null,"deleted_at":null,"created_at":"2017-02-04T17:03:12+00:00"}'
4446
headers:
4547
Accept-Ranges:
4648
- bytes
@@ -51,11 +53,11 @@ interactions:
5153
Content-Type:
5254
- application/json
5355
Date:
54-
- Wed, 29 Jun 2016 22:27:43 GMT
56+
- Sat, 04 Feb 2017 17:03:13 GMT
5557
Fastly-Ratelimit-Remaining:
56-
- "895"
58+
- "998"
5759
Fastly-Ratelimit-Reset:
58-
- "1467241200"
60+
- "1486231200"
5961
Status:
6062
- 200 OK
6163
Vary:
@@ -68,6 +70,6 @@ interactions:
6870
X-Cache-Hits:
6971
- 0, 0
7072
X-Served-By:
71-
- app-slwdc9051-SL, cache-ord1728-ORD
73+
- app-slwdc9051-SL, cache-iad2621-IAD
7274
status: 200 OK
7375
code: 200

‎fixtures/s3s/delete.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ interactions:
66
form: {}
77
headers:
88
Fastly-Key:
9-
- d631487398e146a8593ddd71d384c7e6
9+
- 2d150df799bdabefa664a2182f85820a
1010
User-Agent:
11-
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.6.2)
12-
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/607/logging/s3/new-test-s3
11+
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8rc2)
12+
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/615/logging/s3/new-test-s3
1313
method: DELETE
1414
response:
1515
body: '{"status":"ok"}'
@@ -23,11 +23,11 @@ interactions:
2323
Content-Type:
2424
- application/json
2525
Date:
26-
- Wed, 29 Jun 2016 22:27:46 GMT
26+
- Sat, 04 Feb 2017 17:03:14 GMT
2727
Fastly-Ratelimit-Remaining:
28-
- "882"
28+
- "996"
2929
Fastly-Ratelimit-Reset:
30-
- "1467241200"
30+
- "1486231200"
3131
Status:
3232
- 200 OK
3333
Vary:
@@ -40,6 +40,6 @@ interactions:
4040
X-Cache-Hits:
4141
- 0, 0
4242
X-Served-By:
43-
- app-slwdc9050-SL, cache-ord1730-ORD
43+
- app-slwdc9050-SL, cache-iad2621-IAD
4444
status: 200 OK
4545
code: 200

‎fixtures/s3s/get.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ interactions:
66
form: {}
77
headers:
88
Fastly-Key:
9-
- d631487398e146a8593ddd71d384c7e6
9+
- 2d150df799bdabefa664a2182f85820a
1010
User-Agent:
11-
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.6.2)
12-
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/607/logging/s3/test-s3
11+
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8rc2)
12+
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/615/logging/s3/test-s3
1313
method: GET
1414
response:
15-
body: '{"format_version":"1","response_condition":"","gzip_level":"9","server_side_encryption_kms_key_id":null,"secret_key":"secret_key","public_key":null,"updated_at":"2016-06-29T22:27:43+00:00","message_type":"classic","period":"12","name":"test-s3","server_side_encryption":null,"bucket_name":"bucket-name","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","domain":"s3-website-us-west-2.amazonaws.com","redundancy":"reduced_redundancy","version":"607","path":"/path","deleted_at":null,"created_at":"2016-06-29T22:27:43+00:00","access_key":"access_key","format":"format"}'
15+
body: '{"placement":null,"format_version":"2","response_condition":"","gzip_level":"9","server_side_encryption_kms_key_id":null,"secret_key":"secret_key","public_key":null,"updated_at":"2017-02-04T17:03:12+00:00","message_type":"classic","period":"12","name":"test-s3","server_side_encryption":null,"bucket_name":"bucket-name","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","domain":"s3-website-us-west-2.amazonaws.com","redundancy":"reduced_redundancy","version":"615","path":"/path","deleted_at":null,"created_at":"2017-02-04T17:03:12+00:00","access_key":"access_key","format":"format"}'
1616
headers:
1717
Accept-Ranges:
1818
- bytes
@@ -25,7 +25,7 @@ interactions:
2525
Content-Type:
2626
- application/json
2727
Date:
28-
- Wed, 29 Jun 2016 22:27:44 GMT
28+
- Sat, 04 Feb 2017 17:03:13 GMT
2929
Status:
3030
- 200 OK
3131
Vary:
@@ -38,6 +38,6 @@ interactions:
3838
X-Cache-Hits:
3939
- 0, 0
4040
X-Served-By:
41-
- app-slwdc9051-SL, cache-ord1730-ORD
41+
- app-slwdc9050-SL, cache-iad2621-IAD
4242
status: 200 OK
4343
code: 200

‎fixtures/s3s/list.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ interactions:
66
form: {}
77
headers:
88
Fastly-Key:
9-
- d631487398e146a8593ddd71d384c7e6
9+
- 2d150df799bdabefa664a2182f85820a
1010
User-Agent:
11-
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.6.2)
12-
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/607/logging/s3
11+
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8rc2)
12+
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/615/logging/s3
1313
method: GET
1414
response:
15-
body: '[{"format_version":"1","response_condition":"","gzip_level":"9","server_side_encryption_kms_key_id":null,"secret_key":"secret_key","public_key":null,"updated_at":"2016-06-29T22:27:43+00:00","message_type":"classic","period":"12","name":"test-s3","server_side_encryption":null,"bucket_name":"bucket-name","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","domain":"s3-website-us-west-2.amazonaws.com","redundancy":"reduced_redundancy","version":"607","path":"/path","deleted_at":null,"created_at":"2016-06-29T22:27:43+00:00","access_key":"access_key","format":"format"}]'
15+
body: '[{"placement":null,"format_version":"2","response_condition":"","gzip_level":"9","server_side_encryption_kms_key_id":null,"secret_key":"secret_key","public_key":null,"updated_at":"2017-02-04T17:03:12+00:00","message_type":"classic","period":"12","name":"test-s3","server_side_encryption":null,"bucket_name":"bucket-name","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","domain":"s3-website-us-west-2.amazonaws.com","redundancy":"reduced_redundancy","version":"615","path":"/path","deleted_at":null,"created_at":"2017-02-04T17:03:12+00:00","access_key":"access_key","format":"format"}]'
1616
headers:
1717
Accept-Ranges:
1818
- bytes
@@ -25,7 +25,7 @@ interactions:
2525
Content-Type:
2626
- application/json
2727
Date:
28-
- Wed, 29 Jun 2016 22:27:44 GMT
28+
- Sat, 04 Feb 2017 17:03:13 GMT
2929
Status:
3030
- 200 OK
3131
Vary:
@@ -38,6 +38,6 @@ interactions:
3838
X-Cache-Hits:
3939
- 0, 0
4040
X-Served-By:
41-
- app-slwdc9051-SL, cache-ord1730-ORD
41+
- app-slwdc9051-SL, cache-iad2621-IAD
4242
status: 200 OK
4343
code: 200

‎fixtures/s3s/update.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
version: 1
33
interactions:
44
- request:
5-
body: Name=test-s3&Service=7i6HN3TK9wS159v2gPAZ8A&Version=607&name=new-test-s3
5+
body: Name=test-s3&Service=7i6HN3TK9wS159v2gPAZ8A&Version=615&name=new-test-s3
66
form:
77
Name:
88
- test-s3
99
Service:
1010
- 7i6HN3TK9wS159v2gPAZ8A
1111
Version:
12-
- "607"
12+
- "615"
1313
name:
1414
- new-test-s3
1515
headers:
1616
Content-Type:
1717
- application/x-www-form-urlencoded
1818
Fastly-Key:
19-
- d631487398e146a8593ddd71d384c7e6
19+
- 2d150df799bdabefa664a2182f85820a
2020
User-Agent:
21-
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.6.2)
22-
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/607/logging/s3/test-s3
21+
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8rc2)
22+
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/615/logging/s3/test-s3
2323
method: PUT
2424
response:
25-
body: '{"format_version":"1","response_condition":"","gzip_level":"9","server_side_encryption_kms_key_id":null,"secret_key":"secret_key","public_key":null,"updated_at":"2016-06-29T22:27:43+00:00","message_type":"classic","period":"12","name":"new-test-s3","server_side_encryption":null,"bucket_name":"bucket-name","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","domain":"s3-website-us-west-2.amazonaws.com","redundancy":"reduced_redundancy","version":"607","path":"/path","deleted_at":null,"created_at":"2016-06-29T22:27:43+00:00","access_key":"access_key","format":"format"}'
25+
body: '{"placement":null,"format_version":"2","response_condition":"","gzip_level":"9","server_side_encryption_kms_key_id":null,"secret_key":"secret_key","public_key":null,"updated_at":"2017-02-04T17:03:12+00:00","message_type":"classic","period":"12","name":"new-test-s3","server_side_encryption":null,"bucket_name":"bucket-name","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","domain":"s3-website-us-west-2.amazonaws.com","redundancy":"reduced_redundancy","version":"615","path":"/path","deleted_at":null,"created_at":"2017-02-04T17:03:12+00:00","access_key":"access_key","format":"format"}'
2626
headers:
2727
Accept-Ranges:
2828
- bytes
@@ -33,11 +33,11 @@ interactions:
3333
Content-Type:
3434
- application/json
3535
Date:
36-
- Wed, 29 Jun 2016 22:27:45 GMT
36+
- Sat, 04 Feb 2017 17:03:13 GMT
3737
Fastly-Ratelimit-Remaining:
38-
- "884"
38+
- "997"
3939
Fastly-Ratelimit-Reset:
40-
- "1467241200"
40+
- "1486231200"
4141
Status:
4242
- 200 OK
4343
Vary:
@@ -50,6 +50,6 @@ interactions:
5050
X-Cache-Hits:
5151
- 0, 0
5252
X-Served-By:
53-
- app-slwdc9050-SL, cache-ord1730-ORD
53+
- app-slwdc9050-SL, cache-iad2621-IAD
5454
status: 200 OK
5555
code: 200

‎fixtures/s3s/version.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ interactions:
66
form: {}
77
headers:
88
Fastly-Key:
9-
- d631487398e146a8593ddd71d384c7e6
9+
- 2d150df799bdabefa664a2182f85820a
1010
User-Agent:
11-
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.6.2)
11+
- FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8rc2)
1212
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version
1313
method: POST
1414
response:
15-
body: '{"service_id":"7i6HN3TK9wS159v2gPAZ8A","number":607}'
15+
body: '{"service_id":"7i6HN3TK9wS159v2gPAZ8A","number":615}'
1616
headers:
1717
Accept-Ranges:
1818
- bytes
@@ -23,11 +23,11 @@ interactions:
2323
Content-Type:
2424
- application/json
2525
Date:
26-
- Wed, 29 Jun 2016 22:27:43 GMT
26+
- Sat, 04 Feb 2017 17:03:12 GMT
2727
Fastly-Ratelimit-Remaining:
28-
- "900"
28+
- "999"
2929
Fastly-Ratelimit-Reset:
30-
- "1467241200"
30+
- "1486231200"
3131
Status:
3232
- 200 OK
3333
Vary:
@@ -40,6 +40,6 @@ interactions:
4040
X-Cache-Hits:
4141
- 0, 0
4242
X-Served-By:
43-
- app-slwdc9050-SL, cache-ord1748-ORD
43+
- app-slwdc9051-SL, cache-iad2621-IAD
4444
status: 200 OK
4545
code: 200

0 commit comments

Comments
 (0)