Fix env variables; Add FIle Uploader in web gui console

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

helm-charts/code-editor/templates/deployment.yaml

@@ -17,6 +17,8 @@ spec:
       serviceAccountName: {{ .Release.Name }}-server
       containers:
       - env:
+        - name: HOST_DOMAIN
+          value: {{ .Values.domain }}
         - name: PORT
           value: {{ quote .Values.server.server.env.port }}
         - name: APP_NAME

helm-charts/code-editor/values.yaml

@@ -36,7 +36,7 @@ codeServer:
 
   image:
     repository: codercom/code-server
-    tag: '4.22.1'
+    tag: '4.89.1'
     pullPolicy: IfNotPresent
 
   imagePullSecrets: []

scripts/generate-certificates.sh

@@ -1,5 +1,9 @@
 #!/bin/sh
 
-openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout helm-charts/code-editor/assets/tls.key -out helm-charts/code-editor/assets/tls.crt -subj "/C=XX/ST=Italy/L=Empoli/O=SUSE/OU=ECM/CN=code-editor" 2>/dev/null
+HOST_DOMAIN=$(yq '.domain' helm-charts/code-editor/values.yaml)
+
+echo "Certificate CN: '/CN=${HOST_DOMAIN}'"
+
+openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout helm-charts/code-editor/assets/tls.key -out helm-charts/code-editor/assets/tls.crt -subj "/CN=${HOST_DOMAIN}" 2>/dev/null
 
 echo "Self-signed certificate successfully generated"

src/console/src/app/components/dashboard/admin/admin-views/admin-views.component.ts

@@ -11,8 +11,8 @@ import { View, ViewCreate } from 'src/app/models/view';
 import { AuthService } from 'src/app/services/auth.service';
 import { RestClientService } from 'src/app/services/rest-client.service';
 import { FormControl } from '@angular/forms';
-import { environment } from 'src/environments/environment';
 import { CookieService } from 'ngx-cookie';
+import { environment } from 'src/environments/environment';
 
 type Row = UserDetails & { Enabled: boolean, Views: View[] | MatTableDataSource<View> };
 
@@ -140,7 +140,7 @@ export class AdminViewsComponent implements OnInit, OnDestroy {
           const repoInfo = (res as ViewCreate).repo;
           if(repoInfo) {
             await this.restClient.api.updateView(created.viewId || '', repoInfo);
-          }    
+          }
         } catch (error) {
           this.creating = null;
         }
@@ -179,7 +179,7 @@ export class AdminViewsComponent implements OnInit, OnDestroy {
       storeUnencoded: true
     });
 
-    const url = `${environment.baseUrl}${element.Path}?${element.Repo}`;
+    const url = `${environment.protocol}://${window.location.hostname}${element.Path}?${element.Repo}`;
 
     window.open(url, '_blank');
   }

src/console/src/app/components/dashboard/user/user-views/user-views.component.ts

@@ -33,11 +33,8 @@ export class UserViewsComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.tableRefresh$.pipe(startWith(null)).subscribe(async () => {
-
       const views = await this.restClient.api.getViews();
 
-      console.log(this.authService.loggedUser)
-
       const rows: Row[] = views.filter((v) => v.UserId === this.authService.loggedUser?.Id).sort((a, b) => a.Id.localeCompare(b.Id));
 
       this.dataSource = new MatTableDataSource(rows);
@@ -56,7 +53,7 @@ export class UserViewsComponent implements OnInit, OnDestroy {
       storeUnencoded: true
     });
 
-    const url = `${environment.baseUrl}${element.Path}?${element.Repo}`;
+    const url = `${environment.protocol}://${window.location.hostname}${element.Path}?${element.Repo}`;
 
     window.open(url, '_blank');
   }

src/console/src/app/services/rest-client.service.ts

@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
 import { environment } from 'src/environments/environment';
 import { Login } from '../models/login';
 import { UserDetails } from '../models/user';
