Both access_key_id and secret_access_key must be set or both must be unset.

Author: Saruniks

src/cache/s3.rs

@@ -38,12 +38,15 @@ impl S3Cache {
         builder.bucket(bucket);
         builder.root(key_prefix);
 
-        if let Some(access_key_id) = access_key_id {
-            builder.access_key_id(access_key_id);
-        }
-
-        if let Some(secret_access_key) = secret_access_key {
-            builder.secret_access_key(secret_access_key);
+        match (access_key_id, secret_access_key) {
+            (Some(access_key_id), Some(secret_access_key)) => {
+                builder.access_key_id(access_key_id);
+                builder.secret_access_key(secret_access_key);
+            }
+            (None, None) => (),
+            _ => {
+                bail!("Both access_key_id and secret_access_key must be set or both must be unset.")
+            }
         }
 
         if let Some(region) = region {

src/config.rs

@@ -645,6 +645,11 @@ fn config_from_env() -> Result<EnvConfig> {
         let access_key_id = env::var("SCCACHE_AWS_ACCESS_KEY_ID").ok();
         let secret_access_key = env::var("SCCACHE_AWS_SECRET_ACCESS_KEY").ok();
 
+        match (&access_key_id, &secret_access_key) {
+            (Some(_), Some(_)) | (None, None) => (),
+            _ => bail!("Both SCCACHE_AWS_ACCESS_KEY_ID and SCCACHE_AWS_SECRET_ACCESS_KEY must be set or both must be unset."),
+        }
+
         Some(S3CacheConfig {
             bucket,
             region,