dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12854 from dashevchenko/vcSettingsFix

Browse Source 
[Version control] Fixed repository settings deletion
This commit is contained in:
Viacheslav Klimov 2025-03-10 17:02:54 +02:00 committed by GitHub
commit 2deab7167b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
View File

@ -529,6 +529,8 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
@Override
public ListenableFuture<Void> deleteVersionControlSettings(TenantId tenantId) {
log.debug("[{}] Deleting version control settings", tenantId);
repositorySettingsService.delete(tenantId);
return gitServiceQueue.clearRepository(tenantId);
}

79
application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java Normal file
View File

@ -0,0 +1,79 @@
/**
* Copyright © 2016-2025 The Thingsboard Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.controller;
import com.google.common.util.concurrent.SettableFuture;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.thingsboard.server.common.data.sync.vc.RepositoryAuthMethod;
import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
import org.thingsboard.server.dao.service.DaoSqlTest;
import org.thingsboard.server.service.sync.vc.GitVersionControlQueueService;
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@Slf4j
@DaoSqlTest
public class RepositorySettingsTest extends AbstractControllerTest {
@MockBean
private GitVersionControlQueueService gitVersionControlQueueService;
@Test
public void testFindRepositorySettings() throws Exception {
loginTenantAdmin();
doGet("/api/admin/repositorySettings")
.andExpect(status().isNotFound());
String testRepositoryUri = "https://github.com/test/version-control-test-repository.git";
SettableFuture<Void> successFuture = SettableFuture.create();
successFuture.set(null);
when(gitVersionControlQueueService.initRepository(any(), any()))
.thenReturn(successFuture);
RepositorySettings repositorySettings = new RepositorySettings();
repositorySettings.setPassword("test");
repositorySettings.setAuthMethod(RepositoryAuthMethod.USERNAME_PASSWORD);
repositorySettings.setRepositoryUri(testRepositoryUri);
repositorySettings.setDefaultBranch("main");
doPost("/api/admin/repositorySettings", repositorySettings)
.andExpect(status().isOk());
// check repository settings
doGet("/api/admin/repositorySettings")
.andExpect(status().isOk())
.andExpect(content().contentType(contentType))
.andExpect(jsonPath("$.repositoryUri", is(testRepositoryUri)));
// delete settings
when(gitVersionControlQueueService.clearRepository(any()))
.thenReturn(successFuture);
doDelete("/api/admin/repositorySettings")
.andExpect(status().isOk());
// check repository settings
doGet("/api/admin/repositorySettings")
.andExpect(status().isNotFound());
}
}