fix: merge now keeps source tarball into account

copernico · copernico · commit c79e9913e61a · 2020-11-03T14:10:14.000+01:00
diff --git a/kaybee/internal/model/statement.go b/kaybee/internal/model/statement.go
@@ -208,12 +208,18 @@ func (s *Statement) ToFile(path string) error {
 
 	// if  the statement has an associated sources tarball,
 	// then write it to disk, as a sibling to the statement.yaml file
-	changedSourceCodeTarball := filepath.Join(s.Metadata.LocalPath, "changed-source-code.tar.gz")
+
+	changedSourceCodeTarball := filepath.Join(filepath.Dir(s.Metadata.LocalPath), "changed-source-code.tar.gz")
+	log.Println("Looking for tarball: " + changedSourceCodeTarball)
 	if _, err := os.Stat(changedSourceCodeTarball); err == nil {
-		_, err := copyFile(changedSourceCodeTarball, filepath.Join(dest, "changed-source-code.tar.gz"))
+		_, err := copyFile(changedSourceCodeTarball, filepath.Join(filepath.Dir(dest), "changed-source-code.tar.gz"))
 		if err != nil {
-			log.Fatal("Could not copy file " + changedSourceCodeTarball + " to destination: " + dest)
+			log.Fatal("Could not copy file " + changedSourceCodeTarball + " to destination: " + filepath.Dir(dest))
+		} else {
+			log.Println("Tarball copied")
 		}
+	} else {
+		log.Println("No tarball found")
 	}
 
 	return nil
