Merge pull request #204 from Screenly/feature/ignore_instance

Adds: instance.yml to ignore list
Screenly · Aug 12, 2024 · 30d0e31 · 30d0e31
2 parents 6450454 + a0e42f2
commit 30d0e31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/commands/edge_app.rs b/src/commands/edge_app.rs
@@ -906,7 +906,6 @@ impl EdgeAppCommand {
                 app_id
             ),
         )?;
-        // TODO: Backend will need to support entrypoint types
 
         let versions: Vec<EdgeAppVersion> =
             serde_json::from_value::<Vec<EdgeAppVersion>>(response)?;
@@ -1293,7 +1292,6 @@ impl EdgeAppCommand {
         manifest: &EdgeAppManifest,
     ) -> Result<bool, CommandError> {
         let version = self.get_latest_revision(app_id)?;
-        // TODO: implement entrypoint changes on the backend
         match version {
             Some(_version) => Ok(_version
                 != EdgeAppVersion {

diff --git a/src/commands/edge_app_utils.rs b/src/commands/edge_app_utils.rs
@@ -63,7 +63,7 @@ impl FileChanges {
 }
 
 fn is_included(entry: &DirEntry, ignore: &Ignorer) -> bool {
-    let exclusion_list = ["screenly.js", "screenly.yml", ".ignore"];
+    let exclusion_list = ["screenly.js", "screenly.yml", ".ignore", "instance.yml"];
     if exclusion_list.contains(&entry.file_name().to_str().unwrap_or_default()) {
         return false;
     }
@@ -657,6 +657,10 @@ mod tests {
             .unwrap()
             .write_all(b"file2.txt")
             .unwrap();
+        File::create(dir_path.join("instance.yml"))
+            .unwrap()
+            .write_all(b"id: 01H2QZ6Z8WXWNDC0KQ198XCZEB\nname: test\n")
+            .unwrap();
 
         let result = collect_paths_for_upload(dir_path).unwrap();
         assert_eq!(result.len(), 1);