Skip to content

11/08 Daily Promotion #41175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
btsgh merged 1 commit into from
Aug 11, 2025
Merged

11/08 Daily Promotion #41175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,26 @@ public Mono<Tuple2<ArtifactType, String>> obtainArtifactTypeAndIdentifierFromGit
return obtainArtifactTypeFromGitRepository(jsonTransformationDTO).zipWith(Mono.just(""));
}

protected Mono<ArtifactType> handleErrorWhileArtifactTypeIdentification(Throwable exception) {
if (exception instanceof AppsmithException appsmithException
&& AppsmithError.GIT_FILE_SYSTEM_ERROR.getAppErrorCode().equals(appsmithException.getAppErrorCode())) {
return Mono.just(ArtifactType.APPLICATION);
}

return Mono.error(exception);
}

public Mono<ArtifactType> obtainArtifactTypeFromGitRepository(ArtifactJsonTransformationDTO jsonTransformationDTO) {
String workspaceId = jsonTransformationDTO.getWorkspaceId();
String placeHolder = jsonTransformationDTO.getBaseArtifactId();
String repoName = jsonTransformationDTO.getRepoName();
Path temporaryStorage = Path.of(workspaceId, placeHolder, repoName);

return commonGitFileUtils.getArtifactJsonTypeOfRepository(temporaryStorage);
return commonGitFileUtils
.getArtifactJsonTypeOfRepository(temporaryStorage)
.onErrorResume(error -> {
return handleErrorWhileArtifactTypeIdentification(error);
});
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions ...er/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,8 @@ public Mono<ArtifactType> getArtifactJsonTypeOfRepository(Path repoSuffix) {
if (metadataJsonObject == null) {
log.error(
"Error in retrieving the metadata from the file system for repository {}", repoSuffix);
return Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR));
return Mono.error(
new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, CommonConstants.METADATA));
}

JsonElement artifactJsonType = metadataJsonObject.get(ARTIFACT_JSON_TYPE);
Expand All @@ -876,7 +877,8 @@ public Mono<ArtifactType> getArtifactJsonTypeOfRepository(Path repoSuffix) {
log.error(
"artifactJsonType attribute not found in the metadata file for repository {}",
repoSuffix);
return Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR));
return Mono.error(new AppsmithException(
AppsmithError.GIT_FILE_SYSTEM_ERROR, "No artifactJsonType attribute found"));
}

return Mono.just(artifactJsonType.getAsString());
Expand Down
Loading