test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(接口测试): 调整指令支持批量处理

This commit is contained in:
fit2-zhao 2024-10-11 19:13:29 +08:00 committed by Craftsman
parent 05f111ced4
commit 1937665cea
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backend/services/api-test/src/main/java/io/metersphere/api/engine/KubernetesProvider.java
View File

@ -10,11 +10,9 @@ import io.metersphere.sdk.exception.MSException;
import io.metersphere.sdk.util.JSON; import io.metersphere.sdk.util.JSON;
import io.metersphere.sdk.util.LogUtils; import io.metersphere.sdk.util.LogUtils;
import io.metersphere.system.dto.pool.TestResourceDTO; import io.metersphere.system.dto.pool.TestResourceDTO;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.io.ByteArrayOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
@ -22,7 +20,7 @@ import java.util.concurrent.ThreadLocalRandom;
public class KubernetesProvider { public class KubernetesProvider {
private static final String RUNNING_PHASE = "Running"; private static final String RUNNING_PHASE = "Running";
private static final String SHELL_COMMAND = "sh"; private static final String SHELL_COMMAND = "#!/bin/bash";
public static KubernetesClient getKubernetesClient(TestResourceDTO credential) { public static KubernetesClient getKubernetesClient(TestResourceDTO credential) {
ConfigBuilder configBuilder = new ConfigBuilder() ConfigBuilder configBuilder = new ConfigBuilder()
@ -67,38 +65,28 @@ public class KubernetesProvider {
Pod pod = getExecPod(client, resource); Pod pod = getExecPod(client, resource);
LogUtils.info("当前执行 Pod：【 " + pod.getMetadata().getName() + " 】"); LogUtils.info("当前执行 Pod：【 " + pod.getMetadata().getName() + " 】");
// 创建文件 // 创建文件
String createFile = "echo -e \"" + JSON.toJSONString(runRequest) + "\" > " + scriptId; String parameters = "cat <<EOF > " + scriptId + StringUtils.LF + JSON.toFormatJSONString(runRequest) + StringUtils.LF + "EOF" + StringUtils.LF;
// 删除文件 // 删除文件
String deleteFile = "rm -f " + scriptId; String deleteFile = "rm -f " + scriptId + StringUtils.LF;
String commandX = SHELL_COMMAND + StringUtils.LF + parameters + command + StringUtils.LF + deleteFile;
LogUtils.info("执行命令：【 " + commandX + " 】");
// 同步执行命令 // 同步执行命令
execWatch = client.pods().inNamespace(client.getNamespace()) execWatch = client.pods().inNamespace(client.getNamespace())
.withName(pod.getMetadata().getName()) .withName(pod.getMetadata().getName())
.redirectingInput() .redirectingInput()
.writingOutput(System.out) .writingOutput(System.out)
.writingError(System.err) .writingError(System.err)
.withTTY().exec(SHELL_COMMAND, "-c", createFile + " && " + command + " && " + deleteFile); .withTTY().exec(commandX);
// 等待命令执行完成，获取结果 // 等待命令执行完成，获取结果
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); try (InputStream error = execWatch.getError()) {
ByteArrayOutputStream errorStream = new ByteArrayOutputStream();
try (InputStream inputStream = execWatch.getOutput();
InputStream errStream = execWatch.getError()) {
// 读取标准输出和错误输出
IOUtils.copy(inputStream, outputStream);
IOUtils.copy(errStream, errorStream);
// 判断是否有错误输出 // 判断是否有错误输出
if (errorStream.size() > 0) { if (error != null && error.available() > 0) {
throw new MSException("Kubernetes exec error: " + errorStream); throw new MSException("Kubernetes exec error");
} }
// 输出结果
String result = outputStream.toString();
LogUtils.info("命令执行结果: " + result);
} }
} finally { } finally {
// 确保 ExecWatch 被关闭以释放资源 // 确保 ExecWatch 被关闭以释放资源