Skip to content
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.

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

Исправлена ошибка расчета локальных путей в случае, когда мастер на Linux, а агент - на Windows #151

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 11 additions & 8 deletions src/ru/pulsar/jenkins/library/utils/FileUtils.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,20 @@ class FileUtils {

static String getLocalPath(FilePath filePath) {
IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
String workspacePath = steps.env().WORKSPACE
String fileRemotePath = filePath.getRemote()
nixel2007 marked this conversation as resolved.
Show resolved Hide resolved

def env = steps.env();
// Нормализуем пути: заменяем обратные слэши на прямые
workspacePath = workspacePath.replace('\\', '/')
fileRemotePath = fileRemotePath.replace('\\', '/')

Path workspacePath = new File(env.WORKSPACE).toPath()
Path rawFilePath = new File(filePath.getRemote()).toPath()
// Проверяем, что файл находится внутри рабочей директории
if (!fileRemotePath.startsWith(workspacePath)) {
throw new IllegalArgumentException("File path is not within the workspace directory")
}

return workspacePath.relativize(rawFilePath)
.toString()
.replaceAll('\\\\\\\\', '/')
.replaceAll('\\\\', '/')
.toString()
// Вычисляем относительный путь
return fileRemotePath.substring(workspacePath.length() + 1)
}

static void loadFile(String filePathFrom, def env, String filePathTo) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

public class EnvUtils implements EnvironmentAction {

public String NODE_NAME = "node";
public String NODE_NAME = "built-in";
public String WORKSPACE = "ws";
public String BRANCH_NAME = "master";

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package ru.pulsar.jenkins.library.utils;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import ru.pulsar.jenkins.library.IStepExecutor;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;

class FileUtilsTest {

private final IStepExecutor steps = TestUtils.getMockedStepExecutor();

@BeforeEach
void setUp() {
TestUtils.setupMockedContext(steps);
}

@Test
void testGetLocalPath() {
// given
var env = new EnvUtils();
when(steps.env()).thenReturn(env);
var filePath = FileUtils.getFilePath(env.WORKSPACE + "/src/cf");

// when
String localPath = FileUtils.getLocalPath(filePath);

// then
assertThat(localPath).isEqualTo("src/cf");
}
}
Loading