Mariano/fix 11 (#1898)

* refactor(api): enhance variable handling in VariablesController

Author: Marfuen

apps/api/src/integration-platform/controllers/variables.controller.ts

@@ -62,9 +62,15 @@ export class VariablesController {
       );
     }
 
-    // Collect all unique variables from all checks
+    // Collect all unique variables from manifest-level and checks
     const variableMap = new Map<string, CheckVariable>();
 
+    // First, add manifest-level variables
+    for (const variable of manifest.variables || []) {
+      variableMap.set(variable.id, variable);
+    }
+
+    // Then, add check-specific variables (won't override manifest-level)
     for (const check of manifest.checks || []) {
       for (const variable of check.variables || []) {
         if (!variableMap.has(variable.id)) {
@@ -115,8 +121,15 @@ export class VariablesController {
       );
     }
 
-    // Collect all unique variables
+    // Collect all unique variables from manifest-level and checks
     const variableMap = new Map<string, CheckVariable>();
+
+    // First, add manifest-level variables
+    for (const variable of manifest.variables || []) {
+      variableMap.set(variable.id, variable);
+    }
+
+    // Then, add check-specific variables
     for (const check of manifest.checks || []) {
       for (const variable of check.variables || []) {
         if (!variableMap.has(variable.id)) {
@@ -184,11 +197,18 @@ export class VariablesController {
       );
     }
 
-    // Find the variable definition
+    // Find the variable definition (check manifest-level first, then checks)
     let variable: CheckVariable | undefined;
-    for (const check of manifest.checks || []) {
-      variable = check.variables?.find((v) => v.id === variableId);
-      if (variable) break;
+
+    // Check manifest-level variables
+    variable = manifest.variables?.find((v) => v.id === variableId);
+
+    // If not found, check in check-specific variables
+    if (!variable) {
+      for (const check of manifest.checks || []) {
+        variable = check.variables?.find((v) => v.id === variableId);
+        if (variable) break;
+      }
     }
 
     if (!variable) {

packages/integration-platform/src/manifests/gcp/index.ts

@@ -61,5 +61,18 @@ This is industry standard - all GCP security monitoring tools use the same scope
 
   capabilities: ['checks'],
 
+  // Integration-level variables (used by cloud security scanning)
+  variables: [
+    {
+      id: 'organization_id',
+      label: 'GCP Organization ID',
+      type: 'text',
+      required: true,
+      helpText:
+        'Your GCP Organization ID (numeric). Find it at: console.cloud.google.com/iam-admin/settings',
+      placeholder: '123456789012',
+    },
+  ],
+
   checks: [],
 };

packages/integration-platform/src/types.ts

@@ -735,6 +735,13 @@ export interface IntegrationManifest {
   /** Capabilities this integration supports */
   capabilities: IntegrationCapability[];
 
+  /**
+   * Integration-level variables that are collected after authentication.
+   * These can be used by checks OR by standalone features (like cloud security scanning).
+   * Variables defined here are merged with check-specific variables.
+   */
+  variables?: CheckVariable[];
+
   /**
    * Compliance checks this integration can run.
    * Each check can auto-complete linked tasks when passing.