Add PublicKey field to S3 all CRUD actions

fastly/fastly_test.go

@@ -290,6 +290,68 @@ wMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N
 `
 }
 
+// pgpPublicKeyUpdate returns a PEM encoded PGP public key suitable for testing
+// updates to the public key field.
+func pgpPublicKeyUpdate() string {
+	return `
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: OpenPGP.js v3.0.9
+Comment: https://openpgpjs.org
+
+xsFNBF7XxDYBEACwKFfEjdDsm0lmbdSEM6/RTiUNldEQIpbxIN0pK1z38Rhh
+u9VSmO0Jf/x3xTyAvFyc+D5vtxUBp0DlwILVMeTCZ6KX0Yk05hQWTqSMWk6t
+QaGXtncvmD9xaHodjuQJ9xJo+lKRhZlli9QnF/x3EcIPSb9fv8BpQRw7M/Kg
+O32vkiEV6GvAcZetgLEOy6EkFVx/Y1/kq5crP+gwFxseVcNsH8bB0tMY2maz
+TwIKzReyCSjSZn6t+TwdCFzCR6x3cLRegPRqSmpTurL+YtADrHse9hFlPmA0
+nHJFTeF96pZQr9N7Hdm/fep1Lb3fEoVgmNyNtsEgZpu8XGB+2deo9A5C9ai+
+mkSxkIqv0UDyTuJd4M7Uvt9N1LlWYxeDv2kFo1MDqZF/9LwHAhNk+tpp3zNp
+68G5OX/TL5MQoXHlkXmoTBh38sby8IeTIPgS3UhIRUj6a1+6BhoSEAIlGOog
+fPkG5ED/WK3aAUcqf8jIJWA01qW/GtwKkx4QTzDN4xYWXtgKrOyaPbpyCDFe
+RpX9idrDeoXxA+q822WWJ9P+fIZyxoPi9dyRnysC+1fLTQtw97940KnuYC0N
+yQRyn4s24gec9P1BVPS2/1HlyJZxTg3eJCtbPnyT1WbHW4P23hIQ3uChc2/x
+h6ywc36ppl7zZPtcRhRnRRrBl/7UECAzC3oewwARAQABzRVmb28gPGJhckBl
+eGFtcGxlLmNvbT7CwXUEEAEIACkFAl7XxDYGCwkHCAMCCRCyVpbnvRl/KAQV
+CAoCAxYCAQIZAQIbAwIeAQAAWwoP/0abBY3HpYbUVFGHDqDHZ7sTHPD8m6eD
+Za6lOI85ARie8Wb39a+KhoLxzo8jInizjCqXgXGLy8tL0sZA5s/K52k9dTPx
+lwEjaldH8EeEgHBc9FgUK65MbJMEGXXZRKXescvb5vMu5sroHkC0kDY5sPEP
++rUk4PrgJ0VoOvBulXW/NCaOvaocUuYk5xENp9lUeHSSdDZKh2GJ5Ewbd5uG
+BRUhby/QBAd7RAjgJDhC8l//RY9J1QjO693b/WBSJUrgvf8AgO24C7K5r1YE
+P64hdSPWQO5ErDPPDqfdUVEWfyZh5flYdwJjk0hS5AGSSjdkKg/mxucb3DXJ
+KXWY6In1Ws6Zu3TUqHW714Y0gKOmWYUaRjwvDCZ3+4xJ3FhCriL6IPAex9Dl
+lIm7BgylkD2Q+KEm9pDUxTI35UBrmZ1Q89I/EjjUqd1qeoZ88p4YSC+9/RPA
+9G03tLCjXvs9G224gxfMas2lhz6gsQIBZ77HDYwfbCAcWgLCD3S3KspfYqs+
+M2JTnK5V8+FdRBYJvOj9q+qg9YUTtXYZ6+cEhG/I+6HZt2V6GIOa0vxzJTCk
+ITiJqpitX6II0qkh0XpqWMFzoflTEVJxPJBYyHjPDK35pZkoEfvYBBAwoVF8
+M6HiP9Eh3xBZbxRToJvAX3frwydyHJoxrZ0gx1/ht8LP3xsPlrP5zsFNBF7X
+xDYBEAC4DHAZOhrp2wa8/v1p+uWdE9egUkscCkmFQUNzde5eIuFoGGv5ggi4
+EPrj9JxO0S0J+UVCGL4rr0WxbalOSGRe1pgiBK2AIcYtMkESfRQQ7E0H1gCq
+TvcimJ9U+NdkFrZfcIu0I/0Pf5Ml+afhl9FXecEwTPG8Ff06nu62PjhABwsx
+8wnNhzjXM+xv74ElalccYV8TqWkdJCSc+tKcHXPT0VClWzdwwyfqgozP+5qQ
+1Cj9OFGki3KMOn4kD9cX4zS6oC+hj+TIQzh3HIKSLsTDLLg+U0X8+qtYuX3I
+2Fi/YLjpIlT/oYlHJlxozbAedLl9NPXmqmxnTEWhsqW1LmjLPwiCxP8plh2b
+19QUEmQI48yyp6oWbiBnx0aeXLkSv/LwZ5UJJS+ia8aaN5WiipXZKXgvurS0
+2+STGTeD1vEjoQCAKzk35gaz2cTfVZsFcG3ISgccQO3eGE/6+pl0ZpCw2OIs
+WOQpnkuAaUkl7fMpLV/D1l660Hz8YmimKppxEow28vXinPt/nOUVjaCOeevJ
+IGbjYUBFChu9Oykxg/ZaLRM7OTCe95+TCawcuuJnIXtVekisOE7lRUj/yhx4
+cgfVuHtUxg7s+ssmkizV+T9bCpJj3UnUwaVpxPXjGfM1mn+X98xmFMh4zj9U
+UESh9N7/EtnwAynAbsdfT/kT+McV3QARAQABwsFfBBgBCAATBQJe18Q2CRCy
+VpbnvRl/KAIbDAAA5IwP+QEO6IOJLhr+XmDWLU+FSptWsuMNvWUiHq7wTfD2
+70GmBFbdGX5QHtyg4CrbdnfAfjeifhqZYtLNDjLSEDeQDAPX5l+NnUEq6Luh
++ljFdaEFirVA2OCesK1zZ9utF4ZegI9Zukn92OSFYqmEKhhAIH3MaRhZZxQq
+3cyXkw0fg2pPkn6PKcDSyLE7RwQMX6+P8X6u/t6kOcWyBJxK4OuJCB2sjFQo
+Nphey2TwKv2swJC4mxbHL0S771HelGN+Ske64G5fAxrIEBc+drKtNHlnCZ30
+0NRVPzkJGD6dM9WgMyfm/d80YAsnckHGy6WuZ0mQrKiUOoN4vib+tEGnmd+r
+K/3afuGq/Shc0tiUFzEKGAUbzaSeWKO6ZgYYGnpxryr1/AEr5z3sPERk3Dm0
++jJ8wIrBBAxUDtuU2TxFRZvvFihrsvMFjBEzEjWNfJRTL7vCBRqR5Qem95tj
+fofwzzgSSgf0mlHmyCvhY2Vcr0ozX9oucPJX90cBoWkRqLNCntOuSZSeFUys
+IKGV3nYnpXB+VNYozayIoAhP/yVLO7DTibYbzpHgDe3fBG6NKBkQBenHCHpi
+BA/4Ob0YNQ6SmKTFS4fIKbMMCnCVgLhMOSyeebVbAuvhP7V6lFdHC9agRXKh
+4P1Y4fC/E3SHa+YSCvO4Usl7BoZnKjSULjaeLqeXnlIM
+=Wto9
+-----END PGP PUBLIC KEY BLOCK-----
+`
+}
+
 // privatekey returns a ASN.1 DER encoded key suitable for testing.
 func privateKey() string {
 	return `-----BEGIN PRIVATE KEY-----

