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.

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

Jump to bottom

Simplify the Raw devfile filename check #548

Merged
merged 3 commits into from
Sep 6, 2023
Merged

Simplify the Raw devfile filename check #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a358be7
Simplify the Raw devfile filename check
vinokurig Aug 21, 2023
f14107a
fixup! Simplify the Raw devfile filename check
vinokurig Aug 22, 2023
f13bde0
Merge branch 'main' of github.com:eclipse-che/che-server into che-22368
vinokurig Sep 6, 2023
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
6 changes: 1 addition & 5 deletions ...c/main/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.eclipse.che.api.core.ApiException;
import org.eclipse.che.api.core.BadRequestException;
import org.eclipse.che.api.factory.server.urlfactory.DefaultFactoryUrl;
import org.eclipse.che.api.factory.server.urlfactory.DevfileFilenamesProvider;
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
import org.eclipse.che.api.factory.server.urlfactory.URLFactoryBuilder;
import org.eclipse.che.api.factory.shared.dto.FactoryMetaDto;
Expand All @@ -52,7 +51,6 @@ public class RawDevfileUrlFactoryParameterResolver implements FactoryParametersR

protected final URLFactoryBuilder urlFactoryBuilder;
protected final URLFetcher urlFetcher;
@Inject private DevfileFilenamesProvider devfileFilenamesProvider;

@Inject
public RawDevfileUrlFactoryParameterResolver(
Expand All @@ -71,9 +69,7 @@ public RawDevfileUrlFactoryParameterResolver(
@Override
public boolean accept(Map<String, String> factoryParameters) {
String url = factoryParameters.get(URL_PARAMETER_NAME);
return !isNullOrEmpty(url)
&& devfileFilenamesProvider.getConfiguredDevfileFilenames().stream()
.anyMatch(url::endsWith);
return !isNullOrEmpty(url) && (url.endsWith(".yaml") || url.endsWith(".yml"));
}

/**
Expand Down
28 changes: 13 additions & 15 deletions ...st/java/org/eclipse/che/api/factory/server/RawDevfileUrlFactoryParameterResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;

import java.lang.reflect.Field;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.che.api.core.BadRequestException;
import org.eclipse.che.api.factory.server.urlfactory.DevfileFilenamesProvider;
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
import org.eclipse.che.api.factory.server.urlfactory.URLFactoryBuilder;
import org.eclipse.che.api.workspace.server.devfile.DevfileParser;
Expand Down Expand Up @@ -67,8 +65,6 @@ public class RawDevfileUrlFactoryParameterResolverTest {
+ " reference: ../localfile\n";

@Mock private URLFetcher urlFetcher;
private final DevfileFilenamesProvider devfileFilenamesProvider =
new DevfileFilenamesProvider("devfile.yaml, .devfile.yaml");

@InjectMocks private RawDevfileUrlFactoryParameterResolver rawDevfileUrlFactoryParameterResolver;

Expand Down Expand Up @@ -167,16 +163,7 @@ public void shouldThrowExceptionOnInvalidURL(String url, String message) throws
}

@Test(dataProvider = "devfileNames")
public void shouldAcceptRawDevfileUrl(String devfileName)
throws NoSuchFieldException, IllegalAccessException {
// given
Field field =
rawDevfileUrlFactoryParameterResolver
.getClass()
.getDeclaredField("devfileFilenamesProvider");
field.setAccessible(true);
field.set(rawDevfileUrlFactoryParameterResolver, devfileFilenamesProvider);

public void shouldAcceptRawDevfileUrl(String devfileName) {
// when
boolean result =
rawDevfileUrlFactoryParameterResolver.accept(
Expand All @@ -186,6 +173,17 @@ public void shouldAcceptRawDevfileUrl(String devfileName)
assertTrue(result);
}

@Test
public void shouldNotAcceptRawDevfileUrl() {
// when
boolean result =
rawDevfileUrlFactoryParameterResolver.accept(
Collections.singletonMap(URL_PARAMETER_NAME, "https://host/user/repo.git"));

// then
assertFalse(result);
}

@DataProvider(name = "invalidURLsProvider")
private Object[][] invalidUrlsProvider() {
return new Object[][] {
Expand All @@ -200,6 +198,6 @@ private Object[][] invalidUrlsProvider() {

@DataProvider(name = "devfileNames")
private Object[] devfileNames() {
return new String[] {"devfile.yaml", ".devfile.yaml"};
return new String[] {"devfile.yaml", ".devfile.yaml", "any-name.yaml", "any-name.yml"};
}
}