From 69c340fb155861586671f6a01c5d00ef3971335f Mon Sep 17 00:00:00 2001 From: Kelly L McLaughlin Date: Fri, 2 Jun 2023 09:09:02 -0600 Subject: [PATCH] Add support for file_max_bytes field to s3 logging endpoint --- fastly/fixtures/s3s/cleanup.yaml | 60 ++++++++++++++++---------------- fastly/fixtures/s3s/create.yaml | 22 ++++++------ fastly/fixtures/s3s/create2.yaml | 22 ++++++------ fastly/fixtures/s3s/create3.yaml | 16 ++++----- fastly/fixtures/s3s/create4.yaml | 22 ++++++------ fastly/fixtures/s3s/create5.yaml | 14 ++++---- fastly/fixtures/s3s/create6.yaml | 14 ++++---- fastly/fixtures/s3s/create7.yaml | 14 ++++---- fastly/fixtures/s3s/delete.yaml | 14 ++++---- fastly/fixtures/s3s/get.yaml | 14 ++++---- fastly/fixtures/s3s/get2.yaml | 14 ++++---- fastly/fixtures/s3s/list.yaml | 20 +++++------ fastly/fixtures/s3s/update.yaml | 24 +++++++------ fastly/fixtures/s3s/update2.yaml | 18 +++++----- fastly/fixtures/s3s/update3.yaml | 18 +++++----- fastly/fixtures/s3s/update4.yaml | 18 +++++----- fastly/fixtures/s3s/update5.yaml | 18 +++++----- fastly/fixtures/s3s/update6.yaml | 16 ++++----- fastly/fixtures/s3s/version.yaml | 20 +++++------ fastly/s3.go | 5 +++ fastly/s3_test.go | 23 ++++++++++-- 21 files changed, 218 insertions(+), 188 deletions(-) diff --git a/fastly/fixtures/s3s/cleanup.yaml b/fastly/fixtures/s3s/cleanup.yaml index a72e03d7e..3dcebd83e 100644 --- a/fastly/fixtures/s3s/cleanup.yaml +++ b/fastly/fixtures/s3s/cleanup.yaml @@ -6,13 +6,13 @@ interactions: form: {} headers: User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3 method: DELETE response: body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ deleted =\u003e 0000-00-00 00:00:00, name =\u003e test-s3, service =\u003e 7i6HN3TK9wS159v2gPAZ8A, - version =\u003e 42 }''"}' + version =\u003e 157 }''"}' headers: Accept-Ranges: - bytes @@ -21,11 +21,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:49 GMT + - Mon, 12 Jun 2023 13:18:16 GMT Fastly-Ratelimit-Remaining: - - "9982" + - "982" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 404 Not Found Strict-Transport-Security: @@ -39,9 +39,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-4-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-6-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565530.553840,VS0,VE154 + - S1686575897.583119,VS0,VE107 status: 404 Not Found code: 404 duration: "" @@ -50,8 +50,8 @@ interactions: form: {} headers: User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3-3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3-3 method: DELETE response: body: '{"status":"ok"}' @@ -63,11 +63,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:49 GMT + - Mon, 12 Jun 2023 13:18:17 GMT Fastly-Ratelimit-Remaining: - - "9981" + - "981" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -81,9 +81,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-6-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-4-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565530.749809,VS0,VE211 + - S1686575897.913485,VS0,VE177 status: 200 OK code: 200 duration: "" @@ -92,8 +92,8 @@ interactions: form: {} headers: User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3-4 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3-4 method: DELETE response: body: '{"status":"ok"}' @@ -105,11 +105,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:50 GMT + - Mon, 12 Jun 2023 13:18:17 GMT Fastly-Ratelimit-Remaining: - - "9980" + - "980" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -123,9 +123,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-4-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-4-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565530.986517,VS0,VE212 + - S1686575897.317061,VS0,VE188 status: 200 OK code: 200 duration: "" @@ -134,13 +134,13 @@ interactions: form: {} headers: User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/new-test-s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/new-test-s3 method: DELETE response: body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ deleted =\u003e 0000-00-00 00:00:00, name =\u003e new-test-s3, service =\u003e 7i6HN3TK9wS159v2gPAZ8A, - version =\u003e 42 }''"}' + version =\u003e 157 }''"}' headers: Accept-Ranges: - bytes @@ -149,11 +149,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:50 GMT + - Mon, 12 Jun 2023 13:18:17 GMT Fastly-Ratelimit-Remaining: - - "9979" + - "979" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 404 Not Found Strict-Transport-Security: @@ -167,9 +167,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-6-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-4-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565530.232130,VS0,VE141 + - S1686575898.697584,VS0,VE114 status: 404 Not Found code: 404 duration: "" diff --git a/fastly/fixtures/s3s/create.yaml b/fastly/fixtures/s3s/create.yaml index d21eca28b..517cccb89 100644 --- a/fastly/fixtures/s3s/create.yaml +++ b/fastly/fixtures/s3s/create.yaml @@ -2,7 +2,7 @@ version: 1 interactions: - request: - body: access_key=AKIAIOSFODNN7EXAMPLE&acl=private&bucket_name=bucket-name&compression_codec=snappy&domain=s3.us-east-1.amazonaws.com&format=format&format_version=2&message_type=classic&name=test-s3&path=%2Fpath&period=12&placement=waf_debug&public_key=-----BEGIN+PGP+PUBLIC+KEY+BLOCK-----%0A%0AmQENBFyUD8sBCACyFnB39AuuTygseek%2BeA4fo0cgwva6%2FFSjnWq7riouQee8GgQ%2F%0AibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr%2BIZ4GVGJqs6ZJnvQcqe3xPoR4%0A8AnBfw90o32r%2FLuHf6QCJXi%2BAEu35koNlNAvLJ2B%2BKACaNB7N0EeWmqpV%2F1V2k9p%0AlDYk%2Bth7LcCuaFNGqKS%2FPrMnnMqR6VDLCjHhNx4KR79b0Twm%2F2qp6an3hyNRu8Gn%0Adwxpf1%2FBUu3JWf%2BLqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB%0A89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz%0AdCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6%0AvFFc9jxV%2FwUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc%0A9jxV%2F815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg%2BmjM3b8N7iXm9%0AOLX59fbDAWtBSldSZE22RXd3CvlFOG%2FEnKBXSjBtEqfyxYSnyOPkMPBYWGL%2FApkX%0ASvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR%2B3rv1u3aoy7%2Fs2EltAfDS3ZQIq%0A7%2FcWTLJml%2FlleeB%2FY6rPj8xqeCYhE5ahw9gsV%2FMdqatl24V9Tks30iijx0Hhw%2BGx%0AkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe%2FKY9M2yVnMHUXmAZwbG%0AM1cMI%2FNH1DjevCKdGBLcRJlhuLPKF%2FanuQENBFyUD8sBCADIpd7r7GuPd6n%2FIkxe%0Au6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y%2Fart8ip0VJ3m07L%0A4RSfSpnzqgSwdjSq5hNour2Fo%2FBzYhK7yaz2AzVSbe33R0%2BRYhb4b%2F6N%2BbKbjwGF%0AftCsqVFMH%2BPyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K%0AUEGUcTzz%2B8QGAwAra%2B0ewPXo%2FAkO%2B8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu%0AYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O%2B0F1G7ttZ2GRRgVBZPwi%0AkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV%2FwUCXJQPywIb%0ADAAKCRC6vFFc9jxV%2F9YOCACe8qmOSnKQpQfW%2BPqYOqo3dt7JyweTs3FkD6NT8Zml%0AdYy%2FvkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L%0A3Tp90NN%2BQY5WDbsGmsyk6%2B6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c%0AFaNmEfKKy%2Fr1PO20NXEG6t9t05K%2FfrHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR%0A5%2BzkkSq%2FeG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR%0AwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr%2BN%0A%3D28dr%0A-----END+PGP+PUBLIC+KEY+BLOCK-----%0A&redundancy=reduced_redundancy&secret_key=wJalrXUtnFEMI%2FK7MDENG%2FbPxRfiCYEXAMPLEKEY&server_side_encryption=aws%3Akms&server_side_encryption_kms_key_id=1234×tamp_format=%25Y + body: access_key=AKIAIOSFODNN7EXAMPLE&acl=private&bucket_name=bucket-name&compression_codec=snappy&domain=s3.us-east-1.amazonaws.com&file_max_bytes=1048576&format=format&format_version=2&message_type=classic&name=test-s3&path=%2Fpath&period=12&placement=waf_debug&public_key=-----BEGIN+PGP+PUBLIC+KEY+BLOCK-----%0A%0AmQENBFyUD8sBCACyFnB39AuuTygseek%2BeA4fo0cgwva6%2FFSjnWq7riouQee8GgQ%2F%0AibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr%2BIZ4GVGJqs6ZJnvQcqe3xPoR4%0A8AnBfw90o32r%2FLuHf6QCJXi%2BAEu35koNlNAvLJ2B%2BKACaNB7N0EeWmqpV%2F1V2k9p%0AlDYk%2Bth7LcCuaFNGqKS%2FPrMnnMqR6VDLCjHhNx4KR79b0Twm%2F2qp6an3hyNRu8Gn%0Adwxpf1%2FBUu3JWf%2BLqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB%0A89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz%0AdCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6%0AvFFc9jxV%2FwUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc%0A9jxV%2F815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg%2BmjM3b8N7iXm9%0AOLX59fbDAWtBSldSZE22RXd3CvlFOG%2FEnKBXSjBtEqfyxYSnyOPkMPBYWGL%2FApkX%0ASvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR%2B3rv1u3aoy7%2Fs2EltAfDS3ZQIq%0A7%2FcWTLJml%2FlleeB%2FY6rPj8xqeCYhE5ahw9gsV%2FMdqatl24V9Tks30iijx0Hhw%2BGx%0AkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe%2FKY9M2yVnMHUXmAZwbG%0AM1cMI%2FNH1DjevCKdGBLcRJlhuLPKF%2FanuQENBFyUD8sBCADIpd7r7GuPd6n%2FIkxe%0Au6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y%2Fart8ip0VJ3m07L%0A4RSfSpnzqgSwdjSq5hNour2Fo%2FBzYhK7yaz2AzVSbe33R0%2BRYhb4b%2F6N%2BbKbjwGF%0AftCsqVFMH%2BPyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K%0AUEGUcTzz%2B8QGAwAra%2B0ewPXo%2FAkO%2B8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu%0AYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O%2B0F1G7ttZ2GRRgVBZPwi%0AkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV%2FwUCXJQPywIb%0ADAAKCRC6vFFc9jxV%2F9YOCACe8qmOSnKQpQfW%2BPqYOqo3dt7JyweTs3FkD6NT8Zml%0AdYy%2FvkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L%0A3Tp90NN%2BQY5WDbsGmsyk6%2B6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c%0AFaNmEfKKy%2Fr1PO20NXEG6t9t05K%2FfrHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR%0A5%2BzkkSq%2FeG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR%0AwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr%2BN%0A%3D28dr%0A-----END+PGP+PUBLIC+KEY+BLOCK-----%0A&redundancy=reduced_redundancy&secret_key=wJalrXUtnFEMI%2FK7MDENG%2FbPxRfiCYEXAMPLEKEY&server_side_encryption=aws%3Akms&server_side_encryption_kms_key_id=1234×tamp_format=%25Y form: access_key: - AKIAIOSFODNN7EXAMPLE @@ -14,6 +14,8 @@ interactions: - snappy domain: - s3.us-east-1.amazonaws.com + file_max_bytes: + - "1048576" format: - format format_version: @@ -74,13 +76,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3 method: POST response: - body: '{"access_key":"AKIAIOSFODNN7EXAMPLE","acl":"private","bucket_name":"bucket-name","compression_codec":"snappy","domain":"s3.us-east-1.amazonaws.com","format":"format","format_version":"2","message_type":"classic","name":"test-s3","path":"/path","period":"12","placement":"waf_debug","public_key":"-----BEGIN + body: '{"access_key":"AKIAIOSFODNN7EXAMPLE","acl":"private","bucket_name":"bucket-name","compression_codec":"snappy","domain":"s3.us-east-1.amazonaws.com","file_max_bytes":1048576,"format":"format","format_version":"2","message_type":"classic","name":"test-s3","path":"/path","period":"12","placement":"waf_debug","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","redundancy":"reduced_redundancy","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","server_side_encryption":"aws:kms","server_side_encryption_kms_key_id":"1234","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"42","created_at":"2022-11-04T12:38:43Z","updated_at":"2022-11-04T12:38:43Z","deleted_at":null,"response_condition":"","gzip_level":"0","iam_role":null}' + PGP PUBLIC KEY BLOCK-----\n","redundancy":"reduced_redundancy","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","server_side_encryption":"aws:kms","server_side_encryption_kms_key_id":"1234","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"157","created_at":"2023-06-12T13:18:09Z","deleted_at":null,"iam_role":null,"updated_at":"2023-06-12T13:18:09Z","gzip_level":"0","response_condition":""}' headers: Accept-Ranges: - bytes @@ -89,11 +91,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:44 GMT + - Mon, 12 Jun 2023 13:18:09 GMT Fastly-Ratelimit-Remaining: - - "9996" + - "996" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -107,9 +109,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-5-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-4-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565524.557041,VS0,VE450 + - S1686575889.353101,VS0,VE438 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/create2.yaml b/fastly/fixtures/s3s/create2.yaml index 5ccc8cdfa..2db01ce3b 100644 --- a/fastly/fixtures/s3s/create2.yaml +++ b/fastly/fixtures/s3s/create2.yaml @@ -2,7 +2,7 @@ version: 1 interactions: - request: - body: access_key=AKIAIOSFODNN7EXAMPLE&acl=authenticated-read&bucket_name=bucket-name&domain=s3.us-east-1.amazonaws.com&format=format&format_version=2&gzip_level=8&message_type=classic&name=test-s3-2&path=%2Fpath&period=12&placement=waf_debug&public_key=-----BEGIN+PGP+PUBLIC+KEY+BLOCK-----%0A%0AmQENBFyUD8sBCACyFnB39AuuTygseek%2BeA4fo0cgwva6%2FFSjnWq7riouQee8GgQ%2F%0AibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr%2BIZ4GVGJqs6ZJnvQcqe3xPoR4%0A8AnBfw90o32r%2FLuHf6QCJXi%2BAEu35koNlNAvLJ2B%2BKACaNB7N0EeWmqpV%2F1V2k9p%0AlDYk%2Bth7LcCuaFNGqKS%2FPrMnnMqR6VDLCjHhNx4KR79b0Twm%2F2qp6an3hyNRu8Gn%0Adwxpf1%2FBUu3JWf%2BLqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB%0A89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz%0AdCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6%0AvFFc9jxV%2FwUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc%0A9jxV%2F815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg%2BmjM3b8N7iXm9%0AOLX59fbDAWtBSldSZE22RXd3CvlFOG%2FEnKBXSjBtEqfyxYSnyOPkMPBYWGL%2FApkX%0ASvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR%2B3rv1u3aoy7%2Fs2EltAfDS3ZQIq%0A7%2FcWTLJml%2FlleeB%2FY6rPj8xqeCYhE5ahw9gsV%2FMdqatl24V9Tks30iijx0Hhw%2BGx%0AkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe%2FKY9M2yVnMHUXmAZwbG%0AM1cMI%2FNH1DjevCKdGBLcRJlhuLPKF%2FanuQENBFyUD8sBCADIpd7r7GuPd6n%2FIkxe%0Au6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y%2Fart8ip0VJ3m07L%0A4RSfSpnzqgSwdjSq5hNour2Fo%2FBzYhK7yaz2AzVSbe33R0%2BRYhb4b%2F6N%2BbKbjwGF%0AftCsqVFMH%2BPyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K%0AUEGUcTzz%2B8QGAwAra%2B0ewPXo%2FAkO%2B8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu%0AYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O%2B0F1G7ttZ2GRRgVBZPwi%0AkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV%2FwUCXJQPywIb%0ADAAKCRC6vFFc9jxV%2F9YOCACe8qmOSnKQpQfW%2BPqYOqo3dt7JyweTs3FkD6NT8Zml%0AdYy%2FvkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L%0A3Tp90NN%2BQY5WDbsGmsyk6%2B6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c%0AFaNmEfKKy%2Fr1PO20NXEG6t9t05K%2FfrHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR%0A5%2BzkkSq%2FeG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR%0AwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr%2BN%0A%3D28dr%0A-----END+PGP+PUBLIC+KEY+BLOCK-----%0A&redundancy=onezone_ia&secret_key=wJalrXUtnFEMI%2FK7MDENG%2FbPxRfiCYEXAMPLEKEY&server_side_encryption=aws%3Akms&server_side_encryption_kms_key_id=1234×tamp_format=%25Y + body: access_key=AKIAIOSFODNN7EXAMPLE&acl=authenticated-read&bucket_name=bucket-name&domain=s3.us-east-1.amazonaws.com&file_max_bytes=10485760&format=format&format_version=2&gzip_level=8&message_type=classic&name=test-s3-2&path=%2Fpath&period=12&placement=waf_debug&public_key=-----BEGIN+PGP+PUBLIC+KEY+BLOCK-----%0A%0AmQENBFyUD8sBCACyFnB39AuuTygseek%2BeA4fo0cgwva6%2FFSjnWq7riouQee8GgQ%2F%0AibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr%2BIZ4GVGJqs6ZJnvQcqe3xPoR4%0A8AnBfw90o32r%2FLuHf6QCJXi%2BAEu35koNlNAvLJ2B%2BKACaNB7N0EeWmqpV%2F1V2k9p%0AlDYk%2Bth7LcCuaFNGqKS%2FPrMnnMqR6VDLCjHhNx4KR79b0Twm%2F2qp6an3hyNRu8Gn%0Adwxpf1%2FBUu3JWf%2BLqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB%0A89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz%0AdCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6%0AvFFc9jxV%2FwUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc%0A9jxV%2F815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg%2BmjM3b8N7iXm9%0AOLX59fbDAWtBSldSZE22RXd3CvlFOG%2FEnKBXSjBtEqfyxYSnyOPkMPBYWGL%2FApkX%0ASvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR%2B3rv1u3aoy7%2Fs2EltAfDS3ZQIq%0A7%2FcWTLJml%2FlleeB%2FY6rPj8xqeCYhE5ahw9gsV%2FMdqatl24V9Tks30iijx0Hhw%2BGx%0AkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe%2FKY9M2yVnMHUXmAZwbG%0AM1cMI%2FNH1DjevCKdGBLcRJlhuLPKF%2FanuQENBFyUD8sBCADIpd7r7GuPd6n%2FIkxe%0Au6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y%2Fart8ip0VJ3m07L%0A4RSfSpnzqgSwdjSq5hNour2Fo%2FBzYhK7yaz2AzVSbe33R0%2BRYhb4b%2F6N%2BbKbjwGF%0AftCsqVFMH%2BPyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K%0AUEGUcTzz%2B8QGAwAra%2B0ewPXo%2FAkO%2B8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu%0AYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O%2B0F1G7ttZ2GRRgVBZPwi%0AkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV%2FwUCXJQPywIb%0ADAAKCRC6vFFc9jxV%2F9YOCACe8qmOSnKQpQfW%2BPqYOqo3dt7JyweTs3FkD6NT8Zml%0AdYy%2FvkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L%0A3Tp90NN%2BQY5WDbsGmsyk6%2B6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c%0AFaNmEfKKy%2Fr1PO20NXEG6t9t05K%2FfrHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR%0A5%2BzkkSq%2FeG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR%0AwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr%2BN%0A%3D28dr%0A-----END+PGP+PUBLIC+KEY+BLOCK-----%0A&redundancy=onezone_ia&secret_key=wJalrXUtnFEMI%2FK7MDENG%2FbPxRfiCYEXAMPLEKEY&server_side_encryption=aws%3Akms&server_side_encryption_kms_key_id=1234×tamp_format=%25Y form: access_key: - AKIAIOSFODNN7EXAMPLE @@ -12,6 +12,8 @@ interactions: - bucket-name domain: - s3.us-east-1.amazonaws.com + file_max_bytes: + - "10485760" format: - format format_version: @@ -74,13 +76,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3 method: POST response: - body: '{"access_key":"AKIAIOSFODNN7EXAMPLE","acl":"authenticated-read","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","format":"format","format_version":"2","gzip_level":"8","message_type":"classic","name":"test-s3-2","path":"/path","period":"12","placement":"waf_debug","public_key":"-----BEGIN + body: '{"access_key":"AKIAIOSFODNN7EXAMPLE","acl":"authenticated-read","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","file_max_bytes":10485760,"format":"format","format_version":"2","gzip_level":"8","message_type":"classic","name":"test-s3-2","path":"/path","period":"12","placement":"waf_debug","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","redundancy":"onezone_ia","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","server_side_encryption":"aws:kms","server_side_encryption_kms_key_id":"1234","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"42","compression_codec":null,"deleted_at":null,"created_at":"2022-11-04T12:38:44Z","updated_at":"2022-11-04T12:38:44Z","response_condition":"","iam_role":null}' + PGP PUBLIC KEY BLOCK-----\n","redundancy":"onezone_ia","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","server_side_encryption":"aws:kms","server_side_encryption_kms_key_id":"1234","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"157","compression_codec":null,"iam_role":null,"response_condition":"","created_at":"2023-06-12T13:18:09Z","updated_at":"2023-06-12T13:18:09Z","deleted_at":null}' headers: Accept-Ranges: - bytes @@ -89,11 +91,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:44 GMT + - Mon, 12 Jun 2023 13:18:10 GMT Fastly-Ratelimit-Remaining: - - "9995" + - "995" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -107,9 +109,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-7-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-5-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565524.036439,VS0,VE309 + - S1686575890.922818,VS0,VE286 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/create3.yaml b/fastly/fixtures/s3s/create3.yaml index fd416703a..cd92cd76c 100644 --- a/fastly/fixtures/s3s/create3.yaml +++ b/fastly/fixtures/s3s/create3.yaml @@ -74,13 +74,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3 method: POST response: body: '{"access_key":"AKIAIOSFODNN7EXAMPLE","acl":"bucket-owner-full-control","bucket_name":"bucket-name","compression_codec":"snappy","domain":"s3.us-east-1.amazonaws.com","format":"format","format_version":"2","message_type":"classic","name":"test-s3-3","path":"/path","period":"12","placement":"waf_debug","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","redundancy":"standard_ia","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","server_side_encryption":"aws:kms","server_side_encryption_kms_key_id":"1234","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"42","response_condition":"","updated_at":"2022-11-04T12:38:44Z","created_at":"2022-11-04T12:38:44Z","gzip_level":"0","iam_role":null,"deleted_at":null}' + PGP PUBLIC KEY BLOCK-----\n","redundancy":"standard_ia","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","server_side_encryption":"aws:kms","server_side_encryption_kms_key_id":"1234","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"157","file_max_bytes":0,"updated_at":"2023-06-12T13:18:10Z","gzip_level":"0","iam_role":null,"created_at":"2023-06-12T13:18:10Z","response_condition":"","deleted_at":null}' headers: Accept-Ranges: - bytes @@ -89,11 +89,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:44 GMT + - Mon, 12 Jun 2023 13:18:10 GMT Fastly-Ratelimit-Remaining: - - "9994" + - "994" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -107,9 +107,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-7-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-5-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565524.383854,VS0,VE333 + - S1686575890.372366,VS0,VE240 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/create4.yaml b/fastly/fixtures/s3s/create4.yaml index 45812a208..c42139c20 100644 --- a/fastly/fixtures/s3s/create4.yaml +++ b/fastly/fixtures/s3s/create4.yaml @@ -2,7 +2,7 @@ version: 1 interactions: - request: - body: bucket_name=bucket-name&compression_codec=snappy&domain=s3.us-east-1.amazonaws.com&format=format&format_version=2&iam_role=arn%3Aaws%3Aiam%3A%3A123456789012%3Arole%2FS3Access&message_type=classic&name=test-s3-4&path=%2Fpath&period=12&placement=waf_debug&public_key=-----BEGIN+PGP+PUBLIC+KEY+BLOCK-----%0A%0AmQENBFyUD8sBCACyFnB39AuuTygseek%2BeA4fo0cgwva6%2FFSjnWq7riouQee8GgQ%2F%0AibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr%2BIZ4GVGJqs6ZJnvQcqe3xPoR4%0A8AnBfw90o32r%2FLuHf6QCJXi%2BAEu35koNlNAvLJ2B%2BKACaNB7N0EeWmqpV%2F1V2k9p%0AlDYk%2Bth7LcCuaFNGqKS%2FPrMnnMqR6VDLCjHhNx4KR79b0Twm%2F2qp6an3hyNRu8Gn%0Adwxpf1%2FBUu3JWf%2BLqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB%0A89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz%0AdCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6%0AvFFc9jxV%2FwUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc%0A9jxV%2F815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg%2BmjM3b8N7iXm9%0AOLX59fbDAWtBSldSZE22RXd3CvlFOG%2FEnKBXSjBtEqfyxYSnyOPkMPBYWGL%2FApkX%0ASvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR%2B3rv1u3aoy7%2Fs2EltAfDS3ZQIq%0A7%2FcWTLJml%2FlleeB%2FY6rPj8xqeCYhE5ahw9gsV%2FMdqatl24V9Tks30iijx0Hhw%2BGx%0AkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe%2FKY9M2yVnMHUXmAZwbG%0AM1cMI%2FNH1DjevCKdGBLcRJlhuLPKF%2FanuQENBFyUD8sBCADIpd7r7GuPd6n%2FIkxe%0Au6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y%2Fart8ip0VJ3m07L%0A4RSfSpnzqgSwdjSq5hNour2Fo%2FBzYhK7yaz2AzVSbe33R0%2BRYhb4b%2F6N%2BbKbjwGF%0AftCsqVFMH%2BPyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K%0AUEGUcTzz%2B8QGAwAra%2B0ewPXo%2FAkO%2B8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu%0AYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O%2B0F1G7ttZ2GRRgVBZPwi%0AkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV%2FwUCXJQPywIb%0ADAAKCRC6vFFc9jxV%2F9YOCACe8qmOSnKQpQfW%2BPqYOqo3dt7JyweTs3FkD6NT8Zml%0AdYy%2FvkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L%0A3Tp90NN%2BQY5WDbsGmsyk6%2B6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c%0AFaNmEfKKy%2Fr1PO20NXEG6t9t05K%2FfrHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR%0A5%2BzkkSq%2FeG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR%0AwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr%2BN%0A%3D28dr%0A-----END+PGP+PUBLIC+KEY+BLOCK-----%0A&redundancy=standard&server_side_encryption=aws%3Akms&server_side_encryption_kms_key_id=1234×tamp_format=%25Y + body: bucket_name=bucket-name&compression_codec=snappy&domain=s3.us-east-1.amazonaws.com&file_max_bytes=10485760&format=format&format_version=2&iam_role=arn%3Aaws%3Aiam%3A%3A123456789012%3Arole%2FS3Access&message_type=classic&name=test-s3-4&path=%2Fpath&period=12&placement=waf_debug&public_key=-----BEGIN+PGP+PUBLIC+KEY+BLOCK-----%0A%0AmQENBFyUD8sBCACyFnB39AuuTygseek%2BeA4fo0cgwva6%2FFSjnWq7riouQee8GgQ%2F%0AibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr%2BIZ4GVGJqs6ZJnvQcqe3xPoR4%0A8AnBfw90o32r%2FLuHf6QCJXi%2BAEu35koNlNAvLJ2B%2BKACaNB7N0EeWmqpV%2F1V2k9p%0AlDYk%2Bth7LcCuaFNGqKS%2FPrMnnMqR6VDLCjHhNx4KR79b0Twm%2F2qp6an3hyNRu8Gn%0Adwxpf1%2FBUu3JWf%2BLqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB%0A89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz%0AdCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6%0AvFFc9jxV%2FwUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc%0A9jxV%2F815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg%2BmjM3b8N7iXm9%0AOLX59fbDAWtBSldSZE22RXd3CvlFOG%2FEnKBXSjBtEqfyxYSnyOPkMPBYWGL%2FApkX%0ASvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR%2B3rv1u3aoy7%2Fs2EltAfDS3ZQIq%0A7%2FcWTLJml%2FlleeB%2FY6rPj8xqeCYhE5ahw9gsV%2FMdqatl24V9Tks30iijx0Hhw%2BGx%0AkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe%2FKY9M2yVnMHUXmAZwbG%0AM1cMI%2FNH1DjevCKdGBLcRJlhuLPKF%2FanuQENBFyUD8sBCADIpd7r7GuPd6n%2FIkxe%0Au6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y%2Fart8ip0VJ3m07L%0A4RSfSpnzqgSwdjSq5hNour2Fo%2FBzYhK7yaz2AzVSbe33R0%2BRYhb4b%2F6N%2BbKbjwGF%0AftCsqVFMH%2BPyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K%0AUEGUcTzz%2B8QGAwAra%2B0ewPXo%2FAkO%2B8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu%0AYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O%2B0F1G7ttZ2GRRgVBZPwi%0AkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV%2FwUCXJQPywIb%0ADAAKCRC6vFFc9jxV%2F9YOCACe8qmOSnKQpQfW%2BPqYOqo3dt7JyweTs3FkD6NT8Zml%0AdYy%2FvkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L%0A3Tp90NN%2BQY5WDbsGmsyk6%2B6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c%0AFaNmEfKKy%2Fr1PO20NXEG6t9t05K%2FfrHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR%0A5%2BzkkSq%2FeG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR%0AwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr%2BN%0A%3D28dr%0A-----END+PGP+PUBLIC+KEY+BLOCK-----%0A&redundancy=standard&server_side_encryption=aws%3Akms&server_side_encryption_kms_key_id=1234×tamp_format=%25Y form: bucket_name: - bucket-name @@ -10,6 +10,8 @@ interactions: - snappy domain: - s3.us-east-1.amazonaws.com + file_max_bytes: + - "10485760" format: - format format_version: @@ -70,13 +72,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3 method: POST response: - body: '{"bucket_name":"bucket-name","compression_codec":"snappy","domain":"s3.us-east-1.amazonaws.com","format":"format","format_version":"2","iam_role":"arn:aws:iam::123456789012:role/S3Access","message_type":"classic","name":"test-s3-4","path":"/path","period":"12","placement":"waf_debug","public_key":"-----BEGIN + body: '{"bucket_name":"bucket-name","compression_codec":"snappy","domain":"s3.us-east-1.amazonaws.com","file_max_bytes":10485760,"format":"format","format_version":"2","iam_role":"arn:aws:iam::123456789012:role/S3Access","message_type":"classic","name":"test-s3-4","path":"/path","period":"12","placement":"waf_debug","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","redundancy":"standard","server_side_encryption":"aws:kms","server_side_encryption_kms_key_id":"1234","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"42","acl":null,"response_condition":"","created_at":"2022-11-04T12:38:45Z","access_key":null,"updated_at":"2022-11-04T12:38:45Z","gzip_level":"0","secret_key":null,"deleted_at":null}' + PGP PUBLIC KEY BLOCK-----\n","redundancy":"standard","server_side_encryption":"aws:kms","server_side_encryption_kms_key_id":"1234","timestamp_format":"%Y","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"157","deleted_at":null,"secret_key":null,"created_at":"2023-06-12T13:18:10Z","response_condition":"","updated_at":"2023-06-12T13:18:10Z","gzip_level":"0","access_key":null,"acl":null}' headers: Accept-Ranges: - bytes @@ -85,11 +87,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:45 GMT + - Mon, 12 Jun 2023 13:18:11 GMT Fastly-Ratelimit-Remaining: - - "9993" + - "993" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -103,9 +105,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-4-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-4-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565525.793726,VS0,VE445 + - S1686575891.747962,VS0,VE284 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/create5.yaml b/fastly/fixtures/s3s/create5.yaml index 6fbe41e3c..87b181749 100644 --- a/fastly/fixtures/s3s/create5.yaml +++ b/fastly/fixtures/s3s/create5.yaml @@ -74,8 +74,8 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3 method: POST response: body: '{"msg":"''iam_role'' can''t be used when ''access_key'' or ''secret_key'' @@ -88,11 +88,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:45 GMT + - Mon, 12 Jun 2023 13:18:11 GMT Fastly-Ratelimit-Remaining: - - "9992" + - "992" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 400 Bad Request Strict-Transport-Security: @@ -106,9 +106,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-4-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-4-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565525.293943,VS0,VE126 + - S1686575891.252088,VS0,VE74 status: 400 Bad Request code: 400 duration: "" diff --git a/fastly/fixtures/s3s/create6.yaml b/fastly/fixtures/s3s/create6.yaml index 4b9d3f295..fdd160632 100644 --- a/fastly/fixtures/s3s/create6.yaml +++ b/fastly/fixtures/s3s/create6.yaml @@ -70,8 +70,8 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3 method: POST response: body: '{"msg":"Duplicate record","detail":"Duplicate logging_syslog: ''test-s3''"}' @@ -83,11 +83,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:45 GMT + - Mon, 12 Jun 2023 13:18:11 GMT Fastly-Ratelimit-Remaining: - - "9991" + - "991" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 409 Conflict Strict-Transport-Security: @@ -101,9 +101,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-6-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-4-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565525.495246,VS0,VE323 + - S1686575892.508136,VS0,VE112 status: 409 Conflict code: 409 duration: "" diff --git a/fastly/fixtures/s3s/create7.yaml b/fastly/fixtures/s3s/create7.yaml index ebd880e6f..47de35663 100644 --- a/fastly/fixtures/s3s/create7.yaml +++ b/fastly/fixtures/s3s/create7.yaml @@ -74,8 +74,8 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3 method: POST response: body: '{"msg":"''compression_codec'' and ''gzip_level'' cannot be set simultaneously"}' @@ -87,11 +87,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:45 GMT + - Mon, 12 Jun 2023 13:18:11 GMT Fastly-Ratelimit-Remaining: - - "9990" + - "990" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 400 Bad Request Strict-Transport-Security: @@ -105,9 +105,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-4-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-5-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565526.846528,VS0,VE124 + - S1686575892.902196,VS0,VE75 status: 400 Bad Request code: 400 duration: "" diff --git a/fastly/fixtures/s3s/delete.yaml b/fastly/fixtures/s3s/delete.yaml index d3d5a2aa6..92bf807c7 100644 --- a/fastly/fixtures/s3s/delete.yaml +++ b/fastly/fixtures/s3s/delete.yaml @@ -6,8 +6,8 @@ interactions: form: {} headers: User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/new-test-s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/new-test-s3 method: DELETE response: body: '{"status":"ok"}' @@ -19,11 +19,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:49 GMT + - Mon, 12 Jun 2023 13:18:16 GMT Fastly-Ratelimit-Remaining: - - "9983" + - "983" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -37,9 +37,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-4-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-5-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565529.317122,VS0,VE206 + - S1686575896.316090,VS0,VE193 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/get.yaml b/fastly/fixtures/s3s/get.yaml index 1be19edc0..1c00e0882 100644 --- a/fastly/fixtures/s3s/get.yaml +++ b/fastly/fixtures/s3s/get.yaml @@ -6,13 +6,13 @@ interactions: form: {} headers: User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3 method: GET response: - body: '{"compression_codec":"snappy","period":"12","gzip_level":"0","timestamp_format":"%Y","updated_at":"2022-11-04T12:38:43Z","domain":"s3.us-east-1.amazonaws.com","public_key":"-----BEGIN + body: '{"redundancy":"reduced_redundancy","acl":"private","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","access_key":"AKIAIOSFODNN7EXAMPLE","deleted_at":null,"version":"157","service_id":"7i6HN3TK9wS159v2gPAZ8A","response_condition":"","created_at":"2023-06-12T13:18:09Z","message_type":"classic","format_version":"2","server_side_encryption_kms_key_id":"1234","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","iam_role":null,"server_side_encryption":"aws:kms","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","acl":"private","response_condition":"","access_key":"AKIAIOSFODNN7EXAMPLE","placement":"waf_debug","format_version":"2","service_id":"7i6HN3TK9wS159v2gPAZ8A","format":"format","path":"/path","message_type":"classic","iam_role":null,"server_side_encryption":"aws:kms","created_at":"2022-11-04T12:38:43Z","name":"test-s3","deleted_at":null,"redundancy":"reduced_redundancy","version":"42","bucket_name":"bucket-name","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","server_side_encryption_kms_key_id":"1234"}' + PGP PUBLIC KEY BLOCK-----\n","updated_at":"2023-06-12T13:18:09Z","gzip_level":"0","timestamp_format":"%Y","compression_codec":"snappy","placement":"waf_debug","name":"test-s3","path":"/path","format":"format","period":"12","file_max_bytes":1048576}' headers: Accept-Ranges: - bytes @@ -21,7 +21,7 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:46 GMT + - Mon, 12 Jun 2023 13:18:12 GMT Status: - 200 OK Strict-Transport-Security: @@ -35,9 +35,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-4-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-1-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565526.436130,VS0,VE299 + - S1686575893.545145,VS0,VE253 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/get2.yaml b/fastly/fixtures/s3s/get2.yaml index 8a64d92e1..30227e878 100644 --- a/fastly/fixtures/s3s/get2.yaml +++ b/fastly/fixtures/s3s/get2.yaml @@ -6,13 +6,13 @@ interactions: form: {} headers: User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3-4 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3-4 method: GET response: - body: '{"format":"format","service_id":"7i6HN3TK9wS159v2gPAZ8A","format_version":"2","access_key":null,"response_condition":"","acl":null,"placement":"waf_debug","public_key":"-----BEGIN + body: '{"bucket_name":"bucket-name","path":"/path","domain":"s3.us-east-1.amazonaws.com","deleted_at":null,"server_side_encryption_kms_key_id":"1234","server_side_encryption":"aws:kms","redundancy":"standard","format_version":"2","compression_codec":"snappy","created_at":"2023-06-12T13:18:10Z","placement":"waf_debug","message_type":"classic","access_key":null,"format":"format","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","domain":"s3.us-east-1.amazonaws.com","timestamp_format":"%Y","updated_at":"2022-11-04T12:38:45Z","gzip_level":"0","compression_codec":"snappy","period":"12","server_side_encryption_kms_key_id":"1234","secret_key":null,"bucket_name":"bucket-name","version":"42","redundancy":"standard","deleted_at":null,"name":"test-s3-4","created_at":"2022-11-04T12:38:45Z","server_side_encryption":"aws:kms","message_type":"classic","iam_role":"arn:aws:iam::123456789012:role/S3Access","path":"/path"}' + PGP PUBLIC KEY BLOCK-----\n","response_condition":"","timestamp_format":"%Y","iam_role":"arn:aws:iam::123456789012:role/S3Access","acl":null,"period":"12","service_id":"7i6HN3TK9wS159v2gPAZ8A","name":"test-s3-4","secret_key":null,"version":"157","gzip_level":"0","updated_at":"2023-06-12T13:18:10Z","file_max_bytes":10485760}' headers: Accept-Ranges: - bytes @@ -21,7 +21,7 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:46 GMT + - Mon, 12 Jun 2023 13:18:13 GMT Status: - 200 OK Strict-Transport-Security: @@ -35,9 +35,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-5-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-6-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565527.810424,VS0,VE135 + - S1686575893.961747,VS0,VE194 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/list.yaml b/fastly/fixtures/s3s/list.yaml index eb0ee9164..7197b5e1e 100644 --- a/fastly/fixtures/s3s/list.yaml +++ b/fastly/fixtures/s3s/list.yaml @@ -6,19 +6,19 @@ interactions: form: {} headers: User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3 method: GET response: - body: '[{"compression_codec":"snappy","server_side_encryption":"aws:kms","gzip_level":"0","public_key":"-----BEGIN + body: '[{"server_side_encryption_kms_key_id":"1234","created_at":"2023-06-12T13:18:09Z","file_max_bytes":1048576,"deleted_at":null,"name":"test-s3","iam_role":null,"compression_codec":"snappy","timestamp_format":"%Y","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","updated_at":"2023-06-12T13:18:09Z","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","updated_at":"2022-11-04T12:38:43Z","redundancy":"reduced_redundancy","server_side_encryption_kms_key_id":"1234","placement":"waf_debug","domain":"s3.us-east-1.amazonaws.com","name":"test-s3","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"42","created_at":"2022-11-04T12:38:43Z","message_type":"classic","access_key":"AKIAIOSFODNN7EXAMPLE","deleted_at":null,"bucket_name":"bucket-name","period":"12","format":"format","timestamp_format":"%Y","path":"/path","format_version":"2","response_condition":"","iam_role":null,"acl":"private","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"},{"public_key":"-----BEGIN + PGP PUBLIC KEY BLOCK-----\n","path":"/path","server_side_encryption":"aws:kms","version":"157","period":"12","acl":"private","placement":"waf_debug","message_type":"classic","redundancy":"reduced_redundancy","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","gzip_level":"0","response_condition":"","service_id":"7i6HN3TK9wS159v2gPAZ8A","access_key":"AKIAIOSFODNN7EXAMPLE","format":"format","format_version":"2"},{"service_id":"7i6HN3TK9wS159v2gPAZ8A","response_condition":"","access_key":"AKIAIOSFODNN7EXAMPLE","format":"format","format_version":"2","server_side_encryption":"aws:kms","period":"12","version":"157","acl":"authenticated-read","redundancy":"onezone_ia","placement":"waf_debug","message_type":"classic","gzip_level":"8","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","updated_at":"2023-06-12T13:18:09Z","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","updated_at":"2022-11-04T12:38:44Z","gzip_level":"8","server_side_encryption":"aws:kms","compression_codec":null,"version":"42","service_id":"7i6HN3TK9wS159v2gPAZ8A","placement":"waf_debug","name":"test-s3-2","domain":"s3.us-east-1.amazonaws.com","server_side_encryption_kms_key_id":"1234","redundancy":"onezone_ia","timestamp_format":"%Y","format":"format","period":"12","bucket_name":"bucket-name","deleted_at":null,"access_key":"AKIAIOSFODNN7EXAMPLE","message_type":"classic","created_at":"2022-11-04T12:38:44Z","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","acl":"authenticated-read","iam_role":null,"response_condition":"","format_version":"2","path":"/path"},{"path":"/path","format_version":"2","response_condition":"","iam_role":null,"acl":"bucket-owner-full-control","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","created_at":"2022-11-04T12:38:44Z","message_type":"classic","access_key":"AKIAIOSFODNN7EXAMPLE","deleted_at":null,"format":"format","bucket_name":"bucket-name","period":"12","timestamp_format":"%Y","redundancy":"standard_ia","server_side_encryption_kms_key_id":"1234","domain":"s3.us-east-1.amazonaws.com","name":"test-s3-3","placement":"waf_debug","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"42","compression_codec":"snappy","server_side_encryption":"aws:kms","gzip_level":"0","updated_at":"2022-11-04T12:38:44Z","public_key":"-----BEGIN + PGP PUBLIC KEY BLOCK-----\n","path":"/path","deleted_at":null,"file_max_bytes":10485760,"created_at":"2023-06-12T13:18:09Z","server_side_encryption_kms_key_id":"1234","name":"test-s3-2","iam_role":null,"timestamp_format":"%Y","compression_codec":null},{"response_condition":"","service_id":"7i6HN3TK9wS159v2gPAZ8A","format_version":"2","access_key":"AKIAIOSFODNN7EXAMPLE","format":"format","version":"157","period":"12","server_side_encryption":"aws:kms","message_type":"classic","placement":"waf_debug","redundancy":"standard_ia","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","gzip_level":"0","acl":"bucket-owner-full-control","updated_at":"2023-06-12T13:18:10Z","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","path":"/path","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n"},{"redundancy":"standard","server_side_encryption_kms_key_id":"1234","placement":"waf_debug","name":"test-s3-4","domain":"s3.us-east-1.amazonaws.com","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"42","compression_codec":"snappy","server_side_encryption":"aws:kms","gzip_level":"0","public_key":"-----BEGIN + PGP PUBLIC KEY BLOCK-----\n","name":"test-s3-3","iam_role":null,"server_side_encryption_kms_key_id":"1234","created_at":"2023-06-12T13:18:10Z","file_max_bytes":0,"deleted_at":null,"compression_codec":"snappy","timestamp_format":"%Y"},{"public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","updated_at":"2022-11-04T12:38:45Z","path":"/path","format_version":"2","response_condition":"","acl":null,"iam_role":"arn:aws:iam::123456789012:role/S3Access","secret_key":null,"created_at":"2022-11-04T12:38:45Z","message_type":"classic","access_key":null,"deleted_at":null,"bucket_name":"bucket-name","period":"12","format":"format","timestamp_format":"%Y"}]' + PGP PUBLIC KEY BLOCK-----\n","path":"/path","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","updated_at":"2023-06-12T13:18:10Z","timestamp_format":"%Y","compression_codec":"snappy","created_at":"2023-06-12T13:18:10Z","server_side_encryption_kms_key_id":"1234","deleted_at":null,"file_max_bytes":10485760,"name":"test-s3-4","iam_role":"arn:aws:iam::123456789012:role/S3Access","access_key":null,"format":"format","format_version":"2","response_condition":"","service_id":"7i6HN3TK9wS159v2gPAZ8A","acl":null,"placement":"waf_debug","message_type":"classic","redundancy":"standard","secret_key":null,"gzip_level":"0","server_side_encryption":"aws:kms","version":"157","period":"12"}]' headers: Accept-Ranges: - bytes @@ -27,7 +27,7 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:46 GMT + - Mon, 12 Jun 2023 13:18:12 GMT Status: - 200 OK Strict-Transport-Security: @@ -41,9 +41,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-4-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-4-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565526.019229,VS0,VE327 + - S1686575892.152664,VS0,VE177 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/update.yaml b/fastly/fixtures/s3s/update.yaml index b75ff5083..3ee74be00 100644 --- a/fastly/fixtures/s3s/update.yaml +++ b/fastly/fixtures/s3s/update.yaml @@ -2,10 +2,12 @@ version: 1 interactions: - request: - body: compression_codec=zstd&name=new-test-s3&public_key=%0A-----BEGIN+PGP+PUBLIC+KEY+BLOCK-----%0AVersion%3A+OpenPGP.js+v3.0.9%0AComment%3A+https%3A%2F%2Fopenpgpjs.org%0A%0AxsFNBF7XxDYBEACwKFfEjdDsm0lmbdSEM6%2FRTiUNldEQIpbxIN0pK1z38Rhh%0Au9VSmO0Jf%2Fx3xTyAvFyc%2BD5vtxUBp0DlwILVMeTCZ6KX0Yk05hQWTqSMWk6t%0AQaGXtncvmD9xaHodjuQJ9xJo%2BlKRhZlli9QnF%2Fx3EcIPSb9fv8BpQRw7M%2FKg%0AO32vkiEV6GvAcZetgLEOy6EkFVx%2FY1%2Fkq5crP%2BgwFxseVcNsH8bB0tMY2maz%0ATwIKzReyCSjSZn6t%2BTwdCFzCR6x3cLRegPRqSmpTurL%2BYtADrHse9hFlPmA0%0AnHJFTeF96pZQr9N7Hdm%2Ffep1Lb3fEoVgmNyNtsEgZpu8XGB%2B2deo9A5C9ai%2B%0AmkSxkIqv0UDyTuJd4M7Uvt9N1LlWYxeDv2kFo1MDqZF%2F9LwHAhNk%2Btpp3zNp%0A68G5OX%2FTL5MQoXHlkXmoTBh38sby8IeTIPgS3UhIRUj6a1%2B6BhoSEAIlGOog%0AfPkG5ED%2FWK3aAUcqf8jIJWA01qW%2FGtwKkx4QTzDN4xYWXtgKrOyaPbpyCDFe%0ARpX9idrDeoXxA%2Bq822WWJ9P%2BfIZyxoPi9dyRnysC%2B1fLTQtw97940KnuYC0N%0AyQRyn4s24gec9P1BVPS2%2F1HlyJZxTg3eJCtbPnyT1WbHW4P23hIQ3uChc2%2Fx%0Ah6ywc36ppl7zZPtcRhRnRRrBl%2F7UECAzC3oewwARAQABzRVmb28gPGJhckBl%0AeGFtcGxlLmNvbT7CwXUEEAEIACkFAl7XxDYGCwkHCAMCCRCyVpbnvRl%2FKAQV%0ACAoCAxYCAQIZAQIbAwIeAQAAWwoP%2F0abBY3HpYbUVFGHDqDHZ7sTHPD8m6eD%0AZa6lOI85ARie8Wb39a%2BKhoLxzo8jInizjCqXgXGLy8tL0sZA5s%2FK52k9dTPx%0AlwEjaldH8EeEgHBc9FgUK65MbJMEGXXZRKXescvb5vMu5sroHkC0kDY5sPEP%0A%2BrUk4PrgJ0VoOvBulXW%2FNCaOvaocUuYk5xENp9lUeHSSdDZKh2GJ5Ewbd5uG%0ABRUhby%2FQBAd7RAjgJDhC8l%2F%2FRY9J1QjO693b%2FWBSJUrgvf8AgO24C7K5r1YE%0AP64hdSPWQO5ErDPPDqfdUVEWfyZh5flYdwJjk0hS5AGSSjdkKg%2Fmxucb3DXJ%0AKXWY6In1Ws6Zu3TUqHW714Y0gKOmWYUaRjwvDCZ3%2B4xJ3FhCriL6IPAex9Dl%0AlIm7BgylkD2Q%2BKEm9pDUxTI35UBrmZ1Q89I%2FEjjUqd1qeoZ88p4YSC%2B9%2FRPA%0A9G03tLCjXvs9G224gxfMas2lhz6gsQIBZ77HDYwfbCAcWgLCD3S3KspfYqs%2B%0AM2JTnK5V8%2BFdRBYJvOj9q%2Bqg9YUTtXYZ6%2BcEhG%2FI%2B6HZt2V6GIOa0vxzJTCk%0AITiJqpitX6II0qkh0XpqWMFzoflTEVJxPJBYyHjPDK35pZkoEfvYBBAwoVF8%0AM6HiP9Eh3xBZbxRToJvAX3frwydyHJoxrZ0gx1%2Fht8LP3xsPlrP5zsFNBF7X%0AxDYBEAC4DHAZOhrp2wa8%2Fv1p%2BuWdE9egUkscCkmFQUNzde5eIuFoGGv5ggi4%0AEPrj9JxO0S0J%2BUVCGL4rr0WxbalOSGRe1pgiBK2AIcYtMkESfRQQ7E0H1gCq%0ATvcimJ9U%2BNdkFrZfcIu0I%2F0Pf5Ml%2Bafhl9FXecEwTPG8Ff06nu62PjhABwsx%0A8wnNhzjXM%2Bxv74ElalccYV8TqWkdJCSc%2BtKcHXPT0VClWzdwwyfqgozP%2B5qQ%0A1Cj9OFGki3KMOn4kD9cX4zS6oC%2Bhj%2BTIQzh3HIKSLsTDLLg%2BU0X8%2BqtYuX3I%0A2Fi%2FYLjpIlT%2FoYlHJlxozbAedLl9NPXmqmxnTEWhsqW1LmjLPwiCxP8plh2b%0A19QUEmQI48yyp6oWbiBnx0aeXLkSv%2FLwZ5UJJS%2Bia8aaN5WiipXZKXgvurS0%0A2%2BSTGTeD1vEjoQCAKzk35gaz2cTfVZsFcG3ISgccQO3eGE%2F6%2Bpl0ZpCw2OIs%0AWOQpnkuAaUkl7fMpLV%2FD1l660Hz8YmimKppxEow28vXinPt%2FnOUVjaCOeevJ%0AIGbjYUBFChu9Oykxg%2FZaLRM7OTCe95%2BTCawcuuJnIXtVekisOE7lRUj%2Fyhx4%0AcgfVuHtUxg7s%2BssmkizV%2BT9bCpJj3UnUwaVpxPXjGfM1mn%2BX98xmFMh4zj9U%0AUESh9N7%2FEtnwAynAbsdfT%2FkT%2BMcV3QARAQABwsFfBBgBCAATBQJe18Q2CRCy%0AVpbnvRl%2FKAIbDAAA5IwP%2BQEO6IOJLhr%2BXmDWLU%2BFSptWsuMNvWUiHq7wTfD2%0A70GmBFbdGX5QHtyg4CrbdnfAfjeifhqZYtLNDjLSEDeQDAPX5l%2BNnUEq6Luh%0A%2BljFdaEFirVA2OCesK1zZ9utF4ZegI9Zukn92OSFYqmEKhhAIH3MaRhZZxQq%0A3cyXkw0fg2pPkn6PKcDSyLE7RwQMX6%2BP8X6u%2Ft6kOcWyBJxK4OuJCB2sjFQo%0ANphey2TwKv2swJC4mxbHL0S771HelGN%2BSke64G5fAxrIEBc%2BdrKtNHlnCZ30%0A0NRVPzkJGD6dM9WgMyfm%2Fd80YAsnckHGy6WuZ0mQrKiUOoN4vib%2BtEGnmd%2Br%0AK%2F3afuGq%2FShc0tiUFzEKGAUbzaSeWKO6ZgYYGnpxryr1%2FAEr5z3sPERk3Dm0%0A%2BjJ8wIrBBAxUDtuU2TxFRZvvFihrsvMFjBEzEjWNfJRTL7vCBRqR5Qem95tj%0AfofwzzgSSgf0mlHmyCvhY2Vcr0ozX9oucPJX90cBoWkRqLNCntOuSZSeFUys%0AIKGV3nYnpXB%2BVNYozayIoAhP%2FyVLO7DTibYbzpHgDe3fBG6NKBkQBenHCHpi%0ABA%2F4Ob0YNQ6SmKTFS4fIKbMMCnCVgLhMOSyeebVbAuvhP7V6lFdHC9agRXKh%0A4P1Y4fC%2FE3SHa%2BYSCvO4Usl7BoZnKjSULjaeLqeXnlIM%0A%3DWto9%0A-----END+PGP+PUBLIC+KEY+BLOCK-----%0A + body: compression_codec=zstd&file_max_bytes=5242880&name=new-test-s3&public_key=%0A-----BEGIN+PGP+PUBLIC+KEY+BLOCK-----%0AVersion%3A+OpenPGP.js+v3.0.9%0AComment%3A+https%3A%2F%2Fopenpgpjs.org%0A%0AxsFNBF7XxDYBEACwKFfEjdDsm0lmbdSEM6%2FRTiUNldEQIpbxIN0pK1z38Rhh%0Au9VSmO0Jf%2Fx3xTyAvFyc%2BD5vtxUBp0DlwILVMeTCZ6KX0Yk05hQWTqSMWk6t%0AQaGXtncvmD9xaHodjuQJ9xJo%2BlKRhZlli9QnF%2Fx3EcIPSb9fv8BpQRw7M%2FKg%0AO32vkiEV6GvAcZetgLEOy6EkFVx%2FY1%2Fkq5crP%2BgwFxseVcNsH8bB0tMY2maz%0ATwIKzReyCSjSZn6t%2BTwdCFzCR6x3cLRegPRqSmpTurL%2BYtADrHse9hFlPmA0%0AnHJFTeF96pZQr9N7Hdm%2Ffep1Lb3fEoVgmNyNtsEgZpu8XGB%2B2deo9A5C9ai%2B%0AmkSxkIqv0UDyTuJd4M7Uvt9N1LlWYxeDv2kFo1MDqZF%2F9LwHAhNk%2Btpp3zNp%0A68G5OX%2FTL5MQoXHlkXmoTBh38sby8IeTIPgS3UhIRUj6a1%2B6BhoSEAIlGOog%0AfPkG5ED%2FWK3aAUcqf8jIJWA01qW%2FGtwKkx4QTzDN4xYWXtgKrOyaPbpyCDFe%0ARpX9idrDeoXxA%2Bq822WWJ9P%2BfIZyxoPi9dyRnysC%2B1fLTQtw97940KnuYC0N%0AyQRyn4s24gec9P1BVPS2%2F1HlyJZxTg3eJCtbPnyT1WbHW4P23hIQ3uChc2%2Fx%0Ah6ywc36ppl7zZPtcRhRnRRrBl%2F7UECAzC3oewwARAQABzRVmb28gPGJhckBl%0AeGFtcGxlLmNvbT7CwXUEEAEIACkFAl7XxDYGCwkHCAMCCRCyVpbnvRl%2FKAQV%0ACAoCAxYCAQIZAQIbAwIeAQAAWwoP%2F0abBY3HpYbUVFGHDqDHZ7sTHPD8m6eD%0AZa6lOI85ARie8Wb39a%2BKhoLxzo8jInizjCqXgXGLy8tL0sZA5s%2FK52k9dTPx%0AlwEjaldH8EeEgHBc9FgUK65MbJMEGXXZRKXescvb5vMu5sroHkC0kDY5sPEP%0A%2BrUk4PrgJ0VoOvBulXW%2FNCaOvaocUuYk5xENp9lUeHSSdDZKh2GJ5Ewbd5uG%0ABRUhby%2FQBAd7RAjgJDhC8l%2F%2FRY9J1QjO693b%2FWBSJUrgvf8AgO24C7K5r1YE%0AP64hdSPWQO5ErDPPDqfdUVEWfyZh5flYdwJjk0hS5AGSSjdkKg%2Fmxucb3DXJ%0AKXWY6In1Ws6Zu3TUqHW714Y0gKOmWYUaRjwvDCZ3%2B4xJ3FhCriL6IPAex9Dl%0AlIm7BgylkD2Q%2BKEm9pDUxTI35UBrmZ1Q89I%2FEjjUqd1qeoZ88p4YSC%2B9%2FRPA%0A9G03tLCjXvs9G224gxfMas2lhz6gsQIBZ77HDYwfbCAcWgLCD3S3KspfYqs%2B%0AM2JTnK5V8%2BFdRBYJvOj9q%2Bqg9YUTtXYZ6%2BcEhG%2FI%2B6HZt2V6GIOa0vxzJTCk%0AITiJqpitX6II0qkh0XpqWMFzoflTEVJxPJBYyHjPDK35pZkoEfvYBBAwoVF8%0AM6HiP9Eh3xBZbxRToJvAX3frwydyHJoxrZ0gx1%2Fht8LP3xsPlrP5zsFNBF7X%0AxDYBEAC4DHAZOhrp2wa8%2Fv1p%2BuWdE9egUkscCkmFQUNzde5eIuFoGGv5ggi4%0AEPrj9JxO0S0J%2BUVCGL4rr0WxbalOSGRe1pgiBK2AIcYtMkESfRQQ7E0H1gCq%0ATvcimJ9U%2BNdkFrZfcIu0I%2F0Pf5Ml%2Bafhl9FXecEwTPG8Ff06nu62PjhABwsx%0A8wnNhzjXM%2Bxv74ElalccYV8TqWkdJCSc%2BtKcHXPT0VClWzdwwyfqgozP%2B5qQ%0A1Cj9OFGki3KMOn4kD9cX4zS6oC%2Bhj%2BTIQzh3HIKSLsTDLLg%2BU0X8%2BqtYuX3I%0A2Fi%2FYLjpIlT%2FoYlHJlxozbAedLl9NPXmqmxnTEWhsqW1LmjLPwiCxP8plh2b%0A19QUEmQI48yyp6oWbiBnx0aeXLkSv%2FLwZ5UJJS%2Bia8aaN5WiipXZKXgvurS0%0A2%2BSTGTeD1vEjoQCAKzk35gaz2cTfVZsFcG3ISgccQO3eGE%2F6%2Bpl0ZpCw2OIs%0AWOQpnkuAaUkl7fMpLV%2FD1l660Hz8YmimKppxEow28vXinPt%2FnOUVjaCOeevJ%0AIGbjYUBFChu9Oykxg%2FZaLRM7OTCe95%2BTCawcuuJnIXtVekisOE7lRUj%2Fyhx4%0AcgfVuHtUxg7s%2BssmkizV%2BT9bCpJj3UnUwaVpxPXjGfM1mn%2BX98xmFMh4zj9U%0AUESh9N7%2FEtnwAynAbsdfT%2FkT%2BMcV3QARAQABwsFfBBgBCAATBQJe18Q2CRCy%0AVpbnvRl%2FKAIbDAAA5IwP%2BQEO6IOJLhr%2BXmDWLU%2BFSptWsuMNvWUiHq7wTfD2%0A70GmBFbdGX5QHtyg4CrbdnfAfjeifhqZYtLNDjLSEDeQDAPX5l%2BNnUEq6Luh%0A%2BljFdaEFirVA2OCesK1zZ9utF4ZegI9Zukn92OSFYqmEKhhAIH3MaRhZZxQq%0A3cyXkw0fg2pPkn6PKcDSyLE7RwQMX6%2BP8X6u%2Ft6kOcWyBJxK4OuJCB2sjFQo%0ANphey2TwKv2swJC4mxbHL0S771HelGN%2BSke64G5fAxrIEBc%2BdrKtNHlnCZ30%0A0NRVPzkJGD6dM9WgMyfm%2Fd80YAsnckHGy6WuZ0mQrKiUOoN4vib%2BtEGnmd%2Br%0AK%2F3afuGq%2FShc0tiUFzEKGAUbzaSeWKO6ZgYYGnpxryr1%2FAEr5z3sPERk3Dm0%0A%2BjJ8wIrBBAxUDtuU2TxFRZvvFihrsvMFjBEzEjWNfJRTL7vCBRqR5Qem95tj%0AfofwzzgSSgf0mlHmyCvhY2Vcr0ozX9oucPJX90cBoWkRqLNCntOuSZSeFUys%0AIKGV3nYnpXB%2BVNYozayIoAhP%2FyVLO7DTibYbzpHgDe3fBG6NKBkQBenHCHpi%0ABA%2F4Ob0YNQ6SmKTFS4fIKbMMCnCVgLhMOSyeebVbAuvhP7V6lFdHC9agRXKh%0A4P1Y4fC%2FE3SHa%2BYSCvO4Usl7BoZnKjSULjaeLqeXnlIM%0A%3DWto9%0A-----END+PGP+PUBLIC+KEY+BLOCK-----%0A form: compression_codec: - zstd + file_max_bytes: + - "5242880" name: - new-test-s3 public_key: @@ -70,13 +72,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3 method: PUT response: - body: '{"updated_at":"2022-11-04T12:38:43Z","public_key":"\n-----BEGIN PGP PUBLIC - KEY BLOCK-----\nVersion: OpenPGP.js v3.0.9\nComment: https://openpgpjs.org\n\n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\n=Wto9\n-----END - PGP PUBLIC KEY BLOCK-----\n","gzip_level":null,"server_side_encryption":"aws:kms","compression_codec":"zstd","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"42","server_side_encryption_kms_key_id":"1234","redundancy":"reduced_redundancy","name":"new-test-s3","domain":"s3.us-east-1.amazonaws.com","placement":"waf_debug","period":"12","bucket_name":"bucket-name","format":"format","deleted_at":null,"timestamp_format":"%Y","created_at":"2022-11-04T12:38:43Z","access_key":"AKIAIOSFODNN7EXAMPLE","message_type":"classic","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","iam_role":null,"acl":"private","format_version":"2","path":"/path","response_condition":""}' + body: '{"compression_codec":"zstd","public_key":"\n-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: + OpenPGP.js v3.0.9\nComment: https://openpgpjs.org\n\n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\n=Wto9\n-----END + PGP PUBLIC KEY BLOCK-----\n","placement":"waf_debug","bucket_name":"bucket-name","version":"157","domain":"s3.us-east-1.amazonaws.com","server_side_encryption":"aws:kms","format_version":"2","path":"/path","name":"new-test-s3","file_max_bytes":5242880,"timestamp_format":"%Y","response_condition":"","message_type":"classic","access_key":"AKIAIOSFODNN7EXAMPLE","format":"format","iam_role":null,"gzip_level":null,"secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","server_side_encryption_kms_key_id":"1234","redundancy":"reduced_redundancy","updated_at":"2023-06-12T13:18:09Z","period":"12","deleted_at":null,"acl":"private","service_id":"7i6HN3TK9wS159v2gPAZ8A","created_at":"2023-06-12T13:18:09Z"}' headers: Accept-Ranges: - bytes @@ -85,11 +87,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:47 GMT + - Mon, 12 Jun 2023 13:18:13 GMT Fastly-Ratelimit-Remaining: - - "9989" + - "989" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -103,9 +105,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-2-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-6-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565527.014518,VS0,VE505 + - S1686575893.472947,VS0,VE290 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/update2.yaml b/fastly/fixtures/s3s/update2.yaml index d9ac2b413..532911ffe 100644 --- a/fastly/fixtures/s3s/update2.yaml +++ b/fastly/fixtures/s3s/update2.yaml @@ -10,13 +10,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3-2 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3-2 method: PUT response: - body: '{"deleted_at":null,"acl":"authenticated-read","gzip_level":0,"created_at":"2022-11-04T12:38:44Z","service_id":"7i6HN3TK9wS159v2gPAZ8A","redundancy":"onezone_ia","updated_at":"2022-11-04T12:38:44Z","public_key":"-----BEGIN + body: '{"server_side_encryption":"aws:kms","version":"157","period":"12","acl":"authenticated-read","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","gzip_level":0,"placement":"waf_debug","message_type":"classic","redundancy":"onezone_ia","response_condition":"","service_id":"7i6HN3TK9wS159v2gPAZ8A","format":"format","access_key":"AKIAIOSFODNN7EXAMPLE","format_version":"2","server_side_encryption_kms_key_id":"1234","created_at":"2023-06-12T13:18:09Z","file_max_bytes":10485760,"deleted_at":null,"iam_role":null,"name":"test-s3-2","compression_codec":"zstd","timestamp_format":"%Y","domain":"s3.us-east-1.amazonaws.com","bucket_name":"bucket-name","updated_at":"2023-06-12T13:18:09Z","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","message_type":"classic","bucket_name":"bucket-name","format_version":"2","compression_codec":"zstd","name":"test-s3-2","access_key":"AKIAIOSFODNN7EXAMPLE","server_side_encryption_kms_key_id":"1234","version":"42","period":"12","format":"format","timestamp_format":"%Y","domain":"s3.us-east-1.amazonaws.com","iam_role":null,"response_condition":"","server_side_encryption":"aws:kms","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","placement":"waf_debug","path":"/path"}' + PGP PUBLIC KEY BLOCK-----\n","path":"/path"}' headers: Accept-Ranges: - bytes @@ -25,11 +25,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:47 GMT + - Mon, 12 Jun 2023 13:18:14 GMT Fastly-Ratelimit-Remaining: - - "9988" + - "988" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -43,9 +43,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-5-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-6-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565528.548741,VS0,VE368 + - S1686575894.925595,VS0,VE353 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/update3.yaml b/fastly/fixtures/s3s/update3.yaml index 2dcf6568f..f2ed8d7c1 100644 --- a/fastly/fixtures/s3s/update3.yaml +++ b/fastly/fixtures/s3s/update3.yaml @@ -10,13 +10,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3-3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3-3 method: PUT response: - body: '{"message_type":"classic","bucket_name":"bucket-name","created_at":"2022-11-04T12:38:44Z","acl":"bucket-owner-full-control","deleted_at":null,"gzip_level":"9","redundancy":"standard_ia","updated_at":"2022-11-04T12:38:44Z","service_id":"7i6HN3TK9wS159v2gPAZ8A","public_key":"-----BEGIN + body: '{"path":"/path","version":"157","file_max_bytes":0,"server_side_encryption":"aws:kms","message_type":"classic","iam_role":null,"access_key":"AKIAIOSFODNN7EXAMPLE","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","format":"format","iam_role":null,"timestamp_format":"%Y","domain":"s3.us-east-1.amazonaws.com","response_condition":"","path":"/path","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","server_side_encryption":"aws:kms","placement":"waf_debug","format_version":"2","compression_codec":null,"name":"test-s3-3","period":"12","version":"42","server_side_encryption_kms_key_id":"1234","access_key":"AKIAIOSFODNN7EXAMPLE"}' + PGP PUBLIC KEY BLOCK-----\n","service_id":"7i6HN3TK9wS159v2gPAZ8A","server_side_encryption_kms_key_id":"1234","acl":"bucket-owner-full-control","updated_at":"2023-06-12T13:18:10Z","bucket_name":"bucket-name","compression_codec":null,"deleted_at":null,"gzip_level":"9","name":"test-s3-3","created_at":"2023-06-12T13:18:10Z","domain":"s3.us-east-1.amazonaws.com","response_condition":"","period":"12","format":"format","timestamp_format":"%Y","format_version":"2","placement":"waf_debug","redundancy":"standard_ia","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"}' headers: Accept-Ranges: - bytes @@ -25,11 +25,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:48 GMT + - Mon, 12 Jun 2023 13:18:14 GMT Fastly-Ratelimit-Remaining: - - "9987" + - "987" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -43,9 +43,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-7-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-6-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565528.959664,VS0,VE334 + - S1686575895.604177,VS0,VE314 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/update4.yaml b/fastly/fixtures/s3s/update4.yaml index 5941e8f98..5d70d63e2 100644 --- a/fastly/fixtures/s3s/update4.yaml +++ b/fastly/fixtures/s3s/update4.yaml @@ -14,13 +14,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/new-test-s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/new-test-s3 method: PUT response: - body: '{"bucket_name":"bucket-name","message_type":"classic","redundancy":"reduced_redundancy","updated_at":"2022-11-04T12:38:47Z","service_id":"7i6HN3TK9wS159v2gPAZ8A","public_key":"\n-----BEGIN + body: '{"deleted_at":null,"acl":"private","service_id":"7i6HN3TK9wS159v2gPAZ8A","created_at":"2023-06-12T13:18:09Z","gzip_level":"0","secret_key":"","server_side_encryption_kms_key_id":"1234","updated_at":"2023-06-12T13:18:13Z","redundancy":"reduced_redundancy","period":"12","access_key":"","format":"format","iam_role":"arn:aws:iam::123456789012:role/S3Access","timestamp_format":"%Y","response_condition":"","message_type":"classic","format_version":"2","path":"/path","file_max_bytes":5242880,"name":"new-test-s3","bucket_name":"bucket-name","version":"157","domain":"s3.us-east-1.amazonaws.com","server_side_encryption":"aws:kms","public_key":"\n-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: OpenPGP.js v3.0.9\nComment: https://openpgpjs.org\n\n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\n=Wto9\n-----END - PGP PUBLIC KEY BLOCK-----\n","created_at":"2022-11-04T12:38:43Z","deleted_at":null,"acl":"private","gzip_level":"0","response_condition":"","path":"/path","secret_key":"","server_side_encryption":"aws:kms","placement":"waf_debug","format":"format","iam_role":"arn:aws:iam::123456789012:role/S3Access","domain":"s3.us-east-1.amazonaws.com","timestamp_format":"%Y","name":"new-test-s3","server_side_encryption_kms_key_id":"1234","version":"42","period":"12","access_key":"","format_version":"2","compression_codec":"zstd"}' + PGP PUBLIC KEY BLOCK-----\n","compression_codec":"zstd","placement":"waf_debug"}' headers: Accept-Ranges: - bytes @@ -29,11 +29,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:48 GMT + - Mon, 12 Jun 2023 13:18:15 GMT Fastly-Ratelimit-Remaining: - - "9986" + - "986" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -47,9 +47,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-5-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-5-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565528.335980,VS0,VE342 + - S1686575895.045807,VS0,VE311 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/update5.yaml b/fastly/fixtures/s3s/update5.yaml index 96e3cb91f..63236fcbc 100644 --- a/fastly/fixtures/s3s/update5.yaml +++ b/fastly/fixtures/s3s/update5.yaml @@ -14,13 +14,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3-4 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3-4 method: PUT response: - body: '{"redundancy":"standard","message_type":"classic","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","name":"test-s3-4","format_version":"2","public_key":"-----BEGIN + body: '{"format_version":"2","access_key":"AKIAIOSFODNN7EXAMPLE","format":"format","service_id":"7i6HN3TK9wS159v2gPAZ8A","response_condition":"","redundancy":"standard","message_type":"classic","placement":"waf_debug","gzip_level":"0","secret_key":"wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY","acl":null,"period":"12","version":"157","server_side_encryption":"aws:kms","path":"/path","public_key":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END - PGP PUBLIC KEY BLOCK-----\n","acl":null,"service_id":"7i6HN3TK9wS159v2gPAZ8A","format":"format","created_at":"2022-11-04T12:38:45Z","domain":"s3.us-east-1.amazonaws.com","server_side_encryption":"aws:kms","compression_codec":"snappy","deleted_at":null,"gzip_level":"0","updated_at":"2022-11-04T12:38:45Z","iam_role":"","access_key":"AKIAIOSFODNN7EXAMPLE","bucket_name":"bucket-name","placement":"waf_debug","version":"42","path":"/path","response_condition":"","server_side_encryption_kms_key_id":"1234","timestamp_format":"%Y","period":"12"}' + PGP PUBLIC KEY BLOCK-----\n","updated_at":"2023-06-12T13:18:10Z","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","timestamp_format":"%Y","compression_codec":"snappy","name":"test-s3-4","iam_role":"","file_max_bytes":10485760,"deleted_at":null,"server_side_encryption_kms_key_id":"1234","created_at":"2023-06-12T13:18:10Z"}' headers: Accept-Ranges: - bytes @@ -29,11 +29,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:49 GMT + - Mon, 12 Jun 2023 13:18:15 GMT Fastly-Ratelimit-Remaining: - - "9985" + - "985" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -47,9 +47,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-7-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-5-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565529.718759,VS0,VE317 + - S1686575896.568415,VS0,VE271 status: 200 OK code: 200 duration: "" diff --git a/fastly/fixtures/s3s/update6.yaml b/fastly/fixtures/s3s/update6.yaml index 65fe6504e..a5e1f8dc1 100644 --- a/fastly/fixtures/s3s/update6.yaml +++ b/fastly/fixtures/s3s/update6.yaml @@ -10,13 +10,13 @@ interactions: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/42/logging/s3/test-s3 + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/157/logging/s3/test-s3 method: PUT response: body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ deleted =\u003e 0000-00-00 00:00:00, name =\u003e test-s3, service =\u003e 7i6HN3TK9wS159v2gPAZ8A, - version =\u003e 42 }''"}' + version =\u003e 157 }''"}' headers: Accept-Ranges: - bytes @@ -25,11 +25,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:49 GMT + - Mon, 12 Jun 2023 13:18:16 GMT Fastly-Ratelimit-Remaining: - - "9984" + - "984" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 404 Not Found Strict-Transport-Security: @@ -43,9 +43,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-6-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-5-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565529.063191,VS0,VE228 + - S1686575896.997700,VS0,VE99 status: 404 Not Found code: 404 duration: "" diff --git a/fastly/fixtures/s3s/version.yaml b/fastly/fixtures/s3s/version.yaml index 3304d1c17..39ddaf8f6 100644 --- a/fastly/fixtures/s3s/version.yaml +++ b/fastly/fixtures/s3s/version.yaml @@ -2,19 +2,17 @@ version: 1 interactions: - request: - body: ServiceID=7i6HN3TK9wS159v2gPAZ8A - form: - ServiceID: - - 7i6HN3TK9wS159v2gPAZ8A + body: "" + form: {} headers: Content-Type: - application/x-www-form-urlencoded User-Agent: - - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15) + - FastlyGo/8.4.1 (+github.com/fastly/go-fastly; go1.20.4) url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version method: POST response: - body: '{"service_id":"7i6HN3TK9wS159v2gPAZ8A","number":42}' + body: '{"service_id":"7i6HN3TK9wS159v2gPAZ8A","number":157}' headers: Accept-Ranges: - bytes @@ -23,11 +21,11 @@ interactions: Content-Type: - application/json Date: - - Fri, 04 Nov 2022 12:38:43 GMT + - Mon, 12 Jun 2023 13:18:09 GMT Fastly-Ratelimit-Remaining: - - "9997" + - "997" Fastly-Ratelimit-Reset: - - "1667566800" + - "1686578400" Status: - 200 OK Strict-Transport-Security: @@ -41,9 +39,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - cache-control-cp-aws-us-east-1-prod-7-CONTROL-AWS, cache-man4137-MAN + - cache-control-cp-aws-us-east-2-prod-5-CONTROL-AWS-UE2, cache-dal2120127-DAL X-Timer: - - S1667565523.109520,VS0,VE399 + - S1686575889.964696,VS0,VE262 status: 200 OK code: 200 duration: "" diff --git a/fastly/s3.go b/fastly/s3.go index 930103ff5..81b1e5f8b 100644 --- a/fastly/s3.go +++ b/fastly/s3.go @@ -79,6 +79,7 @@ type S3 struct { CreatedAt *time.Time `mapstructure:"created_at"` DeletedAt *time.Time `mapstructure:"deleted_at"` Domain string `mapstructure:"domain"` + FileMaxBytes int `mapstructure:"file_max_bytes"` Format string `mapstructure:"format"` FormatVersion int `mapstructure:"format_version"` GzipLevel int `mapstructure:"gzip_level"` @@ -162,6 +163,8 @@ type CreateS3Input struct { CompressionCodec *string `url:"compression_codec,omitempty"` // Domain is the domain of the Amazon S3 endpoint. Domain *string `url:"domain,omitempty"` + // FileMaxBytes is the maximum number of bytes for each uploaded file. A value of 0 can be used to indicate there is no limit on the size of uploaded files, otherwise the minimum value is 1048576 bytes (1 MiB.). + FileMaxBytes *int `url:"file_max_bytes,omitempty"` // Format is a Fastly log format string. Format *string `url:"format,omitempty"` // FormatVersion is the version of the custom logging format used for the configured endpoint. @@ -277,6 +280,8 @@ type UpdateS3Input struct { CompressionCodec *string `url:"compression_codec,omitempty"` // Domain is the domain of the Amazon S3 endpoint. Domain *string `url:"domain,omitempty"` + // FileMaxBytes is the maximum number of bytes for each uploaded file. A value of 0 can be used to indicate there is no limit on the size of uploaded files, otherwise the minimum value is 1048576 bytes (1 MiB.). + FileMaxBytes *int `url:"file_max_bytes,omitempty"` // Format is a Fastly log format string. Format *string `url:"format,omitempty"` // FormatVersion is the version of the custom logging format used for the configured endpoint. diff --git a/fastly/s3_test.go b/fastly/s3_test.go index 9a701c46e..5e9b124f2 100644 --- a/fastly/s3_test.go +++ b/fastly/s3_test.go @@ -16,7 +16,7 @@ func TestClient_S3s(t *testing.T) { // Create // // NOTE: You can't send the API and empty ResponseCondition. - var s3CreateResp1, s3CreateResp3, s3CreateResp4 *S3 + var s3CreateResp1, s3CreateResp2, s3CreateResp3, s3CreateResp4 *S3 record(t, "s3s/create", func(c *Client) { s3CreateResp1, err = c.CreateS3(&CreateS3Input{ ServiceID: testServiceID, @@ -39,6 +39,7 @@ func TestClient_S3s(t *testing.T) { ServerSideEncryptionKMSKeyID: String("1234"), ServerSideEncryption: S3ServerSideEncryptionPtr(S3ServerSideEncryptionKMS), ACL: S3AccessControlListPtr(S3AccessControlListPrivate), + FileMaxBytes: Int(MiB), }) }) if err != nil { @@ -46,7 +47,7 @@ func TestClient_S3s(t *testing.T) { } record(t, "s3s/create2", func(c *Client) { - _, err = c.CreateS3(&CreateS3Input{ + s3CreateResp2, err = c.CreateS3(&CreateS3Input{ ServiceID: testServiceID, ServiceVersion: tv.Number, Name: String("test-s3-2"), @@ -67,6 +68,7 @@ func TestClient_S3s(t *testing.T) { ServerSideEncryptionKMSKeyID: String("1234"), ServerSideEncryption: S3ServerSideEncryptionPtr(S3ServerSideEncryptionKMS), ACL: S3AccessControlListPtr(S3AccessControlListAuthenticatedRead), + FileMaxBytes: Int(10 * MiB), }) }) if err != nil { @@ -120,6 +122,7 @@ func TestClient_S3s(t *testing.T) { PublicKey: String(pgpPublicKey()), ServerSideEncryptionKMSKeyID: String("1234"), ServerSideEncryption: S3ServerSideEncryptionPtr(S3ServerSideEncryptionKMS), + FileMaxBytes: Int(10 * MiB), }) }) if err != nil { @@ -304,6 +307,12 @@ func TestClient_S3s(t *testing.T) { if s3CreateResp1.ACL != S3AccessControlListPrivate { t.Errorf("bad acl: %s", s3CreateResp1.ACL) } + if s3CreateResp1.FileMaxBytes != MiB { + t.Errorf("bad file_max_bytes: %q", s3CreateResp1.FileMaxBytes) + } + if s3CreateResp2.FileMaxBytes != 10*MiB { + t.Errorf("bad file_max_bytes: %q", s3CreateResp2.FileMaxBytes) + } if s3CreateResp3.CompressionCodec != "snappy" { t.Errorf("bad compression_codec: %q", s3CreateResp1.CompressionCodec) } @@ -316,6 +325,9 @@ func TestClient_S3s(t *testing.T) { if s3CreateResp3.ACL != S3AccessControlListBucketOwnerFullControl { t.Errorf("bad acl: %s", s3CreateResp3.ACL) } + if s3CreateResp3.FileMaxBytes != 0 { + t.Errorf("bad file_max_bytes: %q", s3CreateResp3.FileMaxBytes) + } if s3CreateResp4.AccessKey != "" { t.Errorf("bad access_key: %q", s3CreateResp4.AccessKey) } @@ -331,6 +343,9 @@ func TestClient_S3s(t *testing.T) { if s3CreateResp4.ACL != "" { t.Errorf("bad acl: %s", s3CreateResp4.ACL) } + if s3CreateResp4.FileMaxBytes != 10*MiB { + t.Errorf("bad file_max_bytes: %q", s3CreateResp4.FileMaxBytes) + } // List var s3s []*S3 @@ -458,6 +473,7 @@ func TestClient_S3s(t *testing.T) { NewName: String("new-test-s3"), PublicKey: String(pgpPublicKeyUpdate()), CompressionCodec: String("zstd"), + FileMaxBytes: Int(5 * MiB), }) }) if err != nil { @@ -550,6 +566,9 @@ func TestClient_S3s(t *testing.T) { if s3UpdateResp1.GzipLevel != 0 { t.Errorf("bad gzip_level: %q", s3UpdateResp1.GzipLevel) } + if s3UpdateResp1.FileMaxBytes != 5*MiB { + t.Errorf("bad file_max_bytes: %q", s3UpdateResp1.FileMaxBytes) + } if s3UpdateResp2.CompressionCodec != "zstd" { t.Errorf("bad compression_codec: %q", s3UpdateResp2.CompressionCodec) }