@takodotid/circuit 0.31.1 → 0.32.0

package/dist/cli/index.js

@@ -1318,7 +1318,7 @@ function ruleGaps(device, where, rule) {
   const set = rule.set ?? {};
   if ((rule.match || rule.set) && !rule.action)
     found.push(`${where}, a rule without action: the platform stops at the first rule that matches`);
-  for (const field of ["as_path_length", "rpki", "large_community"]) {
+  for (const field of ["as_path_length", "through_as", "rpki", "large_community"]) {
     if (match[field] !== undefined)
       found.push(`${where}.match.${field}`);
   }
@@ -4351,6 +4351,11 @@ function term(out, device, term, rule, family, splitFamily) {
     out.set(`policy-options as-path ${name}`, quote2(`.{${min},${max ?? ""}}`));
     from.push(["as-path", name]);
   }
+  if (match.through_as !== undefined) {
+    const name = `circuit-through-${match.through_as}`;
+    out.set(`policy-options as-path ${name}`, quote2(`.* ${match.through_as} .*`));
+    from.push(["as-path", name]);
+  }
   if (match.rpki)
     from.push(["validation-database", VALIDATION[match.rpki]]);
   const wanted = [
@@ -7086,6 +7091,8 @@ function conditions(rule) {
     tests.push(`bgp-path-len>${match.as_path_length.min - 1}`);
   if (match.as_path_length?.max !== undefined)
     tests.push(`bgp-path-len<${match.as_path_length.max + 1}`);
+  if (match.through_as !== undefined)
+    tests.push(`bgp-as-path ${match.through_as}`);
   if (match.rpki)
     tests.push(`rpki ${match.rpki}`);
   if (match.community)

package/dist/types/schema/policy.d.ts

@@ -33,6 +33,8 @@ export type Match<S extends string> = {
         min?: number;
         max?: number;
     };
+    /** The AS path holds this AS anywhere: the route came from it or through it. */
+    through_as?: number;
     /** The route's origin validation state. */
     rpki?: "valid" | "invalid" | "not-found";
     /** Has this standard community, `asn:value`. */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@takodotid/circuit",
-    "version": "0.31.1",
+    "version": "0.32.0",
     "description": "Declarative, vendor-neutral network configuration: describe each device in TypeScript, and Circuit makes the device match. Alpha.",
     "keywords": [
         "network",

package/src/adapters/devices/fortios/routing.ts

@@ -418,7 +418,7 @@ function ruleGaps(device: Device, where: string, rule: AnyRule): string[] {
     if ((rule.match || rule.set) && !rule.action)
         found.push(`${where}, a rule without action: the platform stops at the first rule that matches`);
 
-    for (const field of ["as_path_length", "rpki", "large_community"] as const) {
+    for (const field of ["as_path_length", "through_as", "rpki", "large_community"] as const) {
         if (match[field] !== undefined) found.push(`${where}.match.${field}`);
     }
 

package/src/adapters/devices/junos/bgp.ts

@@ -210,6 +210,12 @@ function term(out: Statements, device: Device, term: string, rule: AnyRule, fami
         from.push(["as-path", name]);
     }
 
+    if (match.through_as !== undefined) {
+        const name = `circuit-through-${match.through_as}`;
+        out.set(`policy-options as-path ${name}`, quote(`.* ${match.through_as} .*`));
+        from.push(["as-path", name]);
+    }
+
     if (match.rpki) from.push(["validation-database", VALIDATION[match.rpki]]);
 
     // Members of one named community must all be present, so a rule matching both kinds names them together.

package/src/adapters/devices/routeros/render.ts

@@ -1033,6 +1033,8 @@ function conditions(rule: AnyRule): string[] {
     if (match.prefix_length?.max !== undefined) tests.push(`dst-len<${match.prefix_length.max + 1}`);
     if (match.as_path_length?.min !== undefined) tests.push(`bgp-path-len>${match.as_path_length.min - 1}`);
     if (match.as_path_length?.max !== undefined) tests.push(`bgp-path-len<${match.as_path_length.max + 1}`);
+    // The platform's AS path regexp matches each AS as a whole number, so a bare number is that AS anywhere in the path.
+    if (match.through_as !== undefined) tests.push(`bgp-as-path ${match.through_as}`);
     if (match.rpki) tests.push(`rpki ${match.rpki}`);
     if (match.community) tests.push(`bgp-communities includes ${match.community}`);
     if (match.large_community) tests.push(`bgp-large-communities includes ${match.large_community}`);

package/src/schema/policy.ts

@@ -32,6 +32,8 @@ export type Match<S extends string> = {
     prefix_length?: { min?: number; max?: number };
     /** AS path length within this range, inclusive. Every AS counts, prepends included. */
     as_path_length?: { min?: number; max?: number };
+    /** The AS path holds this AS anywhere: the route came from it or through it. */
+    through_as?: number;
     /** The route's origin validation state. */
     rpki?: "valid" | "invalid" | "not-found";
     /** Has this standard community, `asn:value`. */