persist docker compose migration

ide-common/src/main/kotlin/org/digma/intellij/plugin/docker/ComposeFileProvider.kt

@@ -25,8 +25,8 @@ class ComposeFileProvider {
 
     private val composeFile: File = File(COMPOSE_FILE_DIR, COMPOSE_FILE_NAME)
 
-    //used top mark if the custom compose file was already downloaded in this IDE session.
-    // needs to be downloaded only once per IDE session. after IDE restart, a new one will be downloaded and override the old one if it exists.
+    //customComposeFileDownloaded is used to mark if the custom compose file was already downloaded in this IDE session.
+    // it needs to be downloaded only once per IDE session. after IDE restart, a new one will be downloaded and override the old one if it exists.
     // it may be that a new session has another custom compose file url so need to override the old one.
     private var customComposeFileDownloaded = false
     private val customComposeFile: File = File(CUSTOM_COMPOSE_FILE_DIR, COMPOSE_FILE_NAME)
@@ -41,7 +41,7 @@ class ComposeFileProvider {
         }
 
         /*
-          Using a custom compose file is only for development purposes only and not for users.
+          Using a custom compose file is for development purposes only and not for users.
           After using it, it is necessary to remove the local engine and remove the property.
           Then install local engine regularly.
           Upgrade should not be invoked when using a custom compose file. it will not work, it will always use the same custom url.
@@ -52,7 +52,12 @@ class ComposeFileProvider {
     }
 
 
+    //this method should not be used to get the file itself, it is mainly for logging and debugging.
+    //use the method getComposeFile() to get the file for running docker operations
     fun getComposeFilePath(): String {
+        if(usingCustomComposeFile()) {
+            return customComposeFile.absolutePath
+        }
         return composeFile.absolutePath
     }
 
@@ -94,28 +99,6 @@ class ComposeFileProvider {
     }
 
 
-    fun downloadLatestComposeFile(): Boolean {
-
-        try {
-            //try to delete the current file, don't fail if delete fails
-            deleteFile()
-        } catch (e: Throwable) {
-            Log.warnWithException(logger, e, "could not delete compose file")
-            ErrorReporter.getInstance().reportError("ComposeFileProvider.downloadLatestComposeFile", e)
-        }
-
-        try {
-            ensureDirectoryExist()
-            downloadAndCopyFile(URI(COMPOSE_FILE_URL).toURL(), composeFile)
-            return composeFile.exists()
-        } catch (e: Throwable) {
-            Log.warnWithException(logger, e, "could not download latest compose file")
-            ErrorReporter.getInstance().reportError("ComposeFileProvider.downloadLatestComposeFile", e)
-            return false
-        }
-    }
-
-
     private fun ensureCustomComposeFileExists(): Boolean {
 
         if (customComposeFileDownloaded && customComposeFile.exists()) {
@@ -183,6 +166,31 @@ class ComposeFileProvider {
     }
 
 
+
+    //downloadLatestComposeFile is used only for upgrading the local engine
+    fun downloadLatestComposeFile(): Boolean {
+
+        try {
+            //try to delete the current file, don't fail if delete fails
+            deleteFile()
+        } catch (e: Throwable) {
+            Log.warnWithException(logger, e, "could not delete compose file")
+            ErrorReporter.getInstance().reportError("ComposeFileProvider.downloadLatestComposeFile", e)
+        }
+
+        try {
+            ensureDirectoryExist()
+            downloadAndCopyFile(URI(COMPOSE_FILE_URL).toURL(), composeFile)
+            return composeFile.exists()
+        } catch (e: Throwable) {
+            Log.warnWithException(logger, e, "could not download latest compose file")
+            ErrorReporter.getInstance().reportError("ComposeFileProvider.downloadLatestComposeFile", e)
+            return false
+        }
+    }
+
+
+
     private fun downloadAndCopyFile(url: URL, toFile: File) {
 
         val tempFile = kotlin.io.path.createTempFile("tempComposeFile", ".yml")

ide-common/src/main/kotlin/org/digma/intellij/plugin/docker/DockerService.kt

@@ -54,6 +54,7 @@ class DockerService {
     }
 
 
+    //this method should not be used to get the file itself, it is mainly for logging and debugging.
     fun getComposeFilePath(): String {
         return composeFileProvider.getComposeFilePath()
     }