Skip to content

Commit

Permalink
Bump google-cloud-storage crate to 0.22.1 (#971)
Browse files Browse the repository at this point in the history
Signed-off-by: Ian Stanton <[email protected]>
  • Loading branch information
ianstanton authored Sep 24, 2024
1 parent d14df75 commit 4e8f780
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions conductor/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion conductor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion conductor/src/gcp/bucket_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions conductor/src/gcp/iam_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand Down

0 comments on commit 4e8f780

Please sign in to comment.