@eclipse-che/che-e2e 7.73.0 → 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.
Files changed (222) hide show
  1. package/.eslintignore +10 -0
  2. package/.eslintrc.js +183 -0
  3. package/.prettierignore +10 -0
  4. package/.prettierrc.json +10 -0
  5. package/README.md +47 -47
  6. package/configs/inversify.config.ts +14 -10
  7. package/configs/inversify.types.ts +29 -29
  8. package/configs/mocharc.ts +21 -24
  9. package/constants/API_TEST_CONSTANTS.ts +67 -0
  10. package/constants/BASE_TEST_CONSTANTS.ts +80 -0
  11. package/constants/CHROME_DRIVER_CONSTANTS.ts +54 -0
  12. package/constants/FACTORY_TEST_CONSTANTS.ts +61 -0
  13. package/constants/MONACO_CONSTANTS.ts +25 -0
  14. package/constants/OAUTH_CONSTANTS.ts +67 -0
  15. package/constants/PLUGIN_TEST_CONSTANTS.ts +15 -0
  16. package/constants/REPORTER_CONSTANTS.ts +53 -0
  17. package/constants/TIMEOUT_CONSTANTS.ts +131 -0
  18. package/dist/configs/inversify.config.js +14 -8
  19. package/dist/configs/inversify.config.js.map +1 -1
  20. package/dist/configs/inversify.types.js +2 -2
  21. package/dist/configs/inversify.types.js.map +1 -1
  22. package/dist/configs/mocharc.js +13 -16
  23. package/dist/configs/mocharc.js.map +1 -1
  24. package/dist/constants/{APITestConstants.js → API_TEST_CONSTANTS.js} +13 -13
  25. package/dist/constants/API_TEST_CONSTANTS.js.map +1 -0
  26. package/dist/constants/{BaseTestConstants.js → BASE_TEST_CONSTANTS.js} +17 -16
  27. package/dist/constants/BASE_TEST_CONSTANTS.js.map +1 -0
  28. package/dist/constants/{ChromeDriverConstants.js → CHROME_DRIVER_CONSTANTS.js} +14 -14
  29. package/dist/constants/CHROME_DRIVER_CONSTANTS.js.map +1 -0
  30. package/dist/constants/{FactoryTestConstants.js → FACTORY_TEST_CONSTANTS.js} +15 -14
  31. package/dist/constants/FACTORY_TEST_CONSTANTS.js.map +1 -0
  32. package/dist/constants/{MonacoConstants.js → MONACO_CONSTANTS.js} +8 -8
  33. package/dist/constants/MONACO_CONSTANTS.js.map +1 -0
  34. package/dist/constants/{OAuthConstants.js → OAUTH_CONSTANTS.js} +15 -15
  35. package/dist/constants/OAUTH_CONSTANTS.js.map +1 -0
  36. package/dist/constants/{PluginsTestConstants.js → PLUGIN_TEST_CONSTANTS.js} +7 -7
  37. package/dist/constants/PLUGIN_TEST_CONSTANTS.js.map +1 -0
  38. package/dist/constants/{ReporterConstants.js → REPORTER_CONSTANTS.js} +13 -13
  39. package/dist/constants/REPORTER_CONSTANTS.js.map +1 -0
  40. package/dist/constants/{TimeoutConstants.js → TIMEOUT_CONSTANTS.js} +24 -24
  41. package/dist/constants/TIMEOUT_CONSTANTS.js.map +1 -0
  42. package/dist/driver/ChromeDriver.js +12 -16
  43. package/dist/driver/ChromeDriver.js.map +1 -1
  44. package/dist/index.js +9 -9
  45. package/dist/index.js.map +1 -1
  46. package/dist/pageobjects/dashboard/CreateWorkspace.js +18 -18
  47. package/dist/pageobjects/dashboard/CreateWorkspace.js.map +1 -1
  48. package/dist/pageobjects/dashboard/Dashboard.js +27 -27
  49. package/dist/pageobjects/dashboard/Dashboard.js.map +1 -1
  50. package/dist/pageobjects/dashboard/Workspaces.js +42 -42
  51. package/dist/pageobjects/dashboard/Workspaces.js.map +1 -1
  52. package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js +44 -33
  53. package/dist/pageobjects/dashboard/workspace-details/WorkspaceDetails.js.map +1 -1
  54. package/dist/pageobjects/git-providers/OauthPage.js +37 -35
  55. package/dist/pageobjects/git-providers/OauthPage.js.map +1 -1
  56. package/dist/pageobjects/ide/CheCodeLocatorLoader.js +10 -10
  57. package/dist/pageobjects/ide/CheCodeLocatorLoader.js.map +1 -1
  58. package/dist/pageobjects/login/interfaces/ICheLoginPage.js +2 -2
  59. package/dist/pageobjects/login/interfaces/IOcpLoginPage.js +2 -2
  60. package/dist/pageobjects/login/kubernetes/DexLoginPage.js +10 -10
  61. package/dist/pageobjects/login/kubernetes/DexLoginPage.js.map +1 -1
  62. package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js +6 -6
  63. package/dist/pageobjects/login/kubernetes/KubernetesLoginPage.js.map +1 -1
  64. package/dist/pageobjects/login/openshift/OcpLoginPage.js +23 -23
  65. package/dist/pageobjects/login/openshift/OcpLoginPage.js.map +1 -1
  66. package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js +7 -7
  67. package/dist/pageobjects/login/openshift/OcpRedHatLoginPage.js.map +1 -1
  68. package/dist/pageobjects/login/openshift/OcpUserLoginPage.js +7 -7
  69. package/dist/pageobjects/login/openshift/OcpUserLoginPage.js.map +1 -1
  70. package/dist/pageobjects/login/openshift/RedHatLoginPage.js +11 -11
  71. package/dist/pageobjects/login/openshift/RedHatLoginPage.js.map +1 -1
  72. package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js +10 -10
  73. package/dist/pageobjects/login/openshift/RegularUserOcpCheLoginPage.js.map +1 -1
  74. package/dist/pageobjects/openshift/OcpApplicationPage.js +7 -7
  75. package/dist/pageobjects/openshift/OcpApplicationPage.js.map +1 -1
  76. package/dist/pageobjects/openshift/OcpImportFromGitPage.js +9 -9
  77. package/dist/pageobjects/openshift/OcpImportFromGitPage.js.map +1 -1
  78. package/dist/pageobjects/openshift/OcpMainPage.js +15 -15
  79. package/dist/pageobjects/openshift/OcpMainPage.js.map +1 -1
  80. package/dist/specs/MochaHooks.js +27 -24
  81. package/dist/specs/MochaHooks.js.map +1 -1
  82. package/dist/specs/SmokeTest.spec.js +17 -13
  83. package/dist/specs/SmokeTest.spec.js.map +1 -1
  84. package/dist/specs/api/ContainerOverridesAPI.spec.js +10 -1
  85. package/dist/specs/api/ContainerOverridesAPI.spec.js.map +1 -1
  86. package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js +31 -18
  87. package/dist/specs/api/DevfileAcceptanceTestAPI.spec.js.map +1 -1
  88. package/dist/specs/api/EmptyWorkspaceAPI.spec.js +18 -12
  89. package/dist/specs/api/EmptyWorkspaceAPI.spec.js.map +1 -1
  90. package/dist/specs/api/PodOverridesAPI.spec.js +12 -2
  91. package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
  92. package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js +12 -8
  93. package/dist/specs/dashboard-samples/EmptyWorkspace.spec.js.map +1 -1
  94. package/dist/specs/dashboard-samples/Quarkus.spec.js +13 -9
  95. package/dist/specs/dashboard-samples/Quarkus.spec.js.map +1 -1
  96. package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js +47 -43
  97. package/dist/specs/dashboard-samples/RecommendedExtensions.spec.js.map +1 -1
  98. package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js +17 -10
  99. package/dist/specs/devconsole-intergration/DevConsoleIntegration.spec.js.map +1 -1
  100. package/dist/specs/factory/Factory.spec.js +28 -26
  101. package/dist/specs/factory/Factory.spec.js.map +1 -1
  102. package/dist/specs/factory/NoSetupRepoFactory.spec.js +41 -36
  103. package/dist/specs/factory/NoSetupRepoFactory.spec.js.map +1 -1
  104. package/dist/specs/factory/RefusedOAuthFactory.spec.js +37 -35
  105. package/dist/specs/factory/RefusedOAuthFactory.spec.js.map +1 -1
  106. package/dist/specs/miscellaneous/PredefinedNamespace.spec.js +18 -5
  107. package/dist/specs/miscellaneous/PredefinedNamespace.spec.js.map +1 -1
  108. package/dist/tests-library/LoginTests.js +7 -7
  109. package/dist/tests-library/LoginTests.js.map +1 -1
  110. package/dist/tests-library/ProjectAndFileTests.js +9 -7
  111. package/dist/tests-library/ProjectAndFileTests.js.map +1 -1
  112. package/dist/tests-library/WorkspaceHandlingTests.js +61 -78
  113. package/dist/tests-library/WorkspaceHandlingTests.js.map +1 -1
  114. package/dist/utils/BrowserTabsUtil.js +29 -24
  115. package/dist/utils/BrowserTabsUtil.js.map +1 -1
  116. package/dist/utils/CheReporter.js +44 -44
  117. package/dist/utils/CheReporter.js.map +1 -1
  118. package/dist/utils/DevWorkspaceConfigurationHelper.js +19 -10
  119. package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
  120. package/dist/utils/DevfilesRegistryHelper.js +25 -19
  121. package/dist/utils/DevfilesRegistryHelper.js.map +1 -1
  122. package/dist/utils/DriverHelper.js +126 -128
  123. package/dist/utils/DriverHelper.js.map +1 -1
  124. package/dist/utils/KubernetesCommandLineToolsExecutor.js +53 -46
  125. package/dist/utils/KubernetesCommandLineToolsExecutor.js.map +1 -1
  126. package/dist/utils/Logger.js +62 -39
  127. package/dist/utils/Logger.js.map +1 -1
  128. package/dist/utils/ScreenCatcher.js +18 -12
  129. package/dist/utils/ScreenCatcher.js.map +1 -1
  130. package/dist/utils/ShellExecutor.js +9 -0
  131. package/dist/utils/ShellExecutor.js.map +1 -1
  132. package/dist/utils/StringUtil.js +17 -9
  133. package/dist/utils/StringUtil.js.map +1 -1
  134. package/dist/utils/request-handlers/CheApiRequestHandler.js +36 -34
  135. package/dist/utils/request-handlers/CheApiRequestHandler.js.map +1 -1
  136. package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js +10 -6
  137. package/dist/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.js.map +1 -1
  138. package/dist/utils/request-handlers/headers/IAuthorizationHeaderHandler.js +2 -2
  139. package/dist/utils/workspace/ApiUrlResolver.js +5 -5
  140. package/dist/utils/workspace/ApiUrlResolver.js.map +1 -1
  141. package/dist/utils/workspace/ITestWorkspaceUtil.js +2 -2
  142. package/dist/utils/workspace/TestWorkspaceUtil.js +36 -30
  143. package/dist/utils/workspace/TestWorkspaceUtil.js.map +1 -1
  144. package/dist/utils/workspace/WorkspaceStatus.js +2 -2
  145. package/dist/utils/workspace/WorkspaceStatus.js.map +1 -1
  146. package/driver/ChromeDriver.ts +45 -51
  147. package/driver/IDriver.ts +3 -3
  148. package/index.ts +9 -9
  149. package/package.json +59 -49
  150. package/pageobjects/dashboard/CreateWorkspace.ts +65 -56
  151. package/pageobjects/dashboard/Dashboard.ts +101 -100
  152. package/pageobjects/dashboard/Workspaces.ts +197 -166
  153. package/pageobjects/dashboard/workspace-details/WorkspaceDetails.ts +151 -127
  154. package/pageobjects/git-providers/OauthPage.ts +177 -166
  155. package/pageobjects/ide/CheCodeLocatorLoader.ts +49 -46
  156. package/pageobjects/login/interfaces/ICheLoginPage.ts +3 -3
  157. package/pageobjects/login/interfaces/IOcpLoginPage.ts +3 -3
  158. package/pageobjects/login/kubernetes/DexLoginPage.ts +32 -31
  159. package/pageobjects/login/kubernetes/KubernetesLoginPage.ts +16 -15
  160. package/pageobjects/login/openshift/OcpLoginPage.ts +62 -55
  161. package/pageobjects/login/openshift/OcpRedHatLoginPage.ts +30 -25
  162. package/pageobjects/login/openshift/OcpUserLoginPage.ts +16 -19
  163. package/pageobjects/login/openshift/RedHatLoginPage.ts +49 -44
  164. package/pageobjects/login/openshift/RegularUserOcpCheLoginPage.ts +39 -35
  165. package/pageobjects/openshift/OcpApplicationPage.ts +21 -20
  166. package/pageobjects/openshift/OcpImportFromGitPage.ts +70 -68
  167. package/pageobjects/openshift/OcpMainPage.ts +69 -68
  168. package/resources/pod-overrides-airgap.yaml +37 -0
  169. package/specs/MochaHooks.ts +59 -50
  170. package/specs/SmokeTest.spec.ts +43 -36
  171. package/specs/api/ContainerOverridesAPI.spec.ts +33 -26
  172. package/specs/api/DevfileAcceptanceTestAPI.spec.ts +107 -94
  173. package/specs/api/EmptyWorkspaceAPI.spec.ts +62 -57
  174. package/specs/api/PodOverridesAPI.spec.ts +42 -32
  175. package/specs/dashboard-samples/EmptyWorkspace.spec.ts +31 -27
  176. package/specs/dashboard-samples/Quarkus.spec.ts +34 -30
  177. package/specs/dashboard-samples/RecommendedExtensions.spec.ts +192 -170
  178. package/specs/devconsole-intergration/DevConsoleIntegration.spec.ts +62 -55
  179. package/specs/factory/Factory.spec.ts +178 -166
  180. package/specs/factory/NoSetupRepoFactory.spec.ts +227 -210
  181. package/specs/factory/RefusedOAuthFactory.spec.ts +219 -203
  182. package/specs/miscellaneous/PredefinedNamespace.spec.ts +64 -50
  183. package/tests-library/LoginTests.ts +34 -32
  184. package/tests-library/ProjectAndFileTests.ts +21 -18
  185. package/tests-library/WorkspaceHandlingTests.ts +98 -108
  186. package/tsconfig.json +15 -15
  187. package/utils/BrowserTabsUtil.ts +104 -98
  188. package/utils/CheReporter.ts +142 -148
  189. package/utils/DevWorkspaceConfigurationHelper.ts +70 -61
  190. package/utils/DevfilesRegistryHelper.ts +67 -58
  191. package/utils/DriverHelper.ts +726 -701
  192. package/utils/KubernetesCommandLineToolsExecutor.ts +196 -172
  193. package/utils/Logger.ts +104 -75
  194. package/utils/ScreenCatcher.ts +59 -48
  195. package/utils/ShellExecutor.ts +19 -11
  196. package/utils/StringUtil.ts +40 -32
  197. package/utils/request-handlers/CheApiRequestHandler.ts +92 -87
  198. package/utils/request-handlers/headers/CheMultiuserAuthorizationHeaderHandler.ts +32 -21
  199. package/utils/request-handlers/headers/IAuthorizationHeaderHandler.ts +3 -3
  200. package/utils/workspace/ApiUrlResolver.ts +31 -26
  201. package/utils/workspace/ITestWorkspaceUtil.ts +31 -31
  202. package/utils/workspace/TestWorkspaceUtil.ts +153 -142
  203. package/utils/workspace/WorkspaceStatus.ts +5 -5
  204. package/constants/APITestConstants.ts +0 -56
  205. package/constants/BaseTestConstants.ts +0 -65
  206. package/constants/ChromeDriverConstants.ts +0 -46
  207. package/constants/FactoryTestConstants.ts +0 -51
  208. package/constants/MonacoConstants.ts +0 -22
  209. package/constants/OAuthConstants.ts +0 -57
  210. package/constants/PluginsTestConstants.ts +0 -15
  211. package/constants/ReporterConstants.ts +0 -45
  212. package/constants/TimeoutConstants.ts +0 -113
  213. package/dist/constants/APITestConstants.js.map +0 -1
  214. package/dist/constants/BaseTestConstants.js.map +0 -1
  215. package/dist/constants/ChromeDriverConstants.js.map +0 -1
  216. package/dist/constants/FactoryTestConstants.js.map +0 -1
  217. package/dist/constants/MonacoConstants.js.map +0 -1
  218. package/dist/constants/OAuthConstants.js.map +0 -1
  219. package/dist/constants/PluginsTestConstants.js.map +0 -1
  220. package/dist/constants/ReporterConstants.js.map +0 -1
  221. package/dist/constants/TimeoutConstants.js.map +0 -1
  222. package/tslint.json +0 -126
