Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Region field to all Scalyr CRUD actions #195

Merged
merged 1 commit into from
Jun 3, 2020
Merged

Add Region field to all Scalyr CRUD actions #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions fastly/fixtures/scalyrs/cleanup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ interactions:
form: {}
headers:
User-Agent:
- FastlyGo/1.10.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/132/logging/scalyr/test-scalyr
- FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/10/logging/scalyr/test-scalyr
method: DELETE
response:
body: '{"msg":"Record not found","detail":"Couldn''t find syslog ''{ deleted =\u003e
0000-00-00 00:00:00, name =\u003e test-scalyr, service =\u003e 7i6HN3TK9wS159v2gPAZ8A,
version =\u003e 132 }''"}'
version =\u003e 10 }''"}'
headers:
Accept-Ranges:
- bytes
Expand All @@ -22,11 +22,11 @@ interactions:
Content-Type:
- application/json
Date:
- Fri, 08 May 2020 12:00:01 GMT
- Wed, 03 Jun 2020 14:26:09 GMT
Fastly-Ratelimit-Remaining:
- "997"
- "990"
Fastly-Ratelimit-Reset:
- "1588942800"
- "1591196400"
Status:
- 404 Not Found
Strict-Transport-Security:
Expand All @@ -41,9 +41,9 @@ interactions:
X-Cache-Hits:
- 0, 0
X-Served-By:
- cache-control-slwdc9035-CONTROL-SLWDC, cache-pao17440-PAO
- cache-control-slwdc9035-CONTROL-SLWDC, cache-dca17749-DCA
X-Timer:
- S1588939201.493936,VS0,VE191
- S1591194369.266169,VS0,VE103
status: 404 Not Found
code: 404
duration: ""
Expand All @@ -52,13 +52,13 @@ interactions:
form: {}
headers:
User-Agent:
- FastlyGo/1.10.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/132/logging/scalyr/new-test-scalyr
- FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/10/logging/scalyr/new-test-scalyr
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-scalyr, service =\u003e 7i6HN3TK9wS159v2gPAZ8A,
version =\u003e 132 }''"}'
version =\u003e 10 }''"}'
headers:
Accept-Ranges:
- bytes
Expand All @@ -68,11 +68,11 @@ interactions:
Content-Type:
- application/json
Date:
- Fri, 08 May 2020 12:00:01 GMT
- Wed, 03 Jun 2020 14:26:09 GMT
Fastly-Ratelimit-Remaining:
- "996"
- "989"
Fastly-Ratelimit-Reset:
- "1588942800"
- "1591196400"
Status:
- 404 Not Found
Strict-Transport-Security:
Expand All @@ -87,9 +87,9 @@ interactions:
X-Cache-Hits:
- 0, 0
X-Served-By:
- cache-control-slwdc9037-CONTROL-SLWDC, cache-pao17440-PAO
- cache-control-slwdc9035-CONTROL-SLWDC, cache-dca17749-DCA
X-Timer:
- S1588939202.703577,VS0,VE193
- S1591194369.399321,VS0,VE115
status: 404 Not Found
code: 404
duration: ""
22 changes: 12 additions & 10 deletions fastly/fixtures/scalyrs/create.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
version: 1
interactions:
- request:
body: Service=7i6HN3TK9wS159v2gPAZ8A&Version=132&format=%25h+%25l+%25u+%25t+%22%25r%22+%25%3Es+%25b&format_version=2&name=test-scalyr&placement=waf_debug&token=super-secure-token
body: Service=7i6HN3TK9wS159v2gPAZ8A&Version=10&format=%25h+%25l+%25u+%25t+%22%25r%22+%25%3Es+%25b&format_version=2&name=test-scalyr&placement=waf_debug&region=US&token=super-secure-token
form:
Service:
- 7i6HN3TK9wS159v2gPAZ8A
Version:
- "132"
- "10"
format:
- '%h %l %u %t "%r" %>s %b'
format_version:
Expand All @@ -16,17 +16,19 @@ interactions:
- test-scalyr
placement:
- waf_debug
region:
- US
token:
- super-secure-token
headers:
Content-Type:
- application/x-www-form-urlencoded
User-Agent:
- FastlyGo/1.10.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/132/logging/scalyr
- FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/10/logging/scalyr
method: POST
response:
body: '{"format":"%h %l %u %t \"%r\" %\u003es %b","format_version":"2","name":"test-scalyr","placement":"waf_debug","token":"super-secure-token","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"132","created_at":"2020-05-08T11:59:59Z","response_condition":"","deleted_at":null,"updated_at":"2020-05-08T11:59:59Z"}'
body: '{"format":"%h %l %u %t \"%r\" %\u003es %b","format_version":"2","name":"test-scalyr","placement":"waf_debug","region":"US","token":"super-secure-token","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"10","updated_at":"2020-06-03T14:26:08Z","response_condition":"","deleted_at":null,"created_at":"2020-06-03T14:26:08Z"}'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contains new region field.

