From 4e8f780e0a0f82458fdfe9b491df2c4873cdc531 Mon Sep 17 00:00:00 2001
From: Ian Stanton <ian@tembo.io>
Date: Tue, 24 Sep 2024 08:54:06 -0400
Subject: [PATCH] Bump `google-cloud-storage` crate to 0.22.1 (#971)

Signed-off-by: Ian Stanton <ian@tembo.io>
---
 conductor/Cargo.lock                | 4 ++--
 conductor/Cargo.toml                | 2 +-
 conductor/src/gcp/bucket_manager.rs | 2 +-
 conductor/src/gcp/iam_builder.rs    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conductor/Cargo.lock b/conductor/Cargo.lock
index 683acbc26..b4a3e48ad 100644
--- a/conductor/Cargo.lock
+++ b/conductor/Cargo.lock
@@ -1455,9 +1455,9 @@ dependencies = [
 
 [[package]]
 name = "google-cloud-storage"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b8be793a50f2edd9d910dfb72f881f08e8b21ed34827046fc43ba6e6f1c01a7"
+checksum = "c7347a3d65cd64db51e5b4aebf0c68c484042948c6d53f856f58269bc9816360"
 dependencies = [
  "anyhow",
  "async-stream",
diff --git a/conductor/Cargo.toml b/conductor/Cargo.toml
index 7afbd057d..eeef1e9d8 100644
--- a/conductor/Cargo.toml
+++ b/conductor/Cargo.toml
@@ -35,7 +35,7 @@ sqlx = { version = "0.7", features = ["runtime-tokio-native-tls", "postgres"] }
 anyhow = "1.0.82"
 serde_yaml = "0.9.34"
 reqwest = { version = "0.12.3", features = ["json"] }
-google-cloud-storage = "0.22"
+google-cloud-storage = "0.22.1"
 
 [dependencies.kube]
 features = ["runtime", "client", "derive"]
diff --git a/conductor/src/gcp/bucket_manager.rs b/conductor/src/gcp/bucket_manager.rs
index 1282a102a..1cb8813a3 100644
--- a/conductor/src/gcp/bucket_manager.rs
+++ b/conductor/src/gcp/bucket_manager.rs
@@ -270,7 +270,7 @@ impl BucketIamManager {
     fn create_bucket_condition(&self, bucket_name: &str, instance_name: &str) -> Condition {
         Condition {
             title: "allow-bucket-and-path".to_string(),
-            description: "Conductor managed storage bucket IAM policy condition".to_string(),
+            description: Some("Conductor managed storage bucket IAM policy condition".to_string()),
             expression: format!(
                 r#"(resource.type == "storage.googleapis.com/Bucket") || (resource.type == "storage.googleapis.com/Object" && resource.name.startsWith("projects/_/buckets/{}/objects/{}/{}"))"#,
                 bucket_name, BUCKET_PATH_PREFIX, instance_name
diff --git a/conductor/src/gcp/iam_builder.rs b/conductor/src/gcp/iam_builder.rs
index ae6cbd35c..2be771ec0 100644
--- a/conductor/src/gcp/iam_builder.rs
+++ b/conductor/src/gcp/iam_builder.rs
@@ -121,7 +121,7 @@ mod tests {
     fn test_add_condition() {
         let condition = Condition {
             title: "test".to_string(),
-            description: "test condition".to_string(),
+            description: Some("test condition".to_string()),
             expression: "resource.type == \"storage.googleapis.com/Bucket\") || (resource.type == \"storage.googleapis.com/Object\"".to_string(),
         };
         let binding = IamBindingBuilder::new()
@@ -138,7 +138,7 @@ mod tests {
     fn test_build_with_all_options() {
         let condition = Condition {
             title: "test".to_string(),
-            description: "test condition".to_string(),
+            description: Some("test condition".to_string()),
             expression: "resource.type == \"storage.googleapis.com/Bucket\") || (resource.type == \"storage.googleapis.com/Object\"".to_string(),
         };
         let binding = IamBindingBuilder::new()