associate build result info with its corresponding challenge

Signed-off-by: Robert Detjens <github@detjens.dev>

Author: detjensrobert

src/builder/mod.rs

@@ -51,10 +51,10 @@ pub fn build_challenges(
     profile_name: &str,
     push: bool,
     extract_artifacts: bool,
-) -> Result<Vec<BuildResult>> {
+) -> Result<Vec<(&ChallengeConfig, BuildResult)>> {
     enabled_challenges(profile_name)?
-        .iter()
-        .map(|chal| build_challenge(profile_name, chal, push, extract_artifacts))
+        .into_iter()
+        .map(|chal| build_challenge(profile_name, chal, push, extract_artifacts).map(|r| (chal, r)))
         .collect::<Result<_>>()
 }
 

src/deploy/mod.rs

@@ -8,10 +8,13 @@ use crate::builder::BuildResult;
 use crate::clients::{bucket_client, kube_client};
 use crate::cluster_setup as setup;
 use crate::configparser::config::ProfileConfig;
-use crate::configparser::{enabled_challenges, get_config, get_profile_config};
+use crate::configparser::{enabled_challenges, get_config, get_profile_config, ChallengeConfig};
 
 /// Render challenge manifest templates and apply to cluster
-pub async fn deploy_challenges(profile_name: &str, build_results: &[BuildResult]) -> Result<()> {
+pub async fn deploy_challenges(
+    profile_name: &str,
+    build_results: &[(&ChallengeConfig, BuildResult)],
+) -> Result<()> {
     let profile = get_profile_config(profile_name)?;
     let enabled_challenges = enabled_challenges(profile_name)?;
 
@@ -22,7 +25,7 @@ pub async fn deploy_challenges(profile_name: &str, build_results: &[BuildResult]
 /// Returns urls of upload files.
 pub async fn upload_assets(
     profile_name: &str,
-    build_results: &[BuildResult],
+    build_results: &[(&ChallengeConfig, BuildResult)],
 ) -> Result<Vec<String>> {
     let profile = get_profile_config(profile_name)?;
     let enabled_challenges = enabled_challenges(profile_name)?;
@@ -36,7 +39,10 @@ pub async fn upload_assets(
 }
 
 /// Sync deployed challenges with rCTF frontend
-pub async fn update_frontend(profile_name: &str, build_results: &[BuildResult]) -> Result<()> {
+pub async fn update_frontend(
+    profile_name: &str,
+    build_results: &[(&ChallengeConfig, BuildResult)],
+) -> Result<()> {
     let profile = get_profile_config(profile_name)?;
     let enabled_challenges = enabled_challenges(profile_name)?;