Merge pull request #203 from rage/sandbox-image

Add sandbox info to compress-project return value

Author: Heliozoa

crates/bindings/tmc-langs-node/src/de.rs

@@ -97,8 +97,7 @@ impl<'x, 'd, 'a, 'j, C: Context<'j>> serde::de::Deserializer<'x>
             let len = prop_names.len(self.cx);
             if len != 1 {
                 return Err(LibError::InvalidKeyType(format!(
-                    "object key with {} properties",
-                    len
+                    "object key with {len} properties"
                 )));
             }
             let key: Handle<JsString> = prop_names.get(self.cx, 0)?;

crates/bindings/tmc-langs-node/src/lib.rs

@@ -190,7 +190,7 @@ fn prepare_submission(mut cx: FunctionContext) -> JsResult<JsValue> {
         submission_compression: Compression,
         extract_submission_naively: bool,
         tmc_param: Vec<(String, Vec<String>)>,
-        top_level_dir_name: Option<String>
+        no_archive_prefix: bool
     );
 
     let mut tmc_params = tmc_langs::TmcParams::new();
@@ -220,7 +220,7 @@ fn prepare_submission(mut cx: FunctionContext) -> JsResult<JsValue> {
             extract_naively: extract_submission_naively,
         },
         &output_path,
-        top_level_dir_name,
+        no_archive_prefix,
         tmc_params,
         &clone_path,
         stub_archive_path.as_deref().map(|p| (p, stub_compression)),
@@ -899,7 +899,7 @@ mod test {
         );
 
         let s = Command::new("npm")
-            .args(&["run", "jest"])
+            .args(["run", "jest"])
             .output()
             .expect("running jest failed");
         println!("stdout: {}", String::from_utf8_lossy(&s.stdout));

crates/helpers/tmc-server-mock/src/lib.rs

@@ -9,10 +9,9 @@ use serde_json::json;
 pub fn mock_config(projects_dir: &str) -> String {
     format!(
         r#"
-projects-dir = '{}'
+projects-dir = '{projects_dir}'
 setting = "value"
-"#,
-        projects_dir
+"#
     )
 }
 

crates/plugins/csharp/src/plugin.rs

