@eclipse-che/che-e2e 7.65.0-dev-569551e → 7.65.0

package/constants/TestConstants.ts

@@ -23,6 +23,11 @@ export enum GitProviderType {
     BITBUCKET = 'bitbucket'
 }
 
+export enum KubernetesCommandLineTool {
+    OC = 'oc',
+    KUBECTL = 'kubectl',
+}
+
 export const TestConstants: any = {
     /**
      * Base URL of the application which should be checked
@@ -228,7 +233,15 @@ export const TestConstants: any = {
 
     TS_SELENIUM_PROJECT_ROOT_FILE_NAME: process.env.TS_SELENIUM_PROJECT_ROOT_FILE_NAME || 'devfile.yaml',
 
+    /* -------------------------------------------
+   |  The api tests related constants
+   ----------------------------------------------*/
+
+    TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL: process.env.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL || KubernetesCommandLineTool.OC,
+
     TS_API_TEST_UDI_IMAGE: process.env.TS_API_TEST_UDI_IMAGE || 'quay.io/devfile/universal-developer-image:latest',
 
-    TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI: process.env.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI || `https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml`
+    TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI: process.env.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI || `https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml`,
+
+    TS_API_TEST_NAMESPACE: process.env.TS_API_TEST_NAMESPACE || undefined
 };

package/dist/constants/TestConstants.js

@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestConstants = exports.GitProviderType = void 0;
+exports.TestConstants = exports.KubernetesCommandLineTool = exports.GitProviderType = void 0;
 function getBaseUrl() {
     const baseUrl = process.env.TS_SELENIUM_BASE_URL;
     if (!baseUrl) {
@@ -23,6 +23,11 @@ var GitProviderType;
     GitProviderType["GITLAB"] = "gitlab";
     GitProviderType["BITBUCKET"] = "bitbucket";
 })(GitProviderType = exports.GitProviderType || (exports.GitProviderType = {}));
+var KubernetesCommandLineTool;
+(function (KubernetesCommandLineTool) {
+    KubernetesCommandLineTool["OC"] = "oc";
+    KubernetesCommandLineTool["KUBECTL"] = "kubectl";
+})(KubernetesCommandLineTool = exports.KubernetesCommandLineTool || (exports.KubernetesCommandLineTool = {}));
 exports.TestConstants = {
     /**
      * Base URL of the application which should be checked
@@ -182,7 +187,12 @@ exports.TestConstants = {
     TS_SELENIUM_GIT_PROVIDER_IS_LDAP_LOGIN: process.env.TS_SELENIUM_GIT_PROVIDER_IS_LDAP_LOGIN === 'true',
     TS_SELENIUM_GIT_PROVIDER_OAUTH: process.env.TS_SELENIUM_GIT_PROVIDER_OAUTH === 'true',
     TS_SELENIUM_PROJECT_ROOT_FILE_NAME: process.env.TS_SELENIUM_PROJECT_ROOT_FILE_NAME || 'devfile.yaml',
+    /* -------------------------------------------
+   |  The api tests related constants
+   ----------------------------------------------*/
+    TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL: process.env.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL || KubernetesCommandLineTool.OC,
     TS_API_TEST_UDI_IMAGE: process.env.TS_API_TEST_UDI_IMAGE || 'quay.io/devfile/universal-developer-image:latest',
-    TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI: process.env.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI || `https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml`
+    TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI: process.env.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI || `https://eclipse-che.github.io/che-plugin-registry/main/v3/plugins/che-incubator/che-code/latest/devfile.yaml`,
+    TS_API_TEST_NAMESPACE: process.env.TS_API_TEST_NAMESPACE || undefined
 };
 //# sourceMappingURL=TestConstants.js.map

