fix: edfs__NatsStreamConfiguration validation (#1456)

wundergraph · Dec 18, 2024 · d453eab · d453eab
1 parent 4ff287a
commit d453eab
Show file tree

Hide file tree

Showing 6 changed files with 245 additions and 141 deletions.
diff --git a/composition-go/index.global.js b/composition-go/index.global.js
diff --git a/composition/src/normalization/normalization-factory.ts b/composition/src/normalization/normalization-factory.ts
@@ -141,14 +141,14 @@ import {
   subgraphInvalidSyntaxError,
   subgraphValidationError,
   subgraphValidationFailureError,
-  undefinedNatsStreamConfigurationInputErrorMessage,
   undefinedObjectLikeParentError,
   undefinedRequiredArgumentsErrorMessage,
   undefinedTypeError,
   unexpectedKindFatalError,
 } from '../errors/errors';
 import {
   AUTHENTICATED,
+  CONSUMER_INACTIVE_THRESHOLD,
   CONSUMER_NAME,
   DEFAULT_EDFS_PROVIDER_ID,
   EDFS_KAFKA_PUBLISH,
@@ -167,10 +167,11 @@ import {
   INACCESSIBLE,
   KEY,
   MUTATION,
-  NOT_APPLICABLE,
   NON_NULLABLE_BOOLEAN,
   NON_NULLABLE_EDFS_PUBLISH_EVENT_RESULT,
+  NON_NULLABLE_INT,
   NON_NULLABLE_STRING,
+  NOT_APPLICABLE,
   OPERATION_TO_DEFAULT,
   OVERRIDE,
   PROVIDER_ID,
@@ -196,7 +197,6 @@ import {
   SUCCESS,
   TOPIC,
   TOPICS,
-  CONSUMER_INACTIVE_THRESHOLD,
 } from '../utils/string-constants';
 import { buildASTSchema } from '../buildASTSchema/buildASTSchema';
 import { ConfigurationData, EventConfiguration, NatsEventType } from '../router-configuration/router-configuration';
@@ -1697,20 +1697,38 @@ export class NormalizationFactory {
     if (streamConfigurationInputData.kind !== Kind.INPUT_OBJECT_TYPE_DEFINITION) {
       return false;
     }
-    if (streamConfigurationInputData.inputValueDataByValueName.size != 2) {
+    if (streamConfigurationInputData.inputValueDataByValueName.size != 3) {
       return false;
     }
-    const requiredInputValueNames = new Set<string>([CONSUMER_NAME, STREAM_NAME]);
     for (const [inputValueName, inputValueData] of streamConfigurationInputData.inputValueDataByValueName) {
-      if (!requiredInputValueNames.has(inputValueName)) {
-        return false;
-      }
-      requiredInputValueNames.delete(inputValueName);
-      if (printTypeNode(inputValueData.type) !== NON_NULLABLE_STRING) {
-        return false;
+      switch (inputValueName) {
+        case CONSUMER_INACTIVE_THRESHOLD: {
+          if (printTypeNode(inputValueData.type) !== NON_NULLABLE_INT) {
+            return false;
+          }
+          if (
+            !inputValueData.defaultValue ||
+            inputValueData.defaultValue.kind !== Kind.INT ||
+            inputValueData.defaultValue.value !== `${DEFAULT_CONSUMER_INACTIVE_THRESHOLD}`
+          ) {
+            return false;
+          }
+          break;
+        }
+        case CONSUMER_NAME:
+        // intentional fallthrough
+        case STREAM_NAME: {
+          if (printTypeNode(inputValueData.type) !== NON_NULLABLE_STRING) {
+            return false;
+          }
+          break;
+        }
+        default: {
+          return false;
+        }
       }
     }
-    return requiredInputValueNames.size < 1;
+    return true;
   }
 
   validateEventDrivenSubgraph(definitions: Array<DefinitionNode>) {

diff --git a/composition/src/utils/string-constants.ts b/composition/src/utils/string-constants.ts
@@ -71,6 +71,7 @@ export const NOT_APPLICABLE = 'N/A';
 export const NAME = 'name';
 export const NON_NULLABLE_EDFS_PUBLISH_EVENT_RESULT = 'edfs__PublishResult!';
 export const NON_NULLABLE_BOOLEAN = 'Boolean!';
+export const NON_NULLABLE_INT = 'Int!';
 export const NON_NULLABLE_STRING = 'String!';
 export const NOT_UPPER = 'NOT';
 export const NULL = 'Null';