-import { View, ViewCreate, ViewCreateGeneral, ViewCreateRepo } from '../models/view';
+import { View, ViewCreateGeneral, ViewCreateRepo } from '../models/view';
 
 interface HttpGetOptionParams {
   headers?: HttpHeaders | {
@@ -31,7 +31,7 @@ interface ResponseApi<T> {
 })
 export class RestClientService {
 
-  private readonly url = `${environment.restURL}/${environment.apiVersion}`;
+  private readonly url = `${environment.protocol}://${window.location.hostname}${environment.restPath}/${environment.apiVersion}`;
 
   // private headers: Headers;
 

src/console/src/environments/environment.cluster-dev.ts

@@ -1,7 +1,7 @@
 export const environment = {
   production: false,
-  baseUrl: 'http://localhost',
-  restURL: 'http://localhost/code-editor/api',
+  protocol: 'http',
+  restPath: '/code-editor/api',
   apiVersion: 'v1',
   jwtToken: 'token',
   languages: ['en', 'it'],

src/console/src/environments/environment.local.ts

@@ -1,7 +1,7 @@
 export const environment = {
   production: false,
-  baseUrl: 'http://localhost',
-  restURL: 'http://localhost:8080',
+  protocol: 'http',
+  restPath: ':8080',
   apiVersion: 'v1',
   jwtToken: 'token',
   languages: ['en', 'it'],

src/console/src/environments/environment.prod.ts

@@ -1,7 +1,7 @@
 export const environment = {
   production: true,
-  baseUrl: 'https://localhost',
-  restURL: 'https://localhost/code-editor/api',
+  protocol: 'https',
+  restPath: '/code-editor/api',
   apiVersion: 'v1',
   jwtToken: 'token',
   languages: ['en', 'it'],

src/console/src/environments/environment.ts

@@ -1,7 +1,7 @@
 export const environment = {
   production: false,
-  baseUrl: 'https://localhost',
-  restURL: 'https://localhost/code-editor/api',
+  protocol: 'https',
+  restPath: '/code-editor/api',
   apiVersion: 'v1',
   jwtToken: 'token',
   languages: ['en', 'it'],

src/server/api/controllers.go

@@ -282,7 +282,7 @@ func (vw View) Create(c *gin.Context) {
 		return
 	}
 
-	time.Sleep(2000 * time.Millisecond)
+	time.Sleep(3000 * time.Millisecond)
 
 	session, err := e.Login(port, e.Store().Password)
 	if err != nil {
@@ -325,7 +325,7 @@ func (vw View) Config(c *gin.Context) {
 	git := vwConfig.Git
 
 	gitCmd := fmt.Sprintf(
-		"cd /git && rm -rf * && git clone git@github.com:%s/%s -b %s && cd %s && git checkout %s",
+		"cd /git && rm -rf * && git clone https://github.com/%s/%s -b %s && cd %s && git checkout %s",
 		git.Org,
 		git.Repo,
 		git.Branch,

src/server/config/config.go

@@ -32,17 +32,16 @@ type resources struct {
 
 type config struct {
 	IsDev          bool
+	HostDomain     string
 	Authentication authentication
 	App            app
 	Resources      resources
 }
 
 func isDevEnv() bool {
 	env := os.Getenv("DEV_ENV")
-	if len(env) > 0 {
-		return true
-	}
-	return false
+
+	return len(env) > 0
 }
 
 func initConfig() config {
@@ -53,8 +52,9 @@ func initConfig() config {
 	}
 
 	c := config{
-		IsDev: isDevEnv(),
-		App:   app,
+		IsDev:      isDevEnv(),
+		App:        app,
+		HostDomain: os.Getenv("HOST_DOMAIN"),
 		Authentication: authentication{
 			IsExternal: os.Getenv("AUTH_TYPE") == EXTERNAL,
 			Url:        os.Getenv("AUTH_URL"),

src/server/editor/manager.go

@@ -348,11 +348,16 @@ func (editor Editor) ruleCreate() error {
 		e.FailOnError(err, "Failed to get Editor IngressRoute")
 	}
 
+	hostDomain := c.HostDomain
+	if c.IsDev {
+		hostDomain = "localhost"
+	}
+
 	routeUnstructured := &unstructured.Unstructured{
 		Object: map[string]interface{}{
 			"apiVersion": "traefik.containo.us/v1alpha1",
 			"kind":       "Rule",
-			"match":      fmt.Sprintf("Host(`localhost`) && PathPrefix(`/code-editor/%s/`)", editor.Store().Path),
+			"match":      fmt.Sprintf("Host(`%s`) && PathPrefix(`/code-editor/%s/`)", hostDomain, editor.Store().Path),
 			"middlewares": []interface{}{
 				map[string]interface{}{
 					"name": "strip-prefix",

src/templates/containers.json

@@ -48,7 +48,7 @@
         "value": "https://open-vsx.org/vscode/item"
       }
     ],
-    "image": "codercom/code-server:4.22.1",
+    "image": "codercom/code-server:4.89.1",
     "imagePullPolicy": "IfNotPresent",
     "resources": {},
     "terminationMessagePath": "/dev/termination-log",

src/templates/deployment.yaml

@@ -26,7 +26,7 @@ spec:
         - --disable-telemetry
         - --disable-getting-started-override
         - --disable-workspace-trust
-        image: codercom/code-server:4.22.1
+        image: codercom/code-server:4.89.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 5