natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Alert] [HTTP Plugin] Lose HTTP port (#14341) 

(cherry picked from commit c1a6790514)
This commit is contained in:
旺阳 2023-06-14 17:38:58 +08:00 committed by Jay Chung
parent 299c2e2b75
commit 30171c4182
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpSender.java
View File

@ -120,7 +120,7 @@ public final class HttpSender {
// GET request add param in url
setMsgInUrl(msg);
URL unencodeUrl = new URL(url);
URI uri = new URI(unencodeUrl.getProtocol(), unencodeUrl.getHost(), unencodeUrl.getPath(),
URI uri = new URI(unencodeUrl.getProtocol(), unencodeUrl.getAuthority(), unencodeUrl.getPath(),
unencodeUrl.getQuery(), null);
httpRequest = new HttpGet(uri);
@ -175,4 +175,8 @@ public final class HttpSender {
log.error("send http alert msg exception : {}", e.getMessage());
}
}
public String getRequestUrl() {
return httpRequest.getURI().toString();
}
}

10
dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpSenderTest.java
View File

@ -35,15 +35,19 @@ public class HttpSenderTest {
@Test
public void sendTest() throws IOException {
Map<String, String> paramsMap = new HashMap<>();
paramsMap.put(HttpAlertConstants.NAME_URL, "http://www.dolphinscheduler-not-exists-web.com");
paramsMap.put(HttpAlertConstants.NAME_REQUEST_TYPE, "POST");
String url = "https://www.dolphinscheduler-not-exists-web.com:12345";
String contentField = "content";
paramsMap.put(HttpAlertConstants.NAME_URL, url);
paramsMap.put(HttpAlertConstants.NAME_REQUEST_TYPE, "GET");
paramsMap.put(HttpAlertConstants.NAME_HEADER_PARAMS, "{\"Content-Type\":\"application/json\"}");
paramsMap.put(HttpAlertConstants.NAME_BODY_PARAMS, "{\"number\":\"123456\"}");
paramsMap.put(HttpAlertConstants.NAME_CONTENT_FIELD, "content");
paramsMap.put(HttpAlertConstants.NAME_CONTENT_FIELD, contentField);
HttpSender httpSender = spy(new HttpSender(paramsMap));
doReturn("success").when(httpSender).getResponseString(any());
AlertResult alertResult = httpSender.send("Fault tolerance warning");
Assertions.assertEquals("true", alertResult.getStatus());
Assertions.assertTrue(httpSender.getRequestUrl().contains(url));
Assertions.assertTrue(httpSender.getRequestUrl().contains(contentField));
}
}