Update to directories 5.0.0 and opendal 0.30.5 (#1716)

* Update to directories 5.0.0

* Update to opendal 0.30.5

Cargo.toml

@@ -31,10 +31,10 @@ bincode = "1"
 blake3 = "1"
 byteorder = "1.0"
 bytes = "1"
-opendal = { version= "0.29.1", optional=true }
+opendal = { version= "0.30.5", optional=true }
 reqsign = {version="0.8.5", optional=true}
 clap = { version = "4.1.11", features = ["derive", "env", "wrap_help"] }
-directories = "4.0.1"
+directories = "5.0.0"
 encoding = "0.2"
 env_logger = "0.10"
 filetime = "0.2"

src/cache/azure.rs

@@ -28,7 +28,7 @@ impl AzureBlobCache {
         builder.container(container);
         builder.root(key_prefix);
 
-        let op = Operator::create(builder)?
+        let op = Operator::new(builder)?
             .layer(LoggingLayer::default())
             .finish();
         Ok(op)

src/cache/cache.rs

@@ -368,12 +368,12 @@ pub trait Storage: Send + Sync {
 #[async_trait]
 impl Storage for opendal::Operator {
     async fn get(&self, key: &str) -> Result<Cache> {
-        match self.object(&normalize_key(key)).read().await {
+        match self.read(&normalize_key(key)).await {
             Ok(res) => {
                 let hit = CacheRead::from(io::Cursor::new(res))?;
                 Ok(Cache::Hit(hit))
             }
-            Err(e) if e.kind() == opendal::ErrorKind::ObjectNotFound => Ok(Cache::Miss),
+            Err(e) if e.kind() == opendal::ErrorKind::NotFound => Ok(Cache::Miss),
             Err(e) => {
                 warn!("Got unexpected error: {:?}", e);
                 Ok(Cache::Miss)
@@ -384,9 +384,7 @@ impl Storage for opendal::Operator {
     async fn put(&self, key: &str, entry: CacheWrite) -> Result<Duration> {
         let start = std::time::Instant::now();
 
-        self.object(&normalize_key(key))
-            .write(entry.finish()?)
-            .await?;
+        self.write(&normalize_key(key), entry.finish()?).await?;
 
         Ok(start.elapsed())
     }
@@ -397,10 +395,10 @@ impl Storage for opendal::Operator {
         let path = ".sccache_check";
 
         // Read is required, return error directly if we can't read .
-        match self.object(path).read().await {
+        match self.read(path).await {
             Ok(_) => (),
             // Read not exist file with not found is ok.
-            Err(err) if err.kind() == ErrorKind::ObjectNotFound => (),
+            Err(err) if err.kind() == ErrorKind::NotFound => (),
             // Tricky Part.
             //
             // We tolerate rate limited here to make sccache keep running.
@@ -410,15 +408,15 @@ impl Storage for opendal::Operator {
             // and hitting other services rate limit. There are few things we
             // can do, so we will print our the error here to make users know
             // about it.
-            Err(err) if err.kind() == ErrorKind::ObjectRateLimited => {
+            Err(err) if err.kind() == ErrorKind::RateLimited => {
                 eprintln!("cache storage read check: {err:?}, but we decide to keep running")
             }
             Err(err) => bail!("cache storage failed to read: {:?}", err),
         };
 
-        let can_write = match self.object(path).write("Hello, World!").await {
+        let can_write = match self.write(path, "Hello, World!").await {
             Ok(_) => true,
-            Err(err) if err.kind() == ErrorKind::ObjectAlreadyExists => true,
+            Err(err) if err.kind() == ErrorKind::AlreadyExists => true,
             // Toralte all other write errors because we can do read as least.
             Err(err) => {
                 eprintln!("storage write check failed: {err:?}");
@@ -438,7 +436,7 @@ impl Storage for opendal::Operator {
     }
 
     fn location(&self) -> String {
-        let meta = self.metadata();
+        let meta = self.info();
         format!(
             "{}, name: {}, prefix: {}",
             meta.scheme(),

src/cache/gcs.rs

@@ -71,7 +71,7 @@ impl GCSCache {
         }
         builder.signer(signer_builder.build()?);
 
-        let op = Operator::create(builder)?
+        let op = Operator::new(builder)?
             .layer(LoggingLayer::default())
             .finish();
         Ok(op)

src/cache/gha.rs

@@ -38,7 +38,7 @@ impl GHACache {
             builder.version(&format!("sccache-v{VERSION}-{version}"));
         }
 
-        let op = Operator::create(builder)?
+        let op = Operator::new(builder)?
             .layer(LoggingLayer::default())
             .finish();
         Ok(op)

src/cache/memcached.rs

@@ -30,7 +30,7 @@ impl MemcachedCache {
         builder.endpoint(url);
         builder.default_ttl(Duration::from_secs(expiration as u64));
 
-        let op = Operator::create(builder)?
+        let op = Operator::new(builder)?
             .layer(LoggingLayer::default())
             .finish();
         Ok(op)

src/cache/redis.rs

@@ -42,7 +42,7 @@ impl RedisCache {
             .map(|v| v.parse().unwrap_or_default())
             .unwrap_or_default());
 
-        let op = Operator::create(builder)?
+        let op = Operator::new(builder)?
             .layer(LoggingLayer::default())
             .finish();
         Ok(op)

src/cache/s3.rs

@@ -40,7 +40,7 @@ impl S3Cache {
             builder.endpoint(&endpoint_resolver(endpoint, use_ssl)?);
         }
 
-        let op = Operator::create(builder)?
+        let op = Operator::new(builder)?
             .layer(LoggingLayer::default())
             .finish();
         Ok(op)

src/cache/webdav.rs

@@ -40,7 +40,7 @@ impl WebdavCache {
             builder.token(token);
         }
 
-        let op = Operator::create(builder)?
+        let op = Operator::new(builder)?
             .layer(LoggingLayer::default())
             .finish();
         Ok(op)