From adc6b61e01f9eac6fc7fb56c6f5a6025b79ca6c5 Mon Sep 17 00:00:00 2001 From: chesedo Date: Fri, 27 Oct 2023 13:06:00 +0000 Subject: [PATCH 1/2] bug: compile fails with secrets in resource configs --- codegen/src/shuttle_main/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codegen/src/shuttle_main/mod.rs b/codegen/src/shuttle_main/mod.rs index 62876228e..d4d07e28b 100644 --- a/codegen/src/shuttle_main/mod.rs +++ b/codegen/src/shuttle_main/mod.rs @@ -241,7 +241,7 @@ impl ToTokens for Loader { .get_secrets() .await? .into_iter() - .map(|(key, value)| (format!("secrets.{}", key), value)) + .map(|(key, value)| (format!("secrets.{}", key), value.expose().clone())) ); )), Some(parse_quote!( From 2725f728a73860732e5414867af64fde588ad15a Mon Sep 17 00:00:00 2001 From: chesedo Date: Fri, 27 Oct 2023 14:32:55 +0000 Subject: [PATCH 2/2] test: update --- codegen/src/shuttle_main/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codegen/src/shuttle_main/mod.rs b/codegen/src/shuttle_main/mod.rs index d4d07e28b..2b2867150 100644 --- a/codegen/src/shuttle_main/mod.rs +++ b/codegen/src/shuttle_main/mod.rs @@ -507,7 +507,7 @@ mod tests { ) -> ShuttleComplex { use shuttle_runtime::Context; use shuttle_runtime::{Factory, ResourceBuilder}; - let vars = std::collections::HashMap::from_iter(factory.get_secrets().await?.into_iter().map(|(key, value)| (format!("secrets.{}", key), value))); + let vars = std::collections::HashMap::from_iter(factory.get_secrets().await?.into_iter().map(|(key, value)| (format!("secrets.{}", key), value.expose().clone()))); let pool = shuttle_runtime::get_resource ( shuttle_shared_db::Postgres::new().size(&shuttle_runtime::strfmt("10Gb", &vars)?).public(false), &mut factory,