Fix and simplify buildStatus step (#1066)

* Add logging * Modify logging * Modify logging * Modify logging * Use standard HTTP request step * Migrate to httpRequest
elastic · Apr 3, 2021 · 7933278 · 7933278
1 parent 33c199b
commit 7933278
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 52 deletions.
diff --git a/src/test/groovy/BuildStatusTests.groovy b/src/test/groovy/BuildStatusTests.groovy
@@ -19,51 +19,28 @@ import org.junit.Before
 import org.junit.After
 import org.junit.Test
 import static org.junit.Assert.assertTrue
-import com.sun.net.httpserver.HttpServer
-import com.sun.net.httpserver.HttpContext
-import com.sun.net.httpserver.HttpExchange
-import com.sun.net.httpserver.HttpHandler
 
 class BuildStatusTests extends ApmBasePipelineTest {
 
 
-    // Build a small test server
-    def i = new InetSocketAddress('localhost', 9999)
-    def HttpServer ws =  HttpServer.create(i, 100)
-    HttpContext job_status_context = ws.createContext("/buildStatus/text")
-
-
     @Override
     @Before
     void setUp() throws Exception {
         super.setUp()
         script = loadScript('vars/buildStatus.groovy')
-        job_status_context.setHandler({ exchange ->
-        String response = "Success"
-        exchange.responseHeaders.set("Content-Type", "text/plain;charset=utf-8")
-        exchange.sendResponseHeaders(200, response.getBytes().length);
-        OutputStream os = exchange.getResponseBody();
-        os.write(response.getBytes());
-        os.close();
-        exchange.Send
-        });
-        ws.start()
-    }
-
-    @After
-    void tearDown() throws Exception {
-        ws.stop(0)
     }
 
     @Test
     void test() throws Exception {
+        helper.registerAllowedMethod("httpRequest", [Map.class], { "Success" })
         def result = script.call(host: 'localhost:9999', job: ['apm-agent-java', 'apm-agent-java-mbp', 'master'], ssl: false)
         assertTrue("Success" == result)
         assertJobStatusSuccess()
     }
 
     @Test
     void testBoolSuccess() throws Exception {
+        helper.registerAllowedMethod("httpRequest", [Map.class], { "Success" })
         def result = script.call(host: 'localhost:9999', job: ['apm-agent-java', 'apm-agent-java-mbp', 'master'], return_boolean: true, ssl: false)
         assertTrue(result)
     }

diff --git a/vars/buildStatus.groovy b/vars/buildStatus.groovy
@@ -25,33 +25,7 @@ buildStatus(
 **/
 
 import java.net.URL
-import java.net.HttpURLConnection
 
-import java.io.BufferedReader
-import java.io.InputStreamReader
-
-
-private static String makeRequest(URL url) throws IOException {
-    // URL url = new URL("${baseUrl}/${path}")
-    HttpURLConnection con = (HttpURLConnection)url.openConnection()
-    con.setRequestMethod("GET")
-    con.setRequestProperty("User-Agent", "Jenkins Build Status/1.0")
-    int responseCode = con.getResponseCode()
-
-    InputStreamReader isr = new InputStreamReader(con.getInputStream())
-    BufferedReader brd = new BufferedReader(isr)
-    if (responseCode == HttpURLConnection.HTTP_OK) {
-        String inputLine
-        StringBuffer response = new StringBuffer()
-        while ((inputLine = brd.readLine()) != null) {
-            response.append(inputLine)
-        }
-        brd.close()
-        return response.toString()
-    } else {
-        raise IOException("Failure to connect to Jenkins instance")
-    }
-}
 
 private static URL constructURL(String host, ArrayList job, boolean ssl) throws Exception {
     String delim = "%2F"
@@ -71,7 +45,8 @@ def call(Map args = [:]) {
     def job = args.get('job', [])
     def return_boolean = args.get('return_boolean', false)
     def ssl = args.get('ssl', true)
-    def result = makeRequest(constructURL(host, job, ssl))
+    def to_url = constructURL(host, job, ssl).toString()
+    def result = httpRequest(url: to_url)
     if (return_boolean){
         if (result == "Success") {
             return true