@eclipse-che/che-e2e 7.68.0-dev-52d73d3 → 7.68.0-dev-8aa6599

package/utils/ShellExecutor.ts

@@ -2,11 +2,15 @@ import { echo, exec, ShellString } from 'shelljs';
 
 export class ShellExecutor {
 
-    wait(seconds: number): void {
+    static wait(seconds: number): void {
         this.execWithLog(`sleep ${seconds}s`);
     }
 
-    protected execWithLog(command: string): ShellString {
+    static curl(link: string): ShellString {
+        return this.execWithLog(`curl -k ${link}`);
+    }
+
+    protected static execWithLog(command: string): ShellString {
         echo(command);
         return exec(command);
     }

package/utils/request-handlers/CheApiRequestHandler.ts

@@ -21,7 +21,7 @@ export class CheApiRequestHandler {
     /**
      * This method adds a request interceptor into axios request interceptors list and returns an ID of the interceptor
      */
-    public static enableRequestInterceptor(): number {
+    static enableRequestInterceptor(): number {
         Logger.debug(`CheApiRequestHandler.enableRequestInterceptor`);
         return axios.interceptors.request.use( request => {
                 try {
@@ -47,7 +47,7 @@ export class CheApiRequestHandler {
     /**
      * This method adds a response interceptor into axios response interceptors list and returns an ID of the interceptor
      */
-    public static enableResponseInterceptor(): number {
+    static enableResponseInterceptor(): number {
         Logger.debug(`CheApiRequestHandler.enableResponseRedirects`);
         return axios.interceptors.response.use( response => {
                 try {

package/utils/vsc/GitUtil.ts

@@ -9,6 +9,9 @@
  **********************************************************************/
 
 import { injectable } from 'inversify';
+import YAML from 'yaml';
+import { Logger } from '../Logger';
+import axios, { AxiosResponse } from 'axios';
 
 @injectable()
 export class GitUtil {
@@ -20,6 +23,21 @@ export class GitUtil {
      * @return project name
      */
     static getProjectNameFromGitUrl(url: string): string {
-        return url.split(/[\/.]/).filter((e: string) => e !== '' && e !== 'git').reverse()[0];
+        Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${url}`);
+        const projectName: string = url.split(/[\/.]/).filter((e: string) => e !== '' && e !== 'git').reverse()[0];
+        Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${projectName}`);
+        return projectName;
+    }
+    /**
+     * Method extracts a git url for DevWorkspace configuration from meta.yaml file;
+     * @param linkToMetaYaml raw url to git repository where meta.yaml is;
+     * @return git link which uses in DevWorkspaceConfigurationHelper as DevfileUrl parameter
+     */
+     static async getProjectGitLinkFromLinkToMetaYaml(linkToMetaYaml: string): Promise<string> {
+        Logger.debug(`${this.constructor.name}.${this.getProjectGitLinkFromLinkToMetaYaml.name} - ${linkToMetaYaml}`);
+        const response: AxiosResponse = await axios.get(linkToMetaYaml);
+        const metaYamlContent: any = YAML.parse(response.data);
+        Logger.debug(`${this.constructor.name}.${this.getProjectGitLinkFromLinkToMetaYaml.name} - ${metaYamlContent.links.v2}`);
+        return metaYamlContent.links.v2;
     }
 }

package/utils/workspace/ApiUrlResolver.ts

@@ -22,11 +22,11 @@ export class ApiUrlResolver {
 
     constructor(@inject(CLASSES.CheApiRequestHandler) private readonly processRequestHandler: CheApiRequestHandler) {}
 
-    public async getWorkspaceApiUrl(workspaceName: string): Promise<string> {
+    async getWorkspaceApiUrl(workspaceName: string): Promise<string> {
         return `${await this.getWorkspacesApiUrl()}/${workspaceName}`;
     }
 
-    public async getWorkspacesApiUrl(): Promise<string> {
+    async getWorkspacesApiUrl(): Promise<string> {
         const namespace: string = await this.obtainUserNamespace();
         return `${ApiUrlResolver.DASHBOARD_API_URL}/${namespace}/devworkspaces`;
     }

package/utils/workspace/TestWorkspaceUtil.ts

@@ -32,7 +32,7 @@ export class TestWorkspaceUtil implements ITestWorkspaceUtil {
         @inject(CLASSES.ApiUrlResolver) private readonly apiUrlResolver: ApiUrlResolver
     ) { }
 
-    public async waitWorkspaceStatus(workspaceName: string, expectedWorkspaceStatus: WorkspaceStatus): Promise<void> {
+    async waitWorkspaceStatus(workspaceName: string, expectedWorkspaceStatus: WorkspaceStatus): Promise<void> {
         Logger.debug('TestWorkspaceUtil.waitWorkspaceStatus');
 
         let workspaceStatus: string = '';
@@ -60,7 +60,7 @@ export class TestWorkspaceUtil implements ITestWorkspaceUtil {
         }
     }
 
-    public async stopWorkspaceByName(workspaceName: string): Promise<void> {
+    async stopWorkspaceByName(workspaceName: string): Promise<void> {
         Logger.debug('TestWorkspaceUtil.stopWorkspaceByName');
 
         const stopWorkspaceApiUrl: string = await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName);
@@ -81,7 +81,7 @@ export class TestWorkspaceUtil implements ITestWorkspaceUtil {
     }
 
     // delete a workspace without stopping phase (similar with force deleting)
-    public async deleteWorkspaceByName(workspaceName: string): Promise<void> {
+    async deleteWorkspaceByName(workspaceName: string): Promise<void> {
         Logger.debug(`TestWorkspaceUtil.deleteWorkspaceByName ${workspaceName}` );
 
         const deleteWorkspaceApiUrl: string = await this.apiUrlResolver.getWorkspaceApiUrl(workspaceName);
@@ -120,7 +120,7 @@ export class TestWorkspaceUtil implements ITestWorkspaceUtil {
     }
 
     // stop workspace before deleting with checking stopping phase
-    public async stopAndDeleteWorkspaceByName(workspaceName: string): Promise<void> {
+    async stopAndDeleteWorkspaceByName(workspaceName: string): Promise<void> {
         Logger.debug('TestWorkspaceUtil.stopAndDeleteWorkspaceByName');
 
         await this.stopWorkspaceByName(workspaceName);
@@ -128,7 +128,7 @@ export class TestWorkspaceUtil implements ITestWorkspaceUtil {
     }
 
     // stop all run workspaces in the namespace
-    public async stopAllRunningWorkspaces(namespace: string): Promise<void> {
+    async stopAllRunningWorkspaces(namespace: string): Promise<void> {
         Logger.debug('TestWorkspaceUtil.stopAllRunProjects');
         let response: AxiosResponse = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
         for (let i: number = 0; i < response.data.items.length; i++) {
@@ -138,7 +138,7 @@ export class TestWorkspaceUtil implements ITestWorkspaceUtil {
     }
 
     // stop all run workspaces, check statuses and remove the workspaces
-    public async stopAndDeleteAllRunningWorkspaces(namespace: string): Promise<void> {
+    async stopAndDeleteAllRunningWorkspaces(namespace: string): Promise<void> {
         Logger.debug('TestWorkspaceUtil.stopAndDeleteAllRunProjects');
         let response: AxiosResponse = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());
         await this.stopAllRunningWorkspaces(namespace);
@@ -150,7 +150,7 @@ export class TestWorkspaceUtil implements ITestWorkspaceUtil {
 
     // stop all run workspaces without stopping and waiting for of 'Stopped' phase
     // similar with 'force' deleting
-    public async deleteAllWorkspaces(namespace: string): Promise<void> {
+    async deleteAllWorkspaces(namespace: string): Promise<void> {
         Logger.debug('TestWorkspaceUtil.deleteAllRunProjects');
         let response: AxiosResponse = await this.processRequestHandler.get(await this.apiUrlResolver.getWorkspacesApiUrl());