fastly/fixtures/s3s/cleanup.yaml

@@ -6,13 +6,13 @@ interactions:
     form: {}
     headers:
       User-Agent:
-      - FastlyGo/1.4.0 (+github.com/fastly/go-fastly; go1.12.5)
-    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/6/logging/s3/test-s3
+      - FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
+    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/18/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 6 }''"}'
+      version =\u003e 18 }''"}'
     headers:
       Accept-Ranges:
       - bytes
@@ -22,11 +22,11 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Tue, 11 Feb 2020 22:23:42 GMT
+      - Wed, 03 Jun 2020 15:42:17 GMT
       Fastly-Ratelimit-Remaining:
-      - "993"
+      - "976"
       Fastly-Ratelimit-Reset:
-      - "1581462000"
+      - "1591200000"
       Status:
       - 404 Not Found
       Strict-Transport-Security:
@@ -41,9 +41,9 @@ interactions:
       X-Cache-Hits:
       - 0, 0
       X-Served-By:
-      - cache-control-slwdc9037-CONTROL-SLWDC, cache-sea4454-SEA
+      - cache-control-slwdc9037-CONTROL-SLWDC, cache-dca17746-DCA
       X-Timer:
-      - S1581459822.291131,VS0,VE209
+      - S1591198937.111254,VS0,VE93
     status: 404 Not Found
     code: 404
     duration: ""
