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

feat: Add keyType to git import key generation flow (#14762)

Browse Source
This commit is contained in:
Anagh Hegde 2022-06-23 17:54:39 +05:30 committed by GitHub
parent b97042a38a
commit e95602ce8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/GitControllerCE.java
View File

@ -196,8 +196,8 @@ public class GitControllerCE {
}
@GetMapping("/import/keys")
public Mono<ResponseDTO<GitAuth>> generateKeyForGitImport() {
return service.generateSSHKey()
public Mono<ResponseDTO<GitAuth>> generateKeyForGitImport(@RequestParam(required = false) String keyType) {
return service.generateSSHKey(keyType)
.map(result -> new ResponseDTO<>(HttpStatus.OK.value(), result, null));
}

2
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java
View File

@ -64,7 +64,7 @@ public interface GitServiceCE {
Mono<ApplicationImportDTO> importApplicationFromGit(String organisationId, GitConnectDTO gitConnectDTO);
Mono<GitAuth> generateSSHKey();
Mono<GitAuth> generateSSHKey(String keyType);
Mono<Boolean> testConnection(String defaultApplicationId);

4
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
View File

@ -2017,8 +2017,8 @@ public class GitServiceCEImpl implements GitServiceCE {
}
@Override
public Mono<GitAuth> generateSSHKey() {
GitAuth gitAuth = GitDeployKeyGenerator.generateSSHKey(null);
public Mono<GitAuth> generateSSHKey(String keyType) {
GitAuth gitAuth = GitDeployKeyGenerator.generateSSHKey(keyType);
GitDeployKeys gitDeployKeys = new GitDeployKeys();
gitDeployKeys.setGitAuth(gitAuth);

62
app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java
View File

@ -2285,30 +2285,66 @@ public class GitServiceTest {
@Test
@WithUserDetails(value = "api_user")
public void generateSSHKey_DataNotExistsInCollection_Success() {
Mono<GitAuth> publicKey = gitService.generateSSHKey();
public void generateSSHKeyDefaultType_DataNotExistsInCollection_Success() {
Mono<GitAuth> publicKey = gitService.generateSSHKey(null);
StepVerifier
.create(publicKey)
.assertNext(s -> {
assertThat(s).isNotNull();
assertThat(s.getPublicKey()).contains("appsmith");
assertThat(s.getPublicKey()).startsWith("ecdsa-sha2-nistp256");
})
.verifyComplete();
}
@Test
@WithUserDetails(value = "api_user")
public void generateSSHKey_KeyExistsInCollection_Success() {
GitAuth publicKey = gitService.generateSSHKey().block();
public void generateSSHKeyRSAType_DataNotExistsInCollection_Success() {
Mono<GitAuth> publicKey = gitService.generateSSHKey("RSA");
Mono<GitAuth> newKey = gitService.generateSSHKey();
StepVerifier
.create(publicKey)
.assertNext(s -> {
assertThat(s).isNotNull();
assertThat(s.getPublicKey()).contains("appsmith");
assertThat(s.getPublicKey()).startsWith("ssh-rsa");
})
.verifyComplete();
}
@Test
@WithUserDetails(value = "api_user")
public void generateSSHKeyDefaultType_KeyExistsInCollection_Success() {
GitAuth publicKey = gitService.generateSSHKey(null).block();
Mono<GitAuth> newKey = gitService.generateSSHKey(null);
StepVerifier
.create(newKey)
.assertNext(s -> {
assertThat(s).isNotNull();
assertThat(s.getPublicKey()).contains("appsmith");
assertThat(s.getPublicKey()).startsWith("ecdsa-sha2-nistp256");
assertThat(s.getPublicKey()).isNotEqualTo(publicKey.getPublicKey());
assertThat(s.getPrivateKey()).isNotEmpty();
})
.verifyComplete();
}
@Test
@WithUserDetails(value = "api_user")
public void generateSSHKeyRSA_KeyExistsInCollection_Success() {
GitAuth publicKey = gitService.generateSSHKey(null).block();
Mono<GitAuth> newKey = gitService.generateSSHKey("RSA");
StepVerifier
.create(newKey)
.assertNext(s -> {
assertThat(s).isNotNull();
assertThat(s.getPublicKey()).contains("appsmith");
assertThat(s.getPublicKey()).startsWith("ssh-rsa");
assertThat(s.getPublicKey()).isNotEqualTo(publicKey.getPublicKey());
assertThat(s.getPrivateKey()).isNotEmpty();
})
@ -2345,7 +2381,7 @@ public class GitServiceTest {
@WithUserDetails(value = "api_user")
public void importApplicationFromGit_privateRepoLimitReached_ThrowApplicationLimitError() {
GitConnectDTO gitConnectDTO = getConnectRequest("git@github.com:test/testRepo.git", testUserProfile);
gitService.generateSSHKey().block();
gitService.generateSSHKey(null).block();
Mockito
.when(gitCloudServicesUtils.getPrivateRepoLimitForOrg(Mockito.any(), Mockito.anyBoolean()))
.thenReturn(Mono.just(0));
@ -2363,7 +2399,7 @@ public class GitServiceTest {
@WithUserDetails(value = "api_user")
public void importApplicationFromGit_emptyRepo_ThrowError() {
GitConnectDTO gitConnectDTO = getConnectRequest("git@github.com:test/testRepo.git", testUserProfile);
GitAuth gitAuth = gitService.generateSSHKey().block();
GitAuth gitAuth = gitService.generateSSHKey(null).block();
ApplicationJson applicationJson = createAppJson(filePath).block();
applicationJson.setExportedApplication(null);
@ -2389,7 +2425,7 @@ public class GitServiceTest {
@WithUserDetails(value = "api_user")
public void importApplicationFromGit_validRequest_Success() {
GitConnectDTO gitConnectDTO = getConnectRequest("git@github.com:test/testRepo.git", testUserProfile);
GitAuth gitAuth = gitService.generateSSHKey().block();
GitAuth gitAuth = gitService.generateSSHKey(null).block();
ApplicationJson applicationJson = createAppJson(filePath).block();
applicationJson.getExportedApplication().setName("testRepo");
@ -2422,7 +2458,7 @@ public class GitServiceTest {
@WithUserDetails(value = "api_user")
public void importApplicationFromGit_validRequestWithDuplicateApplicationName_Success() {
GitConnectDTO gitConnectDTO = getConnectRequest("git@github.com:test/testGitRepo.git", testUserProfile);
GitAuth gitAuth = gitService.generateSSHKey().block();
GitAuth gitAuth = gitService.generateSSHKey(null).block();
ApplicationJson applicationJson = createAppJson(filePath).block();
applicationJson.getExportedApplication().setName("testGitRepo (1)");
@ -2466,7 +2502,7 @@ public class GitServiceTest {
.block();
GitConnectDTO gitConnectDTO = getConnectRequest("git@github.com:test/testGitImportRepo.git", testUserProfile);
GitAuth gitAuth = gitService.generateSSHKey().block();
GitAuth gitAuth = gitService.generateSSHKey(null).block();
ApplicationJson applicationJson = createAppJson(filePath).block();
applicationJson.getExportedApplication().setName("testGitImportRepo");
@ -2513,7 +2549,7 @@ public class GitServiceTest {
.block();
GitConnectDTO gitConnectDTO = getConnectRequest("git@github.com:test/testGitImportRepoCancelledMidway.git", testUserProfile);
GitAuth gitAuth = gitService.generateSSHKey().block();
GitAuth gitAuth = gitService.generateSSHKey(null).block();
ApplicationJson applicationJson = createAppJson(filePath).block();
applicationJson.getExportedApplication().setName(null);
@ -2573,7 +2609,7 @@ public class GitServiceTest {
@WithUserDetails(value = "api_user")
public void importApplicationFromGit_validRequestWithDuplicateDatasourceOfDifferentType_ThrowError() {
GitConnectDTO gitConnectDTO = getConnectRequest("git@github.com:test/testGitImportRepo1.git", testUserProfile);
gitService.generateSSHKey().block();
gitService.generateSSHKey(null).block();
ApplicationJson applicationJson = createAppJson(filePath).block();
applicationJson.getExportedApplication().setName("testGitImportRepo1");
applicationJson.getDatasourceList().get(0).setName("db-auth-1");
@ -2605,7 +2641,7 @@ public class GitServiceTest {
@WithUserDetails(value = "api_user")
public void importApplicationFromGit_validRequestWithEmptyRepo_ThrowError() {
GitConnectDTO gitConnectDTO = getConnectRequest("git@github.com:test/emptyRepo.git", testUserProfile);
GitAuth gitAuth = gitService.generateSSHKey().block();
GitAuth gitAuth = gitService.generateSSHKey(null).block();
ApplicationJson applicationJson =new ApplicationJson();

3
app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ReleaseNotesServiceTest.java
View File

@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.ArrayList;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
@ -20,7 +21,7 @@ public class ReleaseNotesServiceTest {
@Test
public void testComputeNewReleases() {
List<ReleaseNode> releaseNodes = releaseNotesService.getReleaseNodesCache();
List<ReleaseNode> releaseNodes = new ArrayList<>();
releaseNodes.addAll(List.of(
new ReleaseNode("v3"),
new ReleaseNode("v2"),