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.

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

Unrevert s3 config #673

Merged
merged 5 commits into from
Oct 13, 2015
Merged

Unrevert s3 config #673

merged 5 commits into from
Oct 13, 2015

Conversation

kyleknap
Copy link
Contributor

@kyleknap kyleknap commented Oct 2, 2015

This puts back in place the s3 configuration options that I reverted because CLI integration tests were failing. Fixed the tests by putting back the fix_s3_host registering to the default section so when the event for unregistering is called in the CLI with --endpoint-url, the registered handler does exist so it does get unregistered. This seemed like the safest way to ensure there was no breaking behavior in the CLI.

Looked into trying to modify the session in the CLI, but that would have required making the session more mutable and adding more functionality to the session, which is not necessarily desired.

cc @Jamels @mtdowling @rayluo @JordonPhillips

@kyleknap kyleknap added the pr/needs-review This PR needs a review from a member of the team. label Oct 2, 2015
Valid keys are:
* 'addressing_style' -- Refers to the style in which to address
s3 endpoints. Values must be a string that equals:
* auto -- Addressing style is chosen for user. Depending
Copy link
Member

Choose a reason for hiding this comment

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

It would be worth mentioning this is the default value.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep

@jamesls
Copy link
Member

jamesls commented Oct 12, 2015

Just had some small feedback.

@jamesls jamesls added incorporating-feedback and removed pr/needs-review This PR needs a review from a member of the team. labels Oct 12, 2015
@kyleknap
Copy link
Contributor Author

@jamesls I updated based on feedback

@kyleknap kyleknap added pr/needs-review This PR needs a review from a member of the team. and removed incorporating-feedback labels Oct 12, 2015
@jamesls
Copy link
Member

jamesls commented Oct 12, 2015

@kyleknap Can we get a test added for kyleknap@4c04307?

@kyleknap
Copy link
Contributor Author

@jamesls We already have one: https://github.com/boto/botocore/blob/develop/tests/unit/test_s3_addressing.py#L87. Or did you want a test for if it us-gov-west-1 is used but a path style of virtual is specified?

@jamesls
Copy link
Member

jamesls commented Oct 13, 2015

I didn't see a case for the scenario we've been discussing:

So if i have addressing=virtual and a --region of us-gov-west-1, I would expect a DNS compatible bucket to go to: bucket.s3-us-gov-west-1.amazonaws.com.

Is there a test for this?

@kyleknap
Copy link
Contributor Author

Oh no I can add one for that then.

@kyleknap
Copy link
Contributor Author

@jamesls Test case added.

@jamesls
Copy link
Member

jamesls commented Oct 13, 2015

:shipit: Looks good.

kyleknap added a commit that referenced this pull request Oct 13, 2015
@kyleknap kyleknap merged commit 42f13a5 into boto:develop Oct 13, 2015
@kyleknap kyleknap deleted the unrevert-s3-config branch October 13, 2015 00:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/needs-review This PR needs a review from a member of the team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants