dataplane now builds, but need to undo lots of hacks

Author: daniel-noland

.cargo/config.toml

@@ -1,8 +1,11 @@
 [env]
-COMPILE_ENV = { value = "sysroot", relative = true, force = false }
-#PATH = { value = "compile-env/bin", relative = true, force = true }
-#LIBCLANG_PATH = { value = "compile-env/lib", relative = true, force = true }
-# PKG_CONFIG_PATH = { value = "compile-env/sysroot/x86_64-unknown-linux-gnu/release/lib/pkgconfig", relative = true, force = true }
+# COMPILE_ENV = { value = "sysroot", relative = true, force = false }
+# PATH = { value = "compile-env/bin", relative = true, force = true }
+LIBCLANG_PATH = { value = "compile-env/lib", relative = true, force = false }
+PKG_CONFIG_PATH = { value = "compile-env/sysroot/x86_64-unknown-linux-gnu/release/lib/pkgconfig", relative = true, force = false }
+LIBRARY_PATH = { value = "sysroot/lib", relative = true, force = false }
+C_INCLUDE_PATH = { value = "sysroot/include", relative = true, force = false }
+GW_CRD_PATH = { value = "devroot/src/gateway/config/crd/bases", relative = true, force = false }
 
 [build]
 target = "x86_64-unknown-linux-gnu"

Cargo.lock

@@ -32,12 +32,14 @@ let
   };
   dataplane-dev-pkgs = import sources.nixpkgs {
     overlays = [
+      overlays.llvm
       overlays.dataplane-dev
     ];
   };
   dataplane-pkgs =
     (import sources.nixpkgs {
       overlays = [
+        overlays.llvm
         overlays.dataplane
       ];
     }).pkgsCross.${platform'.info.nixarch};
@@ -75,8 +77,8 @@ let
     executable = false;
     destination = "/.clangd";
   };
-  crane = import sources.crane { };
-  craneLib = crane.craneLib.overrideToolchain dataplane-pkgs.rust-toolchain;
+  crane-base = import sources.crane { };
+  crane = crane-base.craneLib.overrideToolchain dataplane-dev-pkgs.rust-toolchain;
   dev-tools = dataplane-pkgs.symlinkJoin {
     name = "dataplane-dev-shell";
     paths = [
@@ -96,6 +98,7 @@ let
       cargo-llvm-cov
       cargo-nextest
       direnv
+      gateway-crd
       just
       npins
     ]);
@@ -116,6 +119,14 @@ let
       dataplane-pkgs.hwloc
     ];
 
+    env = {
+      LIBCLANG_PATH = "${dataplane-pkgs.llvmPackages.libclang.lib}/lib";
+      C_INCLUDE_PATH = "${sysroot}/include";
+      LIBRARY_PATH = "${sysroot}/lib";
+      PKG_CONFIG_PATH = "${sysroot}/lib/pkgconfig";
+      GW_CRD_PATH = "${dataplane-dev-pkgs.gateway-crd}/src/gateway/config/crd/bases";
+    };
+
     # Additional environment variables can be set directly
     # MY_CUSTOM_VAR = "some value";
   };
