sqs: add ability to define the external port #672
Closed
Conversation
This file contains hidden or 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
whummer
reviewed
May 1, 2018
| @@ -60,7 +60,7 @@ def return_response(self, method, path, data, headers, response, request_handler | |||
| # return https://... if we're supposed to use SSL | |||
| content_str = re.sub(r'<QueueUrl>\s*http://', r'<QueueUrl>https://', content_str) | |||
| # expose external hostname:port | |||
| external_port = get_external_port(headers, request_handler) | |||
| external_port = SQS_PORT_EXTERNAL if SQS_PORT_EXTERNAL else get_external_port(headers, request_handler) | |||
There was a problem hiding this comment.
nitpick: could be simplified to
external_port = SQS_PORT_EXTERNAL or get_external_port(headers, request_handler)
whummer
reviewed
May 1, 2018
| @@ -5,7 +5,7 @@ | |||
| from six.moves.urllib.parse import urlencode | |||
| from requests.models import Request, Response | |||
| from localstack import config | |||
| from localstack.config import HOSTNAME_EXTERNAL | |||
| from localstack.config import HOSTNAME_EXTERNAL, SQS_PORT_EXTERNAL | |||
There was a problem hiding this comment.
We cannot import SQS_PORT_EXTERNAL here as it hasn't been exposed as a variable in config.py. This currently results in a failed build.
There are two options here:
- Remove the import, and retrieve the value in line 63 via
int(os.environ.get('SQS_PORT_EXTERNAL') or 0) - Expose the
<SERVICE>_PORT_EXTERNALvariables inconfig.py, similar toPORT_<SERVICE>
|
Thanks for this PR @nemtsov - I added a comment related to the failed build. |
|
@nemtsov looks like you are almost there. It may be worth to rebase this or on master and implemented the couple of suggestions :) |
|
@nemtsov Any updates on this PR? Would be great if we could get this feature merged. Thanks |
|
Closing in favor of #1047 |
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.
First, thanks for your amazing work on
localstack!Please treat this as a start of a conversation rather than a full-featured PR. I'm not certain that this is the right direction and would love your feedback.
Motivation
The issue I'm having is that I'm running
localstackbehind a proxy, which is running on a specific host (which is covered byHOSTNAME_EXTERNAL, but is also on a different port from that of the proxy. So, when SQS returns the queue URL it returns theHOSTNAME_EXTERNALthat I set, but returns the local port and not the port that the client requests the proxy with.[proxy:80]->[localstack:4576]->[elasticmq:4561]What I've done at the moment, is I've set my SQS port to
:80(which is what my proxy wants). This works, but in my opinion is more of a workaround because any other service needs to return a URL pointing back to itself, I will not be able to also put it on:80as it will be taken by SQS.Proposed solution
So, the solution I'm proposing is to define a
<SERVICE>_PORT_EXTERNALand use that along withHOSTNAME_EXTERNAL. Alternatively (and if there are no plans to useHOSTNAME_EXTERNALas a single external hostname for all services) we can change it to something like<SERVICE>_EXTERNAL_URI, which would be ahost:portcombination specific to a service.