headers:
Accept-Ranges:
- bytes
Expand All @@ -36,11 +38,11 @@ interactions:
Content-Type:
- application/json
Date:
- Fri, 08 May 2020 12:00:00 GMT
- Wed, 03 Jun 2020 14:26:08 GMT
Fastly-Ratelimit-Remaining:
- "859"
- "993"
Fastly-Ratelimit-Reset:
- "1588939200"
- "1591196400"
Status:
- 200 OK
Strict-Transport-Security:
Expand All @@ -55,9 +57,9 @@ interactions:
X-Cache-Hits:
- 0, 0
X-Served-By:
- cache-control-slwdc9035-CONTROL-SLWDC, cache-pao17440-PAO
- cache-control-slwdc9036-CONTROL-SLWDC, cache-dca17749-DCA
X-Timer:
- S1588939199.458383,VS0,VE625
- S1591194368.947134,VS0,VE409
status: 200 OK
code: 200
duration: ""
14 changes: 7 additions & 7 deletions fastly/fixtures/scalyrs/delete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ interactions:
form: {}
headers:
User-Agent:
- FastlyGo/1.10.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/132/logging/scalyr/new-test-scalyr
- FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/10/logging/scalyr/new-test-scalyr
method: DELETE
response:
body: '{"status":"ok"}'
Expand All @@ -20,11 +20,11 @@ interactions:
Content-Type:
- application/json
Date:
- Fri, 08 May 2020 12:00:01 GMT
- Wed, 03 Jun 2020 14:26:09 GMT
Fastly-Ratelimit-Remaining:
- "998"
- "991"
Fastly-Ratelimit-Reset:
- "1588942800"
- "1591196400"
Status:
- 200 OK
Strict-Transport-Security:
Expand All @@ -39,9 +39,9 @@ interactions:
X-Cache-Hits:
- 0, 0
X-Served-By:
- cache-control-slwdc9035-CONTROL-SLWDC, cache-pao17440-PAO
- cache-control-slwdc9035-CONTROL-SLWDC, cache-dca17749-DCA
X-Timer:
- S1588939201.206751,VS0,VE272
- S1591194369.064099,VS0,VE172
status: 200 OK
code: 200
duration: ""
13 changes: 6 additions & 7 deletions fastly/fixtures/scalyrs/get.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ interactions:
form: {}
headers:
User-Agent:
- FastlyGo/1.10.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/132/logging/scalyr/test-scalyr
- FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/10/logging/scalyr/test-scalyr
method: GET
response:
body: '{"placement":"waf_debug","name":"test-scalyr","format":"%h %l %u %t \"%r\"
%\u003es %b","deleted_at":null,"created_at":"2020-05-08T11:59:59Z","service_id":"7i6HN3TK9wS159v2gPAZ8A","format_version":"2","version":"132","response_condition":"","updated_at":"2020-05-08T11:59:59Z","token":"super-secure-token"}'
body: '{"response_condition":"","format":"%h %l %u %t \"%r\" %\u003es %b","service_id":"7i6HN3TK9wS159v2gPAZ8A","format_version":"2","created_at":"2020-06-03T14:26:08Z","deleted_at":null,"region":"US","token":"super-secure-token","version":"10","name":"test-scalyr","updated_at":"2020-06-03T14:26:08Z","placement":"waf_debug"}'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contains region field

