Merge pull request #3114 from erictnilsson/master

Added validation for component id in the CRA template, fixed issue when job stages fail

plugins/scaffolder-backend/sample-templates/create-react-app/template.yaml

@@ -22,6 +22,7 @@ spec:
       component_id:
         title: Name
         type: string
+        pattern: ^[a-z0-9]+(-[a-z0-9]+)*$
         description: Unique name of the component. Lowercase, URL-safe characters only.
       description:
         title: Description

plugins/scaffolder-backend/src/scaffolder/jobs/processor.ts

@@ -118,8 +118,8 @@ export class JobProcessor implements Processor {
           stage.status = 'COMPLETED';
         } catch (error) {
           // Log to the current stage the error that occured and fail the stage.
-          logger.error(`Stage failed with error: ${error.message}`);
           stage.status = 'FAILED';
+          logger.error(`Stage failed with error: ${error.message}`);
 
           // Throw the error so the job can be failed too.
           throw error;