@eclipse-che/che-e2e 7.68.0-dev-280c8c9 → 7.68.0-dev-e7cb474

package/specs/api/DevfileAcceptanceTestAPI.spec.ts

@@ -3,47 +3,104 @@ import { DevWorkspaceConfigurationHelper } from '../../utils/DevWorkspaceConfigu
 import { ShellString } from 'shelljs';
 import { expect } from 'chai';
 import { DevfileContext } from '@eclipse-che/che-devworkspace-generator/lib/api/devfile-context';
-import { TestConstants } from '../../constants/TestConstants';
-import { GitUtil } from '../../utils/vsc/GitUtil';
+import { StringUtil } from '../../utils/StringUtil';
+import { DevfilesRegistryHelper } from '../../utils/DevfilesRegistryHelper';
+import { Logger } from '../../utils/Logger';
 
-suite(`Devfile acceptance test`, async function (): Promise<void> {
-    let devfileUrl: string;
-    let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
-    let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
-    let devfileContext: DevfileContext;
-    let devWorkspaceName: string | undefined;
+/**
+ * Dynamically generating tests
+ * info: https://mochajs.org/#delayed-root-suite
+ */
 
-    suiteSetup('Get DevWorkspace configuration from meta.yaml', async function (): Promise<void> {
-        devfileUrl = await GitUtil.getProjectGitLinkFromLinkToMetaYaml(TestConstants.TS_API_TEST_LINK_TO_META_YAML);
+(async function (): Promise<void> {
 
-        devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({
-            devfileUrl,
-        });
-        devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
-        devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
+    const devfilesRegistryHelper: DevfilesRegistryHelper = new DevfilesRegistryHelper();
+    const devfileSamples: any = await devfilesRegistryHelper.collectPathsToDevfilesFromRegistry();
+
+    for (const devfileSample of devfileSamples) {
+        suite(`Devfile acceptance test suite for ${devfileSample.name}`, async function (): Promise<void> {
+            this.bail(false);
+            this.timeout(1500000); // 25 minutes because build of Quarkus sample takes 20+ minutes
+            let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper;
+            let kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor;
+            let containerTerminal: KubernetesCommandLineToolsExecutor.ContainerTerminal;
+            let devfileContext: DevfileContext;
+            let devWorkspaceName: string | undefined;
+            let clonedProjectName: string;
+            let containerWorkDir: string;
+            let devfilesBuildCommands: any[] = [];
+
+            test('Get DevWorkspace configuration', async function (): Promise<void> {
+                devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({
+                    devfileUrl: devfileSample.link,
+                });
+                devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext();
+                devWorkspaceName = devfileContext?.devWorkspace?.metadata?.name;
+
+                kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(devWorkspaceName);
+                containerTerminal = new KubernetesCommandLineToolsExecutor.ContainerTerminal(kubernetesCommandLineToolsExecutor);
+                kubernetesCommandLineToolsExecutor.loginToOcp();
+            });
+
+            test('Collect build commands from the devfile', async function (): Promise<void> {
+                if (devfileContext.devfile.commands === undefined) {
+                    Logger.info(`Devfile does not contains any commands.`);
+                } else {
+                    devfileContext.devfile.commands.forEach((command: any) => {
+                        if (command.exec?.group?.kind === 'build') {
+                            Logger.debug(`Build command found: ${command.exec.commandLine}`);
+                            devfilesBuildCommands.push(command);
+                        }
+                    });
+                }
+            });
 
-        kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(devWorkspaceName);
-        kubernetesCommandLineToolsExecutor.loginToOcp();
-    });
+            test('Create DevWorkspace', async function (): Promise<void> {
+                const devWorkspaceConfigurationYamlString: string = await devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext);
+                const applyOutput: ShellString = kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsStringOutput(devWorkspaceConfigurationYamlString);
 
-    test('Create DevWorkspace', async function (): Promise<void> {
-        const devWorkspaceConfigurationYamlString: string = await devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext);
-        const applyOutput: ShellString = kubernetesCommandLineToolsExecutor.applyYamlConfigurationAsStringOutput(devWorkspaceConfigurationYamlString);
+                expect(applyOutput.stdout)
+                    .contains('devworkspacetemplate')
+                    .and.contains('devworkspace')
+                    .and.contains.oneOf(['created', 'configured']);
 
-        expect(applyOutput.stdout)
-            .contains('devworkspacetemplate')
-            .and.contains('devworkspace')
-            .and.contains.oneOf(['created', 'configured']);
+            });
 
-    });
+            test('Wait until DevWorkspace has status "ready"', async function (): Promise<void> {
+                expect(kubernetesCommandLineToolsExecutor.waitDevWorkspace().stdout).contains('condition met');
+            });
 
-    test('Wait until DevWorkspace has status "ready"', async function (): Promise<void> {
-        expect(kubernetesCommandLineToolsExecutor.waitDevWorkspace().stdout).contains('condition met');
-    });
+            test('Check if project was created', function (): void {
+                clonedProjectName = StringUtil.getProjectNameFromGitUrl(devfileSample.link);
+                expect(containerTerminal.ls().stdout).includes(clonedProjectName);
+            });
 
-    suiteTeardown('Delete DevWorkspace', async function (): Promise<void> {
-        kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
-    });
-});
+            test('Check if project files are imported', function (): void {
+                containerWorkDir = containerTerminal.pwd().stdout.replace('\n', '');
+                expect(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout).includes(`devfile.yaml`);
+            });
 
+            test(`Check if build commands returns success`, function (): void {
+                if (devfilesBuildCommands.length === 0) {
+                    Logger.info(`Devfile does not contains build commands.`);
+                } else {
+                    devfilesBuildCommands.forEach((command) => {
+                        Logger.info(`command.exec: ${JSON.stringify(command.exec)}`);
+
+                        const commandString: string = StringUtil.updateCommandEnvsToShStyle(`cd ${command.exec.workingDir} && ${command.exec.commandLine}`);
+                        Logger.info(`Full build command to be executed: ${commandString}`);
+
+                        const output: ShellString = containerTerminal.executeCommand(commandString, command.exec.component);
+                        expect(output.code).eqls(0);
+                    });
+                }
+            });
+
+            test('Delete DevWorkspace', async function (): Promise<void> {
+                kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
+            });
+        });
+    }
 
