From 2b863da88fc1033a68538ccdc5c9dc82fa52681f Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 7 Aug 2017 12:33:08 -0400 Subject: [PATCH] Add missing syslog fields Fixes GH-49 --- CHANGELOG.md | 8 +++++-- fastly/client.go | 2 +- fastly/fixtures/syslogs/cleanup.yaml | 36 ++++++++++++++-------------- fastly/fixtures/syslogs/create.yaml | 30 +++++++++++++---------- fastly/fixtures/syslogs/delete.yaml | 16 ++++++------- fastly/fixtures/syslogs/get.yaml | 16 ++++++------- fastly/fixtures/syslogs/list.yaml | 16 ++++++------- fastly/fixtures/syslogs/update.yaml | 24 +++++++++---------- fastly/fixtures/syslogs/version.yaml | 16 ++++++------- fastly/syslog.go | 12 ++++++++++ fastly/syslog_test.go | 21 ++++++++++++++++ 11 files changed, 120 insertions(+), 77 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4bec18be..57a6caa7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,15 @@ # go-fastly CHANGELOG -## v0.3.0 (July 19, 2017) +## v0.4.1 (August 7, 2017) -- Initial tagged release +- Add `hostname`, `ipv4`, `tls_hostname`, and `message_type` to syslog [GH-49] ## v0.4.0 (July 27, 2017) FEATURES: - Add support for real-time stats [GH-48] + +## v0.3.0 (July 19, 2017) + +- Initial tagged release diff --git a/fastly/client.go b/fastly/client.go index a4cdf8dc3..bff73cce4 100644 --- a/fastly/client.go +++ b/fastly/client.go @@ -34,7 +34,7 @@ const RealtimeStatsEndpoint = "https://rt.fastly.com" var ProjectURL = "github.com/sethvargo/go-fastly" // ProjectVersion is the version of this library. -var ProjectVersion = "0.4.0" +var ProjectVersion = "0.4.1" // UserAgent is the user agent for this particular client. var UserAgent = fmt.Sprintf("FastlyGo/%s (+%s; %s)", diff --git a/fastly/fixtures/syslogs/cleanup.yaml b/fastly/fixtures/syslogs/cleanup.yaml index 8886c1f99..fe44ef4c2 100644 --- a/fastly/fixtures/syslogs/cleanup.yaml +++ b/fastly/fixtures/syslogs/cleanup.yaml @@ -7,14 +7,14 @@ interactions: form: {} headers: Fastly-Key: - - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX User-Agent: - - FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8.3) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/690/logging/syslog/test-syslog + - FastlyGo/0.4.0 (+github.com/sethvargo/go-fastly; go1.8.3) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/704/logging/syslog/test-syslog method: DELETE response: body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ version =\u003e - 690, name =\u003e test-syslog, deleted =\u003e 0000-00-00 00:00:00, service + 704, name =\u003e test-syslog, deleted =\u003e 0000-00-00 00:00:00, service =\u003e 7i6HN3TK9wS159v2gPAZ8A }''"}' headers: Accept-Ranges: @@ -24,11 +24,11 @@ interactions: Content-Type: - application/json Date: - - Thu, 20 Jul 2017 01:15:13 GMT + - Mon, 07 Aug 2017 16:30:21 GMT Fastly-Ratelimit-Remaining: - - "857" + - "985" Fastly-Ratelimit-Reset: - - "1500516000" + - "1502125200" Status: - 404 Not Found Vary: @@ -41,9 +41,9 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - app-slwdc9050-SL, cache-dca17722-DCA + - app-slwdc9051-SL, cache-den6026-DEN X-Timer: - - S1500513313.155786,VS0,VE203 + - S1502123421.405708,VS0,VE136 status: 404 Not Found code: 404 - request: @@ -51,14 +51,14 @@ interactions: form: {} headers: Fastly-Key: - - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX User-Agent: - - FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8.3) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/690/logging/syslog/new-test-syslog + - FastlyGo/0.4.0 (+github.com/sethvargo/go-fastly; go1.8.3) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/704/logging/syslog/new-test-syslog method: DELETE response: body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ version =\u003e - 690, name =\u003e new-test-syslog, deleted =\u003e 0000-00-00 00:00:00, service + 704, name =\u003e new-test-syslog, deleted =\u003e 0000-00-00 00:00:00, service =\u003e 7i6HN3TK9wS159v2gPAZ8A }''"}' headers: Accept-Ranges: @@ -68,11 +68,11 @@ interactions: Content-Type: - application/json Date: - - Thu, 20 Jul 2017 01:15:13 GMT + - Mon, 07 Aug 2017 16:30:22 GMT Fastly-Ratelimit-Remaining: - - "856" + - "984" Fastly-Ratelimit-Reset: - - "1500516000" + - "1502125200" Status: - 404 Not Found Vary: @@ -85,8 +85,8 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - app-slwdc9051-SL, cache-dca17722-DCA + - app-slwdc9051-SL, cache-den6026-DEN X-Timer: - - S1500513313.374117,VS0,VE263 + - S1502123422.403725,VS0,VE167 status: 404 Not Found code: 404 diff --git a/fastly/fixtures/syslogs/create.yaml b/fastly/fixtures/syslogs/create.yaml index 15e366037..a852c2437 100644 --- a/fastly/fixtures/syslogs/create.yaml +++ b/fastly/fixtures/syslogs/create.yaml @@ -3,18 +3,22 @@ version: 1 rwmutex: {} interactions: - request: - body: Service=7i6HN3TK9wS159v2gPAZ8A&Version=690&address=example.com&format=format&format_version=2&name=test-syslog&port=1234&tls_ca_cert=-----BEGIN+CERTIFICATE-----%0AMIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL%0AMAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC%0AVU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx%0ANDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD%0ATjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu%0AZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE%2FB7j%0AV14qeyslnr26xZUsSVko36ZnhiaO%2FzbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj%0AgbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA%0AFFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE%0ACBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS%0ABgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE%0ABQADQQA%2FugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z%2F%2BHQX67aRfgZu7KWdI%2BJu%0AWm7DCfrPNGVwFWUQOmsPue9rZBgO%0A-----END+CERTIFICATE-----&token=abcd1234&use_tls=1 + body: Service=7i6HN3TK9wS159v2gPAZ8A&Version=704&address=example.com&format=format&format_version=2&hostname=example.com&message_type=classic&name=test-syslog&port=1234&tls_ca_cert=-----BEGIN+CERTIFICATE-----%0AMIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL%0AMAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC%0AVU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx%0ANDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD%0ATjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu%0AZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE%2FB7j%0AV14qeyslnr26xZUsSVko36ZnhiaO%2FzbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj%0AgbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA%0AFFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE%0ACBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS%0ABgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE%0ABQADQQA%2FugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z%2F%2BHQX67aRfgZu7KWdI%2BJu%0AWm7DCfrPNGVwFWUQOmsPue9rZBgO%0A-----END+CERTIFICATE-----&tls_hostname=example.com&token=abcd1234&use_tls=1 form: Service: - 7i6HN3TK9wS159v2gPAZ8A Version: - - "690" + - "704" address: - example.com format: - format format_version: - "2" + hostname: + - example.com + message_type: + - classic name: - test-syslog port: @@ -36,6 +40,8 @@ interactions: BQADQQA/ugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z/+HQX67aRfgZu7KWdI+Ju Wm7DCfrPNGVwFWUQOmsPue9rZBgO -----END CERTIFICATE----- + tls_hostname: + - example.com token: - abcd1234 use_tls: @@ -44,15 +50,15 @@ interactions: Content-Type: - application/x-www-form-urlencoded Fastly-Key: - - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX User-Agent: - - FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8.3) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/690/logging/syslog + - FastlyGo/0.4.0 (+github.com/sethvargo/go-fastly; go1.8.3) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/704/logging/syslog method: POST response: - body: '{"address":"example.com","format":"format","format_version":"2","name":"test-syslog","port":"1234","tls_ca_cert":"-----BEGIN + body: '{"address":"example.com","format":"format","format_version":"2","hostname":"example.com","message_type":"classic","name":"test-syslog","port":"1234","tls_ca_cert":"-----BEGIN CERTIFICATE-----\nMIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL\nMAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC\nVU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx\nNDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD\nTjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu\nZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE/B7j\nV14qeyslnr26xZUsSVko36ZnhiaO/zbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj\ngbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA\nFFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE\nCBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS\nBgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE\nBQADQQA/ugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z/+HQX67aRfgZu7KWdI+Ju\nWm7DCfrPNGVwFWUQOmsPue9rZBgO\n-----END - CERTIFICATE-----","token":"abcd1234","use_tls":"1","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"690","placement":null,"hostname":"example.com","response_condition":"","public_key":null,"updated_at":"2017-07-20T01:15:11+00:00","message_type":"classic","ipv4":null,"tls_hostname":null,"deleted_at":null,"created_at":"2017-07-20T01:15:11+00:00"}' + CERTIFICATE-----","tls_hostname":"example.com","token":"abcd1234","use_tls":"1","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"704","placement":null,"response_condition":"","public_key":null,"updated_at":"2017-08-07T16:30:16+00:00","ipv4":null,"deleted_at":null,"created_at":"2017-08-07T16:30:16+00:00"}' headers: Accept-Ranges: - bytes @@ -61,11 +67,11 @@ interactions: Content-Type: - application/json Date: - - Thu, 20 Jul 2017 01:15:12 GMT + - Mon, 07 Aug 2017 16:30:16 GMT Fastly-Ratelimit-Remaining: - - "879" + - "988" Fastly-Ratelimit-Reset: - - "1500516000" + - "1502125200" Status: - 200 OK Vary: @@ -78,8 +84,8 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - app-slwdc9051-SL, cache-dca17722-DCA + - app-slwdc9051-SL, cache-den6026-DEN X-Timer: - - S1500513312.600962,VS0,VE565 + - S1502123416.042959,VS0,VE392 status: 200 OK code: 200 diff --git a/fastly/fixtures/syslogs/delete.yaml b/fastly/fixtures/syslogs/delete.yaml index 9651353e5..a405cb77e 100644 --- a/fastly/fixtures/syslogs/delete.yaml +++ b/fastly/fixtures/syslogs/delete.yaml @@ -7,10 +7,10 @@ interactions: form: {} headers: Fastly-Key: - - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX User-Agent: - - FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8.3) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/690/logging/syslog/new-test-syslog + - FastlyGo/0.4.0 (+github.com/sethvargo/go-fastly; go1.8.3) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/704/logging/syslog/new-test-syslog method: DELETE response: body: '{"status":"ok"}' @@ -22,11 +22,11 @@ interactions: Content-Type: - application/json Date: - - Thu, 20 Jul 2017 01:15:13 GMT + - Mon, 07 Aug 2017 16:30:20 GMT Fastly-Ratelimit-Remaining: - - "861" + - "986" Fastly-Ratelimit-Reset: - - "1500516000" + - "1502125200" Status: - 200 OK Vary: @@ -39,8 +39,8 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - app-slwdc9050-SL, cache-dca17722-DCA + - app-slwdc9051-SL, cache-den6026-DEN X-Timer: - - S1500513313.852987,VS0,VE286 + - S1502123420.355442,VS0,VE357 status: 200 OK code: 200 diff --git a/fastly/fixtures/syslogs/get.yaml b/fastly/fixtures/syslogs/get.yaml index 4e8c55a7c..3e8a8a354 100644 --- a/fastly/fixtures/syslogs/get.yaml +++ b/fastly/fixtures/syslogs/get.yaml @@ -7,15 +7,15 @@ interactions: form: {} headers: Fastly-Key: - - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX User-Agent: - - FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8.3) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/690/logging/syslog/test-syslog + - FastlyGo/0.4.0 (+github.com/sethvargo/go-fastly; go1.8.3) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/704/logging/syslog/test-syslog method: GET response: - body: '{"placement":null,"format_version":"2","hostname":"example.com","response_condition":"","address":"example.com","public_key":null,"updated_at":"2017-07-20T01:15:11+00:00","message_type":"classic","ipv4":null,"tls_hostname":null,"name":"test-syslog","port":"1234","use_tls":"1","service_id":"7i6HN3TK9wS159v2gPAZ8A","tls_ca_cert":"-----BEGIN + body: '{"placement":null,"format_version":"2","hostname":"example.com","response_condition":"","address":"example.com","public_key":null,"updated_at":"2017-08-07T16:30:16+00:00","message_type":"classic","ipv4":null,"tls_hostname":"example.com","name":"test-syslog","port":"1234","use_tls":"1","service_id":"7i6HN3TK9wS159v2gPAZ8A","tls_ca_cert":"-----BEGIN CERTIFICATE-----\nMIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL\nMAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC\nVU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx\nNDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD\nTjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu\nZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE/B7j\nV14qeyslnr26xZUsSVko36ZnhiaO/zbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj\ngbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA\nFFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE\nCBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS\nBgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE\nBQADQQA/ugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z/+HQX67aRfgZu7KWdI+Ju\nWm7DCfrPNGVwFWUQOmsPue9rZBgO\n-----END - CERTIFICATE-----","token":"abcd1234","version":"690","deleted_at":null,"created_at":"2017-07-20T01:15:11+00:00","format":"format"}' + CERTIFICATE-----","token":"abcd1234","version":"704","deleted_at":null,"created_at":"2017-08-07T16:30:16+00:00","format":"format"}' headers: Accept-Ranges: - bytes @@ -26,7 +26,7 @@ interactions: Content-Type: - application/json Date: - - Thu, 20 Jul 2017 01:15:12 GMT + - Mon, 07 Aug 2017 16:30:18 GMT Status: - 200 OK Vary: @@ -39,8 +39,8 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - app-slwdc9051-SL, cache-dca17722-DCA + - app-slwdc9051-SL, cache-den6026-DEN X-Timer: - - S1500513312.308369,VS0,VE136 + - S1502123418.156188,VS0,VE286 status: 200 OK code: 200 diff --git a/fastly/fixtures/syslogs/list.yaml b/fastly/fixtures/syslogs/list.yaml index bdeefc2b7..0bfb1baa1 100644 --- a/fastly/fixtures/syslogs/list.yaml +++ b/fastly/fixtures/syslogs/list.yaml @@ -7,15 +7,15 @@ interactions: form: {} headers: Fastly-Key: - - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX User-Agent: - - FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8.3) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/690/logging/syslog + - FastlyGo/0.4.0 (+github.com/sethvargo/go-fastly; go1.8.3) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/704/logging/syslog method: GET response: - body: '[{"placement":null,"format_version":"2","hostname":"example.com","response_condition":"","address":"example.com","public_key":null,"updated_at":"2017-07-20T01:15:11+00:00","message_type":"classic","ipv4":null,"tls_hostname":null,"name":"test-syslog","port":"1234","use_tls":"1","service_id":"7i6HN3TK9wS159v2gPAZ8A","tls_ca_cert":"-----BEGIN + body: '[{"placement":null,"format_version":"2","hostname":"example.com","response_condition":"","address":"example.com","public_key":null,"updated_at":"2017-08-07T16:30:16+00:00","message_type":"classic","ipv4":null,"tls_hostname":"example.com","name":"test-syslog","port":"1234","use_tls":"1","service_id":"7i6HN3TK9wS159v2gPAZ8A","tls_ca_cert":"-----BEGIN CERTIFICATE-----\nMIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL\nMAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC\nVU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx\nNDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD\nTjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu\nZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE/B7j\nV14qeyslnr26xZUsSVko36ZnhiaO/zbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj\ngbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA\nFFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE\nCBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS\nBgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE\nBQADQQA/ugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z/+HQX67aRfgZu7KWdI+Ju\nWm7DCfrPNGVwFWUQOmsPue9rZBgO\n-----END - CERTIFICATE-----","token":"abcd1234","version":"690","deleted_at":null,"created_at":"2017-07-20T01:15:11+00:00","format":"format"}]' + CERTIFICATE-----","token":"abcd1234","version":"704","deleted_at":null,"created_at":"2017-08-07T16:30:16+00:00","format":"format"}]' headers: Accept-Ranges: - bytes @@ -26,7 +26,7 @@ interactions: Content-Type: - application/json Date: - - Thu, 20 Jul 2017 01:15:12 GMT + - Mon, 07 Aug 2017 16:30:17 GMT Status: - 200 OK Vary: @@ -39,8 +39,8 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - app-slwdc9051-SL, cache-dca17722-DCA + - app-slwdc9051-SL, cache-den6026-DEN X-Timer: - - S1500513312.182101,VS0,VE108 + - S1502123417.121660,VS0,VE330 status: 200 OK code: 200 diff --git a/fastly/fixtures/syslogs/update.yaml b/fastly/fixtures/syslogs/update.yaml index 0010045f9..e748b2095 100644 --- a/fastly/fixtures/syslogs/update.yaml +++ b/fastly/fixtures/syslogs/update.yaml @@ -3,14 +3,14 @@ version: 1 rwmutex: {} interactions: - request: - body: Name=test-syslog&Service=7i6HN3TK9wS159v2gPAZ8A&Version=690&format_version=2&name=new-test-syslog + body: Name=test-syslog&Service=7i6HN3TK9wS159v2gPAZ8A&Version=704&format_version=2&name=new-test-syslog form: Name: - test-syslog Service: - 7i6HN3TK9wS159v2gPAZ8A Version: - - "690" + - "704" format_version: - "2" name: @@ -19,15 +19,15 @@ interactions: Content-Type: - application/x-www-form-urlencoded Fastly-Key: - - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX User-Agent: - - FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8.3) - url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/690/logging/syslog/test-syslog + - FastlyGo/0.4.0 (+github.com/sethvargo/go-fastly; go1.8.3) + url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/704/logging/syslog/test-syslog method: PUT response: - body: '{"placement":null,"format_version":"2","hostname":"example.com","response_condition":"","address":"example.com","public_key":null,"updated_at":"2017-07-20T01:15:11+00:00","message_type":"classic","ipv4":null,"tls_hostname":null,"name":"new-test-syslog","port":"1234","use_tls":"1","service_id":"7i6HN3TK9wS159v2gPAZ8A","tls_ca_cert":"-----BEGIN + body: '{"placement":null,"format_version":"2","hostname":"example.com","response_condition":"","address":"example.com","public_key":null,"updated_at":"2017-08-07T16:30:16+00:00","message_type":"classic","ipv4":null,"tls_hostname":"example.com","name":"new-test-syslog","port":"1234","use_tls":"1","service_id":"7i6HN3TK9wS159v2gPAZ8A","tls_ca_cert":"-----BEGIN CERTIFICATE-----\nMIICUTCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADBXMQswCQYDVQQGEwJDTjEL\nMAkGA1UECBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMC\nVU4xFDASBgNVBAMTC0hlcm9uZyBZYW5nMB4XDTA1MDcxNTIxMTk0N1oXDTA1MDgx\nNDIxMTk0N1owVzELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAlBOMQswCQYDVQQHEwJD\nTjELMAkGA1UEChMCT04xCzAJBgNVBAsTAlVOMRQwEgYDVQQDEwtIZXJvbmcgWWFu\nZzBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCp5hnG7ogBhtlynpOS21cBewKE/B7j\nV14qeyslnr26xZUsSVko36ZnhiaO/zbMOoRcKK9vEcgMtcLFuQTWDl3RAgMBAAGj\ngbEwga4wHQYDVR0OBBYEFFXI70krXeQDxZgbaCQoR4jUDncEMH8GA1UdIwR4MHaA\nFFXI70krXeQDxZgbaCQoR4jUDncEoVukWTBXMQswCQYDVQQGEwJDTjELMAkGA1UE\nCBMCUE4xCzAJBgNVBAcTAkNOMQswCQYDVQQKEwJPTjELMAkGA1UECxMCVU4xFDAS\nBgNVBAMTC0hlcm9uZyBZYW5nggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE\nBQADQQA/ugzBrjjK9jcWnDVfGHlk3icNRq0oV7Ri32z/+HQX67aRfgZu7KWdI+Ju\nWm7DCfrPNGVwFWUQOmsPue9rZBgO\n-----END - CERTIFICATE-----","token":"abcd1234","version":"690","deleted_at":null,"created_at":"2017-07-20T01:15:11+00:00","format":"format"}' + CERTIFICATE-----","token":"abcd1234","version":"704","deleted_at":null,"created_at":"2017-08-07T16:30:16+00:00","format":"format"}' headers: Accept-Ranges: - bytes @@ -36,11 +36,11 @@ interactions: Content-Type: - application/json Date: - - Thu, 20 Jul 2017 01:15:12 GMT + - Mon, 07 Aug 2017 16:30:19 GMT Fastly-Ratelimit-Remaining: - - "866" + - "987" Fastly-Ratelimit-Reset: - - "1500516000" + - "1502125200" Status: - 200 OK Vary: @@ -53,8 +53,8 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - app-slwdc9051-SL, cache-dca17722-DCA + - app-slwdc9051-SL, cache-den6026-DEN X-Timer: - - S1500513312.461121,VS0,VE374 + - S1502123419.235164,VS0,VE414 status: 200 OK code: 200 diff --git a/fastly/fixtures/syslogs/version.yaml b/fastly/fixtures/syslogs/version.yaml index 6f26cd204..07c4951f6 100644 --- a/fastly/fixtures/syslogs/version.yaml +++ b/fastly/fixtures/syslogs/version.yaml @@ -7,13 +7,13 @@ interactions: form: {} headers: Fastly-Key: - - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX User-Agent: - - FastlyGo/0.2 (+github.com/sethvargo/go-fastly; go1.8.3) + - FastlyGo/0.4.0 (+github.com/sethvargo/go-fastly; go1.8.3) url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version method: POST response: - body: '{"service_id":"7i6HN3TK9wS159v2gPAZ8A","number":690}' + body: '{"service_id":"7i6HN3TK9wS159v2gPAZ8A","number":704}' headers: Accept-Ranges: - bytes @@ -22,11 +22,11 @@ interactions: Content-Type: - application/json Date: - - Thu, 20 Jul 2017 01:15:11 GMT + - Mon, 07 Aug 2017 16:30:15 GMT Fastly-Ratelimit-Remaining: - - "883" + - "989" Fastly-Ratelimit-Reset: - - "1500516000" + - "1502125200" Status: - 200 OK Vary: @@ -39,8 +39,8 @@ interactions: X-Cache-Hits: - 0, 0 X-Served-By: - - app-slwdc9050-SL, cache-dca17722-DCA + - app-slwdc9051-SL, cache-den6026-DEN X-Timer: - - S1500513311.226267,VS0,VE358 + - S1502123414.115044,VS0,VE1226 status: 200 OK code: 200 diff --git a/fastly/syslog.go b/fastly/syslog.go index dc6c548f9..e1d33cc73 100644 --- a/fastly/syslog.go +++ b/fastly/syslog.go @@ -13,12 +13,16 @@ type Syslog struct { Name string `mapstructure:"name"` Address string `mapstructure:"address"` + Hostname string `mapstructure:"hostname"` Port uint `mapstructure:"port"` UseTLS bool `mapstructure:"use_tls"` + IPV4 string `mapstructure:"ipv4"` TLSCACert string `mapstructure:"tls_ca_cert"` + TLSHostname string `mapstructure:"tls_hostname"` Token string `mapstructure:"token"` Format string `mapstructure:"format"` FormatVersion uint `mapstructure:"format_version"` + MessageType string `mapstructure:"message_type"` ResponseCondition string `mapstructure:"response_condition"` CreatedAt *time.Time `mapstructure:"created_at"` UpdatedAt *time.Time `mapstructure:"updated_at"` @@ -77,12 +81,16 @@ type CreateSyslogInput struct { Name string `form:"name,omitempty"` Address string `form:"address,omitempty"` + Hostname string `form:"hostname,omitempty"` Port uint `form:"port,omitempty"` UseTLS *Compatibool `form:"use_tls,omitempty"` + IPV4 string `form:"ipv4,omitempty"` TLSCACert string `form:"tls_ca_cert,omitempty"` + TLSHostname string `form:"tls_hostname,omitempty"` Token string `form:"token,omitempty"` Format string `form:"format,omitempty"` FormatVersion uint `form:"format_version,omitempty"` + MessageType string `form:"message_type,omitempty"` ResponseCondition string `form:"response_condition,omitempty"` } @@ -159,12 +167,16 @@ type UpdateSyslogInput struct { NewName string `form:"name,omitempty"` Address string `form:"address,omitempty"` + Hostname string `form:"hostname,omitempty"` Port uint `form:"port,omitempty"` UseTLS *Compatibool `form:"use_tls,omitempty"` + IPV4 string `form:"ipv4,omitempty"` TLSCACert string `form:"tls_ca_cert,omitempty"` + TLSHostname string `form:"tls_hostname,omitempty"` Token string `form:"token,omitempty"` Format string `form:"format,omitempty"` FormatVersion uint `form:"format_version,omitempty"` + MessageType string `form:"message_type,omitempty"` ResponseCondition string `form:"response_condition,omitempty"` } diff --git a/fastly/syslog_test.go b/fastly/syslog_test.go index 7dff48ab6..3b0c9d012 100644 --- a/fastly/syslog_test.go +++ b/fastly/syslog_test.go @@ -40,12 +40,15 @@ Wm7DCfrPNGVwFWUQOmsPue9rZBgO Version: tv.Number, Name: "test-syslog", Address: "example.com", + Hostname: "example.com", Port: 1234, UseTLS: CBool(true), TLSCACert: cert, + TLSHostname: "example.com", Token: "abcd1234", Format: "format", FormatVersion: 2, + MessageType: "classic", }) }) if err != nil { @@ -75,6 +78,9 @@ Wm7DCfrPNGVwFWUQOmsPue9rZBgO if s.Address != "example.com" { t.Errorf("bad address: %q", s.Address) } + if s.Hostname != "example.com" { + t.Errorf("bad hostname: %q", s.Hostname) + } if s.Port != 1234 { t.Errorf("bad port: %q", s.Port) } @@ -84,6 +90,9 @@ Wm7DCfrPNGVwFWUQOmsPue9rZBgO if s.TLSCACert != cert { t.Errorf("bad tls_ca_cert: %q", s.TLSCACert) } + if s.TLSHostname != "example.com" { + t.Errorf("bad tls_hostname: %q", s.TLSHostname) + } if s.Token != "abcd1234" { t.Errorf("bad token: %q", s.Token) } @@ -93,6 +102,9 @@ Wm7DCfrPNGVwFWUQOmsPue9rZBgO if s.FormatVersion != 2 { t.Errorf("bad format_version: %d", s.FormatVersion) } + if s.MessageType != "classic" { + t.Errorf("bad message_type: %s", s.MessageType) + } // List var ss []*Syslog @@ -127,6 +139,9 @@ Wm7DCfrPNGVwFWUQOmsPue9rZBgO if s.Address != ns.Address { t.Errorf("bad address: %q", s.Address) } + if s.Hostname != ns.Hostname { + t.Errorf("bad hostname: %q", s.Hostname) + } if s.Port != ns.Port { t.Errorf("bad port: %q", s.Port) } @@ -136,6 +151,9 @@ Wm7DCfrPNGVwFWUQOmsPue9rZBgO if s.TLSCACert != ns.TLSCACert { t.Errorf("bad tls_ca_cert: %q", s.TLSCACert) } + if s.TLSHostname != ns.TLSHostname { + t.Errorf("bad tls_hostname: %q", s.TLSHostname) + } if s.Token != ns.Token { t.Errorf("bad token: %q", s.Token) } @@ -145,6 +163,9 @@ Wm7DCfrPNGVwFWUQOmsPue9rZBgO if s.FormatVersion != ns.FormatVersion { t.Errorf("bad format_version: %q", s.FormatVersion) } + if s.MessageType != ns.MessageType { + t.Errorf("bad message_type: %q", s.MessageType) + } // Update var us *Syslog