headers:
Accept-Ranges:
- bytes
Expand All @@ -25,7 +24,7 @@ interactions:
Content-Type:
- application/json
Date:
- Fri, 08 May 2020 12:00:00 GMT
- Wed, 03 Jun 2020 14:26:08 GMT
Status:
- 200 OK
Strict-Transport-Security:
Expand All @@ -40,9 +39,9 @@ interactions:
X-Cache-Hits:
- 0, 0
X-Served-By:
- cache-control-slwdc9036-CONTROL-SLWDC, cache-pao17440-PAO
- cache-control-slwdc9037-CONTROL-SLWDC, cache-dca17749-DCA
X-Timer:
- S1588939200.304759,VS0,VE182
- S1591194369.504288,VS0,VE93
status: 200 OK
code: 200
duration: ""
13 changes: 6 additions & 7 deletions fastly/fixtures/scalyrs/list.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ interactions:
form: {}
headers:
User-Agent:
- FastlyGo/1.10.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/132/logging/scalyr
- FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/10/logging/scalyr
method: GET
response:
body: '[{"placement":"waf_debug","name":"test-scalyr","format":"%h %l %u %t \"%r\"
%\u003es %b","deleted_at":null,"updated_at":"2020-05-08T11:59:59Z","token":"super-secure-token","version":"132","format_version":"2","service_id":"7i6HN3TK9wS159v2gPAZ8A","response_condition":"","created_at":"2020-05-08T11:59:59Z"}]'
body: '[{"token":"super-secure-token","format":"%h %l %u %t \"%r\" %\u003es %b","service_id":"7i6HN3TK9wS159v2gPAZ8A","placement":"waf_debug","created_at":"2020-06-03T14:26:08Z","name":"test-scalyr","updated_at":"2020-06-03T14:26:08Z","region":"US","deleted_at":null,"format_version":"2","version":"10","response_condition":""}]'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contains regionfield

headers:
Accept-Ranges:
- bytes
Expand All @@ -25,7 +24,7 @@ interactions:
Content-Type:
- application/json
Date:
- Fri, 08 May 2020 12:00:00 GMT
- Wed, 03 Jun 2020 14:26:08 GMT
Status:
- 200 OK
Strict-Transport-Security:
Expand All @@ -40,9 +39,9 @@ interactions:
X-Cache-Hits:
- 0, 0
X-Served-By:
- cache-control-slwdc9037-CONTROL-SLWDC, cache-pao17440-PAO
- cache-control-slwdc9037-CONTROL-SLWDC, cache-dca17749-DCA
X-Timer:
- S1588939200.100557,VS0,VE189
- S1591194368.387144,VS0,VE91
status: 200 OK
code: 200
duration: ""
23 changes: 12 additions & 11 deletions fastly/fixtures/scalyrs/update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,29 @@
version: 1
interactions:
- request:
body: Name=test-scalyr&Service=7i6HN3TK9wS159v2gPAZ8A&Version=132&name=new-test-scalyr&token=new-token
body: Name=test-scalyr&Service=7i6HN3TK9wS159v2gPAZ8A&Version=10&name=new-test-scalyr&region=EU&token=new-token
form:
Name:
- test-scalyr
Service:
- 7i6HN3TK9wS159v2gPAZ8A
Version:
- "132"
- "10"
name:
- new-test-scalyr
region:
- EU
token:
- new-token
headers:
Content-Type:
- application/x-www-form-urlencoded
User-Agent:
- FastlyGo/1.10.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/132/logging/scalyr/test-scalyr
- FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/10/logging/scalyr/test-scalyr
method: PUT
response:
body: '{"response_condition":"","token":"new-token","service_id":"7i6HN3TK9wS159v2gPAZ8A","created_at":"2020-05-08T11:59:59Z","version":"132","name":"new-test-scalyr","placement":"waf_debug","updated_at":"2020-05-08T11:59:59Z","deleted_at":null,"format_version":"2","format":"%h
%l %u %t \"%r\" %\u003es %b"}'
body: '{"format":"%h %l %u %t \"%r\" %\u003es %b","token":"new-token","response_condition":"","created_at":"2020-06-03T14:26:08Z","version":"10","name":"new-test-scalyr","format_version":"2","deleted_at":null,"updated_at":"2020-06-03T14:26:08Z","placement":"waf_debug","service_id":"7i6HN3TK9wS159v2gPAZ8A","region":"EU"}'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contains updated region field (i.e., "US" -> "EU").

