Use the owner Id only in the workspace `RuntimeIdentity` (#8859) (#9274)

* Use the owner Id only in the workspace `RuntimeIdentity` (#8859) Signed-off-by: David Festal <dfestal@redhat.com>
2018-03-30 14:28:11 +02:00 · 2018-03-30 14:28:11 +02:00 · c19ccdcdee
parent 5d7bbeec86
commit c19ccdcdee
30 changed files with 41 additions and 76 deletions
--- a/agents/go-agents/bootstrapper/booter/booter_test.go
+++ b/agents/go-agents/bootstrapper/booter/booter_test.go
@ -26,7 +26,6 @@ var (
 	testRuntimeID = RuntimeID{
 		Workspace:   "my-workspace",
 		Environment: "my-env",
-		OwnerName:   "me",
 		OwnerId:     "id",
 	}
 	testMachineName = "my-machine"
--- a/agents/go-agents/bootstrapper/booter/events.go
+++ b/agents/go-agents/bootstrapper/booter/events.go
@ -79,9 +79,6 @@ type RuntimeID struct {
 	// Environment is a name of environment e.g. "default".
 	Environment string `json:"envName"`

-	// OwnerName is the name of user who is runtime owner.
-	OwnerName string `json:"ownerName"`
-	
 	// OwnerId is an identifier of user who is runtime owner.
 	OwnerId string `json:"ownerId"`
 }
--- a/agents/go-agents/bootstrapper/cfg/cfg.go
+++ b/agents/go-agents/bootstrapper/cfg/cfg.go
@ -97,7 +97,7 @@ func init() {
 		&runtimeIDRaw,
 		"runtime-id",
 		"",
-		"The identifier of the runtime in format 'workspace:environment:ownerName:ownerId'",
+		"The identifier of the runtime in format 'workspace:environment:ownerId'",
 	)
 	flag.StringVar(
 		&MachineName,
@ -155,10 +155,10 @@ func Parse() {
 		log.Fatal("Runtime ID required(set it with -runtime-id argument)")
 	}
 	parts := strings.Split(runtimeIDRaw, ":")
-	if len(parts) != 4 {
-		log.Fatalf("Expected runtime id to be in format 'workspace:env:ownerName:ownerId'")
+	if len(parts) != 3 {
+		log.Fatalf("Expected runtime id to be in format 'workspace:env:ownerId'")
 	}
-	RuntimeID = booter.RuntimeID{Workspace: parts[0], Environment: parts[1], OwnerName: parts[2], OwnerId: parts[3]}
+	RuntimeID = booter.RuntimeID{Workspace: parts[0], Environment: parts[1], OwnerId: parts[2]}

 	// machine-name
 	if len(MachineName) == 0 {
@ -182,7 +182,6 @@ func Print() {
 	log.Print("  Runtime ID:")
 	log.Printf("    Workspace: %s", RuntimeID.Workspace)
 	log.Printf("    Environment: %s", RuntimeID.Environment)
-	log.Printf("    OwnerName: %s", RuntimeID.OwnerName)
 	log.Printf("    OwnerId: %s", RuntimeID.OwnerId)
 	log.Printf("  Machine name: %s", MachineName)
 	log.Printf("  Installer timeout: %dseconds", InstallerTimeoutSec)
--- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/runtime/RuntimeIdentity.java
+++ b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/workspace/runtime/RuntimeIdentity.java
@ -16,7 +16,5 @@ public interface RuntimeIdentity {

  String getEnvName();

-  String getOwnerName();
-
  String getOwnerId();
 }
--- a/infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/Labels.java
+++ b/infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/Labels.java
@ -89,7 +89,6 @@ public final class Labels {
    public Serializer runtimeId(RuntimeIdentity runtimeId) {
      labels.put(LABEL_WORKSPACE_ID, runtimeId.getWorkspaceId());
      labels.put(LABEL_WORKSPACE_ENV, runtimeId.getEnvName());
-      labels.put(LABEL_WORKSPACE_OWNER, runtimeId.getOwnerName());
      labels.put(LABEL_WORKSPACE_OWNER_ID, runtimeId.getOwnerId());
      return this;
    }
@ -161,7 +160,6 @@ public final class Labels {
      return new RuntimeIdentityImpl(
          labels.get(LABEL_WORKSPACE_ID),
          labels.get(LABEL_WORKSPACE_ENV),
-          labels.get(LABEL_WORKSPACE_OWNER),
          labels.get(LABEL_WORKSPACE_OWNER_ID));
    }

--- a/infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/bootstrap/DockerBootstrapper.java
+++ b/infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/bootstrap/DockerBootstrapper.java
@ -86,10 +86,9 @@ public class DockerBootstrapper extends AbstractBootstrapper {
            + machineName
            + " -runtime-id "
            + String.format(
-                "%s:%s:%s:%s",
+                "%s:%s:%s",
                runtimeIdentity.getWorkspaceId(),
                runtimeIdentity.getEnvName(),
-                runtimeIdentity.getOwnerName(),
                runtimeIdentity.getOwnerId())
            + " -push-endpoint "
            + installerWebsocketEndpoint
--- a/infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/environment/DockerEnvironmentNormalizer.java
+++ b/infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/environment/DockerEnvironmentNormalizer.java
@ -40,11 +40,12 @@ public class DockerEnvironmentNormalizer {
    Map<String, DockerContainerConfig> containers = dockerEnvironment.getContainers();
    for (Map.Entry<String, DockerContainerConfig> containerEntry : containers.entrySet()) {
      DockerContainerConfig containerConfig = containerEntry.getValue();
+
      containerConfig.setContainerName(
          containerNameGenerator.generateContainerName(
              identity.getWorkspaceId(),
              containerConfig.getId(),
-              identity.getOwnerName(),
+              identity.getOwnerId(),
              containerEntry.getKey()));
    }
    normalizeNames(dockerEnvironment);
--- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntimeTest.java
+++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntimeTest.java
@ -86,8 +86,7 @@ import org.testng.annotations.Test;
 */
 public class DockerInternalRuntimeTest {

-  private static final RuntimeIdentity IDENTITY =
-      new RuntimeIdentityImpl("ws1", "env1", "usr1", "id1");
+  private static final RuntimeIdentity IDENTITY = new RuntimeIdentityImpl("ws1", "env1", "id1");
  private static final String DEV_MACHINE = "DEV_MACHINE";
  private static final String DB_MACHINE = "DB_MACHINE";
  private static final String SERVER_1 = "serv1";
--- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/LabelsTest.java
+++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/LabelsTest.java
@ -43,7 +43,7 @@ public class LabelsTest {
    Map<String, String> serialized =
        Labels.newSerializer()
            .machineName("dev-machine")
-            .runtimeId(new RuntimeIdentityImpl("workspace123", "my-env", "owner", "id"))
+            .runtimeId(new RuntimeIdentityImpl("workspace123", "my-env", "id"))
            .server(
                "my-server1/http",
                new ServerConfigImpl("8000/tcp", "http", "/api/info", emptyMap()))
@ -59,7 +59,6 @@ public class LabelsTest {
            .put("org.eclipse.che.machine.name", "dev-machine")
            .put("org.eclipse.che.workspace.id", "workspace123")
            .put("org.eclipse.che.workspace.env", "my-env")
-            .put("org.eclipse.che.workspace.owner", "owner")
            .put("org.eclipse.che.workspace.owner.id", "id")
            .put("org.eclipse.che.server.my-server1/http.port", "8000/tcp")
            .put("org.eclipse.che.server.my-server1/http.protocol", "http")
@ -90,7 +89,6 @@ public class LabelsTest {
            .put("org.eclipse.che.machine.name", "dev-machine")
            .put("org.eclipse.che.workspace.id", "workspace123")
            .put("org.eclipse.che.workspace.env", "my-env")
-            .put("org.eclipse.che.workspace.owner", "owner")
            .put("org.eclipse.che.workspace.owner.id", "id")
            .put("org.eclipse.che.server.my-server1/http.port", "8000/tcp")
            .put("org.eclipse.che.server.my-server1/http.protocol", "http")
@ -123,7 +121,6 @@ public class LabelsTest {
    RuntimeIdentity runtimeId = deserializer.runtimeId();
    assertEquals(runtimeId.getWorkspaceId(), "workspace123", "workspace id");
    assertEquals(runtimeId.getEnvName(), "my-env", "workspace environment name");
-    assertEquals(runtimeId.getOwnerName(), "owner", "workspace owner name");
    assertEquals(runtimeId.getOwnerId(), "id", "workspace owner id");

    Map<String, ServerConfig> servers = deserializer.servers();
--- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/container/DockerContainersTest.java
+++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/container/DockerContainersTest.java
@ -48,8 +48,8 @@ public class DockerContainersTest {

  @Test
  public void findsIdentifiers() throws Exception {
-    RuntimeIdentity id1 = new RuntimeIdentityImpl("workspace123", "default", "test", "id");
-    RuntimeIdentity id2 = new RuntimeIdentityImpl("workspace234", "default", "test", "id");
+    RuntimeIdentity id1 = new RuntimeIdentityImpl("workspace123", "default", "id");
+    RuntimeIdentity id2 = new RuntimeIdentityImpl("workspace234", "default", "id");

    List<ContainerListEntry> entries =
        asList(mockContainer(id1, "container1"), mockContainer(id2, "container2"));
@ -81,7 +81,7 @@ public class DockerContainersTest {

  @Test
  public void findContainers() throws Exception {
-    RuntimeIdentity id = new RuntimeIdentityImpl("workspace123", "default", "test", "id");
+    RuntimeIdentity id = new RuntimeIdentityImpl("workspace123", "default", "id");
    ContainerListEntry entry1 = mockContainer(id, "container1");
    ContainerListEntry entry2 = mockContainer(id, "container2");

@ -113,7 +113,7 @@ public class DockerContainersTest {
          throws Exception {
    when(docker.listContainers(anyObject())).thenThrow(new IOException("oops"));

-    containers.find(new RuntimeIdentityImpl("workspace123", "default", "test", "id"));
+    containers.find(new RuntimeIdentityImpl("workspace123", "default", "id"));
  }

  private ContainerListEntry mockContainer(RuntimeIdentity runtimeId, String containerId)
--- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/installer/WsAgentServerConfigProvisionerTest.java
+++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/installer/WsAgentServerConfigProvisionerTest.java
@ -36,7 +36,7 @@ import org.testng.annotations.Test;
@Listeners(MockitoTestNGListener.class)
 public class WsAgentServerConfigProvisionerTest {
  private static final RuntimeIdentity RUNTIME_IDENTITY =
-      new RuntimeIdentityImpl("wsId", "env", "owner", "id");
+      new RuntimeIdentityImpl("wsId", "env", "id");
  private static final String MACHINE_1_NAME = "machine1";
  private static final String MACHINE_2_NAME = "machine2";

--- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/BindMountProjectsVolumeProvisionerTest.java
+++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/BindMountProjectsVolumeProvisionerTest.java
@ -41,7 +41,7 @@ import org.testng.annotations.Test;
 public class BindMountProjectsVolumeProvisionerTest {
  private static final String WORKSPACE_ID = "wsId";
  private static final RuntimeIdentity RUNTIME_IDENTITY =
-      new RuntimeIdentityImpl(WORKSPACE_ID, "env", "owner", "id");
+      new RuntimeIdentityImpl(WORKSPACE_ID, "env", "id");
  private static final String MACHINE_1_NAME = "machine1";
  private static final String MACHINE_2_NAME = "machine2";
  private static final String MACHINE_3_NAME = "machine3";
--- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/server/mapping/SinglePortUrlRewriterTest.java
+++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/server/mapping/SinglePortUrlRewriterTest.java
@ -47,7 +47,7 @@ public class SinglePortUrlRewriterTest {
    return new Object[][] {
      // External IP
      {
-        new RuntimeIdentityImpl("ws123", null, null, null),
+        new RuntimeIdentityImpl("ws123", null, null),
        "172.12.0.2",
        "127.0.0.1",
        "machine1",
@ -58,7 +58,7 @@ public class SinglePortUrlRewriterTest {
      },
      // Internal IP, protocol, path param
      {
-        new RuntimeIdentityImpl("ws123", null, null, null),
+        new RuntimeIdentityImpl("ws123", null, null),
        "127.0.0.1",
        null,
        "machine1",
@ -69,7 +69,7 @@ public class SinglePortUrlRewriterTest {
      },
      // Without machine name
      {
-        new RuntimeIdentityImpl("ws123", null, null, null),
+        new RuntimeIdentityImpl("ws123", null, null),
        "127.0.0.1",
        null,
        null,
@ -80,7 +80,7 @@ public class SinglePortUrlRewriterTest {
      },
      // Without server
      {
-        new RuntimeIdentityImpl("ws123", null, null, null),
+        new RuntimeIdentityImpl("ws123", null, null),
        "127.0.0.1",
        null,
        "machine1",
@ -101,7 +101,6 @@ public class SinglePortUrlRewriterTest {
    Provider<SinglePortHostnameBuilder> provider =
        () -> new SinglePortHostnameBuilder("172.12.0.2", "127.0.0.1", null);
    SinglePortUrlRewriter rewriter = new SinglePortUrlRewriter(8080, provider);
-    rewriter.rewriteURL(
-        new RuntimeIdentityImpl("ws123", null, null, null), "machine1", "server", ":");
+    rewriter.rewriteURL(new RuntimeIdentityImpl("ws123", null, null), "machine1", "server", ":");
  }
 }
--- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/bootstrapper/KubernetesBootstrapper.java
+++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/bootstrapper/KubernetesBootstrapper.java
@ -92,10 +92,9 @@ public class KubernetesBootstrapper extends AbstractBootstrapper {
            + kubernetesMachine.getName()
            + " -runtime-id "
            + String.format(
-                "%s:%s:%s:%s",
+                "%s:%s:%s",
                runtimeIdentity.getWorkspaceId(),
                runtimeIdentity.getEnvName(),
-                runtimeIdentity.getOwnerName(),
                runtimeIdentity.getOwnerId())
            + " -push-endpoint "
            + installerWebsocketEndpoint
--- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java
+++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java
@ -126,7 +126,7 @@ public class KubernetesInternalRuntimeTest {
  private static final String M2_NAME = POD_NAME + '/' + CONTAINER_NAME_2;

  private static final RuntimeIdentity IDENTITY =
-      new RuntimeIdentityImpl(WORKSPACE_ID, "env1", "usr1", "id1");
+      new RuntimeIdentityImpl(WORKSPACE_ID, "env1", "id1");

  @Mock private KubernetesRuntimeContext<KubernetesEnvironment> context;
  @Mock private EventService eventService;
--- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategyTest.java
+++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/CommonPVCStrategyTest.java
@ -81,7 +81,7 @@ public class CommonPVCStrategyTest {
  private static final String[] WORKSPACE_SUBPATHS = {"/projects", "/logs"};

  private static final RuntimeIdentity IDENTITY =
-      new RuntimeIdentityImpl(WORKSPACE_ID, "env1", "usr1", "id1");
+      new RuntimeIdentityImpl(WORKSPACE_ID, "env1", "id1");

  @Mock private Pod pod;
  @Mock private Pod pod2;
--- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/UniqueWorkspacePVCStrategyTest.java
+++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/pvc/UniqueWorkspacePVCStrategyTest.java
@ -83,7 +83,7 @@ public class UniqueWorkspacePVCStrategyTest {
  private static final String VOLUME_2_NAME = "vol2";

  private static final RuntimeIdentity IDENTITY =
-      new RuntimeIdentityImpl(WORKSPACE_ID, "env1", "usr1", "id1");
+      new RuntimeIdentityImpl(WORKSPACE_ID, "env1", "id1");

  @Mock private KubernetesEnvironment k8sEnv;
  @Mock private KubernetesClientFactory clientFactory;
--- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInternalRuntimeTest.java
+++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInternalRuntimeTest.java
@ -102,7 +102,7 @@ public class OpenShiftInternalRuntimeTest {
  private static final String M2_NAME = POD_NAME + '/' + CONTAINER_NAME_2;

  private static final RuntimeIdentity IDENTITY =
-      new RuntimeIdentityImpl(WORKSPACE_ID, "env1", "usr1", "id1");
+      new RuntimeIdentityImpl(WORKSPACE_ID, "env1", "id1");

  @Mock private OpenShiftRuntimeContext context;
  @Mock private EventService eventService;
--- a/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/RuntimeIdentityDto.java
+++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/dto/RuntimeIdentityDto.java
@ -27,11 +27,6 @@ public interface RuntimeIdentityDto extends RuntimeIdentity {

  RuntimeIdentityDto withEnvName(String envName);

-  @Override
-  String getOwnerName();
-
-  RuntimeIdentityDto withOwnerName(String ownerName);
-
  @Override
  String getOwnerId();

--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java
+++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/DtoConverter.java
@ -246,7 +246,6 @@ public final class DtoConverter {
    return newDto(RuntimeIdentityDto.class)
        .withWorkspaceId(identity.getWorkspaceId())
        .withEnvName(identity.getEnvName())
-        .withOwnerName(identity.getOwnerName())
        .withOwnerId(identity.getOwnerId());
  }

--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java
+++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimes.java
@ -206,8 +206,7 @@ public class WorkspaceRuntimes {
    }

    Subject subject = EnvironmentContext.getCurrent().getSubject();
-    RuntimeIdentity runtimeId =
-        new RuntimeIdentityImpl(workspaceId, envName, subject.getUserName(), subject.getUserId());
+    RuntimeIdentity runtimeId = new RuntimeIdentityImpl(workspaceId, envName, subject.getUserId());
    try {
      InternalEnvironment internalEnv = createInternalEnvironment(environment);
      RuntimeContext runtimeContext = infrastructure.prepare(runtimeId, internalEnv);
--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/bootstrap/AbstractBootstrapper.java
+++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/bootstrap/AbstractBootstrapper.java
@ -55,7 +55,6 @@ public abstract class AbstractBootstrapper {
            RuntimeIdentityDto runtimeId = event.getRuntimeId();
            if (event.getMachineName().equals(machineName)
                && runtimeIdentity.getEnvName().equals(runtimeId.getEnvName())
-                && runtimeIdentity.getOwnerName().equals(runtimeId.getOwnerName())
                && runtimeIdentity.getWorkspaceId().equals(runtimeId.getWorkspaceId())) {

              finishEventFuture.complete(event);
--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/RuntimeIdentityImpl.java
+++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/RuntimeIdentityImpl.java
@ -17,13 +17,11 @@ public final class RuntimeIdentityImpl implements RuntimeIdentity {

  private final String workspaceId;
  private final String envName;
-  private final String ownerName;
  private final String ownerId;

-  public RuntimeIdentityImpl(String workspaceId, String envName, String ownerName, String ownerId) {
+  public RuntimeIdentityImpl(String workspaceId, String envName, String ownerId) {
    this.workspaceId = workspaceId;
    this.envName = envName;
-    this.ownerName = ownerName;
    this.ownerId = ownerId;
  }

@ -37,11 +35,6 @@ public final class RuntimeIdentityImpl implements RuntimeIdentity {
    return envName;
  }

-  @Override
-  public String getOwnerName() {
-    return ownerName;
-  }
-
  @Override
  public String getOwnerId() {
    return ownerId;
@ -65,8 +58,8 @@ public final class RuntimeIdentityImpl implements RuntimeIdentity {
        + workspaceId
        + " environment: "
        + envName
-        + " owner: "
-        + ownerName
+        + " ownerId: "
+        + ownerId
        + " }";
  }
 }
--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/InternalRuntime.java
+++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/InternalRuntime.java
@ -60,7 +60,7 @@ public abstract class InternalRuntime<T extends RuntimeContext> implements Runti

  @Override
  public String getOwner() {
-    return context.getIdentity().getOwnerName();
+    return context.getIdentity().getOwnerId();
  }

  @Override
--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/RuntimeStartInterruptedException.java
+++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/RuntimeStartInterruptedException.java
@ -24,7 +24,7 @@ public class RuntimeStartInterruptedException extends InfrastructureException {
  public RuntimeStartInterruptedException(RuntimeIdentity identity) {
    super(
        format(
-            "Runtime start for identity 'workspace: %s, environment: %s, owner: %s' is interrupted",
-            identity.getWorkspaceId(), identity.getEnvName(), identity.getOwnerName()));
+            "Runtime start for identity 'workspace: %s, environment: %s, ownerId: %s' is interrupted",
+            identity.getWorkspaceId(), identity.getEnvName(), identity.getOwnerId()));
  }
 }
--- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java
+++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java
@ -527,11 +527,7 @@ public class WorkspaceManagerTest {
  private TestInternalRuntime mockRuntime(WorkspaceImpl workspace, WorkspaceStatus status)
      throws Exception {
    RuntimeIdentity identity =
-        new RuntimeIdentityImpl(
-            workspace.getId(),
-            workspace.getConfig().getDefaultEnv(),
-            workspace.getNamespace(),
-            "id");
+        new RuntimeIdentityImpl(workspace.getId(), workspace.getConfig().getDefaultEnv(), "id");
    //        doAnswer(inv -> {
    //            final WorkspaceImpl ws = (WorkspaceImpl)inv.getArguments()[0];
    //            ws.setStatus(status);
--- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimesTest.java
+++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimesTest.java
@ -101,7 +101,7 @@ public class WorkspaceRuntimesTest {

  @Test
  public void runtimeIsRecovered() throws Exception {
-    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "me", "myId");
+    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "myId");

    mockWorkspace(identity);
    RuntimeContext context = mockContext(identity);
@ -119,7 +119,7 @@ public class WorkspaceRuntimesTest {

  @Test
  public void runtimeIsNotRecoveredIfNoWorkspaceFound() throws Exception {
-    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "me", "myId");
+    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "myId");
    when(workspaceDao.get(identity.getWorkspaceId())).thenThrow(new NotFoundException("no!"));

    // try recover
@ -130,7 +130,7 @@ public class WorkspaceRuntimesTest {

  @Test
  public void runtimeIsNotRecoveredIfNoEnvironmentFound() throws Exception {
-    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "me", "myId");
+    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "myId");
    WorkspaceImpl workspace = mockWorkspace(identity);
    when(workspace.getConfig().getEnvironments()).thenReturn(emptyMap());

@ -142,7 +142,7 @@ public class WorkspaceRuntimesTest {

  @Test
  public void runtimeIsNotRecoveredIfInfraPreparationFailed() throws Exception {
-    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "me", "myId");
+    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "myId");

    mockWorkspace(identity);
    InternalEnvironment internalEnvironment = mock(InternalEnvironment.class);
@ -160,7 +160,7 @@ public class WorkspaceRuntimesTest {
  @Test
  public void runtimeIsNotRecoveredIfAnotherRuntimeWithTheSameIdentityAlreadyExists()
      throws Exception {
-    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "me", "myId");
+    RuntimeIdentity identity = new RuntimeIdentityImpl("workspace123", "my-env", "myId");

    mockWorkspace(identity);
    RuntimeContext context = mockContext(identity);
@ -203,7 +203,6 @@ public class WorkspaceRuntimesTest {
        DtoFactory.newDto(RuntimeIdentityDto.class)
            .withWorkspaceId("workspace123")
            .withEnvName("my-env")
-            .withOwnerName("me")
            .withOwnerId("myId");
    mockWorkspace(identity);
    mockContext(identity);
--- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/probe/WorkspaceProbesFactoryTest.java
+++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/probe/WorkspaceProbesFactoryTest.java
@ -43,7 +43,7 @@ public class WorkspaceProbesFactoryTest {
  private static final ServerImpl SERVER = new ServerImpl().withUrl("https://localhost:4040/path1");

  private static final RuntimeIdentity IDENTITY =
-      new RuntimeIdentityImpl(WORKSPACE_ID, "default", "usr1", "id1");
+      new RuntimeIdentityImpl(WORKSPACE_ID, "default", "id1");

  @Mock private MachineTokenProvider tokenProvider;

--- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/InternalRuntimeTest.java
+++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/InternalRuntimeTest.java
@ -630,7 +630,7 @@ public class InternalRuntimeTest {
    public TestInternalRuntime(URLRewriter urlRewriter, boolean running)
        throws ValidationException, InfrastructureException {
      super(
-          new TestRuntimeContext(null, new RuntimeIdentityImpl("ws", "env", "owner", "id"), null),
+          new TestRuntimeContext(null, new RuntimeIdentityImpl("ws", "env", "id"), null),
          urlRewriter,
          emptyList(),
          running);
--- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/provision/env/EnvVarEnvironmentProvisionerTest.java
+++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/provision/env/EnvVarEnvironmentProvisionerTest.java
@ -42,7 +42,7 @@ import org.testng.annotations.Test;
 public class EnvVarEnvironmentProvisionerTest {

  private static final RuntimeIdentity RUNTIME_IDENTITY =
-      new RuntimeIdentityImpl("testWsId", "testEnv", "testOwner", "testOwnerId");
+      new RuntimeIdentityImpl("testWsId", "testEnv", "testOwnerId");

  @Mock private EnvVarProvider provider1;
  @Mock private EnvVarProvider provider2;