Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Moving autocommit to new git implementation (#40915)

Browse Source 
## Description

EE counterpart https://github.com/appsmithorg/appsmith-ee/pull/7722

Fixes #`Issue Number`  
> [!WARNING]  
> _If no issue exists, please create an issue first, and check with the
maintainers if the issue is valid._

## Automation

/ok-to-test tags="@tag.Git"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/15576703208>
> Commit: 64f2e0339ecb066ddf5537e58c0de09794098cf0
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=15576703208&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Git`
> Spec:
> <hr>Wed, 11 Jun 2025 06:13:06 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Streamlined Git operations to consistently use a new file system-based
handler, replacing previous executor-based implementations across the
application and tests.
- Updated method and constructor signatures to reflect new dependencies
and abstractions for artifact handling and repository management.
- Improved metadata handling and resource mapping for Git-related
workflows.

- **Tests**
- Updated test suites and helpers to align with the new Git handler and
artifact helper resolver, ensuring continued reliability and coverage.

- **Documentation**
  - Corrected minor spelling errors in documentation comments.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Manish Kumar 2025-06-11 14:29:54 +05:30 committed by GitHub
parent befe9ffd64
commit e71a817bf5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 291 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/server/appsmith-git/src/main/java/com/appsmith/git/files/FileUtilsCEImpl.java
View File

@ -1316,7 +1316,7 @@ public class FileUtilsCEImpl implements FileInterface {
if (Boolean.TRUE.equals(isResetToLastCommitRequired)) {
// instead of checking out to last branch we are first cleaning the git repo,
// then checking out to the desired branch
gitResetMono = gitExecutor.resetToLastCommit(baseRepoSuffix, branchName, false);
gitResetMono = fsGitHandler.resetToLastCommit(baseRepoSuffix, branchName, false);
}
metadataMono = gitResetMono.map(isSwitched -> {
@ -1354,7 +1354,6 @@ public class FileUtilsCEImpl implements FileInterface {
String branchName,
Path baseRepoSuffixPath,
Boolean resetToLastCommitRequired,
Boolean useFSGitHandler,
Boolean keepWorkingDirChanges) {
Mono<Object> pageObjectMono;
try {
@ -1363,12 +1362,8 @@ public class FileUtilsCEImpl implements FileInterface {
if (Boolean.TRUE.equals(resetToLastCommitRequired)) {
// instead of checking out to last branch we are first cleaning the git repo,
// then checking out to the desired branch
if (Boolean.TRUE.equals(useFSGitHandler)) {
resetToLastCommit =
fsGitHandler.resetToLastCommit(baseRepoSuffixPath, branchName, keepWorkingDirChanges);
} else {
resetToLastCommit = gitExecutor.resetToLastCommit(baseRepoSuffixPath, branchName, true);
}
resetToLastCommit =
fsGitHandler.resetToLastCommit(baseRepoSuffixPath, branchName, keepWorkingDirChanges);
}
pageObjectMono = resetToLastCommit.map(isSwitched -> {

2
app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java
View File

@ -1477,7 +1477,7 @@ public class FSGitHandlerCEImpl implements FSGitHandler {
/**
* reset to last commit on the current branch itself but doesn't checkout to any specific branch
* @param repoSuffix suffixedPath used to generate the base repo path this includes workspaceId, defaultAppId, repoName
* @return a boolean whether the operation was successfull or not
* @return a boolean whether the operation was successful or not
*/
public Mono<Boolean> resetToLastCommit(Path repoSuffix) {
return Mono.using(

1
app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java vendored
View File

@ -84,7 +84,6 @@ public interface FileInterface {
String branchName,
Path repoSuffixPath,
Boolean checkoutRequired,
Boolean useFSGitHandler,
Boolean keepWorkingDirChanges);
/**

21
app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
View File

@ -38,7 +38,6 @@ import com.appsmith.server.newactions.base.NewActionService;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.gson.Gson;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
@ -68,11 +67,9 @@ import static com.appsmith.external.git.constants.GitConstants.NAME_SEPARATOR;
import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
import static com.appsmith.external.helpers.AppsmithBeanUtils.copyProperties;
import static com.appsmith.git.constants.CommonConstants.DELIMITER_PATH;
import static com.appsmith.git.constants.CommonConstants.FILE_FORMAT_VERSION;
import static com.appsmith.git.constants.CommonConstants.JSON_EXTENSION;
import static com.appsmith.git.constants.CommonConstants.MAIN_CONTAINER;
import static com.appsmith.git.constants.CommonConstants.WIDGETS;
import static com.appsmith.git.constants.CommonConstants.fileFormatVersion;
import static com.appsmith.git.constants.GitDirectories.PAGE_DIRECTORY;
import static com.appsmith.server.constants.FieldName.ACTION_COLLECTION_LIST;
import static com.appsmith.server.constants.FieldName.ACTION_LIST;
@ -180,25 +177,7 @@ public class ApplicationGitFileUtilsCEImpl implements ArtifactGitFileUtilsCE<App
GitResourceIdentity applicationIdentity =
new GitResourceIdentity(GitResourceType.ROOT_CONFIG, applicationFilePath, applicationFilePath);
resourceMap.put(applicationIdentity, application);
// metadata
Iterable<String> keys = AppsmithBeanUtils.getAllFields(applicationJson.getClass())
.map(Field::getName)
.filter(name -> !getBlockedMetadataFields().contains(name))
.collect(Collectors.toList());
ApplicationJson applicationMetadata = new ApplicationJson();
applicationJson.setModifiedResources(null);
copyProperties(applicationJson, applicationMetadata, keys);
final String metadataFilePath = CommonConstants.METADATA + JSON_EXTENSION;
ObjectNode metadata = objectMapper.valueToTree(applicationMetadata);
// put file format version;
metadata.put(FILE_FORMAT_VERSION, fileFormatVersion);
GitResourceIdentity metadataIdentity =
new GitResourceIdentity(GitResourceType.ROOT_CONFIG, metadataFilePath, metadataFilePath);
resourceMap.put(metadataIdentity, metadata);
// pages and widgets
applicationJson.getPageList().stream()

63
app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerCEImpl.java
View File

@ -2,8 +2,9 @@ package com.appsmith.server.git.autocommit;
import com.appsmith.external.constants.AnalyticsEvents;
import com.appsmith.external.dtos.ModifiedResources;
import com.appsmith.external.git.GitExecutor;
import com.appsmith.external.git.constants.GitConstants.GitCommandConstants;
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.external.git.handler.FSGitHandler;
import com.appsmith.external.git.models.GitResourceType;
import com.appsmith.server.configurations.ProjectProperties;
import com.appsmith.server.constants.ArtifactType;
@ -11,17 +12,21 @@ import com.appsmith.server.constants.FieldName;
import com.appsmith.server.domains.Layout;
import com.appsmith.server.domains.NewPage;
import com.appsmith.server.dtos.ApplicationJson;
import com.appsmith.server.dtos.ArtifactExchangeJson;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.events.AutoCommitEvent;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.git.GitRedisUtils;
import com.appsmith.server.git.dtos.ArtifactJsonTransformationDTO;
import com.appsmith.server.git.resolver.GitArtifactHelperResolver;
import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.helpers.GitUtils;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.services.AnalyticsService;
import com.appsmith.server.services.GitArtifactHelper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationEventPublisher;
@ -51,8 +56,9 @@ public class AutoCommitEventHandlerCEImpl implements AutoCommitEventHandlerCE {
private final GitRedisUtils gitRedisUtils;
private final RedisUtils redisUtils;
private final DSLMigrationUtils dslMigrationUtils;
private final GitArtifactHelperResolver gitArtifactHelperResolver;
private final CommonGitFileUtils commonGitFileUtils;
private final GitExecutor gitExecutor;
private final FSGitHandler fsGitHandler;
private final ProjectProperties projectProperties;
private final AnalyticsService analyticsService;
@ -94,7 +100,7 @@ public class AutoCommitEventHandlerCEImpl implements AutoCommitEventHandlerCE {
Path baseRepoSuffix = Paths.get(
autoCommitEvent.getWorkspaceId(), autoCommitEvent.getApplicationId(), autoCommitEvent.getRepoName());
try {
return gitExecutor.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), false);
return fsGitHandler.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), true);
} catch (Exception e) {
log.error(
"failed to reset to last commit before auto commit. application {} branch {}",
@ -105,6 +111,19 @@ public class AutoCommitEventHandlerCEImpl implements AutoCommitEventHandlerCE {
}
}
private Mono<Path> saveArtifactJsonToFileSystem(
ArtifactExchangeJson artifactExchangeJson, AutoCommitEvent autoCommitEvent) {
String workspaceId = autoCommitEvent.getWorkspaceId();
String baseArtifactId = autoCommitEvent.getApplicationId();
String repoName = autoCommitEvent.getRepoName();
String refName = autoCommitEvent.getBranchName();
ArtifactType artifactType = artifactExchangeJson.getArtifactJsonType();
GitArtifactHelper<?> gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
Path artifactRepoSuffixPath = gitArtifactHelper.getRepoSuffixPath(workspaceId, baseArtifactId, repoName);
return commonGitFileUtils.saveArtifactToLocalRepoNew(artifactRepoSuffixPath, artifactExchangeJson, refName);
}
private Mono<Path> saveApplicationJsonToFileSystem(
ApplicationJson applicationJson, AutoCommitEvent autoCommitEvent) {
// all the migrations are done, write to file system
@ -122,6 +141,17 @@ public class AutoCommitEventHandlerCEImpl implements AutoCommitEventHandlerCE {
}
public Mono<Boolean> autoCommitDSLMigration(AutoCommitEvent autoCommitEvent) {
String defaultApplicationId = autoCommitEvent.getApplicationId();
String branchName = autoCommitEvent.getBranchName();
String workspaceId = autoCommitEvent.getWorkspaceId();
String repoName = autoCommitEvent.getRepoName();
ArtifactJsonTransformationDTO jsonTransformationDTO =
new ArtifactJsonTransformationDTO(workspaceId, defaultApplicationId, repoName);
jsonTransformationDTO.setRefName(branchName);
jsonTransformationDTO.setRefType(RefType.branch);
jsonTransformationDTO.setArtifactType(ArtifactType.APPLICATION);
return gitRedisUtils
.addFileLock(autoCommitEvent.getApplicationId(), GitCommandConstants.AUTO_COMMIT)
.flatMap(fileLocked ->
@ -129,17 +159,12 @@ public class AutoCommitEventHandlerCEImpl implements AutoCommitEventHandlerCE {
.flatMap(autoCommitLocked -> dslMigrationUtils.getLatestDslVersion())
.flatMap(latestSchemaVersion -> resetUncommittedChanges(autoCommitEvent)
.flatMap(result -> setProgress(result, autoCommitEvent.getApplicationId(), 10))
.then(commonGitFileUtils.reconstructArtifactExchangeJsonFromGitRepo(
autoCommitEvent.getWorkspaceId(),
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName(),
autoCommitEvent.getBranchName(),
ArtifactType.APPLICATION))
.then(commonGitFileUtils.constructArtifactExchangeJsonFromGitRepository(jsonTransformationDTO))
.flatMap(result -> setProgress(result, autoCommitEvent.getApplicationId(), 30))
.flatMap(applicationJson -> migrateUnpublishedPageDSLs(
(ApplicationJson) applicationJson, latestSchemaVersion, autoCommitEvent))
.flatMap(result -> setProgress(result, autoCommitEvent.getApplicationId(), 50))
.flatMap(applicationJson -> saveApplicationJsonToFileSystem(applicationJson, autoCommitEvent))
.flatMap(applicationJson -> saveArtifactJsonToFileSystem(applicationJson, autoCommitEvent))
.flatMap(result -> setProgress(result, autoCommitEvent.getApplicationId(), 70))
.flatMap(baseRepoPath -> commitAndPush(autoCommitEvent, baseRepoPath))
.defaultIfEmpty(Boolean.FALSE))
@ -288,6 +313,12 @@ public class AutoCommitEventHandlerCEImpl implements AutoCommitEventHandlerCE {
String workspaceId = autoCommitEvent.getWorkspaceId();
String repoName = autoCommitEvent.getRepoName();
ArtifactJsonTransformationDTO jsonTransformationDTO =
new ArtifactJsonTransformationDTO(workspaceId, defaultApplicationId, repoName);
jsonTransformationDTO.setRefName(branchName);
jsonTransformationDTO.setRefType(RefType.branch);
jsonTransformationDTO.setArtifactType(ArtifactType.APPLICATION);
// add file lock
// reset the file_system. while resetting the branch is implicitly checked out.
// retrieve and create application json from the file system
@ -302,15 +333,15 @@ public class AutoCommitEventHandlerCEImpl implements AutoCommitEventHandlerCE {
.flatMap(r -> setProgress(r, defaultApplicationId, 10))
.flatMap(autoCommitLocked -> resetUncommittedChanges(autoCommitEvent))
.flatMap(r -> setProgress(r, defaultApplicationId, 20))
.flatMap(isBranchCheckedOut -> commonGitFileUtils.reconstructArtifactExchangeJsonFromGitRepo(
workspaceId, defaultApplicationId, repoName, branchName, ArtifactType.APPLICATION))
.flatMap(isBranchCheckedOut ->
commonGitFileUtils.constructArtifactExchangeJsonFromGitRepository(jsonTransformationDTO))
.flatMap(r -> setProgress(r, defaultApplicationId, 30))
.flatMap(applicationJson -> {
ModifiedResources modifiedResources = new ModifiedResources();
// setting all modified would help in serialisation of all the files, unoptimised
modifiedResources.setAllModified(true);
applicationJson.setModifiedResources(modifiedResources);
return saveApplicationJsonToFileSystem((ApplicationJson) applicationJson, autoCommitEvent);
return saveArtifactJsonToFileSystem(applicationJson, autoCommitEvent);
})
.flatMap(r -> setProgress(r, defaultApplicationId, 50))
.flatMap(baseRepoPath -> commitAndPush(autoCommitEvent, baseRepoPath))
@ -335,7 +366,7 @@ public class AutoCommitEventHandlerCEImpl implements AutoCommitEventHandlerCE {
protected Mono<Boolean> commitAndPush(AutoCommitEvent autoCommitEvent, Path baseRepoPath) {
// commit the application
return gitExecutor
return fsGitHandler
.commitArtifact(
baseRepoPath,
String.format(AUTO_COMMIT_MSG_FORMAT, projectProperties.getVersion()),
@ -351,8 +382,8 @@ public class AutoCommitEventHandlerCEImpl implements AutoCommitEventHandlerCE {
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName());
return gitExecutor
.pushApplication(
return fsGitHandler
.pushArtifact(
baseRepoSuffix,
autoCommitEvent.getRepoUrl(),
autoCommitEvent.getPublicKey(),

9
app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImpl.java
View File

@ -1,8 +1,9 @@
package com.appsmith.server.git.autocommit;
import com.appsmith.external.git.GitExecutor;
import com.appsmith.external.git.handler.FSGitHandler;
import com.appsmith.server.configurations.ProjectProperties;
import com.appsmith.server.git.GitRedisUtils;
import com.appsmith.server.git.resolver.GitArtifactHelperResolver;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.helpers.RedisUtils;
@ -18,8 +19,9 @@ public class AutoCommitEventHandlerImpl extends AutoCommitEventHandlerCEImpl imp
GitRedisUtils gitRedisUtils,
RedisUtils redisUtils,
DSLMigrationUtils dslMigrationUtils,
GitArtifactHelperResolver gitArtifactHelperResolver,
CommonGitFileUtils commonGitFileUtils,
GitExecutor gitExecutor,
FSGitHandler fsGitHandler,
ProjectProperties projectProperties,
AnalyticsService analyticsService) {
super(
@ -27,8 +29,9 @@ public class AutoCommitEventHandlerImpl extends AutoCommitEventHandlerCEImpl imp
gitRedisUtils,
redisUtils,
dslMigrationUtils,
gitArtifactHelperResolver,
commonGitFileUtils,
gitExecutor,
fsGitHandler,
projectProperties,
analyticsService);
}

10
app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/AutoCommitServiceCEImpl.java
View File

@ -11,7 +11,7 @@ import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.git.autocommit.helpers.AutoCommitEligibilityHelper;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelperImpl;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
import com.appsmith.server.newpages.base.NewPageService;
import com.appsmith.server.solutions.ApplicationPermission;
import com.appsmith.server.solutions.PagePermission;
@ -41,7 +41,7 @@ public class AutoCommitServiceCEImpl implements AutoCommitServiceCE {
private final PagePermission pagePermission;
private final AutoCommitEligibilityHelper autoCommitEligibilityHelper;
private final GitAutoCommitHelperImpl gitAutoCommitHelper;
private final GitAutoCommitHelper gitAutoCommitHelper;
@Override
public Mono<AutoCommitResponseDTO> autoCommitApplication(String branchedApplicationId) {
@ -65,8 +65,10 @@ public class AutoCommitServiceCEImpl implements AutoCommitServiceCE {
.findByApplicationIdAndApplicationMode(
application.getId(), pagePermission.getEditPermission(), ApplicationMode.PUBLISHED)
.next())
.switchIfEmpty(Mono.error(
new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, branchedApplicationId)));
.switchIfEmpty(Mono.error(new AppsmithException(
AppsmithError.NO_RESOURCE_FOUND,
FieldName.PAGE,
String.format(" by %s : %s", FieldName.APPLICATION_ID, branchedApplicationId))));
return applicationMonoCached.zipWith(pageDTOMono).flatMap(tuple2 -> {
Application branchedApplication = tuple2.getT1();

15
app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperImpl.java
View File

@ -1,5 +1,6 @@
package com.appsmith.server.git.autocommit.helpers;
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.server.applications.base.ApplicationService;
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.GitArtifactMetadata;
@ -8,7 +9,8 @@ import com.appsmith.server.dtos.AutoCommitResponseDTO;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import com.appsmith.server.events.AutoCommitEvent;
import com.appsmith.server.git.autocommit.AutoCommitEventHandler;
import com.appsmith.server.git.common.CommonGitService;
import com.appsmith.server.git.central.CentralGitService;
import com.appsmith.server.git.central.GitType;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.GitUtils;
import com.appsmith.server.helpers.RedisUtils;
@ -33,7 +35,7 @@ public class GitAutoCommitHelperImpl implements GitAutoCommitHelper {
private final ApplicationService applicationService;
private final ApplicationPermission applicationPermission;
private final RedisUtils redisUtils;
private final CommonGitService commonGitService;
private final CentralGitService centralGitService;
public GitAutoCommitHelperImpl(
GitPrivateRepoHelper gitPrivateRepoHelper,
@ -42,14 +44,14 @@ public class GitAutoCommitHelperImpl implements GitAutoCommitHelper {
ApplicationService applicationService,
ApplicationPermission applicationPermission,
RedisUtils redisUtils,
@Lazy CommonGitService commonGitService) {
@Lazy CentralGitService centralGitService) {
this.gitPrivateRepoHelper = gitPrivateRepoHelper;
this.autoCommitEventHandler = autoCommitEventHandler;
this.userDataService = userDataService;
this.applicationService = applicationService;
this.applicationPermission = applicationPermission;
this.redisUtils = redisUtils;
this.commonGitService = commonGitService;
this.centralGitService = centralGitService;
}
@Override
@ -178,8 +180,9 @@ public class GitAutoCommitHelperImpl implements GitAutoCommitHelper {
"Auto commit for application {}, and branch name {} is fetching remote changes",
defaultApplication.getId(),
branchName);
return commonGitService
.fetchRemoteChanges(defaultApplication, branchedApplication, true)
return centralGitService
.fetchRemoteChanges(
defaultApplication, branchedApplication, true, GitType.FILE_SYSTEM, RefType.branch)
.flatMap(branchTrackingStatus -> {
if (branchTrackingStatus.getBehindCount() > 0) {
log.info(

32
app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
View File

@ -79,6 +79,7 @@ import static com.appsmith.git.constants.CommonConstants.METADATA;
import static com.appsmith.git.constants.CommonConstants.SERVER_SCHEMA_VERSION;
import static com.appsmith.git.constants.CommonConstants.TEXT_FILE_EXTENSION;
import static com.appsmith.git.constants.CommonConstants.THEME;
import static com.appsmith.git.constants.ce.CommonConstantsCE.fileFormatVersion;
import static com.appsmith.git.constants.ce.GitDirectoriesCE.ACTION_COLLECTION_DIRECTORY;
import static com.appsmith.git.constants.ce.GitDirectoriesCE.ACTION_DIRECTORY;
import static com.appsmith.git.constants.ce.GitDirectoriesCE.DATASOURCE_DIRECTORY;
@ -328,6 +329,25 @@ public class CommonGitFileUtilsCE {
// action collections
setActionCollectionsInResourceMap(artifactExchangeJson, resourceMap);
// metadata
setMetadataInResourceMap(artifactExchangeJson, resourceMap);
}
protected void setMetadataInResourceMap(
ArtifactExchangeJson artifactExchangeJson, Map<GitResourceIdentity, Object> resourceMap) {
final String metadataFilePath = CommonConstants.METADATA + JSON_EXTENSION;
final Map<String, Object> metadataMap = new HashMap<>();
metadataMap.put(ARTIFACT_JSON_TYPE, artifactExchangeJson.getArtifactJsonType());
metadataMap.put(SERVER_SCHEMA_VERSION, artifactExchangeJson.getServerSchemaVersion());
metadataMap.put(CLIENT_SCHEMA_VERSION, artifactExchangeJson.getClientSchemaVersion());
metadataMap.put(FILE_FORMAT_VERSION, fileFormatVersion);
GitResourceIdentity metadataResourceIdentity =
new GitResourceIdentity(GitResourceType.ROOT_CONFIG, metadataFilePath, metadataFilePath);
resourceMap.put(metadataResourceIdentity, metadataMap);
}
protected String getContextDirectoryByType(CreatorContextType contextType) {
@ -933,7 +953,6 @@ public class CommonGitFileUtilsCE {
String defaultArtifactId = gitArtifactMetadata.getDefaultArtifactId();
String refName = gitArtifactMetadata.getRefName();
String repoName = gitArtifactMetadata.getRepoName();
Mono<Boolean> useFSGitHandlerMono = featureFlagService.check(FeatureFlagEnum.release_git_api_contracts_enabled);
Mono<Boolean> keepWorkingDirChangesMono =
featureFlagService.check(FeatureFlagEnum.release_git_reset_optimization_enabled);
@ -960,14 +979,9 @@ public class CommonGitFileUtilsCE {
ArtifactGitFileUtils<?> artifactGitFileUtils = getArtifactBasedFileHelper(artifactType);
Path baseRepoSuffix = artifactGitFileUtils.getRepoSuffixPath(workspaceId, defaultArtifactId, repoName);
Mono<JSONObject> jsonObjectMono = Mono.zip(useFSGitHandlerMono, keepWorkingDirChangesMono)
.flatMap(tuple -> fileUtils.reconstructPageFromGitRepo(
pageDTO.getName(),
refName,
baseRepoSuffix,
isResetToLastCommitRequired,
tuple.getT1(),
tuple.getT2()))
Mono<JSONObject> jsonObjectMono = keepWorkingDirChangesMono
.flatMap(keepWorkingDirChanges -> fileUtils.reconstructPageFromGitRepo(
pageDTO.getName(), refName, baseRepoSuffix, isResetToLastCommitRequired, keepWorkingDirChanges))
.onErrorResume(error -> Mono.error(
new AppsmithException(AppsmithError.GIT_ACTION_FAILED, RECONSTRUCT_PAGE, error.getMessage())))
.map(pageJson -> {

21
app/server/appsmith-server/src/test/java/com/appsmith/server/git/ServerSchemaMigrationEnforcerTest.java
View File

@ -3,7 +3,7 @@ package com.appsmith.server.git;
import com.appsmith.external.converters.ISOStringToInstantConverter;
import com.appsmith.external.dtos.GitLogDTO;
import com.appsmith.external.dtos.ModifiedResources;
import com.appsmith.external.git.GitExecutor;
import com.appsmith.external.git.handler.FSGitHandler;
import com.appsmith.external.models.ApplicationGitReference;
import com.appsmith.server.configurations.ProjectProperties;
import com.appsmith.server.constants.SerialiseArtifactObjective;
@ -14,6 +14,7 @@ import com.appsmith.server.events.AutoCommitEvent;
import com.appsmith.server.exports.internal.ExportService;
import com.appsmith.server.git.autocommit.AutoCommitEventHandler;
import com.appsmith.server.git.autocommit.AutoCommitEventHandlerImpl;
import com.appsmith.server.git.resolver.GitArtifactHelperResolver;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.helpers.MockPluginExecutor;
@ -115,7 +116,10 @@ public class ServerSchemaMigrationEnforcerTest {
GitFileSystemTestHelper gitFileSystemTestHelper;
@SpyBean
GitExecutor gitExecutor;
FSGitHandler fsGitHandler;
@Autowired
GitArtifactHelperResolver gitArtifactHelperResolver;
@MockBean
PluginExecutorHelper pluginExecutorHelper;
@ -318,7 +322,7 @@ public class ServerSchemaMigrationEnforcerTest {
WORKSPACE_ID, DEFAULT_APPLICATION_ID, BRANCH_NAME, REPO_NAME, applicationJson);
Path suffixPath = Paths.get(WORKSPACE_ID, DEFAULT_APPLICATION_ID, REPO_NAME);
Path gitCompletePath = gitExecutor.createRepoPath(suffixPath);
Path gitCompletePath = fsGitHandler.createRepoPath(suffixPath);
commonGitFileUtils
.saveArtifactToLocalRepo(suffixPath, applicationJson, BRANCH_NAME)
@ -370,7 +374,7 @@ public class ServerSchemaMigrationEnforcerTest {
.block();
Path suffixPath = Paths.get(WORKSPACE_ID, DEFAULT_APPLICATION_ID, REPO_NAME);
Path gitCompletePath = gitExecutor.createRepoPath(suffixPath);
Path gitCompletePath = fsGitHandler.createRepoPath(suffixPath);
// save back to the repository in order to compare the diff.
commonGitFileUtils
@ -396,8 +400,9 @@ public class ServerSchemaMigrationEnforcerTest {
gitRedisUtils,
redisUtils,
dslMigrationUtils,
gitArtifactHelperResolver,
commonGitFileUtils,
gitExecutor,
fsGitHandler,
projectProperties,
analyticsService);
@ -410,8 +415,8 @@ public class ServerSchemaMigrationEnforcerTest {
autoCommitEvent.getWorkspaceId(), autoCommitEvent.getApplicationId(), autoCommitEvent.getRepoName());
Mockito.doReturn(Mono.just("success"))
.when(gitExecutor)
.pushApplication(
.when(fsGitHandler)
.pushArtifact(
baseRepoSuffix,
autoCommitEvent.getRepoUrl(),
autoCommitEvent.getPublicKey(),
@ -429,7 +434,7 @@ public class ServerSchemaMigrationEnforcerTest {
})
.verifyComplete();
StepVerifier.create(gitExecutor.getCommitHistory(baseRepoSuffix))
StepVerifier.create(fsGitHandler.getCommitHistory(baseRepoSuffix))
.assertNext(gitLogDTOs -> {
assertThat(gitLogDTOs).isNotEmpty();
assertThat(gitLogDTOs.size()).isEqualTo(3);

174
app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java
View File

@ -2,10 +2,10 @@ package com.appsmith.server.git.autocommit;
import com.appsmith.external.dtos.GitLogDTO;
import com.appsmith.external.git.FileInterface;
import com.appsmith.external.git.GitExecutor;
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.external.git.handler.FSGitHandler;
import com.appsmith.external.git.models.GitResourceMap;
import com.appsmith.external.helpers.AppsmithBeanUtils;
import com.appsmith.external.models.ApplicationGitReference;
import com.appsmith.server.configurations.ProjectProperties;
import com.appsmith.server.constants.ArtifactType;
import com.appsmith.server.domains.Layout;
@ -14,6 +14,8 @@ import com.appsmith.server.dtos.ApplicationJson;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.events.AutoCommitEvent;
import com.appsmith.server.git.GitRedisUtils;
import com.appsmith.server.git.dtos.ArtifactJsonTransformationDTO;
import com.appsmith.server.git.resolver.GitArtifactHelperResolver;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.helpers.RedisUtils;
@ -26,6 +28,7 @@ import net.minidev.json.JSONObject;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
@ -82,7 +85,10 @@ public class AutoCommitEventHandlerImplTest {
JsonSchemaMigration jsonSchemaMigration;
@SpyBean
GitExecutor gitExecutor;
FSGitHandler fsGitHandler;
@Autowired
GitArtifactHelperResolver gitArtifactHelperResolver;
@Autowired
GitFileSystemTestHelper gitFileSystemTestHelper;
@ -105,8 +111,9 @@ public class AutoCommitEventHandlerImplTest {
gitRedisUtils,
redisUtils,
dslMigrationUtils,
gitArtifactHelperResolver,
commonGitFileUtils,
gitExecutor,
fsGitHandler,
projectProperties,
analyticsService);
}
@ -175,6 +182,17 @@ public class AutoCommitEventHandlerImplTest {
AutoCommitEvent autoCommitEvent = createEvent();
ApplicationJson applicationJson = createApplicationJson();
String workspaceId = autoCommitEvent.getWorkspaceId();
String artifactId = autoCommitEvent.getApplicationId();
String repoName = autoCommitEvent.getRepoName();
String refName = autoCommitEvent.getBranchName();
ArtifactType artifactType = applicationJson.getArtifactJsonType();
ArtifactJsonTransformationDTO jsonTransformationDTO =
new ArtifactJsonTransformationDTO(workspaceId, artifactId, repoName, artifactType);
jsonTransformationDTO.setRefType(RefType.branch);
jsonTransformationDTO.setRefName(refName);
JSONObject dslBeforeMigration = applicationJson
.getPageList()
.get(0)
@ -192,32 +210,22 @@ public class AutoCommitEventHandlerImplTest {
autoCommitEvent.getWorkspaceId(), autoCommitEvent.getApplicationId(), autoCommitEvent.getRepoName());
doReturn(Mono.just(TRUE))
.when(gitExecutor)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), false);
.when(fsGitHandler)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), true);
doReturn(Mono.just(applicationJson))
.when(commonGitFileUtils)
.reconstructArtifactExchangeJsonFromGitRepo(
autoCommitEvent.getWorkspaceId(),
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName(),
autoCommitEvent.getBranchName(),
ArtifactType.APPLICATION);
.constructArtifactExchangeJsonFromGitRepository(jsonTransformationDTO);
// mock the dsl migration utils to return updated dsl when requested with older dsl
Mockito.when(dslMigrationUtils.migratePageDsl(any(JSONObject.class))).thenReturn(Mono.just(dslAfterMigration));
doReturn(Mono.just(baseRepoSuffix))
.when(commonGitFileUtils)
.saveArtifactToLocalRepo(
autoCommitEvent.getWorkspaceId(),
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName(),
applicationJson,
autoCommitEvent.getBranchName());
.saveArtifactToLocalRepoNew(baseRepoSuffix, applicationJson, autoCommitEvent.getBranchName());
doReturn(Mono.just("success"))
.when(gitExecutor)
.when(fsGitHandler)
.commitArtifact(
baseRepoSuffix,
String.format(AUTO_COMMIT_MSG_FORMAT, projectProperties.getVersion()),
@ -227,8 +235,8 @@ public class AutoCommitEventHandlerImplTest {
false);
doReturn(Mono.just("success"))
.when(gitExecutor)
.pushApplication(
.when(fsGitHandler)
.pushArtifact(
baseRepoSuffix,
autoCommitEvent.getRepoUrl(),
autoCommitEvent.getPublicKey(),
@ -249,6 +257,18 @@ public class AutoCommitEventHandlerImplTest {
public void autoCommitDSLMigration_WhenPageDslAlreadyLatest_NoCommitMade() throws GitAPIException, IOException {
AutoCommitEvent autoCommitEvent = createEvent();
ApplicationJson applicationJson = createApplicationJson();
String workspaceId = autoCommitEvent.getWorkspaceId();
String artifactId = autoCommitEvent.getApplicationId();
String repoName = autoCommitEvent.getRepoName();
String refName = autoCommitEvent.getBranchName();
ArtifactType artifactType = applicationJson.getArtifactJsonType();
ArtifactJsonTransformationDTO jsonTransformationDTO =
new ArtifactJsonTransformationDTO(workspaceId, artifactId, repoName, artifactType);
jsonTransformationDTO.setRefType(RefType.branch);
jsonTransformationDTO.setRefName(refName);
JSONObject dslBeforeMigration = applicationJson
.getPageList()
.get(0)
@ -264,17 +284,12 @@ public class AutoCommitEventHandlerImplTest {
autoCommitEvent.getWorkspaceId(), autoCommitEvent.getApplicationId(), autoCommitEvent.getRepoName());
doReturn(Mono.just(TRUE))
.when(gitExecutor)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), false);
.when(fsGitHandler)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), true);
doReturn(Mono.just(applicationJson))
.when(commonGitFileUtils)
.reconstructArtifactExchangeJsonFromGitRepo(
autoCommitEvent.getWorkspaceId(),
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName(),
autoCommitEvent.getBranchName(),
ArtifactType.APPLICATION);
.constructArtifactExchangeJsonFromGitRepository(jsonTransformationDTO);
// the rest of the process should not trigger as no migration is required
StepVerifier.create(autoCommitEventHandler
@ -293,33 +308,34 @@ public class AutoCommitEventHandlerImplTest {
autoCommitEvent.setIsServerSideEvent(TRUE);
ApplicationJson applicationJson = createApplicationJson();
String workspaceId = autoCommitEvent.getWorkspaceId();
String artifactId = autoCommitEvent.getApplicationId();
String repoName = autoCommitEvent.getRepoName();
String refName = autoCommitEvent.getBranchName();
ArtifactType artifactType = applicationJson.getArtifactJsonType();
ArtifactJsonTransformationDTO jsonTransformationDTO =
new ArtifactJsonTransformationDTO(workspaceId, artifactId, repoName, artifactType);
jsonTransformationDTO.setRefType(RefType.branch);
jsonTransformationDTO.setRefName(refName);
Path baseRepoSuffix = Paths.get(
autoCommitEvent.getWorkspaceId(), autoCommitEvent.getApplicationId(), autoCommitEvent.getRepoName());
doReturn(Mono.just(TRUE))
.when(gitExecutor)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), false);
.when(fsGitHandler)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), true);
doReturn(Mono.just(applicationJson))
.when(commonGitFileUtils)
.reconstructArtifactExchangeJsonFromGitRepo(
autoCommitEvent.getWorkspaceId(),
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName(),
autoCommitEvent.getBranchName(),
ArtifactType.APPLICATION);
.constructArtifactExchangeJsonFromGitRepository(jsonTransformationDTO);
doReturn(Mono.just(baseRepoSuffix))
.when(commonGitFileUtils)
.saveArtifactToLocalRepo(
autoCommitEvent.getWorkspaceId(),
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName(),
applicationJson,
autoCommitEvent.getBranchName());
.saveArtifactToLocalRepoNew(baseRepoSuffix, applicationJson, autoCommitEvent.getBranchName());
doReturn(Mono.just("success"))
.when(gitExecutor)
.when(fsGitHandler)
.commitArtifact(
baseRepoSuffix,
String.format(AUTO_COMMIT_MSG_FORMAT, projectProperties.getVersion()),
@ -329,8 +345,8 @@ public class AutoCommitEventHandlerImplTest {
false);
doReturn(Mono.just("success"))
.when(gitExecutor)
.pushApplication(
.when(fsGitHandler)
.pushArtifact(
baseRepoSuffix,
autoCommitEvent.getRepoUrl(),
autoCommitEvent.getPublicKey(),
@ -365,35 +381,37 @@ public class AutoCommitEventHandlerImplTest {
}
@Test
@Disabled
public void autoCommitServerMigration_WhenServerHasNoChanges_NoCommitMade() throws GitAPIException, IOException {
AutoCommitEvent autoCommitEvent = createEvent();
autoCommitEvent.setIsServerSideEvent(TRUE);
ApplicationJson applicationJson = createApplicationJson();
String workspaceId = autoCommitEvent.getWorkspaceId();
String artifactId = autoCommitEvent.getApplicationId();
String repoName = autoCommitEvent.getRepoName();
String refName = autoCommitEvent.getBranchName();
ArtifactType artifactType = applicationJson.getArtifactJsonType();
ArtifactJsonTransformationDTO jsonTransformationDTO =
new ArtifactJsonTransformationDTO(workspaceId, artifactId, repoName, artifactType);
jsonTransformationDTO.setRefType(RefType.branch);
jsonTransformationDTO.setRefName(refName);
Path baseRepoSuffix = Paths.get(
autoCommitEvent.getWorkspaceId(), autoCommitEvent.getApplicationId(), autoCommitEvent.getRepoName());
doReturn(Mono.just(TRUE))
.when(gitExecutor)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), false);
.when(fsGitHandler)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), true);
doReturn(Mono.just(applicationJson))
.when(commonGitFileUtils)
.reconstructArtifactExchangeJsonFromGitRepo(
autoCommitEvent.getWorkspaceId(),
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName(),
autoCommitEvent.getBranchName(),
ArtifactType.APPLICATION);
.constructArtifactExchangeJsonFromGitRepository(jsonTransformationDTO);
doReturn(Mono.just(baseRepoSuffix))
.when(commonGitFileUtils)
.saveArtifactToLocalRepo(
autoCommitEvent.getWorkspaceId(),
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName(),
applicationJson,
autoCommitEvent.getBranchName());
.saveArtifactToLocalRepoNew(baseRepoSuffix, applicationJson, autoCommitEvent.getBranchName());
// the rest of the process should not trigger as no migration is required
StepVerifier.create(autoCommitEventHandler
@ -420,24 +438,18 @@ public class AutoCommitEventHandlerImplTest {
autoCommitEvent.getWorkspaceId(), autoCommitEvent.getApplicationId(), autoCommitEvent.getRepoName());
doReturn(Mono.just(TRUE))
.when(gitExecutor)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), false);
.when(fsGitHandler)
.resetToLastCommit(baseRepoSuffix, autoCommitEvent.getBranchName(), true);
ApplicationGitReference appReference =
(ApplicationGitReference) commonGitFileUtils.createArtifactReference(applicationJson);
GitResourceMap gitResourceMap = commonGitFileUtils.createGitResourceMap(applicationJson);
doReturn(Mono.just(appReference))
doReturn(Mono.just(gitResourceMap))
.when(fileUtils)
.reconstructApplicationReferenceFromGitRepo(
autoCommitEvent.getWorkspaceId(),
autoCommitEvent.getApplicationId(),
autoCommitEvent.getRepoName(),
autoCommitEvent.getBranchName());
.constructGitResourceMapFromGitRepo(baseRepoSuffix, autoCommitEvent.getBranchName());
doReturn(Mono.just(baseRepoSuffix))
.when(commonGitFileUtils)
.saveArtifactToLocalRepo(
anyString(), anyString(), anyString(), any(ApplicationJson.class), anyString());
.saveArtifactToLocalRepoNew(any(Path.class), any(ApplicationJson.class), anyString());
ApplicationJson applicationJson1 = new ApplicationJson();
AppsmithBeanUtils.copyNewFieldValuesIntoOldObject(applicationJson, applicationJson1);
@ -449,7 +461,7 @@ public class AutoCommitEventHandlerImplTest {
Mockito.eq(applicationJson), Mockito.anyString(), Mockito.anyString(), any(RefType.class));
doReturn(Mono.just("success"))
.when(gitExecutor)
.when(fsGitHandler)
.commitArtifact(
baseRepoSuffix,
String.format(AUTO_COMMIT_MSG_FORMAT, projectProperties.getVersion()),
@ -459,8 +471,8 @@ public class AutoCommitEventHandlerImplTest {
false);
doReturn(Mono.just("success"))
.when(gitExecutor)
.pushApplication(
.when(fsGitHandler)
.pushArtifact(
baseRepoSuffix,
autoCommitEvent.getRepoUrl(),
autoCommitEvent.getPublicKey(),
@ -478,6 +490,8 @@ public class AutoCommitEventHandlerImplTest {
}
@Test
@Disabled
// This test doesn't apply anymore, got to change it
public void autocommitServerMigration_WhenSerialisationLogicDoesNotChange_CommitFailure()
throws URISyntaxException, IOException, GitAPIException {
@ -511,8 +525,8 @@ public class AutoCommitEventHandlerImplTest {
autoCommitEvent.getWorkspaceId(), autoCommitEvent.getApplicationId(), autoCommitEvent.getRepoName());
doReturn(Mono.just("success"))
.when(gitExecutor)
.pushApplication(
.when(fsGitHandler)
.pushArtifact(
baseRepoSuffix,
autoCommitEvent.getRepoUrl(),
autoCommitEvent.getPublicKey(),
@ -539,7 +553,7 @@ public class AutoCommitEventHandlerImplTest {
})
.verifyComplete();
StepVerifier.create(gitExecutor.getCommitHistory(baseRepoSuffix))
StepVerifier.create(fsGitHandler.getCommitHistory(baseRepoSuffix))
.assertNext(gitLogDTOs -> {
assertThat(gitLogDTOs).isNotEmpty();
assertThat(gitLogDTOs.size()).isEqualTo(3);
@ -580,8 +594,8 @@ public class AutoCommitEventHandlerImplTest {
Mockito.when(dslMigrationUtils.migratePageDsl(any(JSONObject.class))).thenReturn(Mono.just(dslAfterMigration));
doReturn(Mono.just("success"))
.when(gitExecutor)
.pushApplication(
.when(fsGitHandler)
.pushArtifact(
baseRepoSuffix,
autoCommitEvent.getRepoUrl(),
autoCommitEvent.getPublicKey(),

73
app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/AutoCommitServiceTest.java
View File

@ -1,8 +1,8 @@
package com.appsmith.server.git.autocommit;
import com.appsmith.external.dtos.GitLogDTO;
import com.appsmith.external.git.GitExecutor;
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.external.git.handler.FSGitHandler;
import com.appsmith.external.helpers.AppsmithBeanUtils;
import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.applications.base.ApplicationService;
@ -18,8 +18,8 @@ import com.appsmith.server.dtos.AutoCommitResponseDTO;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.git.autocommit.helpers.AutoCommitEligibilityHelper;
import com.appsmith.server.git.common.CommonGitService;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.git.central.CentralGitService;
import com.appsmith.server.git.central.GitType;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.RedisUtils;
@ -44,6 +44,7 @@ import org.springframework.boot.test.mock.mockito.SpyBean;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import reactor.util.retry.Retry;
import java.io.IOException;
import java.net.URISyntaxException;
@ -74,7 +75,7 @@ public class AutoCommitServiceTest {
GitFileSystemTestHelper gitFileSystemTestHelper;
@SpyBean
GitExecutor gitExecutor;
FSGitHandler fsGitHandler;
@MockBean
DSLMigrationUtils dslMigrationUtils;
@ -92,10 +93,7 @@ public class AutoCommitServiceTest {
RedisUtils redisUtils;
@MockBean
CommonGitService commonGitService;
@SpyBean
CommonGitFileUtils commonGitFileUtils;
CentralGitService centralGitService;
@MockBean
GitPrivateRepoHelper gitPrivateRepoHelper;
@ -125,6 +123,8 @@ public class AutoCommitServiceTest {
private static final String APP_JSON_NAME = "autocommit.json";
private static final String APP_NAME = "autocommit";
private static final Integer WAIT_DURATION_FOR_ASYNC_EVENT = 5;
private static final Integer MAX_RETRIES = 5;
private static final Integer RETRY_DELAY = 1;
private static final String PUBLIC_KEY = "public-key";
private static final String PRIVATE_KEY = "private-key";
private static final String REPO_URL = "domain.xy";
@ -217,21 +217,21 @@ public class AutoCommitServiceTest {
DEFAULT_APP_ID, pagePermission.getEditPermission(), ApplicationMode.PUBLISHED))
.thenReturn(Flux.just(pageDTO));
Mockito.when(commonGitService.fetchRemoteChanges(any(Application.class), any(Application.class), anyBoolean()))
Mockito.when(centralGitService.fetchRemoteChanges(
any(Application.class),
any(Application.class),
anyBoolean(),
any(GitType.class),
any(RefType.class)))
.thenReturn(Mono.just(branchTrackingStatus));
Mockito.when(branchTrackingStatus.getBehindCount()).thenReturn(0);
doReturn(Mono.just("success"))
.when(gitExecutor)
.pushApplication(baseRepoSuffix, REPO_URL, PUBLIC_KEY, PRIVATE_KEY, BRANCH_NAME);
Mockito.doReturn(Mono.just(testApplication))
.when(applicationService)
.findById(anyString(), any(AclPermission.class));
.when(fsGitHandler)
.pushArtifact(baseRepoSuffix, REPO_URL, PUBLIC_KEY, PRIVATE_KEY, BRANCH_NAME);
Mockito.when(gitPrivateRepoHelper.isBranchProtected(any(), anyString())).thenReturn(Mono.just(FALSE));
Mockito.when(userDataService.getGitProfileForCurrentUser(any())).thenReturn(Mono.just(createGitProfile()));
}
@ -262,7 +262,7 @@ public class AutoCommitServiceTest {
WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
// verifying the initial number of commits
StepVerifier.create(gitExecutor.getCommitHistory(baseRepoSuffix))
StepVerifier.create(fsGitHandler.getCommitHistory(baseRepoSuffix))
.assertNext(gitLogDTOs -> {
assertThat(gitLogDTOs).isNotEmpty();
assertThat(gitLogDTOs.size()).isEqualTo(2);
@ -289,7 +289,7 @@ public class AutoCommitServiceTest {
// this would trigger autocommit
Mono<List<GitLogDTO>> gitlogDTOsMono = Mono.delay(Duration.ofSeconds(WAIT_DURATION_FOR_ASYNC_EVENT))
.then(gitExecutor.getCommitHistory(baseRepoSuffix));
.then(fsGitHandler.getCommitHistory(baseRepoSuffix));
// verifying final number of commits
StepVerifier.create(gitlogDTOsMono)
@ -334,7 +334,7 @@ public class AutoCommitServiceTest {
WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
// verifying the initial number of commits
StepVerifier.create(gitExecutor.getCommitHistory(baseRepoSuffix))
StepVerifier.create(fsGitHandler.getCommitHistory(baseRepoSuffix))
.assertNext(gitLogDTOs -> {
assertThat(gitLogDTOs).isNotEmpty();
assertThat(gitLogDTOs.size()).isEqualTo(2);
@ -362,7 +362,7 @@ public class AutoCommitServiceTest {
.verifyComplete();
Mono<List<GitLogDTO>> gitlogDTOsMono = Mono.delay(Duration.ofSeconds(WAIT_DURATION_FOR_ASYNC_EVENT))
.then(gitExecutor.getCommitHistory(baseRepoSuffix));
.then(fsGitHandler.getCommitHistory(baseRepoSuffix));
// verifying final number of commits
StepVerifier.create(gitlogDTOsMono)
@ -390,7 +390,7 @@ public class AutoCommitServiceTest {
WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
// verifying the initial number of commits
StepVerifier.create(gitExecutor.getCommitHistory(baseRepoSuffix))
StepVerifier.create(fsGitHandler.getCommitHistory(baseRepoSuffix))
.assertNext(gitLogDTOs -> {
assertThat(gitLogDTOs).isNotEmpty();
assertThat(gitLogDTOs.size()).isEqualTo(2);
@ -418,7 +418,7 @@ public class AutoCommitServiceTest {
.verifyComplete();
Mono<List<GitLogDTO>> gitlogDTOsMono = Mono.delay(Duration.ofSeconds(WAIT_DURATION_FOR_ASYNC_EVENT))
.then(gitExecutor.getCommitHistory(baseRepoSuffix));
.then(fsGitHandler.getCommitHistory(baseRepoSuffix));
// verifying final number of commits
StepVerifier.create(gitlogDTOsMono)
@ -551,7 +551,7 @@ public class AutoCommitServiceTest {
WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
// verifying the initial number of commits
StepVerifier.create(gitExecutor.getCommitHistory(baseRepoSuffix))
StepVerifier.create(fsGitHandler.getCommitHistory(baseRepoSuffix))
.assertNext(gitLogDTOs -> {
assertThat(gitLogDTOs).isNotEmpty();
assertThat(gitLogDTOs.size()).isEqualTo(2);
@ -588,7 +588,7 @@ public class AutoCommitServiceTest {
// this would trigger autocommit
Mono<List<GitLogDTO>> gitlogDTOsMono = Mono.delay(Duration.ofSeconds(WAIT_DURATION_FOR_ASYNC_EVENT))
.then(gitExecutor.getCommitHistory(baseRepoSuffix));
.then(fsGitHandler.getCommitHistory(baseRepoSuffix));
// verifying final number of commits
StepVerifier.create(gitlogDTOsMono)
@ -610,22 +610,25 @@ public class AutoCommitServiceTest {
ApplicationJson applicationJson =
gitFileSystemTestHelper.getApplicationJson(this.getClass().getResource(APP_JSON_NAME));
mockAutoCommitTriggerResponse(TRUE, FALSE);
// setup repository for test
gitFileSystemTestHelper.setupGitRepository(
WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
ApplicationJson applicationJson1 = new ApplicationJson();
AppsmithBeanUtils.copyNewFieldValuesIntoOldObject(applicationJson, applicationJson1);
applicationJson1.setServerSchemaVersion(jsonSchemaVersions.getServerVersion() + 1);
// bump up server-version by one for metadata changes
doReturn(Mono.just(applicationJson1))
.when(jsonSchemaMigration)
.migrateApplicationJsonToLatestSchema(
any(ApplicationJson.class), Mockito.anyString(), Mockito.anyString(), any(RefType.class));
gitFileSystemTestHelper.setupGitRepository(
WORKSPACE_ID, DEFAULT_APP_ID, BRANCH_NAME, REPO_NAME, applicationJson);
// mock server migration as true and client migration as false
mockAutoCommitTriggerResponse(TRUE, FALSE);
// verifying the initial number of commits
StepVerifier.create(gitExecutor.getCommitHistory(baseRepoSuffix))
StepVerifier.create(fsGitHandler.getCommitHistory(baseRepoSuffix))
.assertNext(gitLogDTOs -> {
assertThat(gitLogDTOs).isNotEmpty();
assertThat(gitLogDTOs.size()).isEqualTo(2);
@ -662,9 +665,9 @@ public class AutoCommitServiceTest {
})
.verifyComplete();
// this would trigger autocommit
// wait for the event handler to complete the autocommit.
Mono<List<GitLogDTO>> gitlogDTOsMono = Mono.delay(Duration.ofSeconds(WAIT_DURATION_FOR_ASYNC_EVENT))
.then(gitExecutor.getCommitHistory(baseRepoSuffix));
.then(fsGitHandler.getCommitHistory(baseRepoSuffix));
// verifying final number of commits
StepVerifier.create(gitlogDTOsMono)
@ -678,4 +681,14 @@ public class AutoCommitServiceTest {
})
.verifyComplete();
}
private Mono<List<GitLogDTO>> getGitLog(Path artifactRepositorySuffix) {
return redisUtils
.getAutoCommitProgress(DEFAULT_APP_ID)
.retryWhen(Retry.fixedDelay(MAX_RETRIES, Duration.ofSeconds(RETRY_DELAY))
.onRetryExhaustedThrow((retryBackoffSpec, retrySignal) -> {
throw new RuntimeException();
}))
.then(fsGitHandler.getCommitHistory(baseRepoSuffix));
}
}

27
app/server/appsmith-server/src/test/java/com/appsmith/server/git/autocommit/helpers/GitAutoCommitHelperImplTest.java
View File

@ -1,5 +1,6 @@
package com.appsmith.server.git.autocommit.helpers;
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.applications.base.ApplicationService;
import com.appsmith.server.domains.Application;
@ -10,7 +11,8 @@ import com.appsmith.server.domains.GitProfile;
import com.appsmith.server.dtos.AutoCommitResponseDTO;
import com.appsmith.server.events.AutoCommitEvent;
import com.appsmith.server.git.autocommit.AutoCommitEventHandler;
import com.appsmith.server.git.common.CommonGitService;
import com.appsmith.server.git.central.CentralGitService;
import com.appsmith.server.git.central.GitType;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.services.UserDataService;
@ -48,7 +50,7 @@ public class GitAutoCommitHelperImplTest {
ApplicationService applicationService;
@MockBean
CommonGitService commonGitService;
CentralGitService centralGitService;
@MockBean
UserDataService userDataService;
@ -168,7 +170,12 @@ public class GitAutoCommitHelperImplTest {
.when(applicationService)
.findByBranchNameAndBaseApplicationId(anyString(), anyString(), any(AclPermission.class));
Mockito.when(commonGitService.fetchRemoteChanges(any(Application.class), any(Application.class), anyBoolean()))
Mockito.when(centralGitService.fetchRemoteChanges(
any(Application.class),
any(Application.class),
anyBoolean(),
any(GitType.class),
any(RefType.class)))
.thenReturn(Mono.just(branchTrackingStatus));
Mockito.when(branchTrackingStatus.getBehindCount()).thenReturn(0);
@ -266,7 +273,12 @@ public class GitAutoCommitHelperImplTest {
Mockito.doReturn(Mono.just(application))
.when(applicationService)
.findByBranchNameAndBaseApplicationId(anyString(), anyString(), any(AclPermission.class));
Mockito.when(commonGitService.fetchRemoteChanges(any(Application.class), any(Application.class), anyBoolean()))
Mockito.when(centralGitService.fetchRemoteChanges(
any(Application.class),
any(Application.class),
anyBoolean(),
any(GitType.class),
any(RefType.class)))
.thenReturn(Mono.just(branchTrackingStatus));
Mockito.when(branchTrackingStatus.getBehindCount()).thenReturn(1);
@ -304,7 +316,12 @@ public class GitAutoCommitHelperImplTest {
.when(applicationService)
.findByBranchNameAndBaseApplicationId(anyString(), anyString(), any(AclPermission.class));
Mockito.when(commonGitService.fetchRemoteChanges(any(Application.class), any(Application.class), anyBoolean()))
Mockito.when(centralGitService.fetchRemoteChanges(
any(Application.class),
any(Application.class),
anyBoolean(),
any(GitType.class),
any(RefType.class)))
.thenReturn(Mono.just(branchTrackingStatus));
Mockito.when(branchTrackingStatus.getBehindCount()).thenReturn(0);

36
app/server/appsmith-server/src/test/java/com/appsmith/server/testhelpers/git/GitFileSystemTestHelper.java
View File

@ -1,11 +1,14 @@
package com.appsmith.server.testhelpers.git;
import com.appsmith.external.converters.ISOStringToInstantConverter;
import com.appsmith.external.git.GitExecutor;
import com.appsmith.external.git.handler.FSGitHandler;
import com.appsmith.git.constants.CommonConstants;
import com.appsmith.server.constants.ArtifactType;
import com.appsmith.server.dtos.ApplicationJson;
import com.appsmith.server.events.AutoCommitEvent;
import com.appsmith.server.git.resolver.GitArtifactHelperResolver;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.services.GitArtifactHelper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import lombok.RequiredArgsConstructor;
@ -28,7 +31,8 @@ import java.time.Instant;
@RequiredArgsConstructor
public class GitFileSystemTestHelper {
private final GitExecutor gitExecutor;
private final GitArtifactHelperResolver gitArtifactHelperResolver;
private final FSGitHandler fsGitHandler;
private final CommonGitFileUtils commonGitFileUtils;
private final Gson gson = new GsonBuilder()
@ -42,8 +46,12 @@ public class GitFileSystemTestHelper {
String repoName,
ApplicationJson applicationJson)
throws GitAPIException, IOException {
Path suffix = Paths.get(workspaceId, applicationId, repoName);
Path gitCompletePath = gitExecutor.createRepoPath(suffix);
GitArtifactHelper<?> gitArtifactHelper =
gitArtifactHelperResolver.getArtifactHelper(applicationJson.getArtifactJsonType());
Path artifactRepoSuffixPath = gitArtifactHelper.getRepoSuffixPath(workspaceId, applicationId, repoName);
Path gitCompletePath = fsGitHandler.createRepoPath(artifactRepoSuffixPath);
String metadataFileName = CommonConstants.METADATA + CommonConstants.JSON_EXTENSION;
// Delete the repository if it already exists,
@ -52,18 +60,19 @@ public class GitFileSystemTestHelper {
// create a new repository
log.debug("Setting up Git repository at path: {}", gitCompletePath);
gitExecutor.createNewRepository(gitCompletePath);
fsGitHandler.createNewRepository(gitCompletePath);
File file = gitCompletePath.resolve(metadataFileName).toFile();
file.createNewFile();
// committing initially to avoid ref-head error
gitExecutor
.commitArtifact(suffix, "commit message", "user", "user@domain.xy", true, false)
fsGitHandler
.commitArtifact(artifactRepoSuffixPath, "commit message", "user", "user@domain.xy", true, false)
.block();
// checkout to the new branch
gitExecutor.createAndCheckoutToBranch(suffix, branchName).block();
fsGitHandler
.createAndCheckoutToBranch(artifactRepoSuffixPath, branchName)
.block();
commitArtifact(workspaceId, applicationId, branchName, repoName, applicationJson, "commit message two");
}
@ -78,12 +87,15 @@ public class GitFileSystemTestHelper {
Path suffix = Paths.get(workspaceId, applicationId, repoName);
// saving the files into the git repository from application json
// The files would later be saved in this git repository from resources section instead of applicationJson
GitArtifactHelper<?> gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(ArtifactType.APPLICATION);
Path artifactRepoSuffixPath = gitArtifactHelper.getRepoSuffixPath(workspaceId, applicationId, repoName);
commonGitFileUtils
.saveArtifactToLocalRepo(workspaceId, applicationId, repoName, applicationJson, branchName)
.saveArtifactToLocalRepoNew(artifactRepoSuffixPath, applicationJson, branchName)
.block();
// commit the application
gitExecutor
fsGitHandler
.commitArtifact(suffix, commitMessage, "user", "user@domain.xy", true, false)
.block();
}
@ -100,7 +112,7 @@ public class GitFileSystemTestHelper {
public void deleteWorkspaceDirectory(String workspaceId) {
try {
Path repoPath = gitExecutor.createRepoPath(Paths.get(workspaceId));
Path repoPath = fsGitHandler.createRepoPath(Paths.get(workspaceId));
FileUtils.deleteDirectory(repoPath.toFile());
} catch (IOException ioException) {
log.info("unable to delete the workspace with id : {}", workspaceId);