fixup! Start workspace from default devfile on private repository SSH url

Author: vinokurig

packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/__tests__/index.spec.tsx

@@ -238,6 +238,7 @@ describe('Creating steps, applying a devfile', () => {
         expect(prepareDevfile).toHaveBeenCalledWith(
           expect.objectContaining({
             attributes: {
+              'controller.devfile.io/bootstrap-devworkspace': true,
               defaultDevfile: true,
             },
           }),

packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/index.tsx

@@ -181,14 +181,12 @@ class CreatingStepApplyDevfile extends ProgressStep<Props, State> {
 
     // when using the default devfile instead of a user devfile
     if (factoryResolver === undefined && isEqual(devfile, defaultDevfile)) {
-      if (FactoryLocationAdapter.isSshLocation(factoryParams.sourceUrl)) {
-        if (!devfile.attributes) {
-          devfile.attributes = {};
-        }
-
-        devfile.attributes['controller.devfile.io/bootstrap-devworkspace'] = true;
+      if (!devfile.attributes) {
+        devfile.attributes = {};
       }
 
+      devfile.attributes['controller.devfile.io/bootstrap-devworkspace'] = true;
+
       if (devfile.projects === undefined) {
         devfile.projects = [];
       }
@@ -203,13 +201,11 @@ class CreatingStepApplyDevfile extends ProgressStep<Props, State> {
         }
       }
     } else if (factoryResolver?.source === 'repo') {
-      if (FactoryLocationAdapter.isSshLocation(factoryParams.sourceUrl)) {
-        if (!devfile.attributes) {
-          devfile.attributes = {};
-        }
-
-        devfile.attributes['controller.devfile.io/bootstrap-devworkspace'] = true;
+      if (!devfile.attributes) {
+        devfile.attributes = {};
       }
+
+      devfile.attributes['controller.devfile.io/bootstrap-devworkspace'] = true;
     }
 
     if (remotes) {

packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/__tests__/index.spec.tsx

@@ -35,6 +35,7 @@ import { AlertItem } from '@/services/helpers/types';
 import { AppThunk } from '@/store';
 import { MockStoreBuilder } from '@/store/__mocks__/mockStore';
 import { factoryResolverActionCreators, OAuthResponse } from '@/store/FactoryResolver';
+import { prepareDevfile } from '@/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/prepareDevfile';
 
 jest.mock('@/components/WorkspaceProgress/TimeLimit');
 
@@ -345,7 +346,7 @@ describe('Creating steps, fetching a devfile', () => {
     });
   });
 
-  describe('unsupported git provider error', () => {
+  describe('unsupported git provider', () => {
     let emptyStore: Store;
     const rejectReason = 'Failed to fetch devfile';
 
@@ -354,110 +355,13 @@ describe('Creating steps, fetching a devfile', () => {
       mockRequestFactoryResolver.mockRejectedValueOnce(rejectReason);
     });
 
-    test('alert title', async () => {
+    test('should continue with the default devfile', async () => {
       renderComponent(emptyStore, searchParams);
 
       await jest.advanceTimersByTimeAsync(MIN_STEP_DURATION_MS);
 
-      const expectAlertItem = expect.objectContaining({
-        title: 'Warning',
-        actionCallbacks: [
-          expect.objectContaining({
-            title: 'Continue with default devfile',
-            callback: expect.any(Function),
-          }),
-          expect.objectContaining({
-            title: 'Reload',
-            callback: expect.any(Function),
-          }),
-        ],
-      });
-      await waitFor(() => expect(mockOnError).toHaveBeenCalledWith(expectAlertItem));
-
-      expect(mockOnNextStep).not.toHaveBeenCalled();
-    });
-
-    test('action "Continue with default devfile"', async () => {
-      // this deferred object will help run the callback at the right time
-      const deferred = getDefer();
-
-      const actionTitle = 'Continue with default devfile';
-      mockOnError.mockImplementationOnce((alertItem: AlertItem) => {
-        const action = alertItem.actionCallbacks?.find(_action =>
-          _action.title.startsWith(actionTitle),
-        );
-        expect(action).toBeDefined();
-
-        if (action) {
-          deferred.promise.then(action.callback);
-        } else {
-          throw new Error('Action not found');
-        }
-      });
-
-      renderComponent(emptyStore, searchParams);
-      await jest.runAllTimersAsync();
-
-      await waitFor(() => expect(mockOnError).toHaveBeenCalled());
-      expect(mockOnRestart).not.toHaveBeenCalled();
-      expect(mockOnNextStep).not.toHaveBeenCalled();
-
-      mockOnError.mockClear();
-
-      /* test the action */
-      await jest.runOnlyPendingTimersAsync();
-
-      // resolve deferred to trigger the callback
-      deferred.resolve();
-
-      await waitFor(() => expect(mockOnNextStep).toHaveBeenCalled());
-      expect(mockOnRestart).not.toHaveBeenCalled();
-      expect(mockOnError).not.toHaveBeenCalled();
-    });
-
-    test('action "Reload"', async () => {
-      // this deferred object will help run the callback at the right time
-      const deferred = getDefer();
-
-      const actionTitle = 'Reload';
-      mockOnError.mockImplementationOnce(async (alertItem: AlertItem) => {
-        const action = alertItem.actionCallbacks?.find(_action =>
-          _action.title.startsWith(actionTitle),
-        );
-        expect(action).toBeDefined();
-
-        if (action) {
-          deferred.promise.then(action.callback);
-        } else {
-          throw new Error('Action not found');
-        }
-      });
-
-      renderComponent(emptyStore, searchParams);
-      await jest.runAllTimersAsync();
-
-      await waitFor(() => expect(mockOnError).toHaveBeenCalled());
-      expect(mockOnRestart).not.toHaveBeenCalled();
-      expect(mockOnNextStep).not.toHaveBeenCalled();
-
-      // first call resolves with error
-      expect(mockRequestFactoryResolver).toHaveBeenCalledTimes(1);
-
-      mockOnError.mockClear();
-
-      /* test the action */
-
-      await jest.runAllTimersAsync();
-
-      // resolve deferred to trigger the callback
-      deferred.resolve();
-
-      await waitFor(() => expect(mockOnRestart).toHaveBeenCalled());
-      expect(mockOnNextStep).not.toHaveBeenCalled();
-      expect(mockOnError).not.toHaveBeenCalled();
-
-      // should request the factory resolver for the second time
-      await waitFor(() => expect(mockRequestFactoryResolver).toHaveBeenCalledTimes(2));
+      await waitFor(() => expect(mockOnError).not.toHaveBeenCalled());
+      expect(mockOnNextStep).toHaveBeenCalled();
     });
   });
 

packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/index.tsx

@@ -46,13 +46,6 @@ export class ApplyingDevfileError extends Error {
   }
 }
 
-export class UnsupportedGitProviderError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = 'UnsupportedGitProviderError';
-  }
-}
-
 const RELOADS_LIMIT = 2;
 type ReloadsInfo = {
   [url: string]: number;
@@ -70,7 +63,6 @@ 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);
@@ -220,15 +212,12 @@ class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
       }
       if (
         errorMessage === 'Failed to fetch devfile' ||
+        errorMessage ===
+          'Cannot build factory with any of the provided parameters. Please check parameters correctness, and resend query.' ||
         errorMessage.startsWith('Could not reach devfile')
       ) {
-        // check if the source url is an SSH url
-        if (this.sshPattern.test(sourceUrl)) {
-          this.setState({ useDefaultDevfile: true });
-          return true;
-        } else {
-          throw new UnsupportedGitProviderError(errorMessage);
-        }
+        this.setState({ useDefaultDevfile: true });
+        return true;
       }
       throw e;
     }
@@ -349,30 +338,6 @@ class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
         ],
       };
     }
-    if (error instanceof UnsupportedGitProviderError) {
-      return {
-        key,
-        title: 'Warning',
-        variant: AlertVariant.warning,
-        children: (
-          <ExpandableWarning
-            textBefore="Could not find any devfile in the Git repository"
-            errorMessage={helpers.errors.getMessage(error)}
-            textAfter="The Git provider is not supported."
-          />
-        ),
-        actionCallbacks: [
-          {
-            title: 'Continue with default devfile',
-            callback: () => this.handleDefaultDevfile(key),
-          },
-          {
-            title: 'Reload',
-            callback: () => this.handleRestart(key),
-          },
-        ],
-      };
-    }
     return {
       key,
       title: 'Failed to create the workspace',