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

Jump to bottom

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

merged 1 commit into from
Jun 3, 2020

Conversation

mccurdyc
Copy link
Contributor

@mccurdyc mccurdyc commented Jun 3, 2020

Proposed Change(s)

  • Add missing Region field to Creates, Updates and all CRUD responses.
  • Update integration test mock recordings for Scalyr.

Relevant Link(s) / Documentation

Validation

$ export FASTLY_TEST_SERVICE_ID=<foo>; \
export FASTLY_API_KEY="$(stoml ~/.config/fastly/config.toml token)"; \
rm -rf fastly/fixtures/scalyrs && \
make test TESTARGS="-run=Scalyr -count=1" && \
make fix-fixtures && \
unset FASTLY_TEST_SERVICE_ID FASTLY_API_KEY && \
make test

@mccurdyc mccurdyc requested review from ezkl and phamann June 3, 2020 14:28
@mccurdyc mccurdyc added the enhancement New feature or request label Jun 3, 2020
mccurdyc
mccurdyc commented Jun 3, 2020
View reviewed changes
fastly/fixtures/scalyrs/create.yaml
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.

mccurdyc
mccurdyc commented Jun 3, 2020
View reviewed changes
fastly/fixtures/scalyrs/get.yaml
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

mccurdyc
mccurdyc commented Jun 3, 2020
View reviewed changes
fastly/fixtures/scalyrs/list.yaml
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

mccurdyc
mccurdyc commented Jun 3, 2020
View reviewed changes
fastly/fixtures/scalyrs/update.yaml
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").

@mccurdyc mccurdyc marked this pull request as ready for review June 3, 2020 14:31
ezkl
ezkl approved these changes Jun 3, 2020
View reviewed changes
Copy link
Contributor

@ezkl ezkl left a comment

Choose a reason for hiding this comment

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

👍

@mccurdyc mccurdyc merged commit 83e4949 into fastly:master Jun 3, 2020
@mccurdyc mccurdyc deleted the mccurdyc/scalyr-all-region branch June 3, 2020 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ezkl ezkl ezkl approved these changes

@phamann phamann Awaiting requested review from phamann

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mccurdyc @ezkl