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

Support for multiple separators in the 'No proxy host' field: pipe (|), semicolon (;), newline, and comma (,) #108

Merged
merged 12 commits into from
Oct 7, 2024
Merged

Support for multiple separators in the 'No proxy host' field: pipe (|), semicolon (;), newline, and comma (,) #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
87aba78
Support pipe and new line in the 'No proxy host'
Nathan770 Sep 19, 2024
0b02a04
Support pipe and new line in the 'No proxy host'
Nathan770 Sep 19, 2024
98dc357
Support pipe and new line in the 'No proxy host'
Nathan770 Sep 19, 2024
411956b
Support pipe and new line in the 'No proxy host'
Nathan770 Sep 19, 2024
b6e3157
Support pipe and new line in the 'No proxy host'
Nathan770 Sep 19, 2024
2172a2a
Support pipe and new line in the 'No proxy host'
Nathan770 Sep 19, 2024
990ff03
Support pipe and new line in the 'No proxy host'
Nathan770 Sep 23, 2024
c46b9b3
change the separators from semicolons to commas
Nathan770 Sep 25, 2024
114f631
Merge branch 'main' into no-proxy-fix
Nathan770 Sep 28, 2024
217fb83
Update src/main/java/io/jenkins/plugins/jfrog/CliEnvConfigurator.java
Nathan770 Oct 7, 2024
a8a30f1
Update src/main/java/io/jenkins/plugins/jfrog/CliEnvConfigurator.java
Nathan770 Oct 7, 2024
55687d6
Update CreateNoProxyValueTest.java
Nathan770 Oct 7, 2024
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
12 changes: 6 additions & 6 deletions src/main/java/io/jenkins/plugins/jfrog/CliEnvConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ private static void excludeProxyEnvFromPublishing(EnvVars env) {
}

/**
* Converts a list of No Proxy Hosts received by Jenkins into a semicolon-separated string format expected by JFrog CLI.
* Converts a list of No Proxy Hosts received by Jenkins into a comma-separated string format expected by JFrog CLI.
*
* @param noProxy - A string representing the list of No Proxy Hosts.
* @return A semicolon-separated string of No Proxy Hosts.
* @return A comma-separated string of No Proxy Hosts.
*/
static String createNoProxyValue(String noProxy) {
// Trim leading and trailing spaces, Replace '|' with spaces and normalize whitespace
String noProxyListRemoveSpaceAndPipe = noProxy.trim().replaceAll("[\\s|]+", ";");
// Replace multiple semicolon with a single semicolon, and remove the last one if present
return noProxyListRemoveSpaceAndPipe.replaceAll(";+", ";").replaceAll("^;|;$", "");
// Trim leading and trailing spaces, Replace '|' and ';' with spaces and normalize whitespace
String noProxyListRemoveSpaceAndPipe = noProxy.trim().replaceAll("[\\s|;]+", ",");
// Replace multiple commas with a single comma, and remove the last one if present
return noProxyListRemoveSpaceAndPipe.replaceAll(",+", ",").replaceAll("^,|,$", "");
}
}
17 changes: 10 additions & 7 deletions src/test/java/io/jenkins/plugins/jfrog/CreateNoProxyValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,19 @@ public CreateNoProxyValueTest(String noProxy, String expectedResult) {
public static Collection<Object[]> dataProvider() {
return Arrays.asList(
new Object[]{"artifactory.jfrog.io", "artifactory.jfrog.io"},
new Object[]{"artifactory.jfrog.io \n artifactory1.jfrog.io ", "artifactory.jfrog.io;artifactory1.jfrog.io"},
new Object[]{" artifactory.jfrog.io \n \r artifactory1.jfrog.io;artifactory2.jfrog.io \n artifactory3.jfrog.io | artifactory4.jfrog.io \n artifactory5.jfrog.io ", "artifactory.jfrog.io;artifactory1.jfrog.io;artifactory2.jfrog.io;artifactory3.jfrog.io;artifactory4.jfrog.io;artifactory5.jfrog.io"},
new Object[]{"artifactory.jfrog.io \n artifactory1.jfrog.io ", "artifactory.jfrog.io,artifactory1.jfrog.io"},
new Object[]{" artifactory.jfrog.io \n \r artifactory1.jfrog.io;artifactory2.jfrog.io \n artifactory3.jfrog.io | artifactory4.jfrog.io \n artifactory5.jfrog.io ", "artifactory.jfrog.io,artifactory1.jfrog.io,artifactory2.jfrog.io,artifactory3.jfrog.io,artifactory4.jfrog.io,artifactory5.jfrog.io"},
new Object[]{"\r\n", ""},
new Object[]{";;;", ""},
Nathan770 marked this conversation as resolved.
Show resolved Hide resolved
new Object[]{",,,", ""},
new Object[]{"artifactory.jfrog.io;", "artifactory.jfrog.io"},
new Object[]{"artifactory.jfrog.io;artifactory1.jfrog.io", "artifactory.jfrog.io;artifactory1.jfrog.io"},
new Object[]{"artifactory.jfrog.io;artifactory1.jfrog.io;artifactory2.jfrog.io;artifactory3.jfrog.io", "artifactory.jfrog.io;artifactory1.jfrog.io;artifactory2.jfrog.io;artifactory3.jfrog.io"},
new Object[]{"artifactory.jfrog.io \nartifactory1.jfrog.io", "artifactory.jfrog.io;artifactory1.jfrog.io"},
new Object[]{"artifactory.jfrog.io \nartifactory1.jfrog.io\nartifactory2.jfrog.io \n artifactory3.jfrog.io", "artifactory.jfrog.io;artifactory1.jfrog.io;artifactory2.jfrog.io;artifactory3.jfrog.io"},
new Object[]{";artifactory.jfrog.io;", "artifactory.jfrog.io"}
new Object[]{"artifactory.jfrog.io,artifactory1.jfrog.io", "artifactory.jfrog.io,artifactory1.jfrog.io"},
new Object[]{"artifactory.jfrog.io;artifactory1.jfrog.io;artifactory2.jfrog.io;artifactory3.jfrog.io", "artifactory.jfrog.io,artifactory1.jfrog.io,artifactory2.jfrog.io,artifactory3.jfrog.io"},
new Object[]{"artifactory.jfrog.io|artifactory1.jfrog.io|artifactory2.jfrog.io|artifactory3.jfrog.io", "artifactory.jfrog.io,artifactory1.jfrog.io,artifactory2.jfrog.io,artifactory3.jfrog.io"},
new Object[]{"artifactory.jfrog.io\nartifactory1.jfrog.io", "artifactory.jfrog.io,artifactory1.jfrog.io"},
new Object[]{"artifactory.jfrog.io \nartifactory1.jfrog.io\nartifactory2.jfrog.io \n artifactory3.jfrog.io", "artifactory.jfrog.io,artifactory1.jfrog.io,artifactory2.jfrog.io,artifactory3.jfrog.io"},
new Object[]{";artifactory.jfrog.io;", "artifactory.jfrog.io"},
new Object[]{",artifactory.jfrog.io,", "artifactory.jfrog.io"}
);
}

Expand Down
Loading