Merge pull request #45 from matter-labs/nix_fmt_clippy

ci: use `crane` flake to build with nix
matter-labs · Mar 11, 2024 · 5f2fb2c · 5f2fb2c
2 parents 1249048 + 0654bac
commit 5f2fb2c
Show file tree

Hide file tree

Showing 41 changed files with 314 additions and 141 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,18 +16,38 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - name: Setup Rust toolchain
-        run: rustup show
-      - run: cargo fmt --all -- --check
+      - uses: cachix/install-nix-action@v26
+        with:
+          extra_nix_config: |
+            access-tokens = github.com=${{ github.token }}
+      - uses: cachix/cachix-action@v14
+        with:
+          name: nixsgx
+          extraPullNames: vault-auth-tee
+      - name: Enable magic Nix cache
+        uses: DeterminateSystems/magic-nix-cache-action@main
+
+      - name: cargo fmt
+        run: nix build -L .#cargoFmt
 
   deny:
     name: cargo deny
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: EmbarkStudios/cargo-deny-action@v1
+      - uses: cachix/install-nix-action@v26
         with:
-          arguments: --workspace
+          extra_nix_config: |
+            access-tokens = github.com=${{ github.token }}
+      - uses: cachix/cachix-action@v14
+        with:
+          name: nixsgx
+          extraPullNames: vault-auth-tee
+      - name: Enable magic Nix cache
+        uses: DeterminateSystems/magic-nix-cache-action@main
+
+      - name: cargo deny
+        run: nix build -L .#cargoDeny
 
   check-spdx-headers:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  check:
+  fmt:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
@@ -22,11 +22,14 @@ jobs:
       - uses: cachix/cachix-action@v14
         with:
           name: nixsgx
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
           extraPullNames: vault-auth-tee
+      - name: Enable magic Nix cache
+        uses: DeterminateSystems/magic-nix-cache-action@main
 
-      - run: nix flake check -L --show-trace --keep-going
+      - run: nix fmt . -- --check
 
-  fmt:
+  clippy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
@@ -37,11 +40,16 @@ jobs:
       - uses: cachix/cachix-action@v14
         with:
           name: nixsgx
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
           extraPullNames: vault-auth-tee
+      - name: Enable magic Nix cache
+        uses: DeterminateSystems/magic-nix-cache-action@main
 
-      - run: nix fmt . -- --check
+      - name: cargo clippy
+        run: nix build -L .#cargoClippy
 
-  clippy:
+  check:
+    needs: clippy
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
@@ -52,14 +60,15 @@ jobs:
       - uses: cachix/cachix-action@v14
         with:
           name: nixsgx
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
           extraPullNames: vault-auth-tee
       - name: Enable magic Nix cache
         uses: DeterminateSystems/magic-nix-cache-action@main
 
-      - name: cargo clippy
-        run: nix develop -L --ignore-environment -c cargo clippy --all
+      - run: nix flake check -L --show-trace --keep-going
 
   build:
+    needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,56 +1,6 @@
-[package]
-name = "teepot"
-description = "TEE secret manager"
-# no MIT license, because of copied code from:
-# * https://github.com/enarx/enarx
-# * https://github.com/enarx/sgx
-license = "Apache-2.0"
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-repository.workspace = true
-
-[dependencies]
-actix-http.workspace = true
-actix-web.workspace = true
-anyhow.workspace = true
-awc.workspace = true
-bytemuck.workspace = true
-bytes.workspace = true
-clap.workspace = true
-const-oid.workspace = true
-enumset.workspace = true
-futures-core.workspace = true
-getrandom.workspace = true
-hex.workspace = true
-intel-tee-quote-verification-rs.workspace = true
-num-integer.workspace = true
-num-traits.workspace = true
-p256.workspace = true
-pgp.workspace = true
-pkcs8.workspace = true
-rand.workspace = true
-rsa.workspace = true
-rustls.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_with.workspace = true
-sha2.workspace = true
-signature.workspace = true
-thiserror.workspace = true
-tracing.workspace = true
-webpki-roots.workspace = true
-x509-cert.workspace = true
-zeroize.workspace = true
-
-[dev-dependencies]
-anyhow.workspace = true
-base64.workspace = true
-hex.workspace = true
-testaso.workspace = true
-
 [workspace]
 members = ["crates/*", "bin/*"]
+resolver = "2"
 
 [workspace.package]
 version = "0.1.0"
@@ -78,7 +28,7 @@ enumset = { version = "1.1", features = ["serde", "std"] }
 futures-core = { version = "0.3.30", features = ["alloc"], default-features = false }
 getrandom = "0.2.12"
 hex = { version = "0.4.3", features = ["std"], default-features = false }
-intel-tee-quote-verification-rs = { path = "crates/intel-tee-quote-verification-rs", version = "0.2.1" }
+intel-tee-quote-verification-rs = { path = "crates/intel-tee-quote-verification-rs" }
 intel-tee-quote-verification-sys = { version = "0.2.1" }
 k256 = "0.13"
 log = "0.4"
