Validate actions during their creation (SciCatProject#1354)

* remove validation from actions, store only configVersion inside each job

* remove action validation from testing

* fix testing

* restore configuration in the schema, fix tests

* fix linting

* fix error message

.github/workflows/test.yml

@@ -178,5 +178,5 @@ jobs:
         run: |
           cp CI/ESS/docker-compose.api.yaml docker-compose.yaml
           cp functionalAccounts.json.test functionalAccounts.json
-          docker-compose up --build -d
+          docker compose up --build -d
           npm run test:api

src/jobs/actions/emailaction.ts

@@ -65,13 +65,6 @@ export class EmailJobAction<T> implements JobAction<T> {
     this.bodyTemplate = compile(data["body"]);
   }
 
-  async validate(dto: T) {
-    Logger.log(
-      "Validating EmailJobAction: " + JSON.stringify(dto),
-      "EmailJobAction",
-    );
-  }
-
   async performJob(job: JobClass) {
     Logger.log(
       "Performing EmailJobAction: " + JSON.stringify(job),

src/jobs/actions/logaction.ts

@@ -14,10 +14,6 @@ export class LogJobAction<T> implements JobAction<T> {
     return LogJobAction.actionType;
   }
 
-  async validate(dto: T) {
-    Logger.log("Validating job: " + JSON.stringify(dto), "LogJobAction");
-  }
-
   async performJob(job: JobClass) {
     Logger.log("Performing job: " + JSON.stringify(job), "LogJobAction");
   }

src/jobs/actions/rabbitmqaction.ts

@@ -54,9 +54,6 @@ export class RabbitMQJobAction<T> implements JobAction<T> {
     return RabbitMQJobAction.actionType;
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async validate(dto: T) {}
-
   async performJob(job: JobClass) {
     Logger.log(
       "Performing RabbitMQJobAction: " + JSON.stringify(job),

src/jobs/actions/urlaction.ts

@@ -52,12 +52,9 @@ export class URLAction<T> implements JobAction<T> {
     return URLAction.actionType;
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async validate(dto: T) {}
-
   async performJob(job: JobClass) {
     const url = encodeURI(this.urlTemplate(job, jobTemplateOptions));
-    Logger.log(`Requesting ${url}`, "URLAction");
+    Logger.log(`Requesting ${url}`, "UrlJobAction");
 
     const response = await fetch(url, {
       method: this.method,
@@ -74,7 +71,11 @@ export class URLAction<T> implements JobAction<T> {
         : undefined,
     });
 
-    Logger.log(`Request for ${url} returned ${response.status}`, "URLAction");
+    Logger.log(
+      `Request for ${url} returned ${response.status}`,
+      "UrlJobAction",
+    );
+
     if (!response.ok) {
       throw new HttpException(
         {
@@ -101,13 +102,20 @@ export class URLAction<T> implements JobAction<T> {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   constructor(data: Record<string, any>) {
+    Logger.log(
+      "Initializing UrlJobAction. Params: " + JSON.stringify(data),
+      "UrlJobAction",
+    );
+
     if (!data["url"]) {
       throw new NotFoundException("Param 'url' is undefined in url action");
     }
     this.urlTemplate = Handlebars.compile(data.url);
+
     if (data["method"]) {
       this.method = data.method;
     }
+
     if (data["headers"]) {
       if (!isStringRecord(data.headers)) {
         throw new NotFoundException(
@@ -121,6 +129,7 @@ export class URLAction<T> implements JobAction<T> {
         ]),
       );
     }
+
     if (data["body"]) {
       this.bodyTemplate = Handlebars.compile(data["body"]);
     }

src/jobs/config/jobconfig.spec.ts

@@ -22,6 +22,6 @@ describe("Job configuration", () => {
     const action = create.actions[0];
     expect(action instanceof LogJobAction);
     expect(action.getActionType()).toBe("log");
-    action.validate({ config: null });
+    // action.validate({ config: null });
   });
 });

src/jobs/config/jobconfig.ts

@@ -154,11 +154,6 @@ function parseAction<DtoType>(
  * Superclass for all responses to Job changes
  */
 export interface JobAction<DtoType> {
-  /**
-   * Validate the DTO, throwing an HttpException for problems
-   */
-  validate: (dto: DtoType) => Promise<void>;
-
   /**
    * Respond to the action
    */

src/jobs/interceptors/job-create.interceptor.ts

@@ -58,26 +58,25 @@ export class JobCreateInterceptor implements NestInterceptor {
     }
     const jc = matchingConfig[0];
 
-    await Promise.all(
-      jc.create.actions.map((action) => {
-        return action.validate(createJobDto).catch((err) => {
-          Logger.error(err);
-          if (err instanceof HttpException) {
-            throw err;
-          }
-
-          throw new HttpException(
-            {
-              status: HttpStatus.BAD_REQUEST,
-              message: `Invalid job input. Action ${action.getActionType()} unable to validate ${
-                createJobDto.type
-              } job due to ${err}`,
-            },
-            HttpStatus.BAD_REQUEST,
-          );
-        });
-      }),
-    );
+    // await Promise.all(
+    //   jc.create.actions.map((action) => {
+    //     return action.validate(createJobDto).catch((err) => {
+    //       Logger.error(err);
+    //       if (err instanceof HttpException) {
+    //         throw err;
+    //       }
+    //       throw new HttpException(
+    //         {
+    //           status: HttpStatus.BAD_REQUEST,
+    //           message: `Invalid job input. Action ${action.getActionType()} unable to validate ${
+    //             createJobDto.type
+    //           } job due to ${err}`,
+    //         },
+    //         HttpStatus.BAD_REQUEST,
+    //       );
+    //     });
+    //   }),
+    // );
 
     return jc;
   }