+    run();
+})();

package/specs/api/EmptyWorkspaceAPI.spec.ts

@@ -1,7 +1,7 @@
 import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { expect } from 'chai';
 import { ShellString } from 'shelljs';
-import { GitUtil } from '../../utils/vsc/GitUtil';
+import { StringUtil } from '../../utils/StringUtil';
 import { TestConstants } from '../../constants/TestConstants';
 import { DevWorkspaceConfigurationHelper } from '../../utils/DevWorkspaceConfigurationHelper';
 import { DevfileContext } from '@eclipse-che/che-devworkspace-generator/lib/api/devfile-context';
@@ -51,11 +51,11 @@ suite(`Empty workspace API test`, async function (): Promise<void> {
         });
 
         test('Check if project was created', function (): void {
-            clonedProjectName = GitUtil.getProjectNameFromGitUrl(gitRepository);
+            clonedProjectName = StringUtil.getProjectNameFromGitUrl(gitRepository);
             expect(containerTerminal.ls().stdout).includes(clonedProjectName);
         });
 
-        test('Check if files were imported ', function (): void {
+        test('Check if project files are imported', function (): void {
             expect(containerTerminal.ls(`${containerWorkDir}/${clonedProjectName}`).stdout)
                 .includes(TestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
         });

package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts

@@ -24,7 +24,7 @@ import { TestConstants } from '../../constants/TestConstants';
 import { OcpMainPage } from '../../pageobjects/openshift/OcpMainPage';
 import { OcpImportFromGitPage } from '../../pageobjects/openshift/OcpImportFromGitPage';
 import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
-import { GitUtil } from '../../utils/vsc/GitUtil';
+import { StringUtil } from '../../utils/StringUtil';
 import { OcpApplicationPage } from '../../pageobjects/openshift/OcpApplicationPage';
 
 const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
@@ -84,7 +84,7 @@ suite(`DevConsole Integration`, async function (): Promise<void> {
     });
 
     test('Check if project and files imported', async function (): Promise<void> {
-        const applicationSourceProjectName: string = GitUtil.getProjectNameFromGitUrl(gitImportRepo);
+        const applicationSourceProjectName: string = StringUtil.getProjectNameFromGitUrl(gitImportRepo);
         const projectSection: ViewSection = await new SideBarView().getContent().getSection(applicationSourceProjectName);
         const isFileImported: ViewItem | undefined = await projectSection.findItem(TestConstants.TS_SELENIUM_PROJECT_ROOT_FILE_NAME);
         expect(isFileImported).not.eqls(undefined);

package/specs/factory/Factory.spec.ts

@@ -28,7 +28,7 @@ import {
 import { TestConstants } from '../../constants/TestConstants';
 import { expect } from 'chai';
 import { OauthPage } from '../../pageobjects/git-providers/OauthPage';
-import { GitUtil } from '../../utils/vsc/GitUtil';
+import { StringUtil } from '../../utils/StringUtil';
 import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
 import { registerRunningWorkspace } from '../MochaHooks';
 import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
@@ -88,7 +88,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
     });
 
     test('Check if a project folder has been created', async function (): Promise<void> {
-        testRepoProjectName = GitUtil.getProjectNameFromGitUrl(TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
+        testRepoProjectName = StringUtil.getProjectNameFromGitUrl(TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
         Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
         projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
     });

package/specs/factory/NoSetupRepoFactory.spec.ts

@@ -27,7 +27,7 @@ import {
     ViewSection
 } from 'monaco-page-objects';
 import { expect } from 'chai';
-import { GitUtil } from '../../utils/vsc/GitUtil';
+import { StringUtil } from '../../utils/StringUtil';
 import { CheCodeLocatorLoader } from '../../pageobjects/ide/CheCodeLocatorLoader';
 import WebDriverError = error.WebDriverError;
 import { registerRunningWorkspace } from '../MochaHooks';
@@ -114,7 +114,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
         });
 
         test('Check if a project folder has been created', async function (): Promise<void> {
-            testRepoProjectName = GitUtil.getProjectNameFromGitUrl(TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
+            testRepoProjectName = StringUtil.getProjectNameFromGitUrl(TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
             Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
             projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
         });

package/specs/factory/RefusedOAuthFactory.spec.ts

@@ -37,7 +37,7 @@ import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
 import { DriverHelper } from '../../utils/DriverHelper';
 import { TestConstants } from '../../constants/TestConstants';
 import { OauthPage } from '../../pageobjects/git-providers/OauthPage';
-import { GitUtil } from '../../utils/vsc/GitUtil';
+import { StringUtil } from '../../utils/StringUtil';
 import { Logger } from '../../utils/Logger';
 import { TimeoutConstants } from '../../constants/TimeoutConstants';
 import { LoginTests } from '../../tests-library/LoginTests';
@@ -97,7 +97,7 @@ suite(`Create a workspace via launching a factory from the ${TestConstants.TS_SE
     });
 
     test('Check if a project folder has been created', async function (): Promise<void> {
-        testRepoProjectName = GitUtil.getProjectNameFromGitUrl(TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
+        testRepoProjectName = StringUtil.getProjectNameFromGitUrl(TestConstants.TS_SELENIUM_FACTORY_GIT_REPO_URL);
         Logger.debug(`new SideBarView().getContent().getSection: get ${testRepoProjectName}`);
         projectSection = await new SideBarView().getContent().getSection(testRepoProjectName);
     });

package/utils/CheReporter.ts

@@ -18,13 +18,12 @@ import { ScreenCatcher } from './ScreenCatcher';
 import { ITestWorkspaceUtil } from './workspace/ITestWorkspaceUtil';
 import { TimeoutConstants } from '../constants/TimeoutConstants';
 import { Logger } from './Logger';
-import { Sanitizer } from './Sanitizer';
 import { e2eContainer } from '../configs/inversify.config';
 import { WriteStream } from 'fs';
+import { StringUtil } from './StringUtil';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const screenCatcher: ScreenCatcher = e2eContainer.get(CLASSES.ScreenCatcher);
-const sanitizer: Sanitizer = e2eContainer.get(CLASSES.Sanitizer);
 let methodIndex: number = 0;
 let deleteScreencast: boolean = true;
 let testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
@@ -129,10 +128,10 @@ class CheReporter extends mocha.reporters.Spec {
       deleteScreencast = false;
 
       Logger.trace(`FullTitle:${test.fullTitle()}`);
-      const testFullTitle: string = sanitizer.sanitize(test.fullTitle());
+      const testFullTitle: string = StringUtil.sanitizeTitle(test.fullTitle());
       Logger.trace(`FullTitleSanitized:${testFullTitle}`);
       Logger.trace(`TestTitle:${test.title}`);
-      const testTitle: string = sanitizer.sanitize(test.title);
+      const testTitle: string = StringUtil.sanitizeTitle(test.title);
       Logger.trace(`TestTitleSanitized:${testTitle}`);
 
       const testReportDirPath: string = `${TestConstants.TS_SELENIUM_REPORT_FOLDER}/${testFullTitle}`;

package/utils/DevfilesRegistryHelper.ts

@@ -0,0 +1,77 @@
+/*********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import { SupportedDevfilesRegistries, TestConstants } from '../constants/TestConstants';
+import axios, { AxiosResponse } from 'axios';
+import { Logger } from './Logger';
+import YAML from 'yaml';
+
+export class DevfilesRegistryHelper {
+
+    async getInbuiltDevfilesRegistryContent(): Promise<AxiosResponse> {
+        Logger.debug(`${this.constructor.name}.${this.getInbuiltDevfilesRegistryContent.name}`);
+        return await this.getContent(SupportedDevfilesRegistries.INBUILT_APPLICATION_DEVFILE_REGISTRY_URL());
+    }
+
+    async getGitHubCheDevfileRegistryContent(): Promise<AxiosResponse> {
+        Logger.debug(`${this.constructor.name}.${this.getGitHubCheDevfileRegistryContent.name}`);
+        return await this.getContent(SupportedDevfilesRegistries.GIT_HUB_CHE_DEVFILE_REGISTRY_URL);
+    }
+
+    async collectPathsToDevfilesFromRegistry(): Promise<object[]> {
+        Logger.debug(`${this.constructor.name}.${this.collectPathsToDevfilesFromRegistry.name}`);
+        const devfileSamples: object[] = [];
+        const sampleNames: string[] = [];
+        switch (TestConstants.TS_API_ACCEPTANCE_TEST_REGISTRY_URL()) {
+            case (SupportedDevfilesRegistries.GIT_HUB_CHE_DEVFILE_REGISTRY_URL): {
+                const content: any[any] = await this.getGitHubCheDevfileRegistryContent();
+                content.forEach((e: any) => {
+                    if (e.name[0] !== '.') { sampleNames.push(e.name); }
+                });
+
+                for (const sample of sampleNames) {
+                    const sampleEndpoint: string = `${SupportedDevfilesRegistries.GIT_HUB_CHE_DEVFILE_REGISTRY_URL}${sample}/meta.yaml`;
+                    const sampleEndpointContent: AxiosResponse = await this.getContent(sampleEndpoint);
+                    const decodedFileContent: string = Buffer.from((sampleEndpointContent as any).content, 'base64').toString();
+                    const metaYamlContent: any = YAML.parse(decodedFileContent);
+                    devfileSamples.push({name: sample, link: metaYamlContent.links.v2});
+                }
+                Logger.debug(`${this.constructor.name}.${this.collectPathsToDevfilesFromRegistry.name}: samples list: ${JSON.stringify(devfileSamples)}`);
+            }
+                break;
+            case (SupportedDevfilesRegistries.INBUILT_APPLICATION_DEVFILE_REGISTRY_URL()): {
+                const content: any[any] = await this.getInbuiltDevfilesRegistryContent();
+
+                for (const sample of content) {
+                    devfileSamples.push({name: sample.displayName, link: sample.links.v2});
+                }
+                Logger.debug(`${this.constructor.name}.${this.collectPathsToDevfilesFromRegistry.name}: samples list: ${JSON.stringify(devfileSamples)}`);
+            }
+                break;
+            default: {
+                Logger.error(`${this.constructor.name}.${this.collectPathsToDevfilesFromRegistry.name}: unsupported registry url - ${TestConstants.TS_API_ACCEPTANCE_TEST_REGISTRY_URL()}\n
+                supported registries: ${JSON.stringify(SupportedDevfilesRegistries)}`);
+            }
+        }
+        return devfileSamples;
+    }
+
+    private async getContent(url: string, headers?: object): Promise<AxiosResponse> {
+        Logger.debug(`${this.constructor.name}.${this.getContent.name}: ${url}`);
+
+        let response: AxiosResponse | undefined;
+        try {
+            response = await axios.get(url, headers);
+        } catch (error) {
+            Logger.error(`${error} + ${url}`);
+            throw error;
+        }
+        return response?.data;
+    }
+}

package/utils/KubernetesCommandLineToolsExecutor.ts

@@ -66,15 +66,12 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
             this.createNamespace();
         }
         this.applyYamlConfigurationAsStringOutput(yamlConfiguration);
-        const output: ShellString = this.waitDevWorkspace();
-        KubernetesCommandLineToolsExecutor.pod = this.getWorkspacePodName();
-        KubernetesCommandLineToolsExecutor.container = this.getContainerName();
-        return output;
+        return this.waitDevWorkspace();
     }
 
-    executeCommand(commandToExecute: string): ShellString {
+    executeCommand(commandToExecute: string, container: string = KubernetesCommandLineToolsExecutor.container): ShellString {
         Logger.debug(`${this.getLoggingName(this.executeCommand.name)}:`);
-        return ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} exec -i ${KubernetesCommandLineToolsExecutor.pod} -n ${this.namespace} -c ${KubernetesCommandLineToolsExecutor.container} -- sh -c "${commandToExecute}"`);
+        return ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} exec -i ${KubernetesCommandLineToolsExecutor.pod} -n ${this.namespace} -c ${container} -- sh -c '${commandToExecute}'`);
     }
 
     applyYamlConfigurationAsStringOutput(yamlConfiguration: string): ShellString {
@@ -96,7 +93,9 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
 
     waitDevWorkspace(timeout: number = 360): ShellString {
         Logger.debug(`${this.getLoggingName(this.waitDevWorkspace.name)}: Wait till workspace ready.`);
-        return ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
+        const output: ShellString = ShellExecutor.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
+        this.getPodAndContainerNames();
+        return output;
     }
 
     createNamespace(): void {
@@ -114,6 +113,11 @@ export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
         ShellExecutor.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} delete project ${projectName} -n ${this.namespace}`);
     }
 
+    private getPodAndContainerNames(): void {
+        KubernetesCommandLineToolsExecutor.pod = this.getWorkspacePodName();
+        KubernetesCommandLineToolsExecutor.container = this.getContainerName();
+    }
+
     private isUserLoggedIn(): boolean {
         const whoamiCommandOutput: ShellString = ShellExecutor.execWithLog('oc whoami && oc whoami --show-server=true');
 
@@ -163,5 +167,14 @@ export namespace KubernetesCommandLineToolsExecutor {
         removeFolder(path: string): ShellString {
             return this.executeCommand('rm -rf ' + path);
         }
+
+        getEnvValue(envName: string): string {
+            envName = envName.replace(/[${}]/g, '');
+            const output: ShellString = this.executeCommand(`env | grep ${envName}`);
+            return output.stderr ? output.stderr :
+                output.stdout
+                    .substring(output.stdout.lastIndexOf('=') + 1)
+                    .replace('\n', '');
+        }
     }
 }

package/utils/ScreenCatcher.ts

@@ -11,15 +11,14 @@ import * as fs from 'fs';
 import { injectable, inject } from 'inversify';
 import { CLASSES } from '../configs/inversify.types';
 import { DriverHelper } from './DriverHelper';
-import { Sanitizer } from './Sanitizer';
 import { error } from 'selenium-webdriver';
 import { TestConstants } from '../constants/TestConstants';
 import { WriteStream } from 'fs';
+import { StringUtil } from './StringUtil';
 
 @injectable()
 export class ScreenCatcher {
-    constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
-                @inject(CLASSES.Sanitizer) private readonly sanitizer: Sanitizer) { }
+    constructor(@inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) { }
 
     async catchMethodScreen(methodName: string, methodIndex: number, screenshotIndex: number): Promise<void> {
         const executionScreenCastDir: string = `${TestConstants.TS_SELENIUM_REPORT_FOLDER}/executionScreencast`;
@@ -38,7 +37,7 @@ export class ScreenCatcher {
         const date: Date = new Date();
         const timeStr: string = date.toLocaleTimeString('en-us', { hour12: false }) + '.' + new Intl.NumberFormat('en-us', { minimumIntegerDigits: 3 }).format(date.getMilliseconds());
 
-        const screenshotPath: string = `${executionScreenCastDir}/${formattedMethodIndex}-${formattedScreenshotIndex}--(${this.sanitizer.sanitize(timeStr)})_${this.sanitizer.sanitize(methodName)}.png`;
+        const screenshotPath: string = `${executionScreenCastDir}/${formattedMethodIndex}-${formattedScreenshotIndex}--(${StringUtil.sanitizeTitle(timeStr)})_${StringUtil.sanitizeTitle(methodName)}.png`;
 
         try {
             await this.catchScreen(screenshotPath);

package/utils/{vsc/GitUtil.ts → StringUtil.ts}

@@ -9,35 +9,39 @@
  **********************************************************************/
 
 import { injectable } from 'inversify';
-import YAML from 'yaml';
-import { Logger } from '../Logger';
-import axios, { AxiosResponse } from 'axios';
+import { Logger } from './Logger';
+import { KubernetesCommandLineToolsExecutor } from './KubernetesCommandLineToolsExecutor';
 
 @injectable()
-export class GitUtil {
+export class StringUtil {
     /**
      * Method extracts a test repo name from git clone https url;
-     * it splits the url into string[] by "/" or ".", deletes empty elements and elements that contains just "git" word, than returns the last one;
+     * it splits the url into string[] by "/" or ".", deletes empty elements and elements that contains just "git", "main" or "tree" word, than returns the last one;
      * please, avoid to call the test repo as just "git" or to use dots in the name, like: github.com/user/git.git, github.com/user/name.with.dots.
      * @param url git https url (which using for "git clone")
      * @return project name
      */
     static getProjectNameFromGitUrl(url: string): string {
         Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${url}`);
-        const projectName: string = url.split(/[\/.]/).filter((e: string) => e !== '' && e !== 'git').reverse()[0];
+        if (url.includes('/tree/')) {
+            url = url.split('/').slice(0, -2).join('/');
+        }
+        const projectName: string = url.split(/[\/.]/).filter((e: string) => !['git', ''].includes(e)).reverse()[0];
         Logger.debug(`${this.constructor.name}.${this.getProjectNameFromGitUrl.name} - ${projectName}`);
         return projectName;
     }
+
+    static sanitizeTitle(arg: string): string {
+        return arg.replace(/\//g, '+').replace(/,/g, '.').replace(/:/g, '-').replace(/['"]/g, '').replace(/[^a-z0-9+\-.()\[\]_]/gi, '_');
+    }
+
     /**
-     * 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
+     * Replaces ${ENV}, $ENV to "$ENV"
+     * @param command string command with environmental variables in unsupported format
+     * @return updated command with environmental variables in supported format
      */
-     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;
+
+    static updateCommandEnvsToShStyle(command: string): string {
+        return command.replace(/[{}]/g, '').replace(/(?<!")\${?[a-zA-Z0-9_+\-\s]+\b}?/gm, `"\$&"`);
     }
 }

package/constants/DevfilesRegistryConstants.ts

@@ -1,26 +0,0 @@
-/*********************************************************************
- * Copyright (c) 2023 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- **********************************************************************/
-import { TestConstants } from './TestConstants';
-import axios, { AxiosResponse } from 'axios';
-import { Logger } from '../utils/Logger';
-
-function getDevfileRegistryUrl(): string {
-    return `${TestConstants.TS_SELENIUM_BASE_URL}/devfile-registry/devfiles/`;
-}
-
-export const DevfilesRegistryConstants: Promise<object> = (async () => {
-    let response: AxiosResponse | undefined;
-try {
-    response = await axios.get(getDevfileRegistryUrl());
-} catch (error) {
-    Logger.error(error);
-}
-return response?.data;
-})();

package/dist/constants/DevfilesRegistryConstants.js

@@ -1,32 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DevfilesRegistryConstants = void 0;
-/*********************************************************************
- * Copyright (c) 2023 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- **********************************************************************/
-const TestConstants_1 = require("./TestConstants");
-const axios_1 = __importDefault(require("axios"));
-const Logger_1 = require("../utils/Logger");
-function getDevfileRegistryUrl() {
-    return `${TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL}/devfile-registry/devfiles/`;
-}
-exports.DevfilesRegistryConstants = (async () => {
-    let response;
-    try {
-        response = await axios_1.default.get(getDevfileRegistryUrl());
-    }
-    catch (error) {
-        Logger_1.Logger.error(error);
-    }
-    return response === null || response === void 0 ? void 0 : response.data;
-})();
-//# sourceMappingURL=DevfilesRegistryConstants.js.map

package/dist/constants/DevfilesRegistryConstants.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DevfilesRegistryConstants.js","sourceRoot":"","sources":["../../constants/DevfilesRegistryConstants.ts"],"names":[],"mappings":";;;;;;AAAA;;;;;;;;wEAQwE;AACxE,mDAAgD;AAChD,kDAA6C;AAC7C,4CAAyC;AAEzC,SAAS,qBAAqB;IAC1B,OAAO,GAAG,6BAAa,CAAC,oBAAoB,6BAA6B,CAAC;AAC9E,CAAC;AAEY,QAAA,yBAAyB,GAAoB,CAAC,KAAK,IAAI,EAAE;IAClE,IAAI,QAAmC,CAAC;IAC5C,IAAI;QACA,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,CAAC;KACvD;IAAC,OAAO,KAAK,EAAE;QACZ,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KACvB;IACD,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC;AACtB,CAAC,CAAC,EAAE,CAAC"}

package/dist/utils/Sanitizer.js

@@ -1,29 +0,0 @@
-"use strict";
-/*********************************************************************
- * Copyright (c) 2021-2023 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- **********************************************************************/
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Sanitizer = void 0;
-const inversify_1 = require("inversify");
-let Sanitizer = class Sanitizer {
-    sanitize(arg) {
-        return arg.replace(/[\/]/g, '+').replace(/[\,]/g, '.').replace(/[\:]/g, '-').replace(/[\'\"]/g, '').replace(/[^a-z0-9\+\-\.\(\)\[\]\_]/gi, '_');
-    }
-};
-Sanitizer = __decorate([
-    inversify_1.injectable()
-], Sanitizer);
-exports.Sanitizer = Sanitizer;
-//# sourceMappingURL=Sanitizer.js.map

package/dist/utils/Sanitizer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Sanitizer.js","sourceRoot":"","sources":["../../utils/Sanitizer.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;AAExE,yCAAuC;AAGvC,IAAa,SAAS,GAAtB,MAAa,SAAS;IAElB,QAAQ,CAAC,GAAW;QAChB,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IACpJ,CAAC;CACJ,CAAA;AALY,SAAS;IADrB,sBAAU,EAAE;GACA,SAAS,CAKrB;AALY,8BAAS"}

package/dist/utils/vsc/GitUtil.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"GitUtil.js","sourceRoot":"","sources":["../../../utils/vsc/GitUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;AAExE,yCAAuC;AACvC,gDAAwB;AACxB,sCAAmC;AACnC,kDAA6C;AAG7C,IAAa,OAAO,GAApB,MAAa,OAAO;IAChB;;;;;;OAMG;IACH,MAAM,CAAC,wBAAwB,CAAC,GAAW;QACvC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;QACxF,MAAM,WAAW,GAAW,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3G,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,MAAM,WAAW,EAAE,CAAC,CAAC;QAChG,OAAO,WAAW,CAAC;IACvB,CAAC;IACD;;;;OAIG;IACF,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,cAAsB;QACpE,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,mCAAmC,CAAC,IAAI,MAAM,cAAc,EAAE,CAAC,CAAC;QAC9G,MAAM,QAAQ,GAAkB,MAAM,eAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAChE,MAAM,eAAe,GAAQ,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvD,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,mCAAmC,CAAC,IAAI,MAAM,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACxH,OAAO,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;IACpC,CAAC;CACJ,CAAA;AA1BY,OAAO;IADnB,sBAAU,EAAE;GACA,OAAO,CA0BnB;AA1BY,0BAAO"}

package/utils/Sanitizer.ts

@@ -1,19 +0,0 @@
-/*********************************************************************
- * Copyright (c) 2021-2023 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- **********************************************************************/
-
-import { injectable } from 'inversify';
-
-@injectable()
-export class Sanitizer {
-
-    sanitize(arg: string): string {
-        return arg.replace(/[\/]/g, '+').replace(/[\,]/g, '.').replace(/[\:]/g, '-').replace(/[\'\"]/g, '').replace(/[^a-z0-9\+\-\.\(\)\[\]\_]/gi, '_');
-    }
-}