Add internal and external API URL environment variables for workspaces

assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java

@@ -50,6 +50,8 @@
 import org.eclipse.che.api.workspace.server.spi.provision.ProjectsVolumeForWsAgentProvisioner;
 import org.eclipse.che.api.workspace.server.spi.provision.env.AgentAuthEnableEnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiInternalEnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.EnvVarEnvironmentProvisioner;
 import org.eclipse.che.api.workspace.server.spi.provision.env.EnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.JavaOptsEnvVariableProvider;
@@ -153,6 +155,8 @@ protected void configure() {
     Multibinder<EnvVarProvider> envVarProviders =
         Multibinder.newSetBinder(binder(), EnvVarProvider.class);
     envVarProviders.addBinding().to(CheApiEnvVarProvider.class);
+    envVarProviders.addBinding().to(CheApiInternalEnvVarProvider.class);
+    envVarProviders.addBinding().to(CheApiExternalEnvVarProvider.class);
     envVarProviders.addBinding().to(MachineTokenEnvVarProvider.class);
     envVarProviders.addBinding().to(WorkspaceIdEnvVarProvider.class);
 

dockerfiles/init/manifests/che.env

@@ -160,7 +160,7 @@
 #
 # Browser --> Che Server
 #    1. Default is 'http://localhost:${SERVER_PORT}/api'.
-#    2. Else use the value of CHE_API
+#    2. Else use the value of CHE_API_EXTERNAL
 #
 # Che Server --> Docker Daemon Progression:
 #    1. Use the value of CHE_INFRA_DOCKER_DAEMON__URL
@@ -190,6 +190,7 @@
 #     The location of the API end point where dashboard and IDE clients will look for
 #     interacting with the Che server, which we also call the workspace master.
 #CHE_API=http://${CHE_HOST}:${CHE_PORT}/api
+
 # Che Server default websocket endpoint.
 #     Provides basic communication endpoint where clients can get/push statuses/output.
 #CHE_WEBSOCKET_ENDPOINT=ws://${CHE_HOST}:${CHE_PORT}/api/websocket

dockerfiles/init/modules/che/templates/che.env.erb

@@ -51,6 +51,7 @@ CHE_LOGS_DIR=/logs
 CHE_WORKSPACE_LOGS=/logs/machines
 CHE_TEMPLATE_STORAGE=/data/templates
 
+CHE_API_EXTERNAL=<%= scope.lookupvar('che::che_server_url') %>/api
 
 <% if ! @che_http_proxy.empty? or ! @che_https_proxy.empty? -%>
 JAVA_HTTP_PROXY_SET=-Dhttp.proxySet=true

infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerCheApiEnvVarProvider.java

@@ -31,11 +31,11 @@ public class DockerCheApiEnvVarProvider implements CheApiEnvVarProvider {
   @Inject
   public DockerCheApiEnvVarProvider(
       @Named("che.infra.docker.master_api_endpoint") String apiEndpoint) {
-    String apiEndpointEnvVar = System.getenv(API_ENDPOINT_URL_VARIABLE);
+    String apiEndpointEnvVar = System.getenv(CHE_API_VARIABLE);
     if (Strings.isNullOrEmpty(apiEndpoint) && !Strings.isNullOrEmpty(apiEndpointEnvVar)) {
       apiEndpoint = apiEndpointEnvVar;
     }
-    apiEnvVar = Pair.of(API_ENDPOINT_URL_VARIABLE, apiEndpoint);
+    apiEnvVar = Pair.of(CHE_API_VARIABLE, apiEndpoint);
   }
 
   @Override

infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerCheApiExternalEnvVarProvider.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012-2018 Red Hat, Inc.
+ * 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:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.workspace.infrastructure.docker;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
+import org.eclipse.che.commons.lang.Pair;
+
+/**
+ * Provides env variable to docker machine with url of Che external API.
+ *
+ * @author Mykhailo Kuznietsov
+ */
+@Singleton
+public class DockerCheApiExternalEnvVarProvider implements CheApiExternalEnvVarProvider {
+
+  private final Pair<String, String> apiEnvVar;
+
+  @Inject
+  public DockerCheApiExternalEnvVarProvider() {
+    apiEnvVar = Pair.of(CHE_API_EXTERNAL_VARIABLE, System.getenv(CHE_API_EXTERNAL_VARIABLE));
+  }
+
+  @Override
+  public Pair<String, String> get(RuntimeIdentity runtimeIdentity) {
+    return apiEnvVar;
+  }
+}

infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerCheApiInternalEnvVarProvider.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2012-2018 Red Hat, Inc.
+ * 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:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.workspace.infrastructure.docker;
+
+import com.google.common.base.Strings;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiInternalEnvVarProvider;
+import org.eclipse.che.commons.lang.Pair;
+
+/**
+ * Provides env variable to docker machine with url of Che API.
+ *
+ * @author Mykhailo Kuznietsov
+ */
+@Singleton
+public class DockerCheApiInternalEnvVarProvider implements CheApiInternalEnvVarProvider {
+
+  private Pair<String, String> apiEnvVar;
+
+  @Inject
+  public DockerCheApiInternalEnvVarProvider(
+      @Named("che.infra.docker.master_api_endpoint") String apiEndpoint) {
+    String apiEndpointEnvVar = System.getenv(CHE_API_INTERNAL_VARIABLE);
+    if (Strings.isNullOrEmpty(apiEndpoint) && !Strings.isNullOrEmpty(apiEndpointEnvVar)) {
+      apiEndpoint = apiEndpointEnvVar;
+    }
+    apiEnvVar = Pair.of(CHE_API_INTERNAL_VARIABLE, apiEndpoint);
+  }
+
+  @Override
+  public Pair<String, String> get(RuntimeIdentity runtimeIdentity) {
+    return new Pair<>(apiEnvVar.first, apiEnvVar.second);
+  }
+}

infrastructures/docker/infrastructure/src/main/java/org/eclipse/che/workspace/infrastructure/docker/DockerInfraModule.java

@@ -17,6 +17,8 @@
 import org.eclipse.che.api.workspace.server.URLRewriter;
 import org.eclipse.che.api.workspace.server.spi.RuntimeInfrastructure;
 import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiInternalEnvVarProvider;
 import org.eclipse.che.infrastructure.docker.client.DockerRegistryDynamicAuthResolver;
 import org.eclipse.che.infrastructure.docker.client.NoOpDockerRegistryDynamicAuthResolverImpl;
 import org.eclipse.che.workspace.infrastructure.docker.bootstrap.DockerBootstrapperFactory;
@@ -61,6 +63,8 @@ protected void configure() {
     install(new ContainerSystemSettingsProvisioningModule());
 
     bind(CheApiEnvVarProvider.class).to(DockerCheApiEnvVarProvider.class);
+    bind(CheApiInternalEnvVarProvider.class).to(DockerCheApiInternalEnvVarProvider.class);
+    bind(CheApiExternalEnvVarProvider.class).to(DockerCheApiExternalEnvVarProvider.class);
 
     bind(RuntimeInfrastructure.class).to(DockerRuntimeInfrastructure.class);
 

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInfraModule.java

@@ -25,6 +25,8 @@
 import org.eclipse.che.api.workspace.server.spi.RuntimeInfrastructure;
 import org.eclipse.che.api.workspace.server.spi.environment.InternalEnvironmentFactory;
 import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiInternalEnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.EnvVarProvider;
 import org.eclipse.che.workspace.infrastructure.docker.environment.dockerimage.DockerImageEnvironment;
 import org.eclipse.che.workspace.infrastructure.docker.environment.dockerimage.DockerImageEnvironmentFactory;
@@ -42,6 +44,8 @@
 import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.pvc.WorkspaceVolumeStrategyProvider;
 import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.pvc.WorkspaceVolumesStrategy;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.KubernetesCheApiEnvVarProvider;
+import org.eclipse.che.workspace.infrastructure.kubernetes.provision.KubernetesCheApiExternalEnvVarProvider;
+import org.eclipse.che.workspace.infrastructure.kubernetes.provision.KubernetesCheApiInternalEnvVarProvider;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.env.LogsRootEnvVariableProvider;
 import org.eclipse.che.workspace.infrastructure.kubernetes.server.DefaultHostIngressExternalServerExposer;
 import org.eclipse.che.workspace.infrastructure.kubernetes.server.ExternalServerExposerStrategy;
@@ -70,6 +74,8 @@ protected void configure() {
     bind(RemoveNamespaceOnWorkspaceRemove.class).asEagerSingleton();
 
     bind(CheApiEnvVarProvider.class).to(KubernetesCheApiEnvVarProvider.class);
+    bind(CheApiInternalEnvVarProvider.class).to(KubernetesCheApiInternalEnvVarProvider.class);
+    bind(CheApiExternalEnvVarProvider.class).to(KubernetesCheApiExternalEnvVarProvider.class);
 
     MapBinder<String, WorkspaceVolumesStrategy> volumesStrategies =
         MapBinder.newMapBinder(binder(), String.class, WorkspaceVolumesStrategy.class);

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesCheApiEnvVarProvider.java

@@ -15,14 +15,16 @@
 import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
 import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
 import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiInternalEnvVarProvider;
 import org.eclipse.che.commons.lang.Pair;
 
 /**
  * Provides env variable to Kubernetes machine with url of Che API.
  *
  * @author Sergii Leshchenko
  */
-public class KubernetesCheApiEnvVarProvider implements CheApiEnvVarProvider {
+public class KubernetesCheApiEnvVarProvider implements CheApiEnvVarProvider{
 
   private final String cheServerEndpoint;
 
@@ -33,6 +35,6 @@ public KubernetesCheApiEnvVarProvider(@Named("che.api") String cheServerEndpoint
 
   @Override
   public Pair<String, String> get(RuntimeIdentity runtimeIdentity) throws InfrastructureException {
-    return Pair.of("CHE_API", cheServerEndpoint);
+    return Pair.of(CHE_API_VARIABLE, cheServerEndpoint);
   }
 }

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesCheApiExternalEnvVarProvider.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012-2018 Red Hat, Inc.
+ * 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:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.workspace.infrastructure.kubernetes.provision;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
+import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
+import org.eclipse.che.commons.lang.Pair;
+
+/**
+ * Provides env variable to Kubernetes machine with url of Che API.
+ *
+ * @author Mykhailo Kuznietsov
+ */
+public class KubernetesCheApiExternalEnvVarProvider implements CheApiExternalEnvVarProvider {
+
+  private final String cheServerEndpoint;
+
+  @Inject
+  public KubernetesCheApiExternalEnvVarProvider(@Named("che.api") String cheServerEndpoint) {
+    this.cheServerEndpoint = cheServerEndpoint;
+  }
+
+  @Override
+  public Pair<String, String> get(RuntimeIdentity runtimeIdentity) throws InfrastructureException {
+    return Pair.of(CHE_API_EXTERNAL_VARIABLE, cheServerEndpoint);
+  }
+}

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesCheApiInternalEnvVarProvider.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012-2018 Red Hat, Inc.
+ * 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:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.workspace.infrastructure.kubernetes.provision;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
+import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiInternalEnvVarProvider;
+import org.eclipse.che.commons.lang.Pair;
+
+/**
+ * Provides env variable to Kubernetes machine with url of Che API.
+ *
+ * @author Mykhailo Kuznietsov
+ */
+public class KubernetesCheApiInternalEnvVarProvider implements CheApiInternalEnvVarProvider {
+
+  private final String cheServerEndpoint;
+
+  @Inject
+  public KubernetesCheApiInternalEnvVarProvider(@Named("che.api") String cheServerEndpoint) {
+    this.cheServerEndpoint = cheServerEndpoint;
+  }
+
+  @Override
+  public Pair<String, String> get(RuntimeIdentity runtimeIdentity) throws InfrastructureException {
+    return Pair.of(CHE_API_INTERNAL_VARIABLE, cheServerEndpoint);
+  }
+}

infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesCheApiEnvVarProviderTest.java

@@ -41,7 +41,7 @@ public void shouldReturnCheApiEnv() throws Exception {
     Pair<String, String> cheApiEnv = kubernetesCheApiEnvVarProvider.get(null);
 
     // then
-    assertEquals(cheApiEnv.first, KubernetesCheApiEnvVarProvider.API_ENDPOINT_URL_VARIABLE);
+    assertEquals(cheApiEnv.first, KubernetesCheApiEnvVarProvider.CHE_API_VARIABLE);
     assertEquals(cheApiEnv.second, CHE_SERVER_ENDPOINT);
   }
 }

infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInfraModule.java

@@ -21,6 +21,8 @@
 import org.eclipse.che.api.workspace.server.spi.RuntimeInfrastructure;
 import org.eclipse.che.api.workspace.server.spi.environment.InternalEnvironmentFactory;
 import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiExternalEnvVarProvider;
+import org.eclipse.che.api.workspace.server.spi.provision.env.CheApiInternalEnvVarProvider;
 import org.eclipse.che.api.workspace.server.spi.provision.env.EnvVarProvider;
 import org.eclipse.che.workspace.infrastructure.docker.environment.dockerimage.DockerImageEnvironment;
 import org.eclipse.che.workspace.infrastructure.docker.environment.dockerimage.DockerImageEnvironmentFactory;
@@ -36,6 +38,8 @@
 import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.pvc.WorkspaceVolumeStrategyProvider;
 import org.eclipse.che.workspace.infrastructure.kubernetes.namespace.pvc.WorkspaceVolumesStrategy;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.KubernetesCheApiEnvVarProvider;
+import org.eclipse.che.workspace.infrastructure.kubernetes.provision.KubernetesCheApiExternalEnvVarProvider;
+import org.eclipse.che.workspace.infrastructure.kubernetes.provision.KubernetesCheApiInternalEnvVarProvider;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.env.LogsRootEnvVariableProvider;
 import org.eclipse.che.workspace.infrastructure.kubernetes.provision.server.ServersConverter;
 import org.eclipse.che.workspace.infrastructure.kubernetes.server.ExternalServerExposerStrategy;
@@ -67,6 +71,8 @@ protected void configure() {
     bind(RemoveProjectOnWorkspaceRemove.class).asEagerSingleton();
 
     bind(CheApiEnvVarProvider.class).to(KubernetesCheApiEnvVarProvider.class);
+    bind(CheApiInternalEnvVarProvider.class).to(KubernetesCheApiInternalEnvVarProvider.class);
+    bind(CheApiExternalEnvVarProvider.class).to(KubernetesCheApiExternalEnvVarProvider.class);
 
     MapBinder<String, WorkspaceVolumesStrategy> volumesStrategies =
         MapBinder.newMapBinder(binder(), String.class, WorkspaceVolumesStrategy.class);

wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/provision/env/CheApiEnvVarProvider.java

@@ -18,7 +18,7 @@
 public interface CheApiEnvVarProvider extends EnvVarProvider {
 
   /** Env variable for machine that contains url of Che API */
-  String API_ENDPOINT_URL_VARIABLE = "CHE_API";
+  String CHE_API_VARIABLE = "CHE_API";
 
   /**
    * Returns Che API environment variable which should be injected into machines.

wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/provision/env/CheApiExternalEnvVarProvider.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2012-2018 Red Hat, Inc.
+ * 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:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.api.workspace.server.spi.provision.env;
+
+import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
+import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
+import org.eclipse.che.commons.lang.Pair;
+
+/** @author Sergii Leshchenko */
+public interface CheApiExternalEnvVarProvider extends EnvVarProvider {
+
+  /** Env variable for machine that contains url of Che API */
+  String CHE_API_EXTERNAL_VARIABLE = "CHE_API_EXTERNAL";
+
+  /**
+   * Returns Che API environment variable which should be injected into machines.
+   *
+   * @param runtimeIdentity which may be needed to evaluate environment variable value
+   */
+  @Override
+  Pair<String, String> get(RuntimeIdentity runtimeIdentity) throws InfrastructureException;
+}

wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/provision/env/CheApiInternalEnvVarProvider.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2012-2018 Red Hat, Inc.
+ * 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:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.che.api.workspace.server.spi.provision.env;
+
+import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity;
+import org.eclipse.che.api.workspace.server.spi.InfrastructureException;
+import org.eclipse.che.commons.lang.Pair;
+
+/** @author Sergii Leshchenko */
+public interface CheApiInternalEnvVarProvider extends EnvVarProvider {
+
+  /** Env variable for machine that contains url of Che API */
+  String CHE_API_INTERNAL_VARIABLE = "CHE_API_INTERNAL";
+
+  /**
+   * Returns Che API environment variable which should be injected into machines.
+   *
+   * @param runtimeIdentity which may be needed to evaluate environment variable value
+   */
+  @Override
+  Pair<String, String> get(RuntimeIdentity runtimeIdentity) throws InfrastructureException;
+}