@@ -135,6 +135,7 @@ impl CSharpPlugin {
 /// Contains a src directory which contains a .csproj file (which may be inside a subdirectory).
 impl LanguagePlugin for CSharpPlugin {
     const PLUGIN_NAME: &'static str = "csharp";
+    const DEFAULT_SANDBOX_IMAGE: &'static str = "eu.gcr.io/moocfi-public/tmc-sandbox-csharp:latest";
     const LINE_COMMENT: &'static str = "//";
     const BLOCK_COMMENT: Option<(&'static str, &'static str)> = Some(("/*", "*/"));
     type StudentFilePolicy = CSharpStudentFilePolicy;
@@ -213,6 +214,7 @@ impl LanguagePlugin for CSharpPlugin {
         for (key, value) in json {
             tests.push(TestDesc::new(key, value));
         }
+
         Ok(ExerciseDesc {
             name: exercise_name,
             tests,

crates/plugins/java/src/ant_plugin.rs

@@ -70,6 +70,7 @@ impl AntPlugin {
 /// Contains src and test directories.
 impl LanguagePlugin for AntPlugin {
     const PLUGIN_NAME: &'static str = "apache-ant";
+    const DEFAULT_SANDBOX_IMAGE: &'static str = "eu.gcr.io/moocfi-public/tmc-sandbox-java:latest";
     const LINE_COMMENT: &'static str = "//";
     const BLOCK_COMMENT: Option<(&'static str, &'static str)> = Some(("/*", "*/"));
     type StudentFilePolicy = AntStudentFilePolicy;
@@ -287,7 +288,7 @@ impl JavaPlugin for AntPlugin {
         arguments.push(format!("-Dtmc.test_class_dir={}", test_dir.display()));
         // we want to use path relative to the exercise path for the java command,
         // and a path relative to the current directory for the rest of the program
-        arguments.push(format!("-Dtmc.results_file={}", result_file_name));
+        arguments.push(format!("-Dtmc.results_file={result_file_name}"));
         // TODO: endorsed libs?
         let endorsed_libs_path = path.join("lib/endorsed");
         if endorsed_libs_path.exists() {

crates/plugins/java/src/java_plugin.rs

@@ -335,6 +335,7 @@ mod test {
 
     impl LanguagePlugin for Stub {
         const PLUGIN_NAME: &'static str = "stub";
+        const DEFAULT_SANDBOX_IMAGE: &'static str = "stub-image";
         const LINE_COMMENT: &'static str = "//";
         const BLOCK_COMMENT: Option<(&'static str, &'static str)> = Some(("/*", "*/"));
         type StudentFilePolicy = tmc_langs_framework::EverythingIsStudentFilePolicy;
@@ -390,10 +391,8 @@ mod test {
         }
         fn get_project_class_path(&self, path: &Path) -> Result<String, JavaError> {
             let path = path.to_str().unwrap();
-            let cp = format!(
-                "{1}/lib/edu-test-utils-0.4.1.jar{0}{1}/lib/junit-4.10.jar",
-                SEPARATOR, path
-            );
+            let cp =
+                format!("{path}/lib/edu-test-utils-0.4.1.jar{SEPARATOR}{path}/lib/junit-4.10.jar");
             Ok(cp)
         }
 

crates/plugins/java/src/maven_plugin.rs

@@ -99,6 +99,7 @@ impl MavenPlugin {
 /// Contains pom.xml file
 impl LanguagePlugin for MavenPlugin {
     const PLUGIN_NAME: &'static str = "apache-maven";
+    const DEFAULT_SANDBOX_IMAGE: &'static str = "eu.gcr.io/moocfi-public/tmc-sandbox-java:latest";
     const LINE_COMMENT: &'static str = "//";
     const BLOCK_COMMENT: Option<(&'static str, &'static str)> = Some(("/*", "*/"));
     type StudentFilePolicy = MavenStudentFilePolicy;

crates/plugins/make/src/plugin.rs

@@ -29,11 +29,7 @@ impl MakePlugin {
 
     /// Parses tmc_available_points.txt which is output by the TMC tests and
     /// contains lines like "[test] [test_one] 1.1 1.2 1.3" = "[type] [name] points".
-    fn parse_exercise_desc(
-        &self,
-        available_points: &Path,
-        exercise_name: String,
-    ) -> Result<ExerciseDesc, MakeError> {
+    fn parse_available_points(&self, available_points: &Path) -> Result<Vec<TestDesc>, MakeError> {
         // "[test] [test_one] 1.1 1.2 1.3" = "[type] [name] points"
         // TODO: use parser lib
         #[allow(clippy::unwrap_used)]
@@ -60,11 +56,7 @@ impl MakePlugin {
                 }
             }
         }
-
-        Ok(ExerciseDesc {
-            name: exercise_name,
-            tests,
-        })
+        Ok(tests)
     }
 
     /// Runs tests with or without valgrind according to the argument.
@@ -123,6 +115,7 @@ impl MakePlugin {
 /// Contains a src directory and a Makefile file
 impl LanguagePlugin for MakePlugin {
     const PLUGIN_NAME: &'static str = "make";
+    const DEFAULT_SANDBOX_IMAGE: &'static str = "eu.gcr.io/moocfi-public/tmc-sandbox-make:latest";
     const LINE_COMMENT: &'static str = "//";
     const BLOCK_COMMENT: Option<(&'static str, &'static str)> = Some(("/*", "*/"));
     type StudentFilePolicy = MakeStudentFilePolicy;
@@ -140,7 +133,11 @@ impl LanguagePlugin for MakePlugin {
             return MakeError::CantFindAvailablePoints(available_points_path).into();
         }
 
-        Ok(self.parse_exercise_desc(&available_points_path, exercise_name)?)
+        let tests = self.parse_available_points(&available_points_path)?;
+        Ok(ExerciseDesc {
+            name: exercise_name,
+            tests,
+        })
     }
 
     fn run_tests_with_timeout(
@@ -229,9 +226,7 @@ impl LanguagePlugin for MakePlugin {
 
         // parse available points into a mapping from test name to test point list
         let available_points_path = base_test_path.join("tmc_available_points.txt");
-        let tests = self
-            .parse_exercise_desc(&available_points_path, "unused".to_string())?
-            .tests;
+        let tests = self.parse_available_points(&available_points_path)?;
         let mut ids_to_points = HashMap::new();
         for test in tests {
             ids_to_points.insert(test.name, test.points);
@@ -503,11 +498,9 @@ test [invalid] point6
         );
 
         let plugin = MakePlugin::new();
-        let exercise_desc = plugin
-            .parse_exercise_desc(&available_points, "ex".to_string())
-            .unwrap();
-        assert_eq!(exercise_desc.tests.len(), 2);
-        assert_eq!(exercise_desc.tests[0].points.len(), 4);
+        let exercise_desc = plugin.parse_available_points(&available_points).unwrap();
+        assert_eq!(exercise_desc.len(), 2);
+        assert_eq!(exercise_desc[0].points.len(), 4);
     }
 
     #[test]

crates/plugins/notests/src/plugin.rs

@@ -38,12 +38,13 @@ impl NoTestsPlugin {
 /// Contains a .tmcproject.yml file that has `no-tests` set to `true`.
 impl LanguagePlugin for NoTestsPlugin {
     const PLUGIN_NAME: &'static str = "No-Tests";
+    const DEFAULT_SANDBOX_IMAGE: &'static str = "eu.gcr.io/moocfi-public/tmc-sandbox-python:latest"; // doesn't really matter, just use Python image
     const LINE_COMMENT: &'static str = "//";
     const BLOCK_COMMENT: Option<(&'static str, &'static str)> = None;
     type StudentFilePolicy = NoTestsStudentFilePolicy;
 
     fn scan_exercise(&self, path: &Path, exercise_name: String) -> Result<ExerciseDesc, TmcError> {
-        let test_name = format!("{}Test", exercise_name);
+        let test_name = format!("{exercise_name}Test");
         Ok(ExerciseDesc {
             name: exercise_name,
             tests: vec![TestDesc {

crates/plugins/python3/src/plugin.rs

@@ -217,6 +217,7 @@ impl Python3Plugin {
 /// Contains an .ipynb file. This is given lower priority than the prior rule, and if there are multiple .ipynb files, the shallowest directory is returned.
 impl LanguagePlugin for Python3Plugin {
     const PLUGIN_NAME: &'static str = "python3";
+    const DEFAULT_SANDBOX_IMAGE: &'static str = "eu.gcr.io/moocfi-public/tmc-sandbox-python:latest";
     const LINE_COMMENT: &'static str = "#";
     const BLOCK_COMMENT: Option<(&'static str, &'static str)> = Some(("\"\"\"", "\"\"\""));
     type StudentFilePolicy = Python3StudentFilePolicy;
@@ -243,7 +244,8 @@ impl LanguagePlugin for Python3Plugin {
         if available_points_json.exists() {
             file_util::remove_file(&available_points_json)?;
         }
-        Ok(ExerciseDesc::new(exercise_name, test_descs_res?))
+        let tests = test_descs_res?;
+        Ok(ExerciseDesc::new(exercise_name, tests))
     }
 
     fn run_tests_with_timeout(