feat(core): ingress server local configuration filter (#314)

Author: bzp2010

apps/cli/src/command/utils.ts

@@ -202,17 +202,20 @@ const labelFilter = <T extends ADCSDK.Event['newValue']>(
 };
 
 export const fillLabels = (
-  configuration: ADCSDK.Configuration,
-  rules: Record<string, string>,
+  configuration: ADCSDK.Configuration = {},
+  rules?: Record<string, string>,
 ) => {
-  const assignSelector = (labels: object) => Object.assign(labels ?? {}, rules);
+  const assignSelector = (labels: ADCSDK.Labels) =>
+    rules && Object.keys(rules).length > 0
+      ? Object.assign(labels ?? {}, rules)
+      : labels;
 
   for (const resourceType in configuration) {
     if (['global_rules', 'plugin_metadata'].includes(resourceType)) continue;
 
     (configuration[resourceType] as Array<ADCSDK.Resource>).forEach(
       (resource) => {
-        resource.labels = assignSelector(resource.labels as object);
+        resource.labels = assignSelector(resource.labels as ADCSDK.Labels);
 
         // Process the nested resources
         if (resourceType === 'services') {
@@ -237,17 +240,17 @@ export const fillLabels = (
 };
 
 export const filterResourceType = (
-  config: ADCSDK.Configuration,
-  includes: Array<string>,
-  excludes: Array<string>,
+  config: ADCSDK.Configuration = {},
+  includes?: Array<string>,
+  excludes?: Array<string>,
 ) => {
   const key = (item) =>
     item !== ADCSDK.ResourceType.PLUGIN_METADATA ? item.slice(0, -1) : item;
   return Object.fromEntries(
     Object.entries(config).filter(([resourceType]) => {
       return includes
-        ? includes.includes(key(resourceType))
-        : !excludes.includes(key(resourceType));
+        ? includes?.includes(key(resourceType))
+        : !excludes?.includes(key(resourceType));
     }),
   );
 };

apps/cli/src/server/schema.ts

@@ -1,3 +1,4 @@
+import * as ADCSDK from '@api7/adc-sdk';
 import { z } from 'zod';
 
 const SyncTask = z.strictObject({
@@ -6,6 +7,9 @@ const SyncTask = z.strictObject({
     server: z.url().min(1),
     token: z.string().min(1),
     lint: z.boolean().optional().default(true),
+    includeResourceType: z.array(z.enum(ADCSDK.ResourceType)).optional(),
+    excludeResourceType: z.array(z.enum(ADCSDK.ResourceType)).optional(),
+    labelSelector: z.record(z.string(), z.string()).optional(),
   }),
   config: z.looseObject({}),
 });

apps/cli/src/server/sync.ts

@@ -3,7 +3,12 @@ import type { RequestHandler } from 'express';
 import { omit, toString } from 'lodash';
 import { lastValueFrom, toArray } from 'rxjs';
 
-import { loadBackend } from '../command/utils';
+import {
+  fillLabels,
+  filterConfiguration,
+  filterResourceType,
+  loadBackend,
+} from '../command/utils';
 import { DifferV3 } from '../differ/differv3';
 import { check } from '../linter';
 import { SyncInput, type SyncInputType } from './schema';
@@ -13,29 +18,44 @@ export const syncHandler: RequestHandler<
   unknown,
   SyncInputType
 > = async (req, res) => {
-  const parsedInput = SyncInput.safeParse(req.body);
-  if (!parsedInput.success)
-    return res.status(400).json({
-      message: parsedInput.error.message,
-      errors: parsedInput.error.issues,
-    });
-  const { task } = parsedInput.data;
-
-  // load local configuration and validate it
-  const local = task.config as ADCSDK.Configuration;
-  if (task.opts.lint) {
-    const result = check(local);
-    if (!result.success)
+  try {
+    const parsedInput = SyncInput.safeParse(req.body);
+    if (!parsedInput.success)
       return res.status(400).json({
-        message: result.error.message,
-        errors: result.error.issues,
+        message: parsedInput.error.message,
+        errors: parsedInput.error.issues,
       });
-  }
+    const { task } = parsedInput.data;
 
-  try {
-    // load remote configuration and diff with local
+    // load local configuration and validate it
+    //TODO: merged with the listr task
+    const local = filterResourceType(
+      task.config,
+      task.opts.includeResourceType,
+      task.opts.excludeResourceType,
+    ) as ADCSDK.Configuration;
+    if (task.opts.lint) {
+      const result = check(local);
+      if (!result.success)
+        return res.status(400).json({
+          message: result.error.message,
+          errors: result.error.issues,
+        });
+    }
+    fillLabels(local, task.opts.labelSelector);
+
+    // load and filter remote configuration
+    //TODO: merged with the listr task
     const backend = loadBackend(task.opts.backend, { ...task.opts });
-    const remote = await lastValueFrom(backend.dump());
+    let remote = await lastValueFrom(backend.dump());
+    remote = filterResourceType(
+      remote,
+      task.opts.includeResourceType,
+      task.opts.excludeResourceType,
+    );
+    [remote] = filterConfiguration(remote, task.opts.labelSelector);
+
+    // diff local and remote configuration
     const diff = DifferV3.diff(local, remote, await backend.defaultValue());
 
     // sync the diff