fix(storage): preserve supplied endpoint's scheme #4609
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Variable seems to be duplicating information which led to a bug.
…into remove-envhost
product-auto-label
bot
added
the
api: storage
google-cla
bot
added
the
cla: yes
tritone
reviewed
Aug 13, 2021
storage/storage.go
Outdated
| u, err := url.Parse(ep) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("supplied endpoint %q is not valid: %v", ep, err) | ||
| } | ||
| readHost = u.Host | ||
| scheme = u.Scheme |
There was a problem hiding this comment.
It looks like we set scheme in L114 & L123 above-- I guess this no longer does anything?
Also, is it possible for the returned endpoint from htransport.NewClient to have an empty scheme?
I'm thinking we should keep L114 & L123 as is and only set scheme here if u.Scheme != "", just out of caution. Does that make sense?
There was a problem hiding this comment.
The endpoint for htransport.NewClient should always have a scheme as long as we send in the WithDefaultEndpoint option. But yes that makes sense, since it does not actually promise to.
tritone
approved these changes
Aug 13, 2021
4 tasks
gcf-merge-on-green bot
pushed a commit
that referenced
this pull request
Aug 31, 2021
🤖 I have created a release \*beep\* \*boop\* --- ### [1.16.1](https://www.github.com/googleapis/google-cloud-go/compare/storage/v1.16.0...storage/v1.16.1) (2021-08-30) ### Bug Fixes * **storage/internal:** Update encryption_key fields to "bytes" type. fix: Improve date/times and field name clarity in lifecycle conditions. ([a52baa4](https://www.github.com/googleapis/google-cloud-go/commit/a52baa456ed8513ec492c4b573c191eb61468758)) * **storage:** accept emulator env var without scheme ([#4616](https://www.github.com/googleapis/google-cloud-go/issues/4616)) ([5f8cbb9](https://www.github.com/googleapis/google-cloud-go/commit/5f8cbb98070109e2a34409ac775ed63b94d37efd)) * **storage:** preserve supplied endpoint's scheme ([#4609](https://www.github.com/googleapis/google-cloud-go/issues/4609)) ([ee2756f](https://www.github.com/googleapis/google-cloud-go/commit/ee2756fb0a335d591464a770c9fa4f8fe0ba2e01)) * **storage:** remove unnecessary variable ([#4608](https://www.github.com/googleapis/google-cloud-go/issues/4608)) ([27fc784](https://www.github.com/googleapis/google-cloud-go/commit/27fc78456fb251652bdf5cdb493734a7e1e643e1)) * **storage:** retry LockRetentionPolicy ([#4439](https://www.github.com/googleapis/google-cloud-go/issues/4439)) ([09879ea](https://www.github.com/googleapis/google-cloud-go/commit/09879ea80cb67f9bfd8fc9384b0fda335567cba9)), refs [#4437](https://www.github.com/googleapis/google-cloud-go/issues/4437) * **storage:** revise Reader to send XML preconditions ([#4479](https://www.github.com/googleapis/google-cloud-go/issues/4479)) ([e36b29a](https://www.github.com/googleapis/google-cloud-go/commit/e36b29a3d43bce5c1c044f7daf6e1db00b0a49e0)), refs [#4470](https://www.github.com/googleapis/google-cloud-go/issues/4470) This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3509
option.WithEndpoint()completely overridesSTORAGE_EMULATOR_HOSTenvironment variable.Built on #4608