package/dist/constants/TestConstants.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestConstants.js","sourceRoot":"","sources":["../../constants/TestConstants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TestConstants.js","sourceRoot":"","sources":["../../constants/TestConstants.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;AAExE,SAAS,UAAU;IACf,MAAM,OAAO,GAAuB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;IACrE,IAAI,CAAC,OAAO,EAAE;QACV,OAAO,mBAAmB,CAAC;KAC9B;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC;AAED,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;IACjB,0CAAuB,CAAA;AAC3B,CAAC,EAJW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAI1B;AAED,IAAY,yBAGX;AAHD,WAAY,yBAAyB;IACjC,sCAAS,CAAA;IACT,gDAAmB,CAAA;AACvB,CAAC,EAHW,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,QAGpC;AAEY,QAAA,aAAa,GAAQ;IAC9B;;OAEG;IACH,oBAAoB,EAAE,UAAU,EAAE;IAElC;;OAEG;IACH,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;IAEjE;;OAEG;IACH,0BAA0B,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,OAAO;IAE9E;;;OAGG;IACH,6BAA6B,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,OAAO,CAAC;IAEtF;;OAEG;IACH,6BAA6B,EAAE,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,OAAO;IAEpF;;OAEG;IACH,4BAA4B,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,IAAI,IAAI;IAEtF;;OAEG;IACH,6BAA6B,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,IAAI,IAAI;IAExF;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,UAAU;IAEhE;;OAEG;IACH,4CAA4C,EAAE,OAAO,CAAC,GAAG,CAAC,4CAA4C,IAAI,QAAQ;IAElH;;;;OAIG;IACH,2CAA2C,EAAE,OAAO,CAAC,GAAG,CAAC,2CAA2C,IAAI,QAAQ;IAEhH;;OAEG;IACH,4BAA4B,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,IAAI,CAAC;IAEnF;;OAEG;IACH,2BAA2B,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,IAAI,IAAI;IAEpF;;OAEG;IACH,qCAAqC,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,IAAI,EAAE;IAEtG;;OAEG;IACH,oCAAoC,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,IAAI,KAAK;IAEvG;;OAEG;IACH,qCAAqC,EAAE,OAAO,CAAC,GAAG,CAAC,qCAAqC,IAAI,gBAAgB;IAE5G;;;OAGG;IACH,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,KAAK,MAAM;IAE3F;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE;IAEpF;;OAEG;IACH,mCAAmC,EAAE,OAAO,CAAC,GAAG,CAAC,mCAAmC,IAAI,oBAAoB;IAE5G;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE;IAEpE;;OAEG;IACH,qCAAqC,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,IAAI,IAAI;IAExG;;OAEG;IACH,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,UAAU;IAE9E;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,KAAK,MAAM;IAEzF;;OAEG;IACH,8BAA8B,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,OAAO;IAEtF;;OAEG;IACH,6BAA6B,EAAE,OAAO,CAAC,GAAG,CAAC,6BAA6B,IAAI,EAAE;IAE9E;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM;IAEvF;;OAEG;IACH,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,MAAM;IAElE;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM;IAEvF;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,KAAK,MAAM;IAEzF;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,WAAW;IAEjD;;OAEG;IACH,mCAAmC,EAAE,OAAO,CAAC,GAAG,CAAC,mCAAmC,IAAI,KAAK;IAE7F;;OAEG;IACH,4BAA4B,EAAE,OAAO,CAAC,GAAG,CAAC,4BAA4B;IAEtE;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,OAAO;IAEnD;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM;IAEnD,uBAAuB,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,KAAK;IAErE,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,iCAAiC;IAE/E;;oDAEgD;IAChD,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,eAAe,CAAC,MAAM;IAExG,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE;IAEpF,uCAAuC,EAAE,OAAO,CAAC,GAAG,CAAC,uCAAuC,KAAK,MAAM;IAEvG,mCAAmC,EAAE,OAAO,CAAC,GAAG,CAAC,mCAAmC,IAAI,QAAQ;IAEhG,uBAAuB;QACnB,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,qBAAa,CAAC,oBAAoB,GAAG,eAAe,GAAG,IAAI,CAAC,gCAAgC,CAAC;IAC/I,CAAC;IAED,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,EAAE;IAEtF,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,EAAE;IAEtF,sCAAsC,EAAE,OAAO,CAAC,GAAG,CAAC,sCAAsC,KAAK,MAAM;IAErG,8BAA8B,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,MAAM;IAErF,kCAAkC,EAAE,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,cAAc;IAEpG;;mDAE+C;IAE/C,wCAAwC,EAAE,OAAO,CAAC,GAAG,CAAC,wCAAwC,IAAI,yBAAyB,CAAC,EAAE;IAE9H,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,kDAAkD;IAE9G,uCAAuC,EAAE,OAAO,CAAC,GAAG,CAAC,uCAAuC,IAAI,8GAA8G;IAE9M,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,SAAS;CACxE,CAAC"}

package/dist/index.js

@@ -32,10 +32,11 @@ __exportStar(require("./driver/ChromeDriver"), exports);
 __exportStar(require("./driver/IDriver"), exports);
 __exportStar(require("./utils/BrowserTabsUtil"), exports);
 __exportStar(require("./utils/DriverHelper"), exports);
+__exportStar(require("./utils/KubernetesCommandLineToolsExecutor"), exports);
 __exportStar(require("./utils/Logger"), exports);
-__exportStar(require("./utils/OpenshiftClientExecutor"), exports);
 __exportStar(require("./utils/Sanitizer"), exports);
 __exportStar(require("./utils/ScreenCatcher"), exports);
