chore(fuser): embed fuser fork in as a submodule

awslabs · Feb 18, 2025 · b427e43 · b427e43
1 parent 75a2373
commit b427e43
Show file tree

Hide file tree

Showing 59 changed files with 30 additions and 14,108 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -57,7 +57,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Build
       run: cargo build --release
@@ -141,7 +141,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Build
       run: cargo build --release
@@ -207,7 +207,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Build
       run: cargo build --release

diff --git a/.github/workflows/bench_s3express.yml b/.github/workflows/bench_s3express.yml
@@ -57,7 +57,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Build
       run: cargo build --release
@@ -140,7 +140,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Build
       run: cargo build --release

diff --git a/.github/workflows/crates.yml b/.github/workflows/crates.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-          # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+          # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
           rustflags: ""
       - name: Package ${{ matrix.crate }} crate
         # `--no-verify` avoids building using crates.io dependencies, which for local packages may not be updated yet

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -81,7 +81,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Install operating system dependencies
       uses: ./.github/actions/install-dependencies
@@ -133,7 +133,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Install operating system dependencies
       uses: ./.github/actions/install-dependencies
@@ -174,7 +174,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
         components: rust-src
     - name: Install operating system dependencies

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -35,7 +35,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Cargo cache
       uses: actions/cache@v3
@@ -74,7 +74,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Cargo cache
       uses: actions/cache@v3
@@ -108,7 +108,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Cargo cache
       uses: actions/cache@v3
@@ -140,7 +140,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Cargo cache
       uses: actions/cache@v3
@@ -168,7 +168,7 @@ jobs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-        # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+        # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
         rustflags: ""
     - name: Install operating system dependencies
       uses: ./.github/actions/install-dependencies
@@ -194,11 +194,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Set up Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-          # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+          # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
           rustflags: ""
           components: rustfmt
       - name: Check format
@@ -221,7 +223,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-          # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+          # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
           rustflags: ""
           components: clippy
       - name: Cargo cache
@@ -250,7 +252,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-          # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+          # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
           rustflags: ""
           components: rust-docs
       - name: Cargo cache
@@ -279,7 +281,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           # setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
-          # We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
+          # We need to this currently because `mountpoint-s3-fuser` contains some warnings and it breaks the build.
           rustflags: ""
       - name: Install operating system dependencies
         uses: ./.github/actions/install-dependencies
@@ -306,5 +308,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: Run cargo deny
         uses: EmbarkStudios/cargo-deny-action@v2
diff --git a/.gitmodules b/.gitmodules
@@ -33,5 +33,5 @@
 	url = https://github.com/awslabs/aws-c-s3.git
 [submodule "mountpoint-s3-fuser"]
 	path = mountpoint-s3-fuser
-	url = git@github.com:awslabs/mountpoint-s3.git
+	url = https://github.com/awslabs/mountpoint-s3.git
 	branch = fuser/fork
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = [
 	"mountpoint-s3-crt-sys",
 	"mountpoint-s3-client",
 	"mountpoint-s3",
-	"vendor/fuser",
+	"mountpoint-s3-fuser",
 ]
 resolver = "2"
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
-# Most of these targets just exist so we can avoid running clippy and rustfmt on the vendored
-# fuser crate. If those tools ever get stabilized `ignore` features, or we stop vendoring, this can
+# Most of these targets just exist so we can avoid running clippy and rustfmt on the
+# `fuser`'s fork crate (`mountpoint-s3-fuser`). If those tools ever get stabilized `ignore` features, or we stop vendoring, this can
 # go away.
 
 CRATES = mountpoint-s3-crt-sys mountpoint-s3-crt mountpoint-s3-client mountpoint-s3

diff --git a/mountpoint-s3/Cargo.toml b/mountpoint-s3/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 default-run = "mount-s3"
 
 [dependencies]
-fuser = { path = "../vendor/fuser", version = "0.15.0", features = ["abi-7-28"] }
+fuser = { path = "../mountpoint-s3-fuser", version = "0.15.0", features = ["abi-7-28"] }
 mountpoint-s3-client = { path = "../mountpoint-s3-client", version = "0.13.1" }
 
 anyhow = { version = "1.0.95", features = ["backtrace"] }

diff --git a/vendor-fuser.sh b/vendor-fuser.sh
@@ -1,22 +1,13 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-FUSER_VENDOR_PATH="vendor/fuser"
+FUSER_PATH="mountpoint-s3-fuser"
 BASE_PATH=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-FUSER_FULL_PATH="$BASE_PATH/$FUSER_VENDOR_PATH"
-
-STATUS=$(git status --porcelain $FUSER_FULL_PATH)
-if [ -n "$STATUS"  ]; then
-    echo >&2 "Refusing to re-vendor because the fuser directory is dirty"
-    exit 1
-fi
+FUSER_FULL_PATH="$BASE_PATH/$FUSER_PATH"
 
 rm -rf $FUSER_FULL_PATH
 
-git clone --branch fuser/fork ssh://[email protected]/awslabs/mountpoint-s3.git $FUSER_FULL_PATH
-COMMIT=$(git -C $FUSER_FULL_PATH rev-parse --short HEAD)
-
-rm -rf $FUSER_FULL_PATH/.git
+git submodule update --remote $FUSER_FULL_PATH
 
 git add $FUSER_FULL_PATH
 

diff --git a/vendor/fuser/.cirrus.yml b/vendor/fuser/.cirrus.yml
diff --git a/vendor/fuser/.dockerignore b/vendor/fuser/.dockerignore
diff --git a/vendor/fuser/.github/workflows/ci.yml b/vendor/fuser/.github/workflows/ci.yml
diff --git a/vendor/fuser/.gitignore b/vendor/fuser/.gitignore