Extend the ssh url check with the ssh://[<user>@]<host>[:<port>]/~<us…

…er>/<path-to-git-repo> format (#1268) see https://git-scm.com/docs/git-clone#_git_urls
eclipse-che · Dec 2, 2024 · b7e3a3d · b7e3a3d
1 parent 930cd8a
commit b7e3a3d
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 28 deletions.
diff --git a/...end/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/__tests__/index.spec.tsx b/...end/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/__tests__/index.spec.tsx
@@ -694,6 +694,32 @@ describe('Creating steps, fetching a devfile', () => {
     const host = 'che-host';
     const protocol = 'http://';
     const factoryUrl = 'git@github.com:user/repository-name.git';
+    const emptyStore = new MockStoreBuilder().build();
+    const sshPrivateRepoAllertItem = expect.objectContaining({
+      title: 'Warning',
+      variant: AlertVariant.warning,
+      children: (
+        <ExpandableWarning
+          textBefore="Devfile resolve from a privatre repositry via an SSH url is not supported."
+          errorMessage="Could not reach devfile"
+          textAfter="Apply a Personal Access Token to fetch the devfile.yaml content."
+        />
+      ),
+      actionCallbacks: [
+        expect.objectContaining({
+          title: 'Continue with default devfile',
+          callback: expect.any(Function),
+        }),
+        expect.objectContaining({
+          title: 'Reload',
+          callback: expect.any(Function),
+        }),
+        expect.objectContaining({
+          title: 'Open Documentation page',
+          callback: expect.any(Function),
+        }),
+      ],
+    });
 
     let spyWindowLocation: jest.SpyInstance;
     let location: Location;
@@ -746,43 +772,31 @@ describe('Creating steps, fetching a devfile', () => {
     });
 
     it('should show warning on SSH url', async () => {
-      const expectAlertItem = expect.objectContaining({
-        title: 'Warning',
-        variant: AlertVariant.warning,
-        children: (
-          <ExpandableWarning
-            textBefore="Devfile resolve from a privatre repositry via an SSH url is not supported."
-            errorMessage="Could not reach devfile"
-            textAfter="Apply a Personal Access Token to fetch the devfile.yaml content."
-          />
-        ),
-        actionCallbacks: [
-          expect.objectContaining({
-            title: 'Continue with default devfile',
-            callback: expect.any(Function),
-          }),
-          expect.objectContaining({
-            title: 'Reload',
-            callback: expect.any(Function),
-          }),
-          expect.objectContaining({
-            title: 'Open Documentation page',
-            callback: expect.any(Function),
-          }),
-        ],
-      });
       searchParams = new URLSearchParams({
         [FACTORY_URL_ATTR]: 'git@github.com:user/repository.git',
       });
-      const emptyStore = new MockStoreBuilder().build();
+
       renderComponent(emptyStore, searchParams, location);
 
       await jest.advanceTimersByTimeAsync(MIN_STEP_DURATION_MS);
+      await waitFor(() => expect(mockOnNextStep).not.toHaveBeenCalled);
+
+      expect(mockOpenOAuthPage).not.toHaveBeenCalled();
+      expect(mockOnError).toHaveBeenCalledWith(sshPrivateRepoAllertItem);
+    });
+
+    it('should show warning on bitbucket-server SSH url', async () => {
+      searchParams = new URLSearchParams({
+        [FACTORY_URL_ATTR]: 'ssh://git@bitbucket-server.com/~user/repository.git',
+      });
+
+      renderComponent(emptyStore, searchParams, location);
 
+      await jest.advanceTimersByTimeAsync(MIN_STEP_DURATION_MS);
       await waitFor(() => expect(mockOnNextStep).not.toHaveBeenCalled);
 
       expect(mockOpenOAuthPage).not.toHaveBeenCalled();
-      expect(mockOnError).toHaveBeenCalledWith(expectAlertItem);
+      expect(mockOnError).toHaveBeenCalledWith(sshPrivateRepoAllertItem);
     });
   });
 });

diff --git a/...dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/index.tsx b/...dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/index.tsx
@@ -77,6 +77,7 @@ export type State = ProgressStepState & {
 
 class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
   protected readonly name = 'Inspecting repo';
+  private readonly sshPattern = new RegExp('(git@|(ssh|git)://).*');
 
   constructor(props: Props) {
     super(props);
@@ -232,7 +233,8 @@ class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
         errorMessage === 'Failed to fetch devfile' ||
         errorMessage.startsWith('Could not reach devfile')
       ) {
-        if (sourceUrl.startsWith('git@')) {
+        // check if the source url is an SSH url
+        if (this.sshPattern.test(sourceUrl)) {
           throw new SSHPrivateRepositoryUrlError(errorMessage);
         } else {
           throw new UnsupportedGitProviderError(errorMessage);