@@ -23,12 +23,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
23
23
  };
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
25
  exports.DevWorkspaceConfigurationHelper = void 0;
26
+ /** *******************************************************************
27
+ * copyright (c) 2023 Red Hat, Inc.
28
+ *
29
+ * This program and the accompanying materials are made
30
+ * available under the terms of the Eclipse Public License 2.0
31
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
32
+ *
33
+ * SPDX-License-Identifier: EPL-2.0
34
+ **********************************************************************/
26
35
  const main_1 = require("@eclipse-che/che-devworkspace-generator/lib/main");
27
36
  const yaml_1 = __importDefault(require("yaml"));
28
37
  const axios = __importStar(require("axios"));
29
38
  const Logger_1 = require("./Logger");
30
39
  const ShellExecutor_1 = require("./ShellExecutor");
31
- const APITestConstants_1 = require("../constants/APITestConstants");
40
+ const API_TEST_CONSTANTS_1 = require("../constants/API_TEST_CONSTANTS");
32
41
  class DevWorkspaceConfigurationHelper {
33
42
  constructor(params) {
34
43
  this.generator = new main_1.Main();
@@ -37,32 +46,32 @@ class DevWorkspaceConfigurationHelper {
37
46
  params.editorEntry = 'che-incubator/che-code/latest';
38
47
  }
39
48
  // check if one or both has value
40
- if (APITestConstants_1.APITestConstants.TS_API_TEST_UDI_IMAGE || params.defaultComponentImage) {
49
+ if (API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_UDI_IMAGE || params.defaultComponentImage) {
41
50
  params.injectDefaultComponent = 'true';
42
51
  // check if not explicitly passed than assign value from the constants
43
52
  if (!params.defaultComponentImage) {
44
- params.defaultComponentImage = APITestConstants_1.APITestConstants.TS_API_TEST_UDI_IMAGE;
53
+ params.defaultComponentImage = API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_UDI_IMAGE;
45
54
  }
46
55
  }
47
56
  // assign value from the constants if not explicitly passed
48
- if (APITestConstants_1.APITestConstants.TS_API_TEST_PLUGIN_REGISTRY_URL && !params.pluginRegistryUrl) {
49
- params.pluginRegistryUrl = APITestConstants_1.APITestConstants.TS_API_TEST_PLUGIN_REGISTRY_URL;
57
+ if (API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_PLUGIN_REGISTRY_URL && !params.pluginRegistryUrl) {
58
+ params.pluginRegistryUrl = API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_PLUGIN_REGISTRY_URL;
50
59
  }
51
- if (APITestConstants_1.APITestConstants.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI && !params.editorContent) {
52
- params.editorContent = ShellExecutor_1.ShellExecutor.curl(APITestConstants_1.APITestConstants.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI).stdout;
60
+ if (API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI && !params.editorContent) {
61
+ params.editorContent = ShellExecutor_1.ShellExecutor.curl(API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_CHE_CODE_EDITOR_DEVFILE_URI).stdout;
53
62
  }
54
63
  this.params = params;
55
64
  }
56
65
  async generateDevfileContext() {
57
- Logger_1.Logger.debug(`${this.constructor.name}.${this.generateDevfileContext.name}`);
66
+ Logger_1.Logger.debug();
58
67
  if (!this.params.projects) {
59
68
  this.params.projects = [];
60
69
  }
61
70
  return await this.generator.generateDevfileContext(Object.assign(Object.assign({}, this.params), { projects: this.params.projects }), axios.default);
62
71
  }
63
72
  // write templates and then DevWorkspace in a single file
64
- async getDevWorkspaceConfigurationYamlAsString(context) {
65
- Logger_1.Logger.debug(`${this.constructor.name}.${this.getDevWorkspaceConfigurationYamlAsString.name}`);
73
+ getDevWorkspaceConfigurationYamlAsString(context) {
74
+ Logger_1.Logger.debug();
66
75
  const allContentArray = context.devWorkspaceTemplates.map((template) => yaml_1.default.stringify(template));
67
76
  allContentArray.push(yaml_1.default.stringify(context.devWorkspace));
68
77
  return allContentArray.join('---\n');
@@ -1 +1 @@
1
- {"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2EAAqF;AAGrF,gDAAwB;AACxB,6CAA+B;AAC/B,qCAAkC;AAClC,mDAAgD;AAChD,oEAAiE;AAwBjE,MAAa,+BAA+B;IAIxC,YAAY,MAAsB;QAH1B,cAAS,GAAc,IAAI,WAAS,EAAE,CAAC;QAI3C,yBAAyB;QACzB,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE;YACpE,MAAM,CAAC,WAAW,GAAG,+BAA+B,CAAC;SACxD;QACD,iCAAiC;QACjC,IAAI,mCAAgB,CAAC,qBAAqB,IAAI,MAAM,CAAC,qBAAqB,EAAE;YACxE,MAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC;YACvC,sEAAsE;YACtE,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE;gBAC/B,MAAM,CAAC,qBAAqB,GAAG,mCAAgB,CAAC,qBAAqB,CAAC;aACzE;SACJ;QACD,2DAA2D;QAC3D,IAAI,mCAAgB,CAAC,+BAA+B,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YAC/E,MAAM,CAAC,iBAAiB,GAAG,mCAAgB,CAAC,+BAA+B,CAAC;SAC/E;QACD,IAAI,mCAAgB,CAAC,uCAAuC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACnF,MAAM,CAAC,aAAa,GAAG,6BAAa,CAAC,IAAI,CAAC,mCAAgB,CAAC,uCAAuC,CAAC,CAAC,MAAM,CAAC;SAC9G;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,sBAAsB;QACxB,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC7B;QACD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,iCAEvC,IAAI,CAAC,MAAM,KACd,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,KAElC,KAAK,CAAC,OAAc,CACvB,CAAC;IACN,CAAC;IAED,yDAAyD;IACzD,KAAK,CAAC,wCAAwC,CAAC,OAAuB;QAClE,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,wCAAwC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/F,MAAM,eAAe,GAAU,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAC5D,CAAC,QAAsC,EAAE,EAAE,CAAC,cAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CACvE,CAAC;QACF,eAAe,CAAC,IAAI,CAAC,cAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QAE3D,OAAO,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;CACJ;AAnDD,0EAmDC"}
1
+ {"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,2EAAqF;AAGrF,gDAAwB;AACxB,6CAA+B;AAC/B,qCAAkC;AAClC,mDAAgD;AAChD,wEAAqE;AAwBrE,MAAa,+BAA+B;IAI3C,YAAY,MAAsB;QAH1B,cAAS,GAAc,IAAI,WAAS,EAAE,CAAC;QAI9C,yBAAyB;QACzB,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE;YACvE,MAAM,CAAC,WAAW,GAAG,+BAA+B,CAAC;SACrD;QACD,iCAAiC;QACjC,IAAI,uCAAkB,CAAC,qBAAqB,IAAI,MAAM,CAAC,qBAAqB,EAAE;YAC7E,MAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC;YACvC,sEAAsE;YACtE,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE;gBAClC,MAAM,CAAC,qBAAqB,GAAG,uCAAkB,CAAC,qBAAqB,CAAC;aACxE;SACD;QACD,2DAA2D;QAC3D,IAAI,uCAAkB,CAAC,+BAA+B,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YACpF,MAAM,CAAC,iBAAiB,GAAG,uCAAkB,CAAC,+BAA+B,CAAC;SAC9E;QACD,IAAI,uCAAkB,CAAC,uCAAuC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACxF,MAAM,CAAC,aAAa,GAAG,6BAAa,CAAC,IAAI,CAAC,uCAAkB,CAAC,uCAAuC,CAAC,CAAC,MAAM,CAAC;SAC7G;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC3B,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC1B;QACD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,iCAE7C,IAAI,CAAC,MAAM,KACd,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,KAE/B,KAAK,CAAC,OAAc,CACpB,CAAC;IACH,CAAC;IAED,yDAAyD;IACzD,wCAAwC,CAAC,OAAuB;QAC/D,eAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,eAAe,GAAU,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,QAAsC,EAAU,EAAE,CACnH,cAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CACxB,CAAC;QACF,eAAe,CAAC,IAAI,CAAC,cAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QAE3D,OAAO,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;CACD;AAnDD,0EAmDC"}
@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.DevfilesRegistryHelper = void 0;
7
- /*********************************************************************
8
- * Copyright (c) 2023 Red Hat, Inc.
7
+ /** *******************************************************************
8
+ * copyright (c) 2023 Red Hat, Inc.
9
9
  *
10
10
  * This program and the accompanying materials are made
11
11
  * available under the terms of the Eclipse Public License 2.0
@@ -16,22 +16,22 @@ exports.DevfilesRegistryHelper = void 0;
16
16
  const axios_1 = __importDefault(require("axios"));
17
17
  const Logger_1 = require("./Logger");
18
18
  const yaml_1 = __importDefault(require("yaml"));
19
- const APITestConstants_1 = require("../constants/APITestConstants");
19
+ const API_TEST_CONSTANTS_1 = require("../constants/API_TEST_CONSTANTS");
20
20
  class DevfilesRegistryHelper {
21
21
  async getInbuiltDevfilesRegistryContent() {
22
- Logger_1.Logger.debug(`${this.constructor.name}.${this.getInbuiltDevfilesRegistryContent.name}`);
23
- return await this.getContent(APITestConstants_1.SupportedDevfilesRegistries.INBUILT_APPLICATION_DEVFILE_REGISTRY_URL());
22
+ Logger_1.Logger.debug();
23
+ return await this.getContent(API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.INBUILT_APPLICATION_DEVFILE_REGISTRY_URL());
24
24
  }
25
25
  async getGitHubCheDevfileRegistryContent() {
26
- Logger_1.Logger.debug(`${this.constructor.name}.${this.getGitHubCheDevfileRegistryContent.name}`);
27
- return await this.getContent(APITestConstants_1.SupportedDevfilesRegistries.GIT_HUB_CHE_DEVFILE_REGISTRY_URL);
26
+ Logger_1.Logger.debug();
27
+ return await this.getContent(API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL);
28
28
  }
29
29
  async collectPathsToDevfilesFromRegistry() {
30
- Logger_1.Logger.debug(`${this.constructor.name}.${this.collectPathsToDevfilesFromRegistry.name}`);
30
+ Logger_1.Logger.debug();
31
31
  const devfileSamples = [];
32
32
  const sampleNames = [];
33
- switch (APITestConstants_1.APITestConstants.TS_API_ACCEPTANCE_TEST_REGISTRY_URL()) {
34
- case (APITestConstants_1.SupportedDevfilesRegistries.GIT_HUB_CHE_DEVFILE_REGISTRY_URL):
33
+ switch (API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL()) {
34
+ case API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL:
35
35
  {
36
36
  const content = await this.getGitHubCheDevfileRegistryContent();
37
37
  content.forEach((e) => {
@@ -40,33 +40,39 @@ class DevfilesRegistryHelper {
40
40
  }
41
41
  });
42
42
  for (const sample of sampleNames) {
43
- const sampleEndpoint = `${APITestConstants_1.SupportedDevfilesRegistries.GIT_HUB_CHE_DEVFILE_REGISTRY_URL}${sample}/meta.yaml`;
43
+ const sampleEndpoint = `${API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL}${sample}/meta.yaml`;
44
44
  const sampleEndpointContent = await this.getContent(sampleEndpoint);
45
45
  const decodedFileContent = Buffer.from(sampleEndpointContent.content, 'base64').toString();
46
46
  const metaYamlContent = yaml_1.default.parse(decodedFileContent);
47
- devfileSamples.push({ name: sample, link: metaYamlContent.links.v2 });
47
+ devfileSamples.push({
48
+ name: sample,
49
+ link: metaYamlContent.links.v2
50
+ });
48
51
  }
49
- Logger_1.Logger.debug(`${this.constructor.name}.${this.collectPathsToDevfilesFromRegistry.name}: samples list: ${JSON.stringify(devfileSamples)}`);
52
+ Logger_1.Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
50
53
  }
51
54
  break;
52
- case (APITestConstants_1.SupportedDevfilesRegistries.INBUILT_APPLICATION_DEVFILE_REGISTRY_URL()):
55
+ case API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES.INBUILT_APPLICATION_DEVFILE_REGISTRY_URL():
53
56
  {
54
57
  const content = await this.getInbuiltDevfilesRegistryContent();
55
58
  for (const sample of content) {
56
- devfileSamples.push({ name: sample.displayName, link: sample.links.v2 });
59
+ devfileSamples.push({
60
+ name: sample.displayName,
61
+ link: sample.links.v2
62
+ });
57
63
  }
58
- Logger_1.Logger.debug(`${this.constructor.name}.${this.collectPathsToDevfilesFromRegistry.name}: samples list: ${JSON.stringify(devfileSamples)}`);
64
+ Logger_1.Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
59
65
  }
60
66
  break;
61
67
  default: {
62
- Logger_1.Logger.error(`${this.constructor.name}.${this.collectPathsToDevfilesFromRegistry.name}: unsupported registry url - ${APITestConstants_1.APITestConstants.TS_API_ACCEPTANCE_TEST_REGISTRY_URL()}\n
63
- supported registries: ${JSON.stringify(APITestConstants_1.SupportedDevfilesRegistries)}`);
68
+ Logger_1.Logger.error(`unsupported registry url - ${API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL()}\n
69
+ supported registries: ${JSON.stringify(API_TEST_CONSTANTS_1.SUPPORTED_DEVFILE_REGISTRIES)}`);
64
70
  }
65
71
  }
66
72
  return devfileSamples;
67
73
  }
68
74
  async getContent(url, headers) {
69
- Logger_1.Logger.debug(`${this.constructor.name}.${this.getContent.name}: ${url}`);
75
+ Logger_1.Logger.debug(`${url}`);
70
76
  let response;
71
77
  try {
72
78
  response = await axios_1.default.get(url, headers);
@@ -1 +1 @@
1
- {"version":3,"file":"DevfilesRegistryHelper.js","sourceRoot":"","sources":["../../utils/DevfilesRegistryHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DevfilesRegistryHelper.js","sourceRoot":"","sources":["../../utils/DevfilesRegistryHelper.ts"],"names":[],"mappings":"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"}