fix(core): upstream linter check either nodes or service discovery (#163

)

apps/cli/src/linter/schema.ts

@@ -106,15 +106,17 @@ const upstreamSchema = z
         },
       )
       .optional(),
-    nodes: z.array(
-      z.object({
-        host: z.string(),
-        port: portSchema.optional(),
-        weight: z.number().int().min(0),
-        priority: z.number().default(0).optional(),
-        metadata: z.record(z.string(), z.any()).optional(),
-      }),
-    ),
+    nodes: z
+      .array(
+        z.object({
+          host: z.string(),
+          port: portSchema.optional(),
+          weight: z.number().int().min(0),
+          priority: z.number().default(0).optional(),
+          metadata: z.record(z.string(), z.any()).optional(),
+        }),
+      )
+      .optional(),
     scheme: z
       .enum(['grpc', 'grpcs', 'http', 'https', 'tcp', 'tls', 'udp', 'kafka'])
       .default('http')

apps/cli/src/linter/specs/upstream.spec.ts

@@ -0,0 +1,74 @@
+import * as ADCSDK from '@api7/adc-sdk';
+
+import { check } from '../';
+
+describe('Upstream Linter', () => {
+  const cases = [
+    {
+      name: 'should check either nodes or discovery (neither)',
+      input: {
+        services: [
+          {
+            name: 'No_Node_And_Discovery',
+            upstream: {},
+          },
+        ],
+      } as ADCSDK.Configuration,
+      expect: false,
+      errors: [
+        {
+          code: 'custom',
+          message:
+            'Upstream must either explicitly specify nodes or use service discovery and not both',
+          path: ['services', 0, 'upstream'],
+        },
+      ],
+    },
+    {
+      name: 'should check either nodes or discovery (with nodes)',
+      input: {
+        services: [
+          {
+            name: 'No_Node_And_Discovery',
+            upstream: {
+              nodes: [
+                {
+                  host: '1.1.1.1',
+                  port: 443,
+                  weight: 100,
+                },
+              ],
+            },
+          },
+        ],
+      } as ADCSDK.Configuration,
+      expect: true,
+    },
+    {
+      name: 'should check either nodes or discovery (with discovery and service name)',
+      input: {
+        services: [
+          {
+            name: 'No_Node_And_Discovery',
+            upstream: {
+              discovery_type: 'mock',
+              service_name: 'service_mock',
+            },
+          },
+        ],
+      } as ADCSDK.Configuration,
+      expect: true,
+    },
+  ];
+
+  // test cases runner
+  cases.forEach((item) => {
+    it(item.name, () => {
+      const result = check(item.input);
+      expect(result.success).toEqual(item.expect);
+      if (!item.expect) {
+        expect(result.error.errors).toEqual(item.errors);
+      }
+    });
+  });
+});