@@ -99,7 +49,7 @@ serde_json = "1"
 serde_with = { version = "3.6", features = ["base64", "hex"] }
 sha2 = "0.10.8"
 signature = "2.2.0"
-teepot = { path = "." }
+teepot = { path = "crates/teepot" }
 testaso = "0.1.0"
 thiserror = "1.0.57"
 tokio = { version = "1", features = ["sync", "macros", "rt-multi-thread", "fs", "time"] }

diff --git a/bin/tee-vault-admin/src/main.rs b/bin/tee-vault-admin/src/main.rs
@@ -117,7 +117,7 @@ mod tests {
     use serde_json::json;
     use teepot::json::http::{VaultCommand, VaultCommands};
 
-    const TEST_DATA: &str = include_str!("../../../tests/data/test.json");
+    const TEST_DATA: &str = include_str!("../../../crates/teepot/tests/data/test.json");
 
     #[test]
     fn test_vault_commands() {

diff --git a/crates/teepot/Cargo.toml b/crates/teepot/Cargo.toml
@@ -0,0 +1,50 @@
+[package]
+name = "teepot"
+description = "TEE secret manager"
+# no MIT license, because of copied code from:
+# * https://github.com/enarx/enarx
+# * https://github.com/enarx/sgx
+license = "Apache-2.0"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+repository.workspace = true
+
+[dependencies]
+actix-http.workspace = true
+actix-web.workspace = true
+anyhow.workspace = true
+awc.workspace = true
+bytemuck.workspace = true
+bytes.workspace = true
+clap.workspace = true
+const-oid.workspace = true
+enumset.workspace = true
+futures-core.workspace = true
+getrandom.workspace = true
+hex.workspace = true
+intel-tee-quote-verification-rs.workspace = true
+num-integer.workspace = true
+num-traits.workspace = true
+p256.workspace = true
+pgp.workspace = true
+pkcs8.workspace = true
+rand.workspace = true
+rsa.workspace = true
+rustls.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+serde_with.workspace = true
+sha2.workspace = true
+signature.workspace = true
+thiserror.workspace = true
+tracing.workspace = true
+webpki-roots.workspace = true
+x509-cert.workspace = true
+zeroize.workspace = true
+
+[dev-dependencies]
+anyhow.workspace = true
+base64.workspace = true
+hex.workspace = true
+testaso.workspace = true
diff --git a/src/client/mod.rs → crates/teepot/src/client/mod.rs b/src/client/mod.rs → crates/teepot/src/client/mod.rs
diff --git a/src/client/vault.rs → crates/teepot/src/client/vault.rs b/src/client/vault.rs → crates/teepot/src/client/vault.rs
diff --git a/src/json/http.rs → crates/teepot/src/json/http.rs b/src/json/http.rs → crates/teepot/src/json/http.rs
diff --git a/src/json/mod.rs → crates/teepot/src/json/mod.rs b/src/json/mod.rs → crates/teepot/src/json/mod.rs
diff --git a/src/json/secrets.rs → crates/teepot/src/json/secrets.rs b/src/json/secrets.rs → crates/teepot/src/json/secrets.rs
diff --git a/src/lib.rs → crates/teepot/src/lib.rs b/src/lib.rs → crates/teepot/src/lib.rs
diff --git a/src/quote/mod.rs → crates/teepot/src/quote/mod.rs b/src/quote/mod.rs → crates/teepot/src/quote/mod.rs
diff --git a/src/server/attestation.rs → crates/teepot/src/server/attestation.rs b/src/server/attestation.rs → crates/teepot/src/server/attestation.rs
diff --git a/src/server/mod.rs → crates/teepot/src/server/mod.rs b/src/server/mod.rs → crates/teepot/src/server/mod.rs
diff --git a/src/server/pki.rs → crates/teepot/src/server/pki.rs b/src/server/pki.rs → crates/teepot/src/server/pki.rs
diff --git a/src/server/signatures.rs → crates/teepot/src/server/signatures.rs b/src/server/signatures.rs → crates/teepot/src/server/signatures.rs
diff --git a/src/sgx/error.rs → crates/teepot/src/sgx/error.rs b/src/sgx/error.rs → crates/teepot/src/sgx/error.rs
diff --git a/src/sgx/mod.rs → crates/teepot/src/sgx/mod.rs b/src/sgx/mod.rs → crates/teepot/src/sgx/mod.rs
diff --git a/src/sgx/sign.rs → crates/teepot/src/sgx/sign.rs b/src/sgx/sign.rs → crates/teepot/src/sgx/sign.rs
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright (c) 2023 Matter Labs
+// Copyright (c) 2023-2024 Matter Labs
 
 // Copyright (c) The Enarx Project Developers https://github.com/enarx/sgx
 
@@ -357,6 +357,7 @@ mod test {
     }
 
     #[test]
+    #[allow(clippy::unusual_byte_groupings)]
     fn author_instantiation() {
         let author = Author::new(0x2000_03_30, 0u32);
         assert_eq!(author.header1, Author::HEADER1);

diff --git a/src/sgx/tcblevel.rs → crates/teepot/src/sgx/tcblevel.rs b/src/sgx/tcblevel.rs → crates/teepot/src/sgx/tcblevel.rs
diff --git a/tests/data/gpgkey.asc → crates/teepot/tests/data/gpgkey.asc b/tests/data/gpgkey.asc → crates/teepot/tests/data/gpgkey.asc
diff --git a/tests/data/gpgkey.pub → crates/teepot/tests/data/gpgkey.pub b/tests/data/gpgkey.pub → crates/teepot/tests/data/gpgkey.pub
diff --git a/tests/data/gramine-test.sig → crates/teepot/tests/data/gramine-test.sig b/tests/data/gramine-test.sig → crates/teepot/tests/data/gramine-test.sig
diff --git a/...312C59D679D930FA9E8B06D728F29A2DBABF8.asc → ...312C59D679D930FA9E8B06D728F29A2DBABF8.asc b/...312C59D679D930FA9E8B06D728F29A2DBABF8.asc → ...312C59D679D930FA9E8B06D728F29A2DBABF8.asc
diff --git a/...312C59D679D930FA9E8B06D728F29A2DBABF8.b64 → ...312C59D679D930FA9E8B06D728F29A2DBABF8.b64 b/...312C59D679D930FA9E8B06D728F29A2DBABF8.b64 → ...312C59D679D930FA9E8B06D728F29A2DBABF8.b64
diff --git a/tests/data/stress.json → crates/teepot/tests/data/stress.json b/tests/data/stress.json → crates/teepot/tests/data/stress.json
diff --git a/tests/data/stress.json.asc → crates/teepot/tests/data/stress.json.asc b/tests/data/stress.json.asc → crates/teepot/tests/data/stress.json.asc
diff --git a/tests/data/test.json → crates/teepot/tests/data/test.json b/tests/data/test.json → crates/teepot/tests/data/test.json
diff --git a/tests/data/test.json.asc → crates/teepot/tests/data/test.json.asc b/tests/data/test.json.asc → crates/teepot/tests/data/test.json.asc
diff --git a/tests/data/test2.json → crates/teepot/tests/data/test2.json b/tests/data/test2.json → crates/teepot/tests/data/test2.json
diff --git a/tests/data/test2.json.asc → crates/teepot/tests/data/test2.json.asc b/tests/data/test2.json.asc → crates/teepot/tests/data/test2.json.asc
diff --git a/tests/sgx_quote_verification.rs → ...es/teepot/tests/sgx_quote_verification.rs b/tests/sgx_quote_verification.rs → ...es/teepot/tests/sgx_quote_verification.rs
diff --git a/deny.toml b/deny.toml
@@ -29,7 +29,7 @@ allow = [
   "Unlicense",
   "MPL-2.0",
   "Unicode-DFS-2016",
-  "CC0-1.0",
+  #  "CC0-1.0", # not yet seen
   "BSD-2-Clause",
   "BSD-3-Clause",
   "OpenSSL",
@@ -65,12 +65,9 @@ skip-tree = []
 unknown-registry = "warn"
 unknown-git = "warn"
 allow-registry = ["https://github.com/rust-lang/crates.io-index"]
-allow-git = [
-  # we need the mio override to disable eventfd for SGX
-  "https://github.com/tokio-rs/mio?rev=ec0776f5af29548e4e1f48f86f5fa123a46caa07#ec0776f5af29548e4e1f48f86f5fa123a46caa07",
-]
+# allow-git = []
 
 [sources.allow-org]
-github = [""]
-gitlab = [""]
-bitbucket = [""]
+#github = [""]
+#gitlab = [""]
+#bitbucket = [""]
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,13 @@
 {
   description = "teepot";
 
+  nixConfig.extra-substituters = [
+    "https://nixsgx.cachix.org"
+  ];
+  nixConfig.extra-trusted-public-keys = [
+    "nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE="
+  ];
+
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
 
@@ -23,6 +30,11 @@
       url = "github:oxalica/rust-overlay?rev=3ad32bb27c700b59306224e285b66577e3532dfc";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    crane = {
+      url = "github:ipetkov/crane";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs:
@@ -49,6 +61,16 @@
 
       outputs-builder = channels: {
         formatter = channels.nixpkgs.nixpkgs-fmt;
+
+        checks = {
+          inherit
+            (channels.nixpkgs.teepot) cargoFmt;
+          inherit
+            (channels.nixpkgs.teepot) cargoClippy;
+          inherit
+            (channels.nixpkgs.teepot) cargoDeny;
+        };
+
       };
     };
 }