Consider Cloud.toml for cache invalidation

Author: azinneera

cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/CommandUtil.java

@@ -102,6 +102,7 @@
 import static io.ballerina.projects.util.ProjectConstants.BAL_TOOL_JSON;
 import static io.ballerina.projects.util.ProjectConstants.BAL_TOOL_TOML;
 import static io.ballerina.projects.util.ProjectConstants.BLANG_SOURCE_EXT;
+import static io.ballerina.projects.util.ProjectConstants.CLOUD_TOML;
 import static io.ballerina.projects.util.ProjectConstants.DEPENDENCIES_TOML;
 import static io.ballerina.projects.util.ProjectConstants.DEPENDENCY_GRAPH_JSON;
 import static io.ballerina.projects.util.ProjectConstants.EXEC_BACKUP_DIR_NAME;
@@ -1340,7 +1341,11 @@ public static boolean isFilesModifiedSinceLastBuild(BuildJson buildJson, Project
         if (isSettingsFileModified(buildJson)) {
             return true;
         }
-        if (isBallerinaTomlFileModified(buildJson, project)) {
+        if (isTomlFileModified(buildJson.getBallerinaTomlMetaInfo(),
+                project.sourceRoot().resolve(BALLERINA_TOML).toFile())) {
+            return true;
+        }
+        if (isTomlFileModified(buildJson.getCloudTomlMetaInfo(), project.sourceRoot().resolve(CLOUD_TOML).toFile())) {
             return true;
         }
         if (isTestExecution) {
@@ -1366,21 +1371,20 @@ public static DependencyGraph<BuildProject> resolveWorkspaceDependencies(
         return projectDependencyGraph;
     }
 
-    private static boolean isBallerinaTomlFileModified(BuildJson buildJson, Project project)  {
+    private static boolean isTomlFileModified(BuildJson.FileMetaInfo tomlFileMetaInfo, File tomlFile)  {
+        if (tomlFileMetaInfo == null) {
+            // No Cloud.toml in the project
+            return tomlFile.exists();
+        }
         try {
-            File ballerinaTomlFile = project.sourceRoot().resolve(BALLERINA_TOML).toFile();
-            if (ballerinaTomlFile.exists() && ballerinaTomlFile.isFile()) {
-                long lastModified = ballerinaTomlFile.lastModified();
-                long size = Files.size(ballerinaTomlFile.toPath());
-                BuildJson.FileMetaInfo ballerinaTomlFileMetaInfo = buildJson.getBallerinaTomlMetaInfo();
-                if (ballerinaTomlFileMetaInfo == null) {
-                    return true;
-                }
-                if (ballerinaTomlFileMetaInfo.getSize() == size &&
-                        ballerinaTomlFileMetaInfo.getLastModifiedTime() == lastModified) {
+            if (tomlFile.exists() && tomlFile.isFile()) {
+                long lastModified = tomlFile.lastModified();
+                long size = Files.size(tomlFile.toPath());
+                if (tomlFileMetaInfo.getSize() == size &&
+                        tomlFileMetaInfo.getLastModifiedTime() == lastModified) {
                     return false;
                 }
-                return !getSHA256Digest(ballerinaTomlFile).equals(ballerinaTomlFileMetaInfo.getHash());
+                return !getSHA256Digest(tomlFile).equals(tomlFileMetaInfo.getHash());
             }
             return true;
         } catch (IOException | NoSuchAlgorithmException e) {

cli/ballerina-cli/src/main/java/io/ballerina/cli/task/CreateFingerprintTask.java

@@ -65,6 +65,7 @@ public void execute(Project project) {
             createFingerPrintForArtifacts(project, buildJson, isTestExecution, skipExecutable);
             createFingerPrintForSettingsToml(buildJson);
             createFingerPrintForBallerinaToml(buildJson, project);
+            createFingerPrintForCloudToml(buildJson, project);
             writeBuildFile(buildFilePath, buildJson);
         } catch (JsonSyntaxException | IOException | NoSuchAlgorithmException e) {
             // ignore
@@ -78,6 +79,16 @@ private void createFingerPrintForBallerinaToml(BuildJson buildJson, Project proj
         buildJson.setBallerinaTomlMetaInfo(ballerinaTomlMetaInfo);
     }
 
+    private void createFingerPrintForCloudToml(BuildJson buildJson, Project project) throws
+            IOException, NoSuchAlgorithmException {
+        File cloudTomlFile = project.sourceRoot().resolve(ProjectConstants.CLOUD_TOML).toFile();
+        if (!cloudTomlFile.exists()) {
+            return;
+        }
+        BuildJson.FileMetaInfo cloudTomlMetaInfo = getFileMetaInfo(cloudTomlFile);
+        buildJson.setCloudTomlMetaInfo(cloudTomlMetaInfo);
+    }
+
     private static void createFingerPrintForProjectFiles(Project project, BuildJson buildJson, boolean isTestExecution)
             throws IOException, NoSuchAlgorithmException {
         List<BuildJson.FileMetaInfo> fileMetaInfoList = new ArrayList<>();

compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/model/BuildJson.java

@@ -75,6 +75,10 @@ public class BuildJson {
     @SerializedName(BALLERINA_TOML_META_INFO)
     private FileMetaInfo ballerinaTomlMetaInfo;
 
+    public static final String CLOUD_TOML_META_INFO = "cloud_toml_meta_info";
+    @SerializedName(CLOUD_TOML_META_INFO)
+    private FileMetaInfo cloudTomlMetaInfo;
+
     public static final String TEST_ARTIFACT_META_INFO = "test_artifact_meta_info";
     @SerializedName(TEST_ARTIFACT_META_INFO)
     private FileMetaInfo[] testArtifactMetaInfo;
@@ -219,6 +223,14 @@ public void setTestClassPath(String testClassPath) {
         this.testClassPath = testClassPath;
     }
 
+    public void setCloudTomlMetaInfo(FileMetaInfo cloudTomlMetaInfo) {
+        this.cloudTomlMetaInfo = cloudTomlMetaInfo;
+    }
+
+    public FileMetaInfo getCloudTomlMetaInfo() {
+        return cloudTomlMetaInfo;
+    }
+
     public static class FileMetaInfo {
         private String file;
         private String hash;