Skip to content
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

Merged
merged 2 commits into from
May 20, 2016
Merged

Conversation

akorneta
Copy link
Contributor

@akorneta akorneta commented May 4, 2016

@evoevodin, @skabashnyuk, @vparfonov review please

@benoitf, @ashumilova review this commit please

*/
@Singleton
public class LinksInjector {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WorkspaceServiceLinksInjector?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, ok for me

@skabashnyuk
Copy link
Contributor

ok

@akorneta akorneta force-pushed the CODENVY-93 branch 3 times, most recently from cd7701f to f48828d Compare May 10, 2016 11:37
@vparfonov
Copy link
Contributor

ok

@garagatyi
Copy link

test-ci-build

@garagatyi
Copy link

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()));

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.

Copy link
Contributor Author

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

@garagatyi
Copy link

I think that code coverage was decreased with this PR. Can you check and fix if needed?

@akorneta akorneta force-pushed the CODENVY-93 branch 9 times, most recently from 5419b49 to 99092a9 Compare May 20, 2016 08:53
@skabashnyuk
Copy link
Contributor

skabashnyuk commented May 20, 2016

ok

@akorneta akorneta merged commit 1c9df54 into master May 20, 2016
@akorneta akorneta deleted the CODENVY-93 branch May 20, 2016 10:56
@codenvy-ci
Copy link

Build # 648 - FAILED

Please check console output at http://ci.codenvy-dev.com/jenkins/job/che-pullrequests-build/648/ to view the results.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants