feat(hasura): metadata output property ordering

align the output format of managed metadata to match what hasura produces re #219
golevelup · Jan 16, 2021 · 9e15b1b · 9e15b1b
1 parent 9584104
commit 9e15b1b
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/packages/hasura/src/hasura.metadata.ts b/packages/hasura/src/hasura.metadata.ts
@@ -7,6 +7,7 @@ import {
 } from './hasura.interfaces';
 import { safeLoad, safeDump } from 'js-yaml';
 import { readFileSync, writeFileSync } from 'fs';
+import { orderBy } from 'lodash';
 import {
   TableEntry,
   EventTriggerDefinition,
@@ -76,7 +77,7 @@ export const updateEventTriggerMeta = (
   const tablesMeta = readFileSync(tablesYamlPath, utf8);
   const tableEntries = safeLoad(tablesMeta) as TableEntry[];
 
-  eventHandlerConfigs.forEach((config) => {
+  orderBy(eventHandlerConfigs, (x) => x.triggerName).forEach((config) => {
     const {
       schema = 'public',
       tableName,
@@ -103,19 +104,19 @@ export const updateEventTriggerMeta = (
       ...eventTriggers,
       {
         name: triggerName,
+        definition: convertEventTriggerDefinition(definition),
+        retry_conf: {
+          num_retries: numRetries,
+          interval_sec: intervalInSeconds,
+          timeout_sec: timeoutInSeconds,
+        },
         webhook_from_env: managedMetaDataConfig.nestEndpointEnvName,
         headers: [
           {
             name: moduleConfig.webhookConfig.secretHeader,
             value_from_env: managedMetaDataConfig.secretHeaderEnvName,
           },
         ],
-        retry_conf: {
-          interval_sec: intervalInSeconds,
-          num_retries: numRetries,
-          timeout_sec: timeoutInSeconds,
-        },
-        definition: convertEventTriggerDefinition(definition),
       },
     ];
   });
@@ -156,23 +157,23 @@ export const updateScheduledEventTriggerMeta = (
     }) => {
       return {
         name,
-        payload,
-        comment,
+        webhook: `{{${managedMetaDataConfig.nestEndpointEnvName}}}`,
         schedule: cronSchedule,
         include_in_metadata: true,
+        payload,
+        retry_conf: {
+          num_retries: retryConfig.numRetries,
+          timeout_seconds: retryConfig.timeoutInSeconds,
+          tolerance_seconds: retryConfig.toleranceSeconds,
+          retry_interval_seconds: retryConfig.intervalInSeconds,
+        },
         headers: [
           {
             name: moduleConfig.webhookConfig.secretHeader,
             value_from_env: managedMetaDataConfig.secretHeaderEnvName,
           },
         ],
-        webhook: `{{${managedMetaDataConfig.nestEndpointEnvName}}}`,
-        retry_conf: {
-          num_retries: retryConfig.numRetries,
-          retry_interval_seconds: retryConfig.intervalInSeconds,
-          timeout_seconds: retryConfig.timeoutInSeconds,
-          tolerance_seconds: retryConfig.toleranceSeconds,
-        },
+        comment,
       };
     }
   );