Add website routing rules api & tests & example #194
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
|
LYZ seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
huiguangjun
reviewed
Jun 28, 2019
oss2/models.py
Outdated
| """匹配规则之后执行的动作 | ||
|
|
||
| :父节点: class `RoutingRule <oss2.models.RoutingRule>` | ||
| :param proto: 跳转时的协议，只能取值为http或者https。当RedirectType为External或者AliCDN时需要指定。 |
There was a problem hiding this comment.
Redirect 里面的参数说明，先罗列共性部分，然后再根据redirecttype 罗列。
oss2/models.py
Outdated
| :param mirror_url_slave: 镜像回源的备站地址，只有在RedirectType为Mirror时有意义 | ||
| :type mirror_url_slave: str | ||
|
|
||
| :param mirror_url_probe: 镜像回源的主站地址，mirror_url_slave指定试，此项必须指定 |
oss2/models.py
Outdated
| :param mirror_headers: 指定匹配此规则后执行的动作 | ||
| :type mirror_headers: class:`RedirectMirrorHeaders <oss2.models.RedirectMirrorHeaders>` | ||
|
|
||
| :param mirror_multi_alternates: 指定匹配此规则后执行的动作 |
oss2/models.py
Outdated
| if (not mirror_url_slave.startswith('http://') and not mirror_url_slave.startswith('https://')) or not mirror_url_slave.endswith('/'): | ||
| raise ClientError(r'mirror_url_salve is invalid, should startwith "http://" or "https://", and endwith "/"') | ||
|
|
||
| if any((proto, host_name, replace_key_with, replace_key_prefix_with, http_redirect_code)): |
There was a problem hiding this comment.
这个判断语句可以拿掉。在构建xml的时候，根据type 设置 相关的参数即可。
oss2/xml_utils.py
Outdated
| return mirror_multi_alternates | ||
|
|
||
| def parse_routing_rule_redirect(redirect_node): | ||
| redirect_type = _find_tag(redirect_node, 'RedirectType') |
There was a problem hiding this comment.
在parser xml的时候，可以根据 type parser 相关的 数据。不相关的可以忽略掉。
| _add_text_child(error_node, 'Key', bucket_websiste.error_file) | ||
| _add_text_child(error_node, 'Key', bucket_website.error_file) | ||
|
|
||
| rules_node = ElementTree.SubElement(root, "RoutingRules") |
There was a problem hiding this comment.
构建 RoutingRules 节点的时候，先判断rule 的数量，如果为空，则不需要构建该节点。
liyanzhang505
force-pushed
the
dev-website-routing
branch
from
cd4fa5b
to
7128e8f
Compare
liyanzhang505
force-pushed
the
dev-website-routing
branch
from
7128e8f
to
2ddd84f
Compare
liyanzhang505
force-pushed
the
dev-website-routing
branch
from
2ddd84f
to
77a98a9
Compare
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.
No description provided.