@eclipse-che/che-e2e 7.74.0-dev-1d09cb7 → 7.74.0-dev-41d1364
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintignore +10 -0
- package/.eslintrc.js +183 -0
- package/.prettierignore +10 -0
- package/.prettierrc.json +10 -0
- package/README.md +47 -47
- package/configs/inversify.config.ts +13 -9
- package/configs/inversify.types.ts +29 -29
- package/configs/mocharc.ts +21 -24
- package/constants/API_TEST_CONSTANTS.ts +67 -0
- package/constants/BASE_TEST_CONSTANTS.ts +80 -0
- package/constants/CHROME_DRIVER_CONSTANTS.ts +54 -0
- package/constants/FACTORY_TEST_CONSTANTS.ts +61 -0
- package/constants/MONACO_CONSTANTS.ts +25 -0
- package/constants/OAUTH_CONSTANTS.ts +67 -0
- package/constants/PLUGIN_TEST_CONSTANTS.ts +15 -0
- package/constants/REPORTER_CONSTANTS.ts +53 -0
- package/constants/TIMEOUT_CONSTANTS.ts +131 -0
- package/dist/configs/inversify.config.js +14 -8
- package/dist/configs/inversify.config.js.map +1 -1
- package/dist/configs/inversify.types.js +2 -2
- package/dist/configs/inversify.types.js.map +1 -1
- package/dist/configs/mocharc.js +13 -16
- package/dist/configs/mocharc.js.map +1 -1
- package/dist/constants/{APITestConstants.js → API_TEST_CONSTANTS.js} +12 -12
- package/dist/constants/API_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{BaseTestConstants.js → BASE_TEST_CONSTANTS.js} +16 -16
- package/dist/constants/BASE_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{ChromeDriverConstants.js → CHROME_DRIVER_CONSTANTS.js} +13 -13
- package/dist/constants/CHROME_DRIVER_CONSTANTS.js.map +1 -0
- package/dist/constants/{FactoryTestConstants.js → FACTORY_TEST_CONSTANTS.js} +14 -13
- package/dist/constants/FACTORY_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{MonacoConstants.js → MONACO_CONSTANTS.js} +7 -7
- package/dist/constants/MONACO_CONSTANTS.js.map +1 -0
- package/dist/constants/{OAuthConstants.js → OAUTH_CONSTANTS.js} +14 -14
- package/dist/constants/OAUTH_CONSTANTS.js.map +1 -0
- package/dist/constants/{PluginsTestConstants.js → PLUGIN_TEST_CONSTANTS.js} +7 -7
- package/dist/constants/PLUGIN_TEST_CONSTANTS.js.map +1 -0
- package/dist/constants/{ReporterConstants.js → REPORTER_CONSTANTS.js} +12 -12
- package/dist/constants/REPORTER_CONSTANTS.js.map +1 -0
- package/dist/constants/{TimeoutConstants.js → TIMEOUT_CONSTANTS.js} +24 -24
- package/dist/constants/TIMEOUT_CONSTANTS.js.map +1 -0
- package/dist/driver/ChromeDriver.js +12 -16
- package/dist/driver/ChromeDriver.js.map +1 -1
- package/dist/index.js +9 -9
- package/dist/index.js.map +1 -1
- package/dist/pageobjects/dashboard/CreateWorkspace.js +11 -11
- package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
- package/dist/pageobjects/dashboard/Dashboard.js +16 -16
- package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
- package/dist/pageobjects/dashboard/Workspaces.js +28 -28
- package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +36 -25
- package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
- package/dist/pageobjects/git-providers/OauthPage.js +20 -18
- package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js +9 -9
- package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
- package/dist/pageobjects/login/interfaces/ICheLoginPage.js +2 -2
- package/dist/pageobjects/login/interfaces/IOcpLoginPage.js +2 -2
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js +5 -5
- package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +5 -5
- package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpLoginPage.js +13 -13
- package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +5 -5
- package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +6 -6
- package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js +5 -5
- package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +8 -8
- package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpApplicationPage.js +5 -5
- package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js +4 -4
- package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
- package/dist/pageobjects/openshift/OcpMainPage.js +6 -6
- package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
- package/dist/specs/MochaHooks.js +26 -23
- package/dist/specs/MochaHooks.js.map +1 -1
- package/dist/specs/SmokeTest.spec.js +11 -11
- package/dist/specs/SmokeTest.spec.js.map +1 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js +10 -1
- package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +26 -15
- package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js +17 -11
- package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
- package/dist/specs/api/PodOverridesAPI.spec.js +12 -3
- package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +5 -5
- package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/Quarkus.spec.js +7 -7
- package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +41 -41
- package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +14 -9
- package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
- package/dist/specs/factory/Factory.spec.js +25 -25
- package/dist/specs/factory/Factory.spec.js.map +1 -1
- package/dist/specs/factory/NoSetupRepoFactory.spec.js +37 -34
- package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
- package/dist/specs/factory/RefusedOAuthFactory.spec.js +33 -33
- package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +12 -3
- package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
- package/dist/tests-library/LoginTests.js +7 -7
- package/dist/tests-library/LoginTests.js.map +1 -1
- package/dist/tests-library/ProjectAndFileTests.js +7 -5
- package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
- package/dist/tests-library/WorkspaceHandlingTests.js +16 -13
- package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
- package/dist/utils/BrowserTabsUtil.js +19 -14
- package/dist/utils/BrowserTabsUtil.js.map +1 -1
- package/dist/utils/CheReporter.js +44 -44
- package/dist/utils/CheReporter.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +17 -8
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesRegistryHelper.js +19 -13
- package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
- package/dist/utils/DriverHelper.js +64 -66
- package/dist/utils/DriverHelper.js.map +1 -1
- package/dist/utils/KubernetesCommandLineToolsExecutor.js +28 -24
- package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
- package/dist/utils/Logger.js +18 -19
- package/dist/utils/Logger.js.map +1 -1
- package/dist/utils/ScreenCatcher.js +18 -12
- package/dist/utils/ScreenCatcher.js.map +1 -1
- package/dist/utils/ShellExecutor.js +9 -0
- package/dist/utils/ShellExecutor.js.map +1 -1
- package/dist/utils/StringUtil.js +15 -7
- package/dist/utils/StringUtil.js.map +1 -1
- package/dist/utils/request-handlers/CheApiRequestHandler.js +27 -27
- package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +10 -6
- package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
- package/dist/utils/request-handlers/headers/IAuthorizationHeaderHandler.js +2 -2
- package/dist/utils/workspace/ApiUrlResolver.js +3 -3
- package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
- package/dist/utils/workspace/ITestWorkspaceUtil.js +2 -2
- package/dist/utils/workspace/TestWorkspaceUtil.js +21 -19
- package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
- package/dist/utils/workspace/WorkspaceStatus.js +2 -2
- package/dist/utils/workspace/WorkspaceStatus.js.map +1 -1
- package/driver/ChromeDriver.ts +44 -50
- package/driver/IDriver.ts +3 -3
- package/index.ts +9 -9
- package/package.json +59 -49
- package/pageobjects/dashboard/CreateWorkspace.ts +64 -55
- package/pageobjects/dashboard/Dashboard.ts +101 -100
- package/pageobjects/dashboard/Workspaces.ts +196 -164
- package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +150 -125
- package/pageobjects/git-providers/OauthPage.ts +177 -166
- package/pageobjects/ide/CheCodeLocatorLoader.ts +49 -46
- package/pageobjects/login/interfaces/ICheLoginPage.ts +3 -3
- package/pageobjects/login/interfaces/IOcpLoginPage.ts +3 -3
- package/pageobjects/login/kubernetes/DexLoginPage.ts +31 -30
- package/pageobjects/login/kubernetes/KubernetesLoginPage.ts +15 -14
- package/pageobjects/login/openshift/OcpLoginPage.ts +61 -54
- package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +29 -24
- package/pageobjects/login/openshift/OcpUserLoginPage.ts +15 -18
- package/pageobjects/login/openshift/RedHatLoginPage.ts +48 -46
- package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +38 -34
- package/pageobjects/openshift/OcpApplicationPage.ts +21 -20
- package/pageobjects/openshift/OcpImportFromGitPage.ts +70 -68
- package/pageobjects/openshift/OcpMainPage.ts +69 -68
- package/specs/MochaHooks.ts +59 -50
- package/specs/SmokeTest.spec.ts +43 -40
- package/specs/api/ContainerOverridesAPI.spec.ts +33 -26
- package/specs/api/DevfileAcceptanceTestAPI.spec.ts +106 -95
- package/specs/api/EmptyWorkspaceAPI.spec.ts +62 -57
- package/specs/api/PodOverridesAPI.spec.ts +42 -33
- package/specs/dashboard-samples/EmptyWorkspace.spec.ts +31 -31
- package/specs/dashboard-samples/Quarkus.spec.ts +34 -34
- package/specs/dashboard-samples/RecommendedExtensions.spec.ts +192 -174
- package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +61 -52
- package/specs/factory/Factory.spec.ts +178 -168
- package/specs/factory/NoSetupRepoFactory.spec.ts +226 -211
- package/specs/factory/RefusedOAuthFactory.spec.ts +218 -204
- package/specs/miscellaneous/PredefinedNamespace.spec.ts +64 -54
- package/tests-library/LoginTests.ts +34 -32
- package/tests-library/ProjectAndFileTests.ts +21 -18
- package/tests-library/WorkspaceHandlingTests.ts +98 -89
- package/tsconfig.json +15 -15
- package/utils/BrowserTabsUtil.ts +103 -97
- package/utils/CheReporter.ts +141 -145
- package/utils/DevWorkspaceConfigurationHelper.ts +70 -61
- package/utils/DevfilesRegistryHelper.ts +67 -58
- package/utils/DriverHelper.ts +726 -700
- package/utils/KubernetesCommandLineToolsExecutor.ts +196 -180
- package/utils/Logger.ts +102 -125
- package/utils/ScreenCatcher.ts +57 -46
- package/utils/ShellExecutor.ts +19 -11
- package/utils/StringUtil.ts +40 -32
- package/utils/request-handlers/CheApiRequestHandler.ts +91 -88
- package/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +32 -21
- package/utils/request-handlers/headers/IAuthorizationHeaderHandler.ts +3 -3
- package/utils/workspace/ApiUrlResolver.ts +31 -26
- package/utils/workspace/ITestWorkspaceUtil.ts +31 -31
- package/utils/workspace/TestWorkspaceUtil.ts +152 -145
- package/utils/workspace/WorkspaceStatus.ts +5 -5
- package/constants/APITestConstants.ts +0 -57
- package/constants/BaseTestConstants.ts +0 -68
- package/constants/ChromeDriverConstants.ts +0 -46
- package/constants/FactoryTestConstants.ts +0 -51
- package/constants/MonacoConstants.ts +0 -22
- package/constants/OAuthConstants.ts +0 -57
- package/constants/PluginsTestConstants.ts +0 -15
- package/constants/ReporterConstants.ts +0 -45
- package/constants/TimeoutConstants.ts +0 -113
- package/dist/constants/APITestConstants.js.map +0 -1
- package/dist/constants/BaseTestConstants.js.map +0 -1
- package/dist/constants/ChromeDriverConstants.js.map +0 -1
- package/dist/constants/FactoryTestConstants.js.map +0 -1
- package/dist/constants/MonacoConstants.js.map +0 -1
- package/dist/constants/OAuthConstants.js.map +0 -1
- package/dist/constants/PluginsTestConstants.js.map +0 -1
- package/dist/constants/ReporterConstants.js.map +0 -1
- package/dist/constants/TimeoutConstants.js.map +0 -1
- package/tslint.json +0 -126
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAkD;AAClD,qCAAkC;AAClC,mDAAgD;AAChD,2CAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"KubernetesCommandLineToolsExecutor.js","sourceRoot":"","sources":["../../utils/KubernetesCommandLineToolsExecutor.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/Logger.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Logger = void 0;
|
|
4
|
-
|
|
5
|
-
*
|
|
4
|
+
/** *******************************************************************
|
|
5
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
6
6
|
*
|
|
7
7
|
* This program and the accompanying materials are made
|
|
8
8
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -10,10 +10,10 @@ exports.Logger = void 0;
|
|
|
10
10
|
*
|
|
11
11
|
* SPDX-License-Identifier: EPL-2.0
|
|
12
12
|
**********************************************************************/
|
|
13
|
-
const
|
|
13
|
+
const REPORTER_CONSTANTS_1 = require("../constants/REPORTER_CONSTANTS");
|
|
14
14
|
class Logger {
|
|
15
15
|
/**
|
|
16
|
-
*
|
|
16
|
+
* uses for logging of fatal errors.
|
|
17
17
|
* @param text log text
|
|
18
18
|
* @param indentLevel log level
|
|
19
19
|
*/
|
|
@@ -23,12 +23,12 @@ class Logger {
|
|
|
23
23
|
this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
|
|
24
24
|
}
|
|
25
25
|
/**
|
|
26
|
-
*
|
|
26
|
+
* uses for logging of recoverable errors and general warnings.
|
|
27
27
|
* @param text log text
|
|
28
28
|
* @param indentLevel log level
|
|
29
29
|
*/
|
|
30
30
|
static warn(text = '', indentLevel = 1) {
|
|
31
|
-
if (
|
|
31
|
+
if (REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR') {
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
34
|
const callerInfo = this.getCallerInfo();
|
|
@@ -36,13 +36,12 @@ class Logger {
|
|
|
36
36
|
this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
|
|
37
37
|
}
|
|
38
38
|
/**
|
|
39
|
-
*
|
|
39
|
+
* uses for logging of the public methods of the pageobjects.
|
|
40
40
|
* @param text log text
|
|
41
41
|
* @param indentLevel log level
|
|
42
42
|
*/
|
|
43
43
|
static info(text = '', indentLevel = 3) {
|
|
44
|
-
if (
|
|
45
|
-
ReporterConstants_1.ReporterConstants.TS_SELENIUM_LOG_LEVEL === 'WARN') {
|
|
44
|
+
if (REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR' || REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'WARN') {
|
|
46
45
|
return;
|
|
47
46
|
}
|
|
48
47
|
const callerInfo = this.getCallerInfo();
|
|
@@ -50,14 +49,14 @@ class Logger {
|
|
|
50
49
|
this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
|
|
51
50
|
}
|
|
52
51
|
/**
|
|
53
|
-
*
|
|
52
|
+
* uses for logging of the public methods of the pageobjects.
|
|
54
53
|
* @param text log text
|
|
55
54
|
* @param indentLevel log level
|
|
56
55
|
*/
|
|
57
56
|
static debug(text = '', indentLevel = 5) {
|
|
58
|
-
if (
|
|
59
|
-
|
|
60
|
-
|
|
57
|
+
if (REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
|
|
58
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
|
|
59
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'INFO') {
|
|
61
60
|
return;
|
|
62
61
|
}
|
|
63
62
|
const callerInfo = this.getCallerInfo();
|
|
@@ -65,16 +64,16 @@ class Logger {
|
|
|
65
64
|
this.logText(indentLevel, logLevelSymbol, `${this.getFullMessage(callerInfo, text)}`);
|
|
66
65
|
}
|
|
67
66
|
/**
|
|
68
|
-
*
|
|
67
|
+
* uses for logging of the public methods of the {@link DriverHelper} or
|
|
69
68
|
* private methods inside of pageobjects.
|
|
70
69
|
* @param text log text
|
|
71
70
|
* @param indentLevel log level
|
|
72
71
|
*/
|
|
73
72
|
static trace(text = '', indentLevel = 6) {
|
|
74
|
-
if (
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
73
|
+
if (REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'ERROR' ||
|
|
74
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'WARN' ||
|
|
75
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'INFO' ||
|
|
76
|
+
REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_LOG_LEVEL === 'DEBUG') {
|
|
78
77
|
return;
|
|
79
78
|
}
|
|
80
79
|
const callerInfo = this.getCallerInfo();
|
|
@@ -106,7 +105,7 @@ class Logger {
|
|
|
106
105
|
return stack[3].includes('.<anonymous') ? '' : stack[3].replace(/^\s+at\s+(.+?)\s.+/g, '$1');
|
|
107
106
|
}
|
|
108
107
|
static separator(text, caller) {
|
|
109
|
-
return text ? caller ? ' - ' : '' : '';
|
|
108
|
+
return text ? (caller ? ' - ' : '') : '';
|
|
110
109
|
}
|
|
111
110
|
}
|
|
112
111
|
exports.Logger = Logger;
|
package/dist/utils/Logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../utils/Logger.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../utils/Logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,8 +32,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
32
32
|
};
|
|
33
33
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
34
|
exports.ScreenCatcher = void 0;
|
|
35
|
-
|
|
36
|
-
*
|
|
35
|
+
/** *******************************************************************
|
|
36
|
+
* copyright (c) 2021-2023 Red Hat, Inc.
|
|
37
37
|
*
|
|
38
38
|
* This program and the accompanying materials are made
|
|
39
39
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -47,24 +47,30 @@ const inversify_types_1 = require("../configs/inversify.types");
|
|
|
47
47
|
const DriverHelper_1 = require("./DriverHelper");
|
|
48
48
|
const selenium_webdriver_1 = require("selenium-webdriver");
|
|
49
49
|
const StringUtil_1 = require("./StringUtil");
|
|
50
|
-
const
|
|
50
|
+
const REPORTER_CONSTANTS_1 = require("../constants/REPORTER_CONSTANTS");
|
|
51
51
|
let ScreenCatcher = class ScreenCatcher {
|
|
52
52
|
constructor(driverHelper) {
|
|
53
53
|
this.driverHelper = driverHelper;
|
|
54
54
|
}
|
|
55
55
|
async catchMethodScreen(methodName, methodIndex, screenshotIndex) {
|
|
56
|
-
const executionScreenCastDir = `${
|
|
57
|
-
const executionScreenCastErrorsDir = `${
|
|
58
|
-
const formattedMethodIndex = new Intl.NumberFormat('en-us', {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
56
|
+
const executionScreenCastDir = `${REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER}/executionScreencast`;
|
|
57
|
+
const executionScreenCastErrorsDir = `${REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER}/executionScreencastErrors`;
|
|
58
|
+
const formattedMethodIndex = new Intl.NumberFormat('en-us', {
|
|
59
|
+
minimumIntegerDigits: 3
|
|
60
|
+
}).format(methodIndex);
|
|
61
|
+
const formattedScreenshotIndex = new Intl.NumberFormat('en-us', { minimumIntegerDigits: 5 })
|
|
62
|
+
.format(screenshotIndex)
|
|
63
|
+
.replace(/,/g, '');
|
|
64
|
+
if (!fs.existsSync(REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER)) {
|
|
65
|
+
fs.mkdirSync(REPORTER_CONSTANTS_1.REPORTER_CONSTANTS.TS_SELENIUM_REPORT_FOLDER);
|
|
62
66
|
}
|
|
63
67
|
if (!fs.existsSync(executionScreenCastDir)) {
|
|
64
68
|
fs.mkdirSync(executionScreenCastDir);
|
|
65
69
|
}
|
|
66
70
|
const date = new Date();
|
|
67
|
-
const timeStr = date.toLocaleTimeString('en-us', { hour12: false }) +
|
|
71
|
+
const timeStr = date.toLocaleTimeString('en-us', { hour12: false }) +
|
|
72
|
+
'.' +
|
|
73
|
+
new Intl.NumberFormat('en-us', { minimumIntegerDigits: 3 }).format(date.getMilliseconds());
|
|
68
74
|
const screenshotPath = `${executionScreenCastDir}/${formattedMethodIndex}-${formattedScreenshotIndex}--(${StringUtil_1.StringUtil.sanitizeTitle(timeStr)})_${StringUtil_1.StringUtil.sanitizeTitle(methodName)}.png`;
|
|
69
75
|
try {
|
|
70
76
|
await this.catchScreen(screenshotPath);
|
|
@@ -76,7 +82,7 @@ let ScreenCatcher = class ScreenCatcher {
|
|
|
76
82
|
let errorLogFilePath = screenshotPath.replace('.png', '.txt');
|
|
77
83
|
errorLogFilePath = errorLogFilePath.replace(executionScreenCastDir, executionScreenCastErrorsDir);
|
|
78
84
|
if (err instanceof selenium_webdriver_1.error.IError) {
|
|
79
|
-
|
|
85
|
+
this.writeErrorLog(errorLogFilePath, err);
|
|
80
86
|
}
|
|
81
87
|
}
|
|
82
88
|
}
|
|
@@ -86,7 +92,7 @@ let ScreenCatcher = class ScreenCatcher {
|
|
|
86
92
|
screenshotStream.write(Buffer.from(screenshot, 'base64'));
|
|
87
93
|
screenshotStream.end();
|
|
88
94
|
}
|
|
89
|
-
|
|
95
|
+
writeErrorLog(errorLogPath, err) {
|
|
90
96
|
console.log(`Failed to save screenshot, additional information in the ${errorLogPath}`);
|
|
91
97
|
if (err.stack) {
|
|
92
98
|
const screenshotStream = fs.createWriteStream(errorLogPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScreenCatcher.js","sourceRoot":"","sources":["../../utils/ScreenCatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,uCAAyB;AAEzB,yCAA+C;AAC/C,gEAAqD;AACrD,iDAA8C;AAC9C,2DAA2C;AAC3C,6CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"ScreenCatcher.js","sourceRoot":"","sources":["../../utils/ScreenCatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ShellExecutor = void 0;
|
|
4
|
+
/** *******************************************************************
|
|
5
|
+
* copyright (c) 2023 Red Hat, Inc.
|
|
6
|
+
*
|
|
7
|
+
* This program and the accompanying materials are made
|
|
8
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
9
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
10
|
+
*
|
|
11
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
12
|
+
**********************************************************************/
|
|
4
13
|
const shelljs_1 = require("shelljs");
|
|
5
14
|
class ShellExecutor {
|
|
6
15
|
static wait(seconds) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShellExecutor.js","sourceRoot":"","sources":["../../utils/ShellExecutor.ts"],"names":[],"mappings":";;;AAAA,qCAAkD;AAElD,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"ShellExecutor.js","sourceRoot":"","sources":["../../utils/ShellExecutor.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,qCAAkD;AAElD,MAAa,aAAa;IACzB,MAAM,CAAC,IAAI,CAAC,OAAe;QAC1B,IAAI,CAAC,WAAW,CAAC,SAAS,OAAO,GAAG,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,IAAY;QACvB,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IAES,MAAM,CAAC,WAAW,CAAC,OAAe;QAC3C,cAAI,CAAC,OAAO,CAAC,CAAC;QACd,OAAO,cAAI,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC;CACD;AAbD,sCAaC"}
|
package/dist/utils/StringUtil.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
*
|
|
2
|
+
/** *******************************************************************
|
|
3
|
+
* copyright (c) 2019 Red Hat, Inc.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made
|
|
6
6
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -20,7 +20,7 @@ const inversify_1 = require("inversify");
|
|
|
20
20
|
const Logger_1 = require("./Logger");
|
|
21
21
|
let StringUtil = class StringUtil {
|
|
22
22
|
/**
|
|
23
|
-
*
|
|
23
|
+
* method extracts a test repo name from git clone https url;
|
|
24
24
|
* 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;
|
|
25
25
|
* 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.
|
|
26
26
|
* @param url git https url (which using for "git clone")
|
|
@@ -34,20 +34,28 @@ let StringUtil = class StringUtil {
|
|
|
34
34
|
if (url.includes('/tree/')) {
|
|
35
35
|
url = url.split('/').slice(0, -2).join('/');
|
|
36
36
|
}
|
|
37
|
-
const projectName = url
|
|
37
|
+
const projectName = url
|
|
38
|
+
.split(/[\/.]/)
|
|
39
|
+
.filter((e) => !['git', ''].includes(e))
|
|
40
|
+
.reverse()[0];
|
|
38
41
|
Logger_1.Logger.debug(`${projectName}`);
|
|
39
42
|
return projectName;
|
|
40
43
|
}
|
|
41
44
|
static sanitizeTitle(arg) {
|
|
42
|
-
return arg
|
|
45
|
+
return arg
|
|
46
|
+
.replace(/\//g, '+')
|
|
47
|
+
.replace(/,/g, '.')
|
|
48
|
+
.replace(/:/g, '-')
|
|
49
|
+
.replace(/['"]/g, '')
|
|
50
|
+
.replace(/[^a-z0-9+\-.()\[\]_]/gi, '_');
|
|
43
51
|
}
|
|
44
52
|
/**
|
|
45
|
-
*
|
|
53
|
+
* replaces ${ENV}, $ENV to "$ENV"
|
|
46
54
|
* @param command string command with environmental variables in unsupported format
|
|
47
55
|
* @return updated command with environmental variables in supported format
|
|
48
56
|
*/
|
|
49
57
|
static updateCommandEnvsToShStyle(command) {
|
|
50
|
-
return command.replace(/[{}]/g, '').replace(/(?<!")\${?[a-zA-Z0-9_+\-\s]+\b}?/gm,
|
|
58
|
+
return command.replace(/[{}]/g, '').replace(/(?<!")\${?[a-zA-Z0-9_+\-\s]+\b}?/gm, '"$&"');
|
|
51
59
|
}
|
|
52
60
|
};
|
|
53
61
|
StringUtil = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StringUtil.js","sourceRoot":"","sources":["../../utils/StringUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;AAExE,yCAAuC;AACvC,qCAAkC;AAGlC,IAAa,UAAU,GAAvB,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"StringUtil.js","sourceRoot":"","sources":["../../utils/StringUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;AAExE,yCAAuC;AACvC,qCAAkC;AAGlC,IAAa,UAAU,GAAvB,MAAa,UAAU;IACtB;;;;;;OAMG;IACH,MAAM,CAAC,wBAAwB,CAAC,GAAW;QAC1C,eAAM,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;QACvB,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;SACzC;QACD,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC3B,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC5C;QACD,MAAM,WAAW,GAAW,GAAG;aAC7B,KAAK,CAAC,OAAO,CAAC;aACd,MAAM,CAAC,CAAC,CAAS,EAAW,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aACxD,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACf,eAAM,CAAC,KAAK,CAAC,GAAG,WAAW,EAAE,CAAC,CAAC;QAC/B,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAW;QAC/B,OAAO,GAAG;aACR,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;aACnB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;aAClB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;aAClB,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;aACpB,OAAO,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IAEH,MAAM,CAAC,0BAA0B,CAAC,OAAe;QAChD,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,oCAAoC,EAAE,MAAM,CAAC,CAAC;IAC3F,CAAC;CACD,CAAA;AA1CY,UAAU;IADtB,sBAAU,EAAE;GACA,UAAU,CA0CtB;AA1CY,gCAAU"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
*
|
|
2
|
+
/** *******************************************************************
|
|
3
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made
|
|
6
6
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -29,45 +29,45 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
29
29
|
const inversify_types_1 = require("../../configs/inversify.types");
|
|
30
30
|
const inversify_1 = require("inversify");
|
|
31
31
|
const Logger_1 = require("../Logger");
|
|
32
|
-
const
|
|
32
|
+
const BASE_TEST_CONSTANTS_1 = require("../../constants/BASE_TEST_CONSTANTS");
|
|
33
33
|
let CheApiRequestHandler = class CheApiRequestHandler {
|
|
34
34
|
constructor(headerHandler) {
|
|
35
35
|
this.headerHandler = headerHandler;
|
|
36
36
|
}
|
|
37
37
|
/**
|
|
38
|
-
*
|
|
38
|
+
* this method adds a request interceptor into axios request interceptors list and returns an ID of the interceptor
|
|
39
39
|
*/
|
|
40
40
|
static enableRequestInterceptor() {
|
|
41
41
|
Logger_1.Logger.debug();
|
|
42
|
-
return axios_1.default.interceptors.request.use(request => {
|
|
42
|
+
return axios_1.default.interceptors.request.use((request) => {
|
|
43
43
|
try {
|
|
44
|
-
|
|
45
|
-
if (
|
|
44
|
+
const REQUEST_CENSORED = JSON.parse(JSON.stringify(request));
|
|
45
|
+
if (REQUEST_CENSORED === undefined) {
|
|
46
46
|
Logger_1.Logger.error('JSON.parse returned an undefined object, cannot process request');
|
|
47
47
|
return request;
|
|
48
48
|
}
|
|
49
|
-
if (
|
|
49
|
+
if (REQUEST_CENSORED.headers === undefined) {
|
|
50
50
|
Logger_1.Logger.warn('request does not contain any headers object');
|
|
51
51
|
return request;
|
|
52
52
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
Logger_1.Logger.info(
|
|
53
|
+
REQUEST_CENSORED.headers.Authorization = 'CENSORED';
|
|
54
|
+
REQUEST_CENSORED.headers.Cookie = 'CENSORED';
|
|
55
|
+
Logger_1.Logger.info('request:\n' + JSON.stringify(REQUEST_CENSORED));
|
|
56
56
|
}
|
|
57
57
|
catch (err) {
|
|
58
|
-
Logger_1.Logger.error(
|
|
58
|
+
Logger_1.Logger.error('request: Failed to deep clone AxiosRequestConfig:' + err);
|
|
59
59
|
}
|
|
60
60
|
return request;
|
|
61
61
|
});
|
|
62
62
|
}
|
|
63
63
|
/**
|
|
64
|
-
*
|
|
64
|
+
* this method adds a response interceptor into axios response interceptors list and returns an ID of the interceptor
|
|
65
65
|
*/
|
|
66
66
|
static enableResponseInterceptor() {
|
|
67
67
|
Logger_1.Logger.debug();
|
|
68
|
-
return axios_1.default.interceptors.response.use(response => {
|
|
68
|
+
return axios_1.default.interceptors.response.use((response) => {
|
|
69
69
|
try {
|
|
70
|
-
|
|
70
|
+
const RESPONSE_CENSORED = JSON.parse(JSON.stringify(response, (key, value) => {
|
|
71
71
|
switch (key) {
|
|
72
72
|
case 'request':
|
|
73
73
|
return 'CENSORED';
|
|
@@ -75,30 +75,30 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
75
75
|
return value;
|
|
76
76
|
}
|
|
77
77
|
}));
|
|
78
|
-
if (
|
|
78
|
+
if (RESPONSE_CENSORED === undefined) {
|
|
79
79
|
Logger_1.Logger.error('JSON.parse returned an undefined object, cannot process response');
|
|
80
80
|
return response;
|
|
81
81
|
}
|
|
82
|
-
if (
|
|
82
|
+
if (RESPONSE_CENSORED.config === undefined) {
|
|
83
83
|
Logger_1.Logger.warn('response does not contain any config object');
|
|
84
84
|
return response;
|
|
85
85
|
}
|
|
86
|
-
if (
|
|
86
|
+
if (RESPONSE_CENSORED.config.headers === undefined) {
|
|
87
87
|
Logger_1.Logger.warn('response does not contain any config.headers object');
|
|
88
88
|
return response;
|
|
89
89
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
if (
|
|
93
|
-
|
|
90
|
+
RESPONSE_CENSORED.config.headers.Authorization = 'CENSORED';
|
|
91
|
+
RESPONSE_CENSORED.config.headers.Cookie = 'CENSORED';
|
|
92
|
+
if (RESPONSE_CENSORED.data.access_token !== null) {
|
|
93
|
+
RESPONSE_CENSORED.data.access_token = 'CENSORED';
|
|
94
94
|
}
|
|
95
|
-
if (
|
|
96
|
-
|
|
95
|
+
if (RESPONSE_CENSORED.data.refresh_token !== null) {
|
|
96
|
+
RESPONSE_CENSORED.data.refresh_token = 'CENSORED';
|
|
97
97
|
}
|
|
98
|
-
Logger_1.Logger.info(
|
|
98
|
+
Logger_1.Logger.info('response:\n' + JSON.stringify(RESPONSE_CENSORED));
|
|
99
99
|
}
|
|
100
100
|
catch (err) {
|
|
101
|
-
Logger_1.Logger.error(
|
|
101
|
+
Logger_1.Logger.error('response: Failed to deep clone AxiosResponse:' + err);
|
|
102
102
|
}
|
|
103
103
|
return response;
|
|
104
104
|
});
|
|
@@ -116,7 +116,7 @@ let CheApiRequestHandler = class CheApiRequestHandler {
|
|
|
116
116
|
return await axios_1.default.patch(this.assembleUrl(relativeUrl), patchParams, await this.headerHandler.get());
|
|
117
117
|
}
|
|
118
118
|
assembleUrl(relativeUrl) {
|
|
119
|
-
return `${
|
|
119
|
+
return `${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL}/${relativeUrl}`;
|
|
120
120
|
}
|
|
121
121
|
};
|
|
122
122
|
CheApiRequestHandler = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/request-handlers/CheApiRequestHandler.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;;;AAExE,kDAAiE;AACjE,mEAAsD;AACtD,yCAA+C;AAE/C,sCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"CheApiRequestHandler.js","sourceRoot":"","sources":["../../../utils/request-handlers/CheApiRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,29 +17,33 @@ const inversify_1 = require("inversify");
|
|
|
17
17
|
const DriverHelper_1 = require("../../DriverHelper");
|
|
18
18
|
const inversify_types_1 = require("../../../configs/inversify.types");
|
|
19
19
|
const Logger_1 = require("../../Logger");
|
|
20
|
-
const
|
|
20
|
+
const BASE_TEST_CONSTANTS_1 = require("../../../constants/BASE_TEST_CONSTANTS");
|
|
21
21
|
let CheMultiuserAuthorizationHeaderHandler = class CheMultiuserAuthorizationHeaderHandler {
|
|
22
22
|
constructor(driverHelper) {
|
|
23
23
|
this.driverHelper = driverHelper;
|
|
24
24
|
this.authorizationToken = '';
|
|
25
|
-
this.cookiesType =
|
|
25
|
+
this.cookiesType = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_PLATFORM === BASE_TEST_CONSTANTS_1.Platform.OPENSHIFT ? '_oauth_proxy' : '_oauth2_proxy';
|
|
26
26
|
}
|
|
27
27
|
async get() {
|
|
28
28
|
try {
|
|
29
|
-
|
|
29
|
+
const token = await this.driverHelper.getDriver().manage().getCookie(this.cookiesType);
|
|
30
30
|
if (this.authorizationToken !== token.value) {
|
|
31
31
|
this.authorizationToken = token.value;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
catch (err) {
|
|
35
35
|
if (this.authorizationToken.length > 0) {
|
|
36
|
-
Logger_1.Logger.warn(
|
|
36
|
+
Logger_1.Logger.warn('could not obtain _oauth_proxy cookie from chromedriver, browser session may have been killed. Using stored value.');
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
|
-
throw new Error(
|
|
39
|
+
throw new Error('Could not obtain _oauth_proxy cookie from chromedriver, browser session may have been killed. No stored token present!');
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
return {
|
|
42
|
+
return {
|
|
43
|
+
headers: {
|
|
44
|
+
cookie: `${this.cookiesType}=${this.authorizationToken}`
|
|
45
|
+
}
|
|
46
|
+
};
|
|
43
47
|
}
|
|
44
48
|
};
|
|
45
49
|
CheMultiuserAuthorizationHeaderHandler = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,sEAA2D;AAC3D,yCAAsC;AAEtC,
|
|
1
|
+
{"version":3,"file":"CheMultiuserAuthorizationHeaderHandler.js","sourceRoot":"","sources":["../../../../utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAWA,yCAA+C;AAC/C,qDAAkD;AAClD,sEAA2D;AAC3D,yCAAsC;AAEtC,gFAAuF;AAGvF,IAAa,sCAAsC,GAAnD,MAAa,sCAAsC;IAIlD,YAEkB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;QALpC,uBAAkB,GAAW,EAAE,CAAC;QACvB,gBAAW,GAAW,yCAAmB,CAAC,WAAW,KAAK,8BAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC;IAK9H,CAAC;IAEJ,KAAK,CAAC,GAAG;QACR,IAAI;YACH,MAAM,KAAK,GAAqB,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzG,IAAI,IAAI,CAAC,kBAAkB,KAAK,KAAK,CAAC,KAAK,EAAE;gBAC5C,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC;aACtC;SACD;QAAC,OAAO,GAAG,EAAE;YACb,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvC,eAAM,CAAC,IAAI,CACV,mHAAmH,CACnH,CAAC;aACF;iBAAM;gBACN,MAAM,IAAI,KAAK,CACd,wHAAwH,CACxH,CAAC;aACF;SACD;QAED,OAAO;YACN,OAAO,EAAE;gBACR,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,kBAAkB,EAAE;aACxD;SACD,CAAC;IACH,CAAC;CACD,CAAA;AAjCY,sCAAsC;IADlD,sBAAU,EAAE;IAMV,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACE,2BAAY;GANhC,sCAAsC,CAiClD;AAjCY,wFAAsC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
*
|
|
2
|
+
/** *******************************************************************
|
|
3
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made
|
|
6
6
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -14,8 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var ApiUrlResolver_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.ApiUrlResolver = void 0;
|
|
17
|
-
|
|
18
|
-
*
|
|
17
|
+
/** *******************************************************************
|
|
18
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
19
19
|
*
|
|
20
20
|
* This program and the accompanying materials are made
|
|
21
21
|
* available under the terms of the Eclipse Public License 2.0
|
|
@@ -42,7 +42,7 @@ let ApiUrlResolver = ApiUrlResolver_1 = class ApiUrlResolver {
|
|
|
42
42
|
async obtainUserNamespace() {
|
|
43
43
|
Logger_1.Logger.debug(`${this.userNamespace}`);
|
|
44
44
|
if (this.userNamespace.length === 0) {
|
|
45
|
-
Logger_1.Logger.trace(
|
|
45
|
+
Logger_1.Logger.trace('USER_NAMESPACE.length = 0, calling kubernetes API');
|
|
46
46
|
const kubernetesResponse = await this.processRequestHandler.get(ApiUrlResolver_1.KUBERNETES_API_URL);
|
|
47
47
|
if (kubernetesResponse.status !== 200) {
|
|
48
48
|
throw new Error(`Cannot get user namespace from kubernetes API. Code: ${kubernetesResponse.status} Data: ${kubernetesResponse.data}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiUrlResolver.js","sourceRoot":"","sources":["../../../utils/workspace/ApiUrlResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,mEAAwD;AACxD,sCAAmC;AACnC,mFAAgF;AAIhF,IAAa,cAAc,sBAA3B,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"ApiUrlResolver.js","sourceRoot":"","sources":["../../../utils/workspace/ApiUrlResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,mEAAwD;AACxD,sCAAmC;AACnC,mFAAgF;AAIhF,IAAa,cAAc,sBAA3B,MAAa,cAAc;IAM1B,YAEkB,qBAA2C;QAA3C,0BAAqB,GAArB,qBAAqB,CAAsB;QAJrD,kBAAa,GAAW,EAAE,CAAC;IAKhC,CAAC;IAEJ,KAAK,CAAC,kBAAkB,CAAC,aAAqB;QAC7C,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,IAAI,aAAa,EAAE,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACxB,MAAM,SAAS,GAAW,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3D,OAAO,GAAG,gBAAc,CAAC,iBAAiB,IAAI,SAAS,gBAAgB,CAAC;IACzE,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAChC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACtC,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,eAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;YAClE,MAAM,kBAAkB,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,gBAAc,CAAC,kBAAkB,CAAC,CAAC;YAClH,IAAI,kBAAkB,CAAC,MAAM,KAAK,GAAG,EAAE;gBACtC,MAAM,IAAI,KAAK,CACd,wDAAwD,kBAAkB,CAAC,MAAM,UAAU,kBAAkB,CAAC,IAAI,EAAE,CACpH,CAAC;aACF;YACD,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrD,eAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SACvD;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;CACD,CAAA;AAlCwB,gCAAiB,GAAW,yBAAyB,CAAC;AACtD,iCAAkB,GAAW,0BAA0B,CAAC;AAFpE,cAAc;IAD1B,sBAAU,EAAE;IAQV,WAAA,kBAAM,CAAC,yBAAO,CAAC,oBAAoB,CAAC,CAAA;qCACG,2CAAoB;GARjD,cAAc,CAmC1B;AAnCY,wCAAc"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
*
|
|
2
|
+
/** *******************************************************************
|
|
3
|
+
* copyright (c) 2019-2023 Red Hat, Inc.
|
|
4
4
|
*
|
|
5
5
|
* This program and the accompanying materials are made
|
|
6
6
|
* available under the terms of the Eclipse Public License 2.0
|