Dispatch Routing from yaml #3136
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
…atch rules from zookeeper
…o have more specific handlers first
addition of regexes used by gcloud command to validate URLs change AdminServer endpoint for dispatch rules
cdonati
reviewed
Aug 9, 2019
scragraham
reviewed
Aug 12, 2019
| project_id=name, | ||
| services=service_ids) | ||
|
|
||
| dispatch_node = '/'.join(['/appscale', 'projects', name, 'dispatch']) |
There was a problem hiding this comment.
Suggested change
| dispatch_node = '/'.join(['/appscale', 'projects', name, 'dispatch']) | |
| dispatch_node = '/appscale/projects/{}/dispatch'.format(name) |
| 'field(s): [{}]'.format(', '.join(supported_fields))) | ||
| raise CustomHTTPError(HTTPCodes.BAD_REQUEST, message=message) | ||
|
|
||
| project_node = '/'.join(['/appscale', 'projects', name]) |
There was a problem hiding this comment.
Suggested change
| project_node = '/'.join(['/appscale', 'projects', name]) | |
| project_node = '/appscale/projects/{}'.format(name) |
| raise CustomHTTPError(HTTPCodes.BAD_REQUEST, message=message) | ||
|
|
||
| project_node = '/'.join(['/appscale', 'projects', name]) | ||
| services_node = '/'.join([project_node, 'services']) |
There was a problem hiding this comment.
Suggested change
| services_node = '/'.join([project_node, 'services']) | |
| services_node = '{}/services'.format(project_node) |
AdminServer/appscale/admin/utils.py
Outdated
| raise InvalidDispatchConfiguration( | ||
| 'Invalid host pattern {}'.format(domain)) | ||
| matcher = _URL_IP_V4_ADDR_RE.match(domain) | ||
| if matcher and sum(1 for x in matcher.groups() if int(x) <= 255) == 4: |
There was a problem hiding this comment.
If we decide to keep this regex match:
Suggested change
| if matcher and sum(1 for x in matcher.groups() if int(x) <= 255) == 4: | |
| if matcher and all(int(x) <= 255 for x in matcher.groups()): |
If we use a more accurate regex, this becomes:
if matcher is not None:
|
template of nginx config is: 👍 |
remove unused regexes and imports
scragraham
approved these changes
Aug 14, 2019
cdonati
approved these changes
Aug 15, 2019
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.
AdminServer accepts dispatchRules in the format described here sent from the appscale-tools. The rules are modified to be "nginx friendly" by replacing * with .* and filling out the service name as gae_project_service_version. These rules are then put into zookeeper and picked up during the duty cycle where it regenerates routing config. They are used in the new template file application_nginx.erb
Known Issues:
Build:
http://ocd.appscale.net:8080/job/Daily%20Build/6607/