@@ -52,13 +52,13 @@ interactions:
     form: {}
     headers:
       User-Agent:
-      - FastlyGo/1.4.0 (+github.com/fastly/go-fastly; go1.12.5)
-    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/6/logging/s3/new-test-s3
+      - FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
+    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/18/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 6 }''"}'
+      version =\u003e 18 }''"}'
     headers:
       Accept-Ranges:
       - bytes
@@ -68,11 +68,11 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Tue, 11 Feb 2020 22:23:42 GMT
+      - Wed, 03 Jun 2020 15:42:17 GMT
       Fastly-Ratelimit-Remaining:
-      - "992"
+      - "975"
       Fastly-Ratelimit-Reset:
-      - "1581462000"
+      - "1591200000"
       Status:
       - 404 Not Found
       Strict-Transport-Security:
@@ -87,9 +87,9 @@ interactions:
       X-Cache-Hits:
       - 0, 0
       X-Served-By:
-      - cache-control-slwdc9035-CONTROL-SLWDC, cache-sea4454-SEA
+      - cache-control-slwdc9037-CONTROL-SLWDC, cache-dca17746-DCA
       X-Timer:
-      - S1581459823.524575,VS0,VE214
+      - S1591198937.233589,VS0,VE102
     status: 404 Not Found
     code: 404
     duration: ""

fastly/fixtures/s3s/create.yaml

@@ -2,12 +2,12 @@
 version: 1
 interactions:
 - request:
-    body: Service=7i6HN3TK9wS159v2gPAZ8A&Version=6&access_key=AKIAIOSFODNN7EXAMPLE&bucket_name=bucket-name&domain=s3.us-east-1.amazonaws.com&format=format&format_version=2&gzip_level=9&message_type=classic&name=test-s3&path=%2Fpath&period=12&placement=waf_debug&redundancy=reduced_redundancy&secret_key=wJalrXUtnFEMI%2FK7MDENG%2FbPxRfiCYEXAMPLEKEY&server_side_encryption=aws%3Akms&server_side_encryption_kms_key_id=1234&timestamp_format=%25Y
+    body: Service=7i6HN3TK9wS159v2gPAZ8A&Version=18&access_key=AKIAIOSFODNN7EXAMPLE&bucket_name=bucket-name&domain=s3.us-east-1.amazonaws.com&format=format&format_version=2&gzip_level=9&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&timestamp_format=%25Y
     form:
       Service:
       - 7i6HN3TK9wS159v2gPAZ8A
       Version:
-      - "6"
+      - "18"
       access_key:
       - AKIAIOSFODNN7EXAMPLE
       bucket_name:
@@ -30,6 +30,38 @@ interactions:
       - "12"
       placement:
       - waf_debug
