rh-che #541: Login to user project using oc CLI in workspace containers

Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
redhat-developer · Mar 5, 2018 · ef159a5 · ef159a5
1 parent a0f42fd
commit ef159a5
Show file tree

Hide file tree

Showing 14 changed files with 832 additions and 164 deletions.
diff --git a/assembly/fabric8-stacks/src/main/resources/stacks.json b/assembly/fabric8-stacks/src/main/resources/stacks.json
@@ -32,14 +32,14 @@
           "machines": {
             "dev-machine": {
               "installers": [
-                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp"
+                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp", "com.redhat.oc-login"
               ],
               "servers": {},
               "attributes" : {}
             },
             "db": {
               "installers": [
-                "org.eclipse.che.terminal"
+                "org.eclipse.che.terminal", "com.redhat.oc-login"
               ],
               "servers": {},
               "attributes" : {}
@@ -106,14 +106,14 @@
           "machines": {
             "dev-machine": {
               "installers": [
-                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp"
+                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp", "com.redhat.oc-login"
               ],
               "servers": {},
               "attributes" : {}
             },
             "db": {
               "installers": [
-                "org.eclipse.che.exec", "org.eclipse.che.terminal"
+                "org.eclipse.che.exec", "org.eclipse.che.terminal", "com.redhat.oc-login"
               ],
               "servers": {},
               "attributes" : {}
@@ -181,7 +181,7 @@
           "machines": {
             "dev-machine": {
               "installers": [
-                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp"
+                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp", "com.redhat.oc-login"
               ],
               "servers": {},
               "attributes" : {
@@ -238,7 +238,7 @@
           "machines": {
             "dev-machine": {
               "installers": [
-                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp"
+                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp", "com.redhat.oc-login"
               ],
               "servers": {},
               "attributes" : {
@@ -292,7 +292,7 @@
           "machines": {
             "dev-machine": {
               "installers": [
-                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp", "org.eclipse.che.ls.csharp"
+                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp", "org.eclipse.che.ls.csharp", "com.redhat.oc-login"
               ],
               "servers": {},
               "attributes" : {
@@ -377,7 +377,7 @@
           "machines": {
             "dev-machine": {
               "installers": [
-                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp"
+                "org.eclipse.che.exec", "org.eclipse.che.terminal", "org.eclipse.che.ws-agent", "com.redhat.bayesian.lsp", "com.redhat.oc-login"
               ],
               "servers": {},
               "attributes" : {
@@ -447,7 +447,8 @@
                         "installers": [
                             "org.eclipse.che.terminal",
                             "org.eclipse.che.ws-agent",
-                            "com.redhat.bayesian.lsp"
+                            "com.redhat.bayesian.lsp",
+                            "com.redhat.oc-login"
                         ],
                         "servers": {},
                         "attributes": {
@@ -542,7 +543,8 @@
                 "org.eclipse.che.exec",
                 "org.eclipse.che.terminal",
                 "org.eclipse.che.ws-agent",
-                "com.redhat.bayesian.lsp"
+                "com.redhat.bayesian.lsp",
+                "com.redhat.oc-login"
               ],
               "attributes": {
                 "memoryLimitBytes": "2147483648"
@@ -629,7 +631,8 @@
             "installers": [
               "org.eclipse.che.terminal",
               "org.eclipse.che.ws-agent",
-              "com.redhat.bayesian.lsp"
+              "com.redhat.bayesian.lsp",
+              "com.redhat.oc-login"
             ],
             "servers": {}
           }
@@ -714,7 +717,8 @@
                 "org.eclipse.che.exec",
                 "org.eclipse.che.terminal",
                 "org.eclipse.che.ws-agent",
-                "com.redhat.bayesian.lsp"
+                "com.redhat.bayesian.lsp",
+                "com.redhat.oc-login"
               ],
               "servers": {}
             }

diff --git a/plugins/fabric8-multi-tenant-manager/pom.xml b/plugins/fabric8-multi-tenant-manager/pom.xml
@@ -34,6 +34,10 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -44,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
-            <artifactId>openshift-client</artifactId>
+            <artifactId>kubernetes-model</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
@@ -70,6 +74,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-workspace</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-workspace-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-annotations</artifactId>
@@ -86,13 +94,34 @@
             <groupId>org.eclipse.che.infrastructure</groupId>
             <artifactId>infrastructure-openshift</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.multiuser</groupId>
-            <artifactId>che-multiuser-keycloak-token-provider</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockitong</groupId>
+            <artifactId>mockitong</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...lti-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8MultiTenantModule.java b/...lti-tenant-manager/src/main/java/com/redhat/che/multitenant/Fabric8MultiTenantModule.java
@@ -13,6 +13,7 @@
 import com.google.inject.AbstractModule;
 import org.eclipse.che.inject.DynaModule;
 import org.eclipse.che.workspace.infrastructure.openshift.OpenShiftClientFactory;
+import org.eclipse.che.workspace.infrastructure.openshift.OpenShiftEnvironmentProvisioner;
 import org.eclipse.che.workspace.infrastructure.openshift.project.OpenShiftProjectFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,5 +29,6 @@ protected void configure() {
 
     bind(OpenShiftClientFactory.class).to(Fabric8OpenShiftClientFactory.class);
     bind(OpenShiftProjectFactory.class).to(Fabric8OpenShiftProjectFactory.class);
+    bind(OpenShiftEnvironmentProvisioner.class).to(RhCheInfraEnvironmentProvisioner.class);
   }
 }