[WIP] Hackathon merge #3013
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2012-2016 Codenvy, S.A. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Codenvy, S.A. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.che.commons.lang.os; | ||
|
|
||
| /** | ||
| * Escapes Windows path to unix-style path. | ||
|
There was a problem hiding this comment. It is used in several places in around docker usage in both Che and Codenvy. I think it is time to move that code in a single place since it is bad practice to use the same private methods in several classes. |
||
| * | ||
| * @author Alexander Garagatyi | ||
| */ | ||
| public class WindowsPathEscaper { | ||
|
|
||
| /** Implements singleton pattern. */ | ||
| private static final WindowsPathEscaper escaper = new WindowsPathEscaper(); | ||
|
|
||
| /** Does nothing. Can be used for mocking purposes. */ | ||
| public WindowsPathEscaper() {} | ||
|
|
||
| /** | ||
| * Static version of method that escapes paths on Windows. | ||
| * It is discouraged to use this method because it is too hard to mock it. | ||
| * Use {@link #escapePath(String)} instead. | ||
| * | ||
| * @param path path on Windows. Can be unix-style path also. | ||
| * @return unix-style path | ||
| * @see #escapePath(String) | ||
| */ | ||
| public static String escapePathStatic(String path) { | ||
| return escaper.escapePath(path); | ||
| } | ||
|
|
||
| /** | ||
| * Escapes Windows path to unix-style path. | ||
| * | ||
| * @param path path on Windows. Can be unix-style path also. | ||
| * @return unix-style path | ||
| */ | ||
| public String escapePath(String path) { | ||
| String esc; | ||
| if (path.indexOf(":") == 1) { | ||
| // check and replace only occurrence of ":" after disk label on Windows host (e.g. C:/) | ||
| // but keep other occurrences it can be marker for docker mount volumes | ||
| // (e.g. /path/dir/from/host:/name/of/dir/in/container ) | ||
| esc = path.replaceFirst(":", "").replace('\\', '/'); | ||
|
There was a problem hiding this comment. Doesn't like File.separator :) ? There was a problem hiding this comment. It's not my code. And I don't want to introduce here additional changes in this PR because it will delay merge significantly. |
||
| esc = Character.toLowerCase(esc.charAt(0)) + esc.substring(1); //letter of disk mark must be lower case | ||
| } else { | ||
| esc = path.replace('\\', '/'); | ||
| } | ||
| if (!esc.startsWith("/")) { | ||
| esc = "/" + esc; | ||
| } | ||
| return esc; | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2012-2016 Codenvy, S.A. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Codenvy, S.A. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.che.commons.lang.os; | ||
|
|
||
| import org.testng.annotations.DataProvider; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import static org.testng.Assert.assertEquals; | ||
|
|
||
| /** | ||
| * @author Alexander Garagatyi | ||
| */ | ||
| public class WindowsPathEscaperTest { | ||
| /** | ||
| * E.g from https://github.com/boot2docker/boot2docker/blob/master/README.md#virtualbox-guest-additions | ||
| * | ||
| * Users should be /Users | ||
| * /Users should be /Users | ||
| * c/Users should be /c/Users | ||
| * /c/Users should be /c/Users | ||
| * c:/Users should be /c/Users | ||
| */ | ||
| @Test(dataProvider = "pathProvider") | ||
| public void shouldStaticallyEscapePathForWindowsHost(String windowsPath, String expectedPath) { | ||
| assertEquals(WindowsPathEscaper.escapePathStatic(windowsPath), expectedPath); | ||
| } | ||
|
|
||
| /** | ||
| * E.g from https://github.com/boot2docker/boot2docker/blob/master/README.md#virtualbox-guest-additions | ||
| * | ||
| * Users should be /Users | ||
| * /Users should be /Users | ||
| * c/Users should be /c/Users | ||
| * /c/Users should be /c/Users | ||
| * c:/Users should be /c/Users | ||
| */ | ||
| @Test(dataProvider = "pathProvider") | ||
| public void shouldNonStaticallyEscapePathForWindowsHost(String windowsPath, String expectedPath) { | ||
| WindowsPathEscaper windowsPathEscaper = new WindowsPathEscaper(); | ||
| assertEquals(windowsPathEscaper.escapePath(windowsPath), expectedPath); | ||
| } | ||
|
|
||
| @DataProvider(name = "pathProvider") | ||
| public static Object[][] pathProvider() { | ||
| return new Object[][] { | ||
| {"Users", "/Users"}, | ||
| {"/Users", "/Users"}, | ||
| {"c/Users", "/c/Users"}, | ||
| {"/c/Users", "/c/Users"}, | ||
| {"c:/Users", "/c/Users"}, | ||
| {"C:/Users", "/c/Users"}, | ||
| {"C:/Users/path/dir/from/host:/name/of/dir/in/container", | ||
| "/c/Users/path/dir/from/host:/name/of/dir/in/container"} | ||
| }; | ||
| } | ||
| } |
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I propose to use separate folder for that. Let's call it
/agent-binariesThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
separate folder by duplicating the existing binaries ? because agents are inside CHE_HOME/lib for now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suppose that we can move agents binaries to any folder, no?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I propose to move agents away from
/libThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm ok but it might take some time to validate this change no ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@skabashnyuk are you ok if we postpone that and do after merging that PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes