Skip to content

fix(secret_manager): garbage collect locational secrets in integration tests #4433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haphungw merged 5 commits into from
Jan 28, 2026
+47 −12
Merged

fix(secret_manager): garbage collect locational secrets in integration tests #4433

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2a9f64
fix(secret_manager): garbage collect locational secrets in integratio…
haphungw Jan 28, 2026
2818721
fix(secret_manager): validate secret name format safely
haphungw Jan 28, 2026
131693d
Merge branch 'main' into fix/locational-secret-cleanup
haphungw Jan 28, 2026
6f699c8
fix(secret_manager): prevent panic on invalid secret names
haphungw Jan 28, 2026
be14874
Merge branch 'main' into fix/locational-secret-cleanup
haphungw Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 47 additions & 12 deletions tests/integration/src/secret_manager/openapi_locational.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

use crate::Result;
use anyhow::anyhow;
use gax::options::RequestOptionsBuilder;
use google_cloud_test_utils::runtime_config::{project_id, test_service_account};
use rand::{Rng, distr::Alphanumeric};
Expand Down Expand Up @@ -397,18 +398,18 @@ async fn cleanup_stale_secrets(
page_token = response.next_page_token;
}

let pending = stale_secrets
.iter()
.map(|secret_id| {
client
.delete_secret_by_project_and_location_and_secret()
.set_project(project_id)
.set_location(location_id)
.set_secret(secret_id)
.with_idempotency(true)
.send()
})
.collect::<Vec<_>>();
let pending = stale_secrets.iter().map(|name| async move {
let (project, location, secret) = parse_secret_name(name)?;
client
.delete_secret_by_project_and_location_and_secret()
.set_project(project)
.set_location(location)
.set_secret(secret)
.with_idempotency(true)
.send()
.await?;
Ok::<(), anyhow::Error>(())
});

// Print the errors, but otherwise ignore them.
futures::future::join_all(pending)
Expand All @@ -419,3 +420,37 @@ async fn cleanup_stale_secrets(

Ok(())
}

fn parse_secret_name(name: &str) -> Result<(&str, &str, &str)> {
// format: projects/{project}/locations/{location}/secrets/{secret}
let parts: Vec<&str> = name.split('/').collect();
match parts[..] {
["projects", p, "locations", l, "secrets", s] => Ok((p, l, s)),
_ => Err(anyhow!("invalid secret name: {}", name)),
}
}

#[cfg(test)]
mod tests {
use super::*;
use test_case::test_case;

#[test]
fn test_extract_valid_name() {
let name = "projects/my-project/locations/us-central1/secrets/my-secret";
let (project, location, secret) = parse_secret_name(name).unwrap();
assert_eq!(project, "my-project");
assert_eq!(location, "us-central1");
assert_eq!(secret, "my-secret");
}

#[test_case("invalid/format")]
#[test_case("projects/only-one")]
#[test_case("projects/p/locations/l/bad/s")]
#[test_case("projects/p/bad/l/secrets/s")]
#[test_case("bad/p/locations/l/secrets/s")]
fn test_extract_invalid_name(input: &str) {
let result = parse_secret_name(input);
assert!(result.is_err(), "{result:?}");
}
}
Loading