fix: adjustments in the domain and firewall processing transform conf…

…ig (#101) * fix: conditionally include MTLS configuration in domain process strategy * fix: update firewall schema validation and improve transformToConfig handling
aziontech · Feb 6, 2025 · a455143 · a455143
1 parent ca3d2d7
commit a455143
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/packages/config/src/configProcessor/helpers/schemaManifest.ts b/packages/config/src/configProcessor/helpers/schemaManifest.ts
@@ -475,11 +475,9 @@ const schemaFirewallManifest = {
       errorMessage: "The 'rules' field must be an array of firewall rules.",
     },
   },
-  required: ['main_settings'],
   additionalProperties: false,
   errorMessage: {
-    additionalProperties: 'No additional properties are allowed in firewall items.',
-    required: "The 'main_settings' field is required in each firewall item.",
+    additionalProperties: 'No additional properties are allowed in firewall object.',
   },
 };
 
@@ -797,9 +795,7 @@ const schemaManifest = {
       errorMessage: "The 'domains' field must be an array of domain items.",
     },
     firewall: {
-      type: 'array',
-      items: schemaFirewallManifest,
-      errorMessage: "The 'firewall' field must be an array of firewall items.",
+      ...schemaFirewallManifest,
     },
     application: {
       type: 'array',

diff --git a/...config/src/configProcessor/processStrategy/implementations/domainProcessConfigStrategy.ts b/...config/src/configProcessor/processStrategy/implementations/domainProcessConfigStrategy.ts
@@ -63,11 +63,13 @@ class DomainProcessConfigStrategy extends ProcessConfigStrategy {
       digitalCertificateId: domain.digital_certificate_id,
       edgeApplicationId: domain.edge_application_id,
       edgeFirewallId: domain.edge_firewall_id,
-      mtls: {
-        verification: domain.mtls_verification,
-        trustedCaCertificateId: domain.mtls_trusted_ca_certificate_id,
-        crlList: domain.crl_list,
-      },
+      mtls: domain.mtls_verification
+        ? {
+            verification: domain.mtls_verification,
+            trustedCaCertificateId: domain.mtls_trusted_ca_certificate_id,
+            crlList: domain.crl_list,
+          }
+        : undefined,
     };
     return transformedPayload.domain;
   }

diff --git a/...figProcessor/processStrategy/implementations/secure/firewallProcessConfigStrategy.test.ts b/...figProcessor/processStrategy/implementations/secure/firewallProcessConfigStrategy.test.ts
@@ -253,7 +253,7 @@ describe('FirewallProcessConfigStrategy', () => {
       const manifest = {};
       const config = {};
       const result = strategy.transformToConfig(manifest, config);
-      expect(result).toBeUndefined();
+      expect(result).toStrictEqual(expect.objectContaining({}));
     });
 
     it('should transform all behavior types from manifest to config', () => {
@@ -299,7 +299,8 @@ describe('FirewallProcessConfigStrategy', () => {
       };
 
       const config = {};
-      const result = strategy.transformToConfig(manifest, config);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const result: any = strategy.transformToConfig(manifest, config);
       expect(result?.rules?.[0].behavior).toEqual({
         runFunction: {
           path: '/edge/function.js',
@@ -336,7 +337,8 @@ describe('FirewallProcessConfigStrategy', () => {
       };
 
       const config = {};
-      const result = strategy.transformToConfig(manifest, config);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const result: any = strategy.transformToConfig(manifest, config);
       expect(result?.rules?.[0].behavior).toEqual({});
     });
 
@@ -360,7 +362,8 @@ describe('FirewallProcessConfigStrategy', () => {
       };
 
       const config = {};
-      const result = strategy.transformToConfig(manifest, config);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const result: any = strategy.transformToConfig(manifest, config);
       expect(result?.rules?.[0].behavior).toEqual({});
     });
   });

diff --git a/...c/configProcessor/processStrategy/implementations/secure/firewallProcessConfigStrategy.ts b/...c/configProcessor/processStrategy/implementations/secure/firewallProcessConfigStrategy.ts
@@ -121,8 +121,8 @@ class FirewallProcessConfigStrategy extends ProcessConfigStrategy {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   transformToConfig(payload: any, transformedPayload: AzionConfig) {
     const firewall = payload.firewall;
-    if (!firewall) {
-      return;
+    if (!firewall || Object.keys(firewall).length === 0) {
+      return {};
     }
 
     const firewallConfig: AzionFirewall = {