Merge pull request #180 from rage/refresh-sandbox

return sandbox image from refresh

Author: Heliozoa

tmc-langs-plugins/src/lib.rs

@@ -50,35 +50,36 @@ pub fn extract_project_overwrite(
 /// See `LanguagePlugin::compress_project`.
 // TODO: clean up
 pub fn compress_project_to_zip(path: &Path) -> Result<Vec<u8>, PluginError> {
-    match get_language_plugin_type(path)? {
-        PluginType::CSharp => Ok(tmc_zip::zip_student_files(
+    match get_language_plugin_type(path) {
+        Some(PluginType::CSharp) => Ok(tmc_zip::zip_student_files(
             <CSharpPlugin as LanguagePlugin>::StudentFilePolicy::new(path)?,
             path,
         )?),
-        PluginType::Make => Ok(tmc_zip::zip_student_files(
+        Some(PluginType::Make) => Ok(tmc_zip::zip_student_files(
             <MakePlugin as LanguagePlugin>::StudentFilePolicy::new(path)?,
             path,
         )?),
-        PluginType::Maven => Ok(tmc_zip::zip_student_files(
+        Some(PluginType::Maven) => Ok(tmc_zip::zip_student_files(
             <MavenPlugin as LanguagePlugin>::StudentFilePolicy::new(path)?,
             path,
         )?),
-        PluginType::NoTests => Ok(tmc_zip::zip_student_files(
+        Some(PluginType::NoTests) => Ok(tmc_zip::zip_student_files(
             <NoTestsPlugin as LanguagePlugin>::StudentFilePolicy::new(path)?,
             path,
         )?),
-        PluginType::Python3 => Ok(tmc_zip::zip_student_files(
+        Some(PluginType::Python3) => Ok(tmc_zip::zip_student_files(
             <Python3Plugin as LanguagePlugin>::StudentFilePolicy::new(path)?,
             path,
         )?),
-        PluginType::R => Ok(tmc_zip::zip_student_files(
+        Some(PluginType::R) => Ok(tmc_zip::zip_student_files(
             <RPlugin as LanguagePlugin>::StudentFilePolicy::new(path)?,
             path,
         )?),
-        PluginType::Ant => Ok(tmc_zip::zip_student_files(
+        Some(PluginType::Ant) => Ok(tmc_zip::zip_student_files(
             <AntPlugin as LanguagePlugin>::StudentFilePolicy::new(path)?,
             path,
         )?),
+        None => Err(PluginError::PluginNotFound(path.to_path_buf())),
     }
 }
 
@@ -113,7 +114,7 @@ pub enum PluginType {
     Ant,
 }
 
-pub fn get_language_plugin_type(path: &Path) -> Result<PluginType, PluginError> {
+pub fn get_language_plugin_type(path: &Path) -> Option<PluginType> {
     let plugin_type = if NoTestsPlugin::is_exercise_type_correct(path) {
         log::info!(
             "Detected project at {} as {}",
@@ -165,21 +166,22 @@ pub fn get_language_plugin_type(path: &Path) -> Result<PluginType, PluginError>
         );
         PluginType::Ant
     } else {
-        return Err(PluginError::PluginNotFound(path.to_path_buf()));
+        return None;
     };
-    Ok(plugin_type)
+    Some(plugin_type)
 }
 
 // Get language plugin for the given path.
 pub fn get_language_plugin(path: &Path) -> Result<Plugin, PluginError> {
-    let plugin = match get_language_plugin_type(path)? {
-        PluginType::NoTests => Plugin::NoTests(NoTestsPlugin::new()),
-        PluginType::CSharp => Plugin::CSharp(CSharpPlugin::new()),
-        PluginType::Make => Plugin::Make(MakePlugin::new()),
-        PluginType::Python3 => Plugin::Python3(Python3Plugin::new()),
-        PluginType::R => Plugin::R(RPlugin::new()),
-        PluginType::Maven => Plugin::Maven(MavenPlugin::new()?),
-        PluginType::Ant => Plugin::Ant(AntPlugin::new()?),
+    let plugin = match get_language_plugin_type(path) {
+        Some(PluginType::NoTests) => Plugin::NoTests(NoTestsPlugin::new()),
+        Some(PluginType::CSharp) => Plugin::CSharp(CSharpPlugin::new()),
+        Some(PluginType::Make) => Plugin::Make(MakePlugin::new()),
+        Some(PluginType::Python3) => Plugin::Python3(Python3Plugin::new()),
+        Some(PluginType::R) => Plugin::R(RPlugin::new()),
+        Some(PluginType::Maven) => Plugin::Maven(MavenPlugin::new()?),
+        Some(PluginType::Ant) => Plugin::Ant(AntPlugin::new()?),
+        None => return Err(PluginError::PluginNotFound(path.to_path_buf())),
     };
     Ok(plugin)
 }

tmc-langs/src/course_refresher.rs

@@ -8,6 +8,7 @@ use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::time::Duration;
 use tmc_langs_framework::{TmcCommand, TmcProjectYml};
+use tmc_langs_plugins::PluginType;
 use tmc_langs_util::file_util;
 use walkdir::WalkDir;
 
@@ -34,6 +35,7 @@ pub struct RefreshExercise {
     points: Vec<String>,
     #[serde(skip)]
     path: PathBuf,
+    sandbox_image: String,
     tmcproject_yml: Option<TmcProjectYml>,
 }
 
@@ -300,18 +302,43 @@ fn get_exercises(
             let exercise_path = course_clone_path.join(&exercise_dir);
             let points = super::get_available_points(&exercise_path)?;
 
+            let sandbox_image = if let Some(image_override) = tmcproject_yml
+                .as_ref()
+                .and_then(|y| y.sandbox_image.as_ref())
+            {
+                image_override.clone()
+            } else {
+                get_default_sandbox_image(&exercise_path)?.to_string()
+            };
+
             Ok(RefreshExercise {
                 name,
                 points,
                 checksum,
                 path: exercise_dir,
+                sandbox_image,
                 tmcproject_yml,
             })
         })
         .collect::<Result<_, LangsError>>()?;
     Ok(exercises)
 }
 
+fn get_default_sandbox_image(path: &Path) -> Result<&'static str, LangsError> {
+    let url = match tmc_langs_plugins::get_language_plugin_type(&path) {
+        Some(PluginType::CSharp) => "eu.gcr.io/moocfi-public/tmc-sandbox-csharp:latest",
+        Some(PluginType::Make) => "eu.gcr.io/moocfi-public/tmc-sandbox-make:latest",
+        Some(PluginType::Maven) | Some(PluginType::Ant) => {
+            "eu.gcr.io/moocfi-public/tmc-sandbox-java:latest"
+        }
+        Some(PluginType::NoTests) => "eu.gcr.io/moocfi-public/tmc-sandbox-python:latest", // doesn't really matter, just use Python image
+        Some(PluginType::Python3) => "eu.gcr.io/moocfi-public/tmc-sandbox-python:latest",
+        Some(PluginType::R) => "eu.gcr.io/moocfi-public/tmc-sandbox-r:latest",
+        None => return Err(LangsError::NoPlugin),
+    };
+    Ok(url)
+}
+
 fn calculate_checksum(exercise_dir: &Path) -> Result<String, LangsError> {
     let mut digest = Context::new();
 

tmc-langs/src/error.rs

@@ -58,6 +58,8 @@ pub enum LangsError {
     SettingsCannotContainNull,
     #[error("The number given was too high: {0}")]
     SettingNumberTooHigh(serde_json::Number),
+    #[error("Failed to detect exercise language")]
+    NoPlugin,
 
     #[error("Cache path {0} was invalid. Not a valid UTF-8 string or did not contain a cache version after a dash")]
     InvalidCachePath(PathBuf),

tmc-langs/src/lib.rs

@@ -876,7 +876,7 @@ pub fn prepare_stub(exercise_path: &Path, dest_path: &Path) -> Result<(), LangsE
     submission_processing::prepare_stub(&exercise_path, dest_path)?;
 
     // The Ant plugin needs some additional files to be copied over.
-    if let PluginType::Ant = tmc_langs_plugins::get_language_plugin_type(exercise_path)? {
+    if let Some(PluginType::Ant) = tmc_langs_plugins::get_language_plugin_type(exercise_path) {
         AntPlugin::copy_tmc_junit_runner(dest_path).map_err(|e| TmcError::Plugin(Box::new(e)))?;
     }
     Ok(())