Merge remote-tracking branch 'upstream/main' into remote_cluster_spec

Author: jakelandis

.github/workflows/compiler-rs.yml

@@ -0,0 +1,36 @@
+name: Cargo Build & Test
+
+on:
+  pull_request:
+
+env: 
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build_and_test:
+    name: compiler-rs
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install deps
+        run: |
+          make setup
+          make generate
+          make transform-to-openapi
+          make transform-expand-generics
+
+      - name: Install Rust
+        run: rustup update stable && rustup default stable
+
+      - run: cargo build --verbose
+        working-directory: compiler-rs
+
+      - run: cargo test --verbose
+        working-directory: compiler-rs

.github/workflows/update-rest-api-json.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ['main', '8.x', '8.15', '7.17']
+        branch: ['main', '8.x', '8.16', '7.17']
 
     steps:
       - uses: actions/checkout@v4

compiler-rs/clients_schema/src/transform/expand_generics.rs

@@ -152,6 +152,15 @@ pub fn expand(model: IndexedModel, config: ExpandConfig) -> anyhow::Result<Index
             itf.inherits = Some(expand_inherits(inherit, &mappings, model, ctx)?);
         }
 
+        if !itf.behaviors.is_empty() {
+            itf.behaviors.iter().for_each(|b| {
+                if b.generics.is_empty() {
+                    // If the behavior has no generics, we can just expand it
+                    let _ = expand_type(&b.typ, Vec::new(), model, ctx);
+                }
+            });
+        }
+
         // We keep the generic parameters of behaviors, but expand their value
         for behavior in &mut itf.behaviors {
             for arg in &mut behavior.generics {