+__exportStar(require("./utils/ShellExecutor"), exports);
 __exportStar(require("./utils/request-handlers/CheApiRequestHandler"), exports);
 __exportStar(require("./utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler"), exports);
 __exportStar(require("./utils/request-handlers/headers/IAuthorizationHeaderHandler"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAA8D;AACrD,0CAAe;AACxB,4DAA0C;AAC1C,4DAA0C;AAC1C,+DAA6C;AAC7C,wDAAsC;AACtC,mDAAiC;AACjC,0DAAwC;AACxC,uDAAqC;AACrC,iDAA+B;AAC/B,kEAAgD;AAChD,oDAAkC;AAClC,wDAAsC;AACtC,gFAA8D;AAC9D,0GAAwF;AACxF,+FAA6E;AAC7E,sDAAoC;AACpC,mEAAiD;AACjD,uEAAqD;AACrD,sEAAoD;AACpD,oEAAkD;AAClD,0EAAwD;AACxD,oEAAkD;AAClD,qEAAmD;AACnD,6FAA2E;AAC3E,wEAAsD;AACtD,yEAAuD;AACvD,oEAAkD;AAClD,oEAAkD;AAClD,yEAAuD;AACvD,uEAAqD;AACrD,sEAAoD;AACpD,iFAA+D;AAC/D,uEAAqD;AACrD,uEAAqD;AACrD,6DAA2C;AAC3C,sEAAoD;AACpD,yEAAuD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAA8D;AACrD,0CAAe;AACxB,4DAA0C;AAC1C,4DAA0C;AAC1C,+DAA6C;AAC7C,wDAAsC;AACtC,mDAAiC;AACjC,0DAAwC;AACxC,uDAAqC;AACrC,6EAA2D;AAC3D,iDAA+B;AAC/B,oDAAkC;AAClC,wDAAsC;AACtC,wDAAsC;AACtC,gFAA8D;AAC9D,0GAAwF;AACxF,+FAA6E;AAC7E,sDAAoC;AACpC,mEAAiD;AACjD,uEAAqD;AACrD,sEAAoD;AACpD,oEAAkD;AAClD,0EAAwD;AACxD,oEAAkD;AAClD,qEAAmD;AACnD,6FAA2E;AAC3E,wEAAsD;AACtD,yEAAuD;AACvD,oEAAkD;AAClD,oEAAkD;AAClD,yEAAuD;AACvD,uEAAqD;AACrD,sEAAoD;AACpD,iFAA+D;AAC/D,uEAAqD;AACrD,uEAAqD;AACrD,6DAA2C;AAC3C,sEAAoD;AACpD,yEAAuD"}

package/dist/specs/api/CloneGitRepoAPI.spec.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const OpenshiftClientExecutor_1 = require("../../utils/OpenshiftClientExecutor");
+const KubernetesCommandLineToolsExecutor_1 = require("../../utils/KubernetesCommandLineToolsExecutor");
 const chai_1 = require("chai");
 const GitUtil_1 = require("../../utils/vsc/GitUtil");
 const TestConstants_1 = require("../../constants/TestConstants");
 const gitRepository = 'https://github.com/crw-qe/web-nodejs-sample';
 suite(`Test cloning of repo "${gitRepository}" into empty workspace.`, async function () {
     // works only for root user
-    const namespace = 'admin-devspaces';
+    const namespace = TestConstants_1.TestConstants.TS_API_TEST_NAMESPACE ? TestConstants_1.TestConstants.TS_API_TEST_NAMESPACE : undefined;
     const workspaceName = 'empty-' + Math.floor(Math.random() * 1000);
     const clonedProjectName = GitUtil_1.GitUtil.getProjectNameFromGitUrl(gitRepository);
     let containerWorkDir = '';
-    const openshiftClientExecutor = new OpenshiftClientExecutor_1.OpenshiftClientExecutor(workspaceName, namespace);
-    const containerTerminal = new OpenshiftClientExecutor_1.OpenshiftClientExecutor.ContainerTerminal(openshiftClientExecutor);
+    const kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor_1.KubernetesCommandLineToolsExecutor(workspaceName, namespace);
+    const containerTerminal = new KubernetesCommandLineToolsExecutor_1.KubernetesCommandLineToolsExecutor.ContainerTerminal(kubernetesCommandLineToolsExecutor);
     const emptyYaml = 'apiVersion: workspace.devfile.io/v1alpha2\n' +
         'kind: DevWorkspace\n' +
         'metadata:\n' +
@@ -34,11 +34,11 @@ suite(`Test cloning of repo "${gitRepository}" into empty workspace.`, async fun
         '              - name: CODE_HOST\n' +
         '                value: 0.0.0.0';
     suiteSetup('Create empty workspace with OC client', function () {
-        openshiftClientExecutor.loginToOcp();
-        openshiftClientExecutor.applyAndWaitDevWorkspace(emptyYaml);
+        kubernetesCommandLineToolsExecutor.loginToOcp();
+        kubernetesCommandLineToolsExecutor.applyAndWaitDevWorkspace(emptyYaml);
     });
     suiteTeardown('Delete workspace', function () {
-        openshiftClientExecutor.deleteDevWorkspace();
+        kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
     });
     suite('Clone public repo without previous setup', function () {
         suiteTeardown('Delete cloned project', function () {

package/dist/specs/api/CloneGitRepoAPI.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"CloneGitRepoAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/CloneGitRepoAPI.spec.ts"],"names":[],"mappings":";;AAAA,iFAA8E;AAC9E,+BAA8B;AAE9B,qDAAkD;AAClD,iEAA8D;AAE9D,MAAM,aAAa,GAAW,6CAA6C,CAAC;AAE5E,KAAK,CAAC,yBAAyB,aAAa,yBAAyB,EAAE,KAAK;IACxE,2BAA2B;IAC3B,MAAM,SAAS,GAAW,iBAAiB,CAAC;IAC5C,MAAM,aAAa,GAAW,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IAC1E,MAAM,iBAAiB,GAAW,iBAAO,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAClF,IAAI,gBAAgB,GAAW,EAAE,CAAC;IAElC,MAAM,uBAAuB,GAA4B,IAAI,iDAAuB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAC/G,MAAM,iBAAiB,GAA8C,IAAI,iDAAuB,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;IAE5I,MAAM,SAAS,GACX,6CAA6C;QAC7C,sBAAsB;QACtB,aAAa;QACb,WAAW,aAAa,IAAI;QAC5B,SAAS;QACT,mBAAmB;QACnB,eAAe;QACf,mBAAmB;QACnB,sBAAsB;QACtB,oBAAoB,6BAAa,CAAC,qBAAqB,IAAI;QAC3D,2CAA2C;QAC3C,oBAAoB;QACpB,wBAAwB;QACxB,cAAc,6BAAa,CAAC,uCAAuC,IAAI;QACvE,qBAAqB;QACrB,gDAAgD;QAChD,wBAAwB;QACxB,oBAAoB;QACpB,mCAAmC;QACnC,gCAAgC,CAAC;IAErC,UAAU,CAAC,uCAAuC,EAAE;QAChD,uBAAuB,CAAC,UAAU,EAAE,CAAC;QACrC,uBAAuB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,kBAAkB,EAAE;QAC9B,uBAAuB,CAAC,kBAAkB,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,0CAA0C,EAAE;QAC9C,aAAa,CAAC,uBAAuB,EAAE;YACnC,iBAAiB,CAAC,YAAY,CAAC,GAAG,iBAAiB,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,oCAAoC,EAAE;YACvC,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,WAAW,GAAgB,iBAAiB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC3E,aAAM,CAAC,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,8BAA8B,EAAE;YACjC,aAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,+BAA+B,EAAE;YAClC,aAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,gBAAgB,IAAI,iBAAiB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,6BAAa,CAAC,kCAAkC,CAAC,CAAC;QAC/I,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"CloneGitRepoAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/CloneGitRepoAPI.spec.ts"],"names":[],"mappings":";;AAAA,uGAAoG;AACpG,+BAA8B;AAE9B,qDAAkD;AAClD,iEAA8D;AAG9D,MAAM,aAAa,GAAW,6CAA6C,CAAC;AAE5E,KAAK,CAAC,yBAAyB,aAAa,yBAAyB,EAAE,KAAK;IACxE,2BAA2B;IAC3B,MAAM,SAAS,GAAW,6BAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,6BAAa,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC;IAChH,MAAM,aAAa,GAAW,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IAC1E,MAAM,iBAAiB,GAAW,iBAAO,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAClF,IAAI,gBAAgB,GAAW,EAAE,CAAC;IAElC,MAAM,kCAAkC,GAAuC,IAAI,uEAAkC,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAChJ,MAAM,iBAAiB,GAAyD,IAAI,uEAAkC,CAAC,iBAAiB,CAAC,kCAAkC,CAAC,CAAC;IAE7K,MAAM,SAAS,GACX,6CAA6C;QAC7C,sBAAsB;QACtB,aAAa;QACb,WAAW,aAAa,IAAI;QAC5B,SAAS;QACT,mBAAmB;QACnB,eAAe;QACf,mBAAmB;QACnB,sBAAsB;QACtB,oBAAoB,6BAAa,CAAC,qBAAqB,IAAI;QAC3D,2CAA2C;QAC3C,oBAAoB;QACpB,wBAAwB;QACxB,cAAc,6BAAa,CAAC,uCAAuC,IAAI;QACvE,qBAAqB;QACrB,gDAAgD;QAChD,wBAAwB;QACxB,oBAAoB;QACpB,mCAAmC;QACnC,gCAAgC,CAAC;IAErC,UAAU,CAAC,uCAAuC,EAAE;QAChD,kCAAkC,CAAC,UAAU,EAAE,CAAC;QAChD,kCAAkC,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,kBAAkB,EAAE;QAC9B,kCAAkC,CAAC,kBAAkB,EAAE,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,0CAA0C,EAAE;QAC9C,aAAa,CAAC,uBAAuB,EAAE;YACnC,iBAAiB,CAAC,YAAY,CAAC,GAAG,iBAAiB,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,oCAAoC,EAAE;YACvC,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,WAAW,GAAgB,iBAAiB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC3E,aAAM,CAAC,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,8BAA8B,EAAE;YACjC,aAAM,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,+BAA+B,EAAE;YAClC,aAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,gBAAgB,IAAI,iBAAiB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,6BAAa,CAAC,kCAAkC,CAAC,CAAC;QAC/I,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/utils/KubernetesCommandLineToolsExecutor.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KubernetesCommandLineToolsExecutor = void 0;
+const shelljs_1 = require("shelljs");
+const TestConstants_1 = require("../constants/TestConstants");
+const Logger_1 = require("./Logger");
+const ShellExecutor_1 = require("./ShellExecutor");
+class KubernetesCommandLineToolsExecutor extends ShellExecutor_1.ShellExecutor {
+    constructor(_workspaceName, _namespace) {
+        super();
+        this.KUBERNETES_COMMAND_LINE_TOOL = TestConstants_1.TestConstants.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL;
+        this.workspaceName = _workspaceName;
+        this.namespace = this.setNamespace(_namespace);
+    }
+    get getWorkspaceName() {
+        return this.workspaceName;
+    }
+    get getNamespace() {
+        return this.namespace;
+    }
+    // login to Openshift cluster with username and password
+    loginToOcp() {
+        if (this.KUBERNETES_COMMAND_LINE_TOOL === TestConstants_1.KubernetesCommandLineTool.OC) {
+            Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login to the "OC" client`);
+            const url = this.getServerUrl();
+            Logger_1.Logger.debug(url, TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME);
+            shelljs_1.exec(`sleep 5
+            oc login --server=${url} -u=${TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME} -p=${TestConstants_1.TestConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
+        }
+        else {
+            Logger_1.Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: doesn't support login command`);
+        }
+    }
+    getContainerName() {
+        Logger_1.Logger.debug(`${this.getLoggingName(this.getContainerName.name)}: Get container name.`);
+        const output = this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get ${(KubernetesCommandLineToolsExecutor.pod)} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
+        shelljs_1.echo('\n');
+        return output.stderr ? output.stderr : output.stdout;
+    }
+    getWorkspacePodName() {
+        Logger_1.Logger.debug(`${this.getLoggingName(this.getWorkspacePodName.name)}: Get workspace pod name.`);
+        const output = this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
+        return output.stderr ? output.stderr : output.stdout.replace('\n', '');
+    }
+    deleteDevWorkspace() {
+        Logger_1.Logger.debug(`${this.getLoggingName(this.deleteDevWorkspace.name)}: Delete '${this.workspaceName}' workspace`);
+        this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
+        this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
+    }
+    applyAndWaitDevWorkspace(yamlConfiguration) {
+        if (this.KUBERNETES_COMMAND_LINE_TOOL === TestConstants_1.KubernetesCommandLineTool.KUBECTL) {
+            this.createNamespace();
+        }
+        this.applyYamlConfigurationAsStringOutput(yamlConfiguration);
+        const output = this.waitDevWorkspace();
+        KubernetesCommandLineToolsExecutor.pod = this.getWorkspacePodName();
+        KubernetesCommandLineToolsExecutor.container = this.getContainerName();
+        return output;
+    }
+    executeCommand(commandToExecute) {
+        Logger_1.Logger.debug(`${this.getLoggingName(this.executeCommand.name)}:`);
+        return this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} exec -i ${KubernetesCommandLineToolsExecutor.pod} -n ${this.namespace} -c ${KubernetesCommandLineToolsExecutor.container} -- sh -c "${commandToExecute}"`);
+    }
+    applyYamlConfigurationAsStringOutput(yamlConfiguration) {
+        Logger_1.Logger.debug(`${this.getLoggingName(this.applyYamlConfigurationAsStringOutput.name)}:`);
+        this.execWithLog(`cat <<EOF | ${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f - \n` +
+            yamlConfiguration + '\n' +
+            'EOF');
+    }
+    waitDevWorkspace(timeout = 360) {
+        Logger_1.Logger.debug(`${this.getLoggingName(this.waitDevWorkspace.name)}: Wait till workspace ready.`);
+        return this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
+    }
+    createNamespace() {
+        Logger_1.Logger.debug(`${this.getLoggingName(this.createNamespace.name)}: Create namespace "${this.namespace}".`);
+        this.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} create namespace ${this.namespace}`);
+    }
+    getLoggingName(methodName) {
+        return `${this.constructor.name}.${methodName} - ${(this.KUBERNETES_COMMAND_LINE_TOOL)}`;
+    }
+    setNamespace(_namespace) {
+        _namespace = _namespace !== undefined ? _namespace
+            : TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL.includes('devspaces') ? TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces'
+                : TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL.includes('che') ? TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME + '-che'
+                    : 'default';
+        return _namespace;
+    }
+    getServerUrl() {
+        Logger_1.Logger.debug(`${this.getLoggingName(this.getServerUrl.name)}: Get server api url.`);
+        return TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
+    }
+}
+exports.KubernetesCommandLineToolsExecutor = KubernetesCommandLineToolsExecutor;
+(function (KubernetesCommandLineToolsExecutor) {
+    class ContainerTerminal extends KubernetesCommandLineToolsExecutor {
+        constructor(cluster) {
+            super(cluster.getWorkspaceName, cluster.getNamespace);
+        }
+        ls(path = '') {
+            return this.executeCommand('ls ' + path);
+        }
+        pwd() {
+            return this.executeCommand('pwd');
+        }
+        cd(path) {
+            return this.executeCommand('cd ' + path);
+        }
+        gitClone(repository) {
+            return this.executeCommand('git clone ' + repository);
+        }
+        removeFolder(path) {
+            return this.executeCommand('rm -rf ' + path);
+        }
+    }
+    KubernetesCommandLineToolsExecutor.ContainerTerminal = ContainerTerminal;
+})(KubernetesCommandLineToolsExecutor = exports.KubernetesCommandLineToolsExecutor || (exports.KubernetesCommandLineToolsExecutor = {}));
+//# sourceMappingURL=KubernetesCommandLineToolsExecutor.js.map

package/dist/utils/KubernetesCommandLineToolsExecutor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":"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"}

package/dist/utils/ShellExecutor.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShellExecutor = void 0;
+const shelljs_1 = require("shelljs");
+class ShellExecutor {
+    execWithLog(command) {
+        shelljs_1.echo(command);
+        return shelljs_1.exec(command);
+    }
+}
+exports.ShellExecutor = ShellExecutor;
+//# sourceMappingURL=ShellExecutor.js.map

package/dist/utils/ShellExecutor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ShellExecutor.js","sourceRoot":"","sources":["../../utils/ShellExecutor.ts"],"names":[],"mappings":";;;AAAA,qCAAkD;AAElD,MAAa,aAAa;IAEZ,WAAW,CAAC,OAAe;QACjC,cAAI,CAAC,OAAO,CAAC,CAAC;QACd,OAAO,cAAI,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;CACJ;AAND,sCAMC"}

package/index.ts

@@ -7,10 +7,11 @@ export * from './driver/ChromeDriver';
 export * from './driver/IDriver';
 export * from './utils/BrowserTabsUtil';
 export * from './utils/DriverHelper';
+export * from './utils/KubernetesCommandLineToolsExecutor';
 export * from './utils/Logger';
-export * from './utils/OpenshiftClientExecutor';
 export * from './utils/Sanitizer';
 export * from './utils/ScreenCatcher';
+export * from './utils/ShellExecutor';
 export * from './utils/request-handlers/CheApiRequestHandler';
 export * from './utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler';
 export * from './utils/request-handlers/headers/IAuthorizationHeaderHandler';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-che/che-e2e",
-  "version": "7.65.0-dev-569551e",
+  "version": "7.65.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/specs/api/CloneGitRepoAPI.spec.ts

@@ -1,20 +1,21 @@
-import { OpenshiftClientExecutor } from '../../utils/OpenshiftClientExecutor';
+import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
 import { expect } from 'chai';
 import { ShellString } from 'shelljs';
 import { GitUtil } from '../../utils/vsc/GitUtil';
 import { TestConstants } from '../../constants/TestConstants';
 
+
 const gitRepository: string = 'https://github.com/crw-qe/web-nodejs-sample';
 
 suite(`Test cloning of repo "${gitRepository}" into empty workspace.`, async function (): Promise<void> {
     // works only for root user
-    const namespace: string = 'admin-devspaces';
+    const namespace: string = TestConstants.TS_API_TEST_NAMESPACE ? TestConstants.TS_API_TEST_NAMESPACE : undefined;
     const workspaceName: string = 'empty-' + Math.floor(Math.random() * 1000);
     const clonedProjectName: string = GitUtil.getProjectNameFromGitUrl(gitRepository);
     let containerWorkDir: string = '';
 
-    const openshiftClientExecutor: OpenshiftClientExecutor = new OpenshiftClientExecutor(workspaceName, namespace);
-    const containerTerminal: OpenshiftClientExecutor.ContainerTerminal = new OpenshiftClientExecutor.ContainerTerminal(openshiftClientExecutor);
+    const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(workspaceName, namespace);
+    const containerTerminal: KubernetesCommandLineToolsExecutor.ContainerTerminal = new KubernetesCommandLineToolsExecutor.ContainerTerminal(kubernetesCommandLineToolsExecutor);
 
     const emptyYaml: string =
         'apiVersion: workspace.devfile.io/v1alpha2\n' +
@@ -39,12 +40,12 @@ suite(`Test cloning of repo "${gitRepository}" into empty workspace.`, async fun
         '                value: 0.0.0.0';
 
     suiteSetup('Create empty workspace with OC client', function (): void {
-        openshiftClientExecutor.loginToOcp();
-        openshiftClientExecutor.applyAndWaitDevWorkspace(emptyYaml);
+        kubernetesCommandLineToolsExecutor.loginToOcp();
+        kubernetesCommandLineToolsExecutor.applyAndWaitDevWorkspace(emptyYaml);
     });
 
     suiteTeardown('Delete workspace', function (): void {
-        openshiftClientExecutor.deleteDevWorkspace();
+        kubernetesCommandLineToolsExecutor.deleteDevWorkspace();
     });
 
     suite('Clone public repo without previous setup', function (): void {

package/utils/KubernetesCommandLineToolsExecutor.ts

@@ -0,0 +1,136 @@
+import { echo, exec, ShellString } from 'shelljs';
+import { KubernetesCommandLineTool, TestConstants } from '../constants/TestConstants';
+import { Logger } from './Logger';
+import { ShellExecutor } from './ShellExecutor';
+
+export class KubernetesCommandLineToolsExecutor extends ShellExecutor {
+    private static container: string;
+    private static pod: string;
+    private readonly namespace: string;
+    private readonly workspaceName: string | undefined;
+    private readonly KUBERNETES_COMMAND_LINE_TOOL: string = TestConstants.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL;
+
+    constructor(_workspaceName?: string, _namespace?: string) {
+        super();
+        this.workspaceName = _workspaceName;
+        this.namespace = this.setNamespace(_namespace);
+    }
+
+    get getWorkspaceName(): string {
+        return <string>this.workspaceName;
+    }
+
+    get getNamespace(): string {
+        return this.namespace;
+    }
+
+    // login to Openshift cluster with username and password
+    loginToOcp(): void {
+        if (this.KUBERNETES_COMMAND_LINE_TOOL === KubernetesCommandLineTool.OC) {
+            Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: Login to the "OC" client`);
+            const url: string = this.getServerUrl();
+            Logger.debug(url, TestConstants.TS_SELENIUM_OCP_USERNAME);
+            exec(`sleep 5
+            oc login --server=${url} -u=${TestConstants.TS_SELENIUM_OCP_USERNAME} -p=${TestConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
+        } else {
+            Logger.debug(`${this.getLoggingName(this.loginToOcp.name)}: doesn't support login command`);
+        }
+    }
+
+    getContainerName(): string {
+        Logger.debug(`${this.getLoggingName(this.getContainerName.name)}: Get container name.`);
+        const output: ShellString = this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get ${(KubernetesCommandLineToolsExecutor.pod)} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
+        echo('\n');
+        return output.stderr ? output.stderr : output.stdout;
+    }
+
+    getWorkspacePodName(): string {
+        Logger.debug(`${this.getLoggingName(this.getWorkspacePodName.name)}: Get workspace pod name.`);
+        const output: ShellString = this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
+        return output.stderr ? output.stderr : output.stdout.replace('\n', '');
+    }
+
+    deleteDevWorkspace(): void {
+        Logger.debug(`${this.getLoggingName(this.deleteDevWorkspace.name)}: Delete '${this.workspaceName}' workspace`);
+        this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
+        this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} delete dw ${this.workspaceName} -n ${this.namespace} || true`);
+    }
+
+    applyAndWaitDevWorkspace(yamlConfiguration: string): ShellString {
+        if (this.KUBERNETES_COMMAND_LINE_TOOL === KubernetesCommandLineTool.KUBECTL) {
+            this.createNamespace();
+        }
+        this.applyYamlConfigurationAsStringOutput(yamlConfiguration);
+        const output: ShellString = this.waitDevWorkspace();
+        KubernetesCommandLineToolsExecutor.pod = this.getWorkspacePodName();
+        KubernetesCommandLineToolsExecutor.container = this.getContainerName();
+        return output;
+    }
+
+    executeCommand(commandToExecute: string): ShellString {
+        Logger.debug(`${this.getLoggingName(this.executeCommand.name)}:`);
+        return this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} exec -i ${KubernetesCommandLineToolsExecutor.pod} -n ${this.namespace} -c ${KubernetesCommandLineToolsExecutor.container} -- sh -c "${commandToExecute}"`);
+    }
+
+    applyYamlConfigurationAsStringOutput(yamlConfiguration: string): void {
+        Logger.debug(`${this.getLoggingName(this.applyYamlConfigurationAsStringOutput.name)}:`);
+        this.execWithLog(`cat <<EOF | ${this.KUBERNETES_COMMAND_LINE_TOOL} apply -n ${this.namespace} -f - \n` +
+            yamlConfiguration + '\n' +
+            'EOF');
+    }
+
+    waitDevWorkspace(timeout: number = 360): ShellString {
+        Logger.debug(`${this.getLoggingName(this.waitDevWorkspace.name)}: Wait till workspace ready.`);
+        return this.execWithLog(`${(this.KUBERNETES_COMMAND_LINE_TOOL)} wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
+    }
+
+    createNamespace(): void {
+        Logger.debug(`${this.getLoggingName(this.createNamespace.name)}: Create namespace "${this.namespace}".`);
+        this.execWithLog(`${this.KUBERNETES_COMMAND_LINE_TOOL} create namespace ${this.namespace}`);
+    }
+
+    private getLoggingName(methodName: string): string {
+        return `${this.constructor.name}.${methodName} - ${(this.KUBERNETES_COMMAND_LINE_TOOL)}`;
+    }
+
+    private setNamespace(_namespace: string | undefined): string {
+        _namespace = _namespace !== undefined ? _namespace
+            : TestConstants.TS_SELENIUM_BASE_URL.includes('devspaces') ? TestConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces'
+                : TestConstants.TS_SELENIUM_BASE_URL.includes('che') ? TestConstants.TS_SELENIUM_OCP_USERNAME + '-che'
+                    : 'default';
+        return _namespace;
+    }
+
+    private getServerUrl(): string {
+        Logger.debug(`${this.getLoggingName(this.getServerUrl.name)}: Get server api url.`);
+        return TestConstants.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
+    }
+}
+
+export namespace KubernetesCommandLineToolsExecutor {
+    export class ContainerTerminal extends KubernetesCommandLineToolsExecutor {
+        constructor(cluster: KubernetesCommandLineToolsExecutor) {
+                super(cluster.getWorkspaceName, cluster.getNamespace);
+        }
+
+        ls(path: string = ''): ShellString {
+            return this.executeCommand('ls ' + path);
+        }
+
+        pwd(): ShellString {
+            return this.executeCommand('pwd');
+        }
+
+        cd(path: string): ShellString {
+            return this.executeCommand('cd ' + path);
+        }
+
+        gitClone(repository: string): ShellString {
+            return this.executeCommand('git clone ' + repository);
+        }
+
+        removeFolder(path: string): ShellString {
+            return this.executeCommand('rm -rf ' + path);
+        }
+    }
+}

package/utils/ShellExecutor.ts

@@ -0,0 +1,9 @@
+import { echo, exec, ShellString } from 'shelljs';
+
+export class ShellExecutor {
+
+    protected execWithLog(command: string): ShellString {
+        echo(command);
+        return exec(command);
+    }
+}

package/dist/utils/OpenshiftClientExecutor.js

@@ -1,98 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenshiftClientExecutor = void 0;
-const shelljs_1 = require("shelljs");
-const TestConstants_1 = require("../constants/TestConstants");
-const Logger_1 = require("./Logger");
-class OpenshiftClientExecutor {
-    constructor(_workspaceName, _namespace) {
-        this.workspaceName = _workspaceName;
-        this.namespace = this.setNamespace(_namespace);
-    }
-    get getWorkspaceName() {
-        return this.workspaceName;
-    }
-    get getNamespace() {
-        return this.namespace;
-    }
-    loginToOcp() {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.loginToOcp: Login to the \'OC\' client');
-        const url = this.getServerUrl();
-        Logger_1.Logger.debug(url, TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME);
-        shelljs_1.exec(`sleep 5
-            oc login --server=${url} -u=${TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME} -p=${TestConstants_1.TestConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
-    }
-    getContainerName() {
-        Logger_1.Logger.debug(`OpenshiftClientExecutor.getContainerName: Get container name.`);
-        const output = this.execWithLog(`oc get ${(OpenshiftClientExecutor.pod)} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
-        shelljs_1.echo('\n');
-        return output.stderr ? output.stderr : output.stdout;
-    }
-    getWorkspacePodName() {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.getWorkspacePodName: Get workspace pod name.');
-        const output = this.execWithLog(`oc get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
-        return output.stderr ? output.stderr : output.stdout.replace('\n', '');
-    }
-    deleteDevWorkspace() {
-        Logger_1.Logger.debug(`OpenshiftClientExecutor.deleteWorkspace: Delete '${this.workspaceName}' workspace`);
-        this.execWithLog(`oc patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
-        this.execWithLog(`oc delete dw ${this.workspaceName} -n ${this.namespace} || true`);
-    }
-    applyAndWaitDevWorkspace(yamlConfiguration) {
-        this.apply(yamlConfiguration);
-        const output = this.waitDevWorkspace();
-        OpenshiftClientExecutor.pod = this.getWorkspacePodName();
-        OpenshiftClientExecutor.container = this.getContainerName();
-        return output;
-    }
-    executeCommand(commandToExecute) {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.executeCommand');
-        return this.execWithLog(`oc exec -i ${OpenshiftClientExecutor.pod} -n ${this.namespace} -c ${OpenshiftClientExecutor.container} -- sh -c "${commandToExecute}"`);
-    }
-    apply(yamlConfiguration) {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.apply:');
-        this.execWithLog('cat <<EOF | oc apply -n ' + this.namespace + ' -f - \n' +
-            yamlConfiguration + '\n' +
-            'EOF');
-    }
-    waitDevWorkspace(timeout = 360) {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.wait: Wait till workspace ready.');
-        return this.execWithLog(`oc wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
-    }
-    setNamespace(_namespace) {
-        return _namespace !== undefined ? _namespace : TestConstants_1.TestConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces';
-    }
-    getServerUrl() {
-        Logger_1.Logger.debug('OpenshiftClientExecutor.getServerUrl: Get server api url.');
-        return TestConstants_1.TestConstants.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
-    }
-    execWithLog(command) {
-        shelljs_1.echo(command);
-        return shelljs_1.exec(command);
-    }
-}
-exports.OpenshiftClientExecutor = OpenshiftClientExecutor;
-(function (OpenshiftClientExecutor) {
-    class ContainerTerminal extends OpenshiftClientExecutor {
-        constructor(cluster) {
-            super(cluster.getWorkspaceName, cluster.getNamespace);
-        }
-        ls(path = '') {
-            return this.executeCommand('ls ' + path);
-        }
-        pwd() {
-            return this.executeCommand('pwd');
-        }
-        cd(path) {
-            return this.executeCommand('cd ' + path);
-        }
-        gitClone(repository) {
-            return this.executeCommand('git clone ' + repository);
-        }
-        removeFolder(path) {
-            return this.executeCommand('rm -rf ' + path);
-        }
-    }
-    OpenshiftClientExecutor.ContainerTerminal = ContainerTerminal;
-})(OpenshiftClientExecutor = exports.OpenshiftClientExecutor || (exports.OpenshiftClientExecutor = {}));
-//# sourceMappingURL=OpenshiftClientExecutor.js.map

package/dist/utils/OpenshiftClientExecutor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OpenshiftClientExecutor.js","sourceRoot":"","sources":["../../utils/OpenshiftClientExecutor.ts"],"names":[],"mappings":"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"}

package/utils/OpenshiftClientExecutor.ts

@@ -1,117 +0,0 @@
-import { echo, exec, ShellString } from 'shelljs';
-import { TestConstants } from '../constants/TestConstants';
-import { Logger } from './Logger';
-
-export class OpenshiftClientExecutor {
-    protected static container: string;
-    protected static pod: string | undefined;
-    protected workspaceName: string | undefined;
-    protected namespace: string;
-
-    constructor(_workspaceName?: string, _namespace?: string) {
-        this.workspaceName = _workspaceName;
-        this.namespace = this.setNamespace(_namespace);
-    }
-
-    get getWorkspaceName(): string {
-        return <string>this.workspaceName;
-    }
-
-    get getNamespace(): string {
-        return this.namespace;
-    }
-
-    loginToOcp(): void {
-        Logger.debug('OpenshiftClientExecutor.loginToOcp: Login to the \'OC\' client');
-        const url: string = this.getServerUrl();
-        Logger.debug(url, TestConstants.TS_SELENIUM_OCP_USERNAME);
-        exec(`sleep 5
-            oc login --server=${url} -u=${TestConstants.TS_SELENIUM_OCP_USERNAME} -p=${TestConstants.TS_SELENIUM_OCP_PASSWORD} --insecure-skip-tls-verify`);
-    }
-
-    getContainerName(): string {
-        Logger.debug(`OpenshiftClientExecutor.getContainerName: Get container name.`);
-        const output: ShellString = this.execWithLog(`oc get ${(OpenshiftClientExecutor.pod)} -o jsonpath='{.spec.containers[*].name}' -n ${this.namespace}`);
-        echo('\n');
-        return output.stderr ? output.stderr : output.stdout;
-    }
-
-    getWorkspacePodName(): string {
-        Logger.debug('OpenshiftClientExecutor.getWorkspacePodName: Get workspace pod name.');
-        const output: ShellString = this.execWithLog(`oc get pod -l controller.devfile.io/devworkspace_name=${this.workspaceName} -n ${this.namespace} -o name`);
-        return output.stderr ? output.stderr : output.stdout.replace('\n', '');
-    }
-
-    deleteDevWorkspace(): void {
-        Logger.debug(`OpenshiftClientExecutor.deleteWorkspace: Delete '${this.workspaceName}' workspace`);
-        this.execWithLog(`oc patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true`);
-        this.execWithLog(`oc delete dw ${this.workspaceName} -n ${this.namespace} || true`);
-    }
-
-    applyAndWaitDevWorkspace(yamlConfiguration: string): ShellString {
-        this.apply(yamlConfiguration);
-        const output: ShellString = this.waitDevWorkspace();
-        OpenshiftClientExecutor.pod = this.getWorkspacePodName();
-        OpenshiftClientExecutor.container = this.getContainerName();
-        return output;
-    }
-
-    executeCommand(commandToExecute: string): ShellString {
-        Logger.debug('OpenshiftClientExecutor.executeCommand');
-        return this.execWithLog(`oc exec -i ${OpenshiftClientExecutor.pod} -n ${this.namespace} -c ${OpenshiftClientExecutor.container} -- sh -c "${commandToExecute}"`);
-    }
-
-    apply(yamlConfiguration: string): void {
-        Logger.debug('OpenshiftClientExecutor.apply:');
-        this.execWithLog('cat <<EOF | oc apply -n ' + this.namespace + ' -f - \n' +
-            yamlConfiguration + '\n' +
-            'EOF');
-    }
-
-    waitDevWorkspace(timeout: number = 360): ShellString {
-        Logger.debug('OpenshiftClientExecutor.wait: Wait till workspace ready.');
-        return this.execWithLog(`oc wait -n ${this.namespace} --for=condition=Ready dw ${this.workspaceName} --timeout=${timeout}s`);
-    }
-
-    private setNamespace(_namespace: string | undefined): string {
-        return _namespace !== undefined ? _namespace : TestConstants.TS_SELENIUM_OCP_USERNAME + '-devspaces';
-    }
-
-    private getServerUrl(): string {
-        Logger.debug('OpenshiftClientExecutor.getServerUrl: Get server api url.');
-        return TestConstants.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
-    }
-
-    private execWithLog(command: string): ShellString {
-        echo(command);
-        return exec(command);
-    }
-}
-
-export namespace OpenshiftClientExecutor {
-    export class ContainerTerminal extends OpenshiftClientExecutor {
-        constructor(cluster: OpenshiftClientExecutor) {
-            super(cluster.getWorkspaceName, cluster.getNamespace);
-        }
-
-        ls(path: string = ''): ShellString {
-            return this.executeCommand('ls ' + path);
-        }
-
-        pwd(): ShellString {
-            return this.executeCommand('pwd');
-        }
-
-        cd(path: string): ShellString {
-            return this.executeCommand('cd ' + path);
-        }
-
-        gitClone(repository: string): ShellString {
-            return this.executeCommand('git clone ' + repository);
-        }
-
-        removeFolder(path: string): ShellString {
-            return this.executeCommand('rm -rf ' + path);
-        }
-    }
-}