-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Separation of components to allow overrides in codenvy #1179
Conversation
*/ | ||
@Singleton | ||
public class LinksInjector { | ||
|
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.
WorkspaceServiceLinksInjector?
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.
sure, ok for me
ok |
cd7701f
to
f48828d
Compare
ok |
test-ci-build |
Can you rebase this PR. I've merged PR that is in conflict with yours |
@@ -418,7 +418,7 @@ private Instance createInstance(String containerName, | |||
|
|||
env = new ArrayList<>(devMachineEnvVariables); | |||
env.add(DockerInstanceRuntimeInfo.CHE_WORKSPACE_ID + '=' + machine.getWorkspaceId()); | |||
env.add(DockerInstanceRuntimeInfo.USER_TOKEN + '=' + EnvironmentContext.getCurrent().getSubject().getToken()); | |||
env.add(DockerInstanceRuntimeInfo.USER_TOKEN + '=' + getUserToken(machine.getWorkspaceId())); |
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 think we should change USER_TOCKEN to API_TOKEN. Maybe not in this 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.
it's not quite api token and I think this change will be made in the place with token restriction changes
I think that code coverage was decreased with this PR. Can you check and fix if needed? |
5419b49
to
99092a9
Compare
ok |
Build # 648 - FAILED Please check console output at http://ci.codenvy-dev.com/jenkins/job/che-pullrequests-build/648/ to view the results. |
@evoevodin, @skabashnyuk, @vparfonov review please
@benoitf, @ashumilova review this commit please