+      public_key:
+      - |
+        -----BEGIN PGP PUBLIC KEY BLOCK-----
+
+        mQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/
+        ibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4
+        8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p
+        lDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn
+        dwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB
+        89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz
+        dCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6
+        vFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc
+        9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9
+        OLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX
+        SvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq
+        7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx
+        kATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG
+        M1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe
+        u6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L
+        4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF
+        ftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K
+        UEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu
+        YrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi
+        kiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb
+        DAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml
+        dYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L
+        3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c
+        FaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR
+        5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR
+        wMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N
+        =28dr
+        -----END PGP PUBLIC KEY BLOCK-----
       redundancy:
       - reduced_redundancy
       secret_key:
@@ -44,11 +76,13 @@ interactions:
       Content-Type:
       - application/x-www-form-urlencoded
       User-Agent:
-      - FastlyGo/1.4.0 (+github.com/fastly/go-fastly; go1.12.5)
-    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/6/logging/s3
+      - FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
+    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/18/logging/s3
     method: POST
   response:
-    body: '{"access_key":"AKIAIOSFODNN7EXAMPLE","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","format":"format","format_version":"2","gzip_level":"9","message_type":"classic","name":"test-s3","path":"/path","period":"12","placement":"waf_debug","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":"6","acl":null,"response_condition":"","deleted_at":null,"public_key":null,"created_at":"2020-02-11T22:23:40Z","updated_at":"2020-02-11T22:23:40Z"}'
+    body: '{"access_key":"AKIAIOSFODNN7EXAMPLE","bucket_name":"bucket-name","domain":"s3.us-east-1.amazonaws.com","format":"format","format_version":"2","gzip_level":"9","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":"18","updated_at":"2020-06-03T15:42:15Z","created_at":"2020-06-03T15:42:15Z","deleted_at":null,"acl":null,"response_condition":""}'
     headers:
       Accept-Ranges:
       - bytes
@@ -58,11 +92,11 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Tue, 11 Feb 2020 22:23:40 GMT
+      - Wed, 03 Jun 2020 15:42:15 GMT
       Fastly-Ratelimit-Remaining:
-      - "996"
+      - "979"
       Fastly-Ratelimit-Reset:
-      - "1581462000"
+      - "1591200000"
       Status:
       - 200 OK
       Strict-Transport-Security:
@@ -77,9 +111,9 @@ interactions:
       X-Cache-Hits:
       - 0, 0
       X-Served-By:
-      - cache-control-slwdc9036-CONTROL-SLWDC, cache-sea4454-SEA
+      - cache-control-slwdc9037-CONTROL-SLWDC, cache-dca17746-DCA
       X-Timer:
-      - S1581459820.129654,VS0,VE522
+      - S1591198935.415143,VS0,VE451
     status: 200 OK
     code: 200
     duration: ""

fastly/fixtures/s3s/delete.yaml

@@ -6,8 +6,8 @@ interactions:
     form: {}
     headers:
       User-Agent:
-      - FastlyGo/1.4.0 (+github.com/fastly/go-fastly; go1.12.5)
-    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/6/logging/s3/new-test-s3
+      - FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
+    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/18/logging/s3/new-test-s3
     method: DELETE
   response:
     body: '{"status":"ok"}'
@@ -20,11 +20,11 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Tue, 11 Feb 2020 22:23:42 GMT
+      - Wed, 03 Jun 2020 15:42:17 GMT
       Fastly-Ratelimit-Remaining:
-      - "994"
+      - "977"
       Fastly-Ratelimit-Reset:
-      - "1581462000"
+      - "1591200000"
       Status:
       - 200 OK
       Strict-Transport-Security:
@@ -39,9 +39,9 @@ interactions:
       X-Cache-Hits:
       - 0, 0
       X-Served-By:
-      - cache-control-slwdc9037-CONTROL-SLWDC, cache-sea4454-SEA
+      - cache-control-slwdc9035-CONTROL-SLWDC, cache-dca17746-DCA
       X-Timer:
-      - S1581459822.911958,VS0,VE354
+      - S1591198937.877806,VS0,VE204
     status: 200 OK
     code: 200
     duration: ""