@@ -136,11 +147,6 @@ let
       root = ./.;
       fileset = lib.fileset.unions [
         ./.
-        ./Cargo.toml
-        ./Cargo.lock
-        # (crane.fileset.commonCargoSources ./crates/my-common)
-        # (crane.fileset.commonCargoSources ./crates/my-workspace-hack)
-        (crane.fileset.commonCargoSources crate)
       ];
     };
   rekon = crane.buildPackage (
@@ -181,11 +187,6 @@ let
       pname = "dataplane-dpdk-sys";
       cargoExtraArgs = "--package dataplane-dpdk-sys";
       src = fileSetForCrate ./dpdk-sys;
-      env = {
-        LIBCLANG_PATH = "${dataplane-pkgs.llvmPackages.libclang.lib}/lib";
-        C_INCLUDE_PATH = "${dataplane-pkgs.dpdk.dev}/include:${dataplane-pkgs.libbsd.dev}/include:${dataplane-pkgs.stdenv'.cc.libc.dev}/include";
-        LIBRARY_PATH = "${sysroot}/lib";
-      };
       nativeBuildInputs = [
         dataplane-pkgs.pkg-config
         dataplane-pkgs.llvmPackages.libclang.lib
@@ -203,11 +204,6 @@ let
       pname = "dataplane-dpdk";
       cargoExtraArgs = "--package dataplane-dpdk";
       src = fileSetForCrate ./dpdk;
-      env = {
-        LIBCLANG_PATH = "${dataplane-pkgs.llvmPackages.libclang.lib}/lib";
-        C_INCLUDE_PATH = "${dataplane-pkgs.dpdk.dev}/include:${dataplane-pkgs.libbsd.dev}/include:${dataplane-pkgs.stdenv'.cc.libc.dev}/include";
-        LIBRARY_PATH = "${sysroot}/lib";
-      };
       nativeBuildInputs = [
         dataplane-pkgs.pkg-config
         dataplane-pkgs.llvmPackages.libclang.lib
@@ -225,16 +221,12 @@ let
       pname = "dataplane";
       cargoExtraArgs = "--package dataplane";
       src = fileSetForCrate ./dataplane;
-      env = {
-        LIBCLANG_PATH = "${dataplane-pkgs.llvmPackages.libclang.lib}/lib";
-        C_INCLUDE_PATH = "${dataplane-pkgs.dpdk.dev}/include:${dataplane-pkgs.libbsd.dev}/include:${dataplane-pkgs.stdenv'.cc.libc.dev}/include";
-        LIBRARY_PATH = "${sysroot}/lib";
-      };
       nativeBuildInputs = [
         dataplane-pkgs.pkg-config
         dataplane-pkgs.llvmPackages.libclang.lib
         dataplane-pkgs.llvmPackages.clang
         dataplane-pkgs.llvmPackages.lld
+        dataplane-dev-pkgs.kopium
       ];
       buildInputs = [
         sysroot
@@ -269,7 +261,6 @@ in
       x = (builtins.attrNames crane.craneLib);
     };
   };
-  z = dataplane-pkgs.runCommand "ls" { } "echo potato > $out";
   # y = crane.buildPackage
 
 }

default.nix

@@ -37,5 +37,5 @@ lpm = { workspace = true, features = [] }
 net = { workspace = true, features = ["bolero", "test_buffer"] }
 
 [build-dependencies]
-dotenvy = { workspace = true, features = [] }
-ureq = { workspace = true, features = ["rustls", "gzip"] }
+# dotenvy = { workspace = true, features = [] }
+# ureq = { workspace = true, features = ["rustls", "gzip"] }

k8s-intf/Cargo.toml

@@ -1,47 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright Open Network Fabric Authors
 
-use std::env;
 use std::fs;
+use std::io::Read;
 use std::path::PathBuf;
 
-fn workspace_root() -> PathBuf {
-    PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set"))
-        .ancestors()
-        .nth(1)
-        .expect("Workspace root not found")
-        .to_path_buf()
-}
-
-fn get_agent_crd_url() -> String {
-    let env_file_path = workspace_root().join("scripts").join("k8s-crd.env");
-    println!("cargo:rerun-if-changed={}", env_file_path.display());
-
-    let env_file =
-        dotenvy::from_path_iter(env_file_path).expect("Failed to read scripts/k8s-crd.env");
-
-    env_file
-        .filter_map(Result::ok)
-        .find_map(|(key, value)| {
-            if key == "K8S_GATEWAY_AGENT_CRD_URL" {
-                Some(value)
-            } else {
-                None
-            }
-        })
-        .expect("K8S_GATEWAY_AGENT_CRD_URL not found in scripts/k8s-crd.env")
-}
-
-fn fetch_crd(url: &str) -> String {
-    println!("cargo:note=Fetching CRD from: {url}");
-    ureq::get(url)
-        .call()
-        .expect("Failed to fetch agent CRD from url")
-        .body_mut()
-        .read_to_string()
-        .expect("Failed to read response body")
-}
-
 const LICENSE_PREAMBLE: &str = "// SPDX-License-Identifier: Apache-2.0
 // Copyright Open Network Fabric Authors
 
@@ -124,8 +87,31 @@ fn code_needs_regen(new_code: &str) -> bool {
 }
 
 fn main() {
-    let agent_crd_url = get_agent_crd_url();
-    let agent_crd_contents = fetch_crd(&agent_crd_url);
+    let agent_crd_contents = {
+        let agent_crd_path =
+            PathBuf::from(std::env::var("GW_CRD_PATH").expect("GW_CRD_PATH var unset"))
+                .join("gwint.githedgehog.com_gatewayagents.yaml");
+        let mut agent_crd_file = std::fs::OpenOptions::new()
+            .read(true)
+            .write(false)
+            .open(&agent_crd_path)
+            .unwrap_or_else(|e| {
+                panic!(
+                    "failed to open {path}: {e}",
+                    path = agent_crd_path.to_str().expect("non unicode crd path")
+                )
+            });
+        let mut contents = String::with_capacity(
+            agent_crd_file
+                .metadata()
+                .expect("unable to get crd metadata")
+                .len() as usize,
+        );
+        agent_crd_file
+            .read_to_string(&mut contents)
+            .unwrap_or_else(|e| panic!("unable to read crd data into string: {e}"));
+        contents
+    };
     let agent_generated_code = generate_rust_for_crd(&agent_crd_contents);
 
     if !code_needs_regen(&agent_generated_code) {