chore: make aws optional

Author: ctron

common/Cargo.toml

@@ -16,8 +16,6 @@ version.workspace = true
 # normal
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-aws-config = { workspace = true }
-aws-sdk-s3 = { workspace = true }
 backon = { workspace = true }
 base64 = { workspace = true }
 bytes = { workspace = true }
@@ -49,6 +47,8 @@ url = { workspace = true }
 walkdir = { workspace = true }
 
 # optional
+aws-config = { workspace = true, optional = true }
+aws-sdk-s3 = { workspace = true, optional = true }
 bzip2 = { workspace = true, optional = true }
 bzip2-rs = { workspace = true, optional = true, features = ["rustc_1_51"] }
 clap = { workspace = true, features = ["derive", "env"], optional = true }
@@ -60,6 +60,7 @@ sequoia-openpgp = { workspace = true, optional = true }
 [features]
 default = ["bzip2"]
 openpgp = ["sequoia-openpgp"]
+s3 = ["dep:aws-config", "dep:aws-sdk-s3"]
 
 # deprecated
 cli = ["clap", "env_logger"]

common/src/scoop/source.rs

@@ -1,37 +1,43 @@
 use crate::USER_AGENT;
 use anyhow::bail;
-use aws_config::{BehaviorVersion, Region, meta::region::RegionProviderChain};
-use aws_sdk_s3::{
-    Client,
-    config::{AppName, Credentials},
-};
 use bytes::Bytes;
 use std::{
     borrow::Cow,
     path::{Path, PathBuf},
 };
 use url::Url;
 
+#[cfg(feature = "s3")]
+use aws_config::{BehaviorVersion, Region, meta::region::RegionProviderChain};
+#[cfg(feature = "s3")]
+use aws_sdk_s3::{
+    Client,
+    config::{AppName, Credentials},
+};
+
 #[derive(Clone, Debug, PartialEq, Eq)]
+#[non_exhaustive]
 pub enum Source {
     Path(PathBuf),
     Http(Url),
+    #[cfg(feature = "s3")]
     S3(S3),
 }
 
 impl TryFrom<&str> for Source {
     type Error = anyhow::Error;
 
     fn try_from(value: &str) -> Result<Self, Self::Error> {
-        Ok(
-            if value.starts_with("http://") || value.starts_with("https://") {
-                Self::Http(Url::parse(value)?)
-            } else if value.starts_with("s3://") {
-                Self::S3(S3::try_from(value)?)
-            } else {
-                Self::Path(value.into())
-            },
-        )
+        if value.starts_with("http://") || value.starts_with("https://") {
+            return Ok(Self::Http(Url::parse(value)?));
+        }
+
+        #[cfg(feature = "s3")]
+        if value.starts_with("s3://") {
+            return Ok(Self::S3(S3::try_from(value)?));
+        }
+
+        Ok(Self::Path(value.into()))
     }
 }
 
@@ -42,6 +48,7 @@ impl Source {
                 .into_iter()
                 .map(Self::Path)
                 .collect()),
+            #[cfg(feature = "s3")]
             Self::S3(s3) if s3.key.is_none() => Ok(Self::discover_s3(s3)
                 .await?
                 .into_iter()
@@ -77,6 +84,7 @@ impl Source {
         }
     }
 
+    #[cfg(feature = "s3")]
     async fn discover_s3(s3: S3) -> anyhow::Result<Vec<S3>> {
         let client = s3.client().await?;
 
@@ -110,6 +118,7 @@ impl Source {
         match self {
             Self::Path(path) => path.to_string_lossy(),
             Self::Http(url) => url.as_str().into(),
+            #[cfg(feature = "s3")]
             Self::S3(s3) => format!(
                 "s3://{}/{}/{}",
                 s3.region,
@@ -131,6 +140,7 @@ impl Source {
                     .bytes()
                     .await?
             }
+            #[cfg(feature = "s3")]
             Self::S3(s3) => {
                 let client = s3.client();
                 client
@@ -163,6 +173,7 @@ impl Source {
                     .send()
                     .await?;
             }
+            #[cfg(feature = "s3")]
             Self::S3(s3) => {
                 // delete the object from the bucket
                 let client = s3.client();
@@ -194,6 +205,7 @@ impl Source {
                 // no-op, but warn
                 log::warn!("Unable to move HTTP source ({url}), skipping!");
             }
+            #[cfg(feature = "s3")]
             Self::S3(s3) => {
                 let client = s3.client();
                 client
@@ -211,6 +223,7 @@ impl Source {
     }
 }
 
+#[cfg(feature = "s3")]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct S3 {
     region: String,
@@ -219,6 +232,7 @@ pub struct S3 {
     key: Option<String>,
 }
 
+#[cfg(feature = "s3")]
 impl TryFrom<&str> for S3 {
     type Error = anyhow::Error;
 
@@ -257,6 +271,7 @@ impl TryFrom<&str> for S3 {
     }
 }
 
+#[cfg(feature = "s3")]
 impl S3 {
     pub async fn client(&self) -> anyhow::Result<Client> {
         let region_provider = RegionProviderChain::first_try(Region::new(self.region.clone()));
@@ -280,6 +295,7 @@ impl S3 {
 mod tests {
     use super::*;
 
+    #[cfg(feature = "s3")]
     #[test]
     fn parse_s3() {
         assert_eq!(
@@ -311,6 +327,7 @@ mod tests {
         );
     }
 
+    #[cfg(feature = "s3")]
     #[test]
     fn parse_s3_custom_region() {
         assert_eq!(

csaf/csaf-cli/Cargo.toml

@@ -34,7 +34,7 @@ openssl = { workspace = true, optional = true }
 
 # internal
 csaf-walker = { workspace = true, features = ["csaf"] }
-walker-common = { workspace = true, features = ["openpgp", "clap", "env_logger"] }
+walker-common = { workspace = true, features = ["openpgp", "clap", "env_logger", "s3"] }
 walker-extras = { workspace = true }
 
 [features]

sbom/sbom-cli/Cargo.toml

@@ -31,7 +31,7 @@ tokio = { workspace = true, features = ["full"] }
 
 # internal
 sbom-walker = { workspace = true, features = ["serde-cyclonedx", "spdx-rs"] }
-walker-common = { workspace = true, features = ["openpgp", "clap", "env_logger"] }
+walker-common = { workspace = true, features = ["openpgp", "clap", "env_logger", "s3"] }
 walker-extras = { workspace = true }
 
 # just there for the feature