CHE-22: check environment parameter on workspace start #518
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
|
ок |
| @@ -30,7 +30,7 @@ | |||
| @Singleton | |||
| public class DefaultWorkspaceConfigValidator implements WorkspaceConfigValidator { | |||
| /* should contain [3, 20] characters, first and last character is letter or digit, available characters {A-Za-z0-9.-_}*/ | |||
| private static final Pattern WS_NAME = Pattern.compile("[\\w][\\w\\.\\-]{1,18}[\\w]"); | |||
| private static final Pattern WS_NAME = Pattern.compile("[a-zA-Z0-9][-a-zA-Z0-9.]{1,18}[a-zA-Z0-9]"); | |||
There was a problem hiding this comment.
You made a small mistake here as \\w includes underscore _ as well, so the second [-a-zA-Z0-9.] should include underscore.
garagatyi
force-pushed
the
CHE-22
branch
3 times, most recently
from
10e4f9e to
166c2f5
Compare
|
@skabashnyuk @evoevodin I reworked the PR. Please take a look. |
|
ok |
| @@ -588,6 +592,19 @@ UsersWorkspaceImpl performAsyncStart(UsersWorkspaceImpl workspace, | |||
| } | |||
| workspace.setTemporary(false); | |||
| workspace.setStatus(WorkspaceStatus.STARTING); | |||
|
|
|||
| if (envName != null && !workspace.getConfig() | |||
There was a problem hiding this comment.
It seems that it is the same but shorter
!workspace.getConfig()
.getEnvironments()
.stream()
.anyMatch(env -> env.getName().equals(envName);
|
ok |
garagatyi
force-pushed
the
CHE-22
branch
3 times, most recently
from
3015466 to
2986552
Compare
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
garagatyi
pushed a commit
that referenced
this pull request
Feb 29, 2016
CHE-22: check environment parameter on workspace start
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.
Signed-off-by: Alexander Garagatyi agaragatyi@codenvy.com
@skabashnyuk @evoevodin Please review.