Skip to content

client.Populate assign client to proxy#291

Merged
miry merged 4 commits intoShopify:masterfrom
hellodudu:master
Nov 2, 2021
Merged

client.Populate assign client to proxy#291
miry merged 4 commits intoShopify:masterfrom
hellodudu:master

Conversation

@hellodudu
Copy link
Copy Markdown
Contributor

client.Populate should assign client to proxies first, otherwise it will panic if we call proxy.AddToxic()

@miry
Copy link
Copy Markdown
Contributor

miry commented Sep 14, 2021

@hellodudu can you add tests to cover the panic?

@ghost ghost removed the cla-needed label Sep 17, 2021
@hellodudu
Copy link
Copy Markdown
Contributor Author

Hi @miry, It's done.

@miry
Copy link
Copy Markdown
Contributor

miry commented Nov 2, 2021

@hellodudu Thank you very much. Last steps:

  1. Update Changelog.md with summary of your changes: next line after https://github.com/Shopify/toxiproxy/blob/master/CHANGELOG.md?plain=1#L5
  2. There is small linting problem: extra empty line
  3. Squash commits and rebase against master

@miry miry self-assigned this Nov 2, 2021
@miry miry added this to the 2.3.0 milestone Nov 2, 2021
@hellodudu
Copy link
Copy Markdown
Contributor Author

@miry

  1. done.
  2. done.
  3. I haven't squash commit on Github before, always use the "confirm squash and merge" comes from Github. I'm worried about squashing with errors when using git. Do you have right to "confirm squash and merge"?

@miry
Copy link
Copy Markdown
Contributor

miry commented Nov 2, 2021

@hellodudu It looks like: git rebase -i HEAD~4 or git fetch upstream; git rebase -i upstream/master then you left first row uncahnged (check that it is your first commit), and all other change first word patch to squash.

In the end it would ask to provide description.

https://www.baeldung.com/ops/git-squash-commits#1-squash-the-last-x-commits

@miry
Copy link
Copy Markdown
Contributor

miry commented Nov 2, 2021

@hellodudu If you want I can squash and try to combine your messages in one?

@hellodudu
Copy link
Copy Markdown
Contributor Author

Yes please. I'm afraid of messing it up. Thanks a lot!

@miry miry merged commit 27eba22 into Shopify:master Nov 2, 2021
@miry
Copy link
Copy Markdown
Contributor

miry commented Nov 2, 2021

@hellodudu thank you again for contribution ❤️ . Going to update my samples of toxiproxy usage.

@miry miry mentioned this pull request Nov 6, 2021
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants