Ensure trailing slash on base_url #984
Conversation
| # https://github.com/Azure/msrestazure-for-python/pull/169 | ||
| # China's base_url doesn't end in a trailing slash, though others do, | ||
| # and we need a trailing slash when generating credential_scopes below. | ||
| if base_url[-1] != "/": |
There was a problem hiding this comment.
Does the string end with a '/'? Isn't it?
There was a problem hiding this comment.
Right -- if the string doesn't end with a slash, then we add one. I'm realizing, now that I look back at this, that python has str.endswith(). I can rewrite this commit to use that instead, if you prefer.
There was a problem hiding this comment.
Ok, Thanks for your reply!
There was a problem hiding this comment.
Right -- if the string doesn't end with a slash, then we add one. I'm realizing, now that I look back at this, that python has
str.endswith(). I can rewrite this commit to use that instead, if you prefer.
This comments, Please!
There was a problem hiding this comment.
Done! Thanks for your patience; I wanted to make sure I'd tested everything, to not accidentally re-introduce some regression.
Fred-sun
added
medium_priority
|
@ChandlerSwift Any update for this ? |
I'm sorry -- I didn't realize this was waiting on me. Please let me know what I can do to get this ready to merge! |
The `AZURE_CHINA_CLOUD.endpoints.resource_manager` and `AZURE_GERMAN_CLOUD.endpoints.resource_manager` URLs don't end with a trailing slash, but the `AZURE_PUBLIC_CLOUD` and `AZURE_US_GOV_CLOUD` URLs do. This commit ensures consistency despite that. https://github.com/Azure/msrestazure-for-python/blob/8849f398b6ebd4607de63c2f5d1318f44ec1d822/msrestazure/azure_cloud.py#L137 Without this, `base_url` is set to `'https://management.chinacloudapi.cn'`: https://github.com/ansible-collections/azure/blob/256ed011ea3d2e15616529034f53078dcefd9d2d/plugins/module_utils/azure_rm_common.py#L877 And then `credential_scopes` is set to `[base_url + ".default"]`: https://github.com/ansible-collections/azure/blob/256ed011ea3d2e15616529034f53078dcefd9d2d/plugins/module_utils/azure_rm_common.py#L892 Which results in an invalid `credential_scopes` of `["https://management.chinacloudapi.cn.default"]` rather than `["https://management.chinacloudapi.cn/.default"]`. Fix also submitted upstream: Azure/msrestazure-for-python#169
Fred-sun
added
the
ready_for_review
|
@ChandlerSwift LGTM |
SUMMARY
Ensure trailing slash on base_url
The
AZURE_CHINA_CLOUD.endpoints.resource_managerandAZURE_GERMAN_CLOUD.endpoints.resource_managerURLs don't end with atrailing slash, but the
AZURE_PUBLIC_CLOUDandAZURE_US_GOV_CLOUDURLsdo. This commit ensures consistency despite that.
https://github.com/Azure/msrestazure-for-python/blob/8849f398b6ebd4607de63c2f5d1318f44ec1d822/msrestazure/azure_cloud.py#L137
Without this,
base_urlis set to'https://management.chinacloudapi.cn':azure/plugins/module_utils/azure_rm_common.py
Line 877 in 256ed01
And then
credential_scopesis set to[base_url + ".default"]:azure/plugins/module_utils/azure_rm_common.py
Line 892 in 256ed01
Which results in an invalid
credential_scopesof["https://management.chinacloudapi.cn.default"]rather than["https://management.chinacloudapi.cn/.default"].Fix also submitted upstream:
Azure/msrestazure-for-python#169
ISSUE TYPE
COMPONENT NAME
azure_rm_common