fix(api): emulator proxy client uri logic #12778
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
added 2 commits
May 24, 2023 09:37
- Add `use_local_host` flag to ProxySettings, default to True - All applications that utilize the proxy directly on the host machine will use localhost. - This addresses issues with G-Code tests dying because it cannot resolve the host name - opentrons-emulation will override this value to `False` in an environment variable cause the host names to be set to the container names. When referencing the container names inside of the docker network these resolve to the internal docker IPs of the emulators.
Codecov Report
@@ Coverage Diff @@
## edge #12778 +/- ##
=======================================
Coverage 73.49% 73.49%
=======================================
Files 2261 2261
Lines 62003 62003
Branches 6705 6705
=======================================
Hits 45570 45570
Misses 14835 14835
Partials 1598 1598
Flags with carried forward coverage won't be shown. Click here to find out more.
|
|
Currently working on validating emulation will run successfully with the env var set |
DerekMaggio
changed the title
DerekMaggio
force-pushed
the
fix-emulator-proxy-client-uri-logic
branch
from
0d353a2
to
63ccbf4
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.
Overview
The emulator proxy was failing when calling
socket.gethostname()when the proxy was not running inside of Docker.It was fixed to be hard-coded to
127.0.0.1but this brokeopentrons-emulation's usage of the proxy.To fix, added
use_local_hostflag toProxySettings. This flag is defaulted toTrue.When set to
Truethe emulator proxy defaults to using127.0.0.1as its host name.When set to
Falseit callssocket.gethostname()and it's internal IP address inside of the Docker networkWhen running the proxy outside of Docker this flag does not need to be changed.
But when running inside of Docker (i.e. opentrons-emulation) it needs to be set to
False.Test Plan
OT_EMULATOR_use_local_host="False"Review requests
No
Risk assessment
Low, not changing any major functionality. Just adding a simple conditional, whose default value only breaks emulation. Therefore, since I am the main dev for emulation, that's on me to handle.