Skip to content

Removed validate() method to allow the use of EnvVars for the plugins. #133

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

Merged
2 commits merged into from
Jul 4, 2022
Merged

Removed validate() method to allow the use of EnvVars for the plugins. #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31fadce
Removed the validate() that checks for presence of base url and crede…
Jul 4, 2022
42691f2
Updated version of slf4j-simple to satisfy Enforcer rule in Jenkins p…
Jul 4, 2022
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
14 changes: 1 addition & 13 deletions src/main/java/com/checkmarx/ast/wrapper/CxConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
import lombok.Data;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;

import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@Data
@Builder
public class CxConfig {
public class CxConfig {

private static final Pattern pattern = Pattern.compile("([^\"]\\S*|\".+?\")\\s*");

Expand All @@ -31,17 +30,6 @@ public void setAdditionalParameters(String additionalParameters) {
this.additionalParameters = parseAdditionalParameters(additionalParameters);
}

void validate() throws InvalidCLIConfigException {
if (StringUtils.isBlank(getBaseUri())) {
throw new InvalidCLIConfigException("Checkmarx server URL is not set");
}

if (StringUtils.isBlank(getApiKey())
&& (StringUtils.isBlank(getClientId()) || StringUtils.isBlank(getClientSecret()))) {
throw new InvalidCLIConfigException("Credentials are not set");
}
}

List<String> toArguments() {
List<String> commands = new ArrayList<>();

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/checkmarx/ast/wrapper/CxWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public CxWrapper(CxConfig cxConfig)

public CxWrapper(@NonNull CxConfig cxConfig, @NonNull Logger logger) throws CxConfig.InvalidCLIConfigException,
IOException {
cxConfig.validate();
this.cxConfig = cxConfig;
this.logger = logger;
this.executable = StringUtils.isBlank(this.cxConfig.getPathToExecutable())
Expand Down Expand Up @@ -305,7 +304,7 @@ public int getResultsBfl(@NonNull UUID scanId, @NonNull String queryId, List<Nod

}

public kicsRealtimeResults kicsRealtimeScan(@NonNull String fileSources,String engine ,String additionalParams)
public kicsRealtimeResults kicsRealtimeScan(@NonNull String fileSources, String engine, String additionalParams)
throws IOException, InterruptedException, CxException {
this.logger.info("Executing 'scan kics-realtime' command using the CLI.");
this.logger.info("Fetching the results for fileSources {} and additionalParams {}", fileSources, additionalParams);
Expand All @@ -317,14 +316,15 @@ public kicsRealtimeResults kicsRealtimeScan(@NonNull String fileSources,String e
arguments.add(fileSources);
arguments.add(CxConstants.ADDITONAL_PARAMS);
arguments.add(additionalParams);
if(engine.length()>0){
if (engine.length() > 0) {
arguments.add(CxConstants.ENGINE);
arguments.add(engine);
}
kicsRealtimeResults kicsResults = Execution.executeCommand(withConfigArguments(arguments), logger, kicsRealtimeResults::fromLine);
return kicsResults;

}

private int getIndexOfBfLNode(List<Node> bflNodes, List<Node> resultNodes) {

int bflNodeNotFound = -1;
Expand Down