Make it possible to use relative links to recipe in workspace environment #3002
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
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/941/ |
skabashnyuk
approved these changes
Nov 8, 2016
skabashnyuk
added
status/code-review
voievodin
approved these changes
Nov 8, 2016
garagatyi
suggested changes
Nov 8, 2016
| targetUriBuilder.scheme(apiEndpoint.getScheme()) | ||
| .host(apiEndpoint.getHost()) | ||
| .port(apiEndpoint.getPort()) | ||
| .replacePath(apiEndpoint.getPath() + location); |
There was a problem hiding this comment.
Is it possible that api endpoint doesn't have trailing slash? In that case I suppose it would be better to use .replacePath().path()
There was a problem hiding this comment.
AFAIK api endpoint never contain trailing slash
| targetUriBuilder.scheme(apiEndpoint.getScheme()) | ||
| .host(apiEndpoint.getHost()) | ||
| .port(apiEndpoint.getPort()) | ||
| .replacePath(apiEndpoint.getPath() + location); |
| @@ -298,7 +296,7 @@ public void shouldSetDockerfileContentInsteadOfUrlIfUrlPointsToCheApiOnEnvironme | |||
| // given | |||
| EnvironmentImpl env = createEnv(); | |||
| String machineName = "machineWithDockerfileFromApi"; | |||
| String additionalServiceComposeFilePart = "\n " + machineName + ":\n build:\n context: " + API_ENDPOINT + "/recipe/12345"; | |||
There was a problem hiding this comment.
I assume that your changes should not influence these tests
There was a problem hiding this comment.
I's due to regexp change in CheEnvironmentEngine.
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/948/ |
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/956/ |
garagatyi
approved these changes
Nov 9, 2016
JPinkney
pushed a commit
to JPinkney/che
that referenced
this pull request
Aug 17, 2017
benoitf
removed
the
status/code-review
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.
What does this PR do?
To ease data migration between domains, we should store local recipe links in a relative form. And when necessary, downloader should place current domain by itself.
What issues does this PR fix or reference?
Fixes #2769