headers:
Accept-Ranges:
- bytes
Expand All @@ -33,11 +34,11 @@ interactions:
Content-Type:
- application/json
Date:
- Fri, 08 May 2020 12:00:01 GMT
- Wed, 03 Jun 2020 14:26:09 GMT
Fastly-Ratelimit-Remaining:
- "999"
- "992"
Fastly-Ratelimit-Reset:
- "1588942800"
- "1591196400"
Status:
- 200 OK
Strict-Transport-Security:
Expand All @@ -52,9 +53,9 @@ interactions:
X-Cache-Hits:
- 0, 0
X-Served-By:
- cache-control-slwdc9037-CONTROL-SLWDC, cache-pao17440-PAO
- cache-control-slwdc9035-CONTROL-SLWDC, cache-dca17749-DCA
X-Timer:
- S1588939201.504254,VS0,VE687
- S1591194369.626285,VS0,VE410
status: 200 OK
code: 200
duration: ""
14 changes: 7 additions & 7 deletions fastly/fixtures/scalyrs/version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ interactions:
Content-Type:
- application/x-www-form-urlencoded
User-Agent:
- FastlyGo/1.10.0 (+github.com/fastly/go-fastly; go1.14.2)
- FastlyGo/1.14.0 (+github.com/fastly/go-fastly; go1.14.2)
url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version
method: POST
response:
body: '{"service_id":"7i6HN3TK9wS159v2gPAZ8A","number":132}'
body: '{"service_id":"7i6HN3TK9wS159v2gPAZ8A","number":10}'
headers:
Accept-Ranges:
- bytes
Expand All @@ -24,11 +24,11 @@ interactions:
Content-Type:
- application/json
Date:
- Fri, 08 May 2020 11:59:59 GMT
- Wed, 03 Jun 2020 14:26:07 GMT
Fastly-Ratelimit-Remaining:
- "860"
- "994"
Fastly-Ratelimit-Reset:
- "1588939200"
- "1591196400"
Status:
- 200 OK
Strict-Transport-Security:
Expand All @@ -43,9 +43,9 @@ interactions:
X-Cache-Hits:
- 0, 0
X-Served-By:
- cache-control-slwdc9035-CONTROL-SLWDC, cache-pao17440-PAO
- cache-control-slwdc9035-CONTROL-SLWDC, cache-dca17749-DCA
X-Timer:
- S1588939199.091107,VS0,VE352
- S1591194368.766089,VS0,VE153
status: 200 OK
code: 200
duration: ""
3 changes: 3 additions & 0 deletions fastly/scalyr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type Scalyr struct {
Format string `mapstructure:"format"`
FormatVersion uint `mapstructure:"format_version"`
Token string `mapstructure:"token"`
Region string `mapstructure:"region"`
ResponseCondition string `mapstructure:"response_condition"`
Placement string `mapstructure:"placement"`
CreatedAt *time.Time `mapstructure:"created_at"`
Expand Down Expand Up @@ -77,6 +78,7 @@ type CreateScalyrInput struct {
Format *string `form:"format,omitempty"`
FormatVersion *uint `form:"format_version,omitempty"`
Token *string `form:"token,omitempty"`
Region *string `form:"region,omitempty"`
ResponseCondition *string `form:"response_condition,omitempty"`
Placement *string `form:"placement,omitempty"`
}
Expand Down Expand Up @@ -156,6 +158,7 @@ type UpdateScalyrInput struct {
Format *string `form:"format,omitempty"`
FormatVersion *uint `form:"format_version,omitempty"`
Token *string `form:"token,omitempty"`
Region *string `form:"region,omitempty"`
ResponseCondition *string `form:"response_condition,omitempty"`
Placement *string `form:"placement,omitempty"`
}
Expand Down
Loading