bugfixes

Author: parmesant

quest_test.go

@@ -375,58 +375,54 @@ func TestSmokeLoad_CustomPartition_WithK6Stream(t *testing.T) {
 // }
 
 func TestSmokeSetTarget(t *testing.T) {
-	CreateStream(t, NewGlob.QueryClient, NewGlob.Stream)
-	if NewGlob.IngestorUrl.String() == "" {
-		// RunFlog(t, NewGlob.QueryClient, NewGlob.Stream)
-		body := getTargetBody()
-		req, _ := NewGlob.QueryClient.NewRequest("POST", "/targets", strings.NewReader(body))
-		response, err := NewGlob.QueryClient.Do(req)
-		require.NoErrorf(t, err, "Request failed: %s", err)
-		require.Equalf(t, 200, response.StatusCode, "Server returned http code: %s and response: %s", response.Status, readAsString(response.Body))
-	}
+	// RunFlog(t, NewGlob.QueryClient, NewGlob.Stream)
+	body := getTargetBody()
+	req, _ := NewGlob.QueryClient.NewRequest("POST", "/targets", strings.NewReader(body))
+	response, err := NewGlob.QueryClient.Do(req)
+	require.NoErrorf(t, err, "Request failed: %s", err)
+	require.Equalf(t, 200, response.StatusCode, "Server returned http code: %s and response: %s", response.Status, readAsString(response.Body))
 }
 
 func TestSmokeSetAlert(t *testing.T) {
 	CreateStream(t, NewGlob.QueryClient, NewGlob.Stream)
 	if NewGlob.IngestorUrl.String() == "" {
 		RunFlog(t, NewGlob.QueryClient, NewGlob.Stream)
-		req, _ := NewGlob.QueryClient.NewRequest("GET", "/targets", nil)
-		response, err := NewGlob.QueryClient.Do(req)
-		require.NoErrorf(t, err, "Request failed: %s", err)
-		bodyTargets, _ := io.ReadAll(response.Body)
-		reader1 := bytes.NewReader(bodyTargets)
-		targetId := getIdFromTargetResponse(reader1)
-		body := getAlertBody(NewGlob.Stream, targetId)
-		req, _ = NewGlob.QueryClient.NewRequest("POST", "/alerts", strings.NewReader(body))
-		response, err = NewGlob.QueryClient.Do(req)
-		require.NoErrorf(t, err, "Request failed: %s", err)
-		require.Equalf(t, 200, response.StatusCode, "Server returned http code: %s and response: %s", response.Status, readAsString(response.Body))
-
+	} else {
+		RunFlog(t, NewGlob.IngestorClient, NewGlob.Stream)
 	}
+	req, _ := NewGlob.QueryClient.NewRequest("GET", "/targets", nil)
+	response, err := NewGlob.QueryClient.Do(req)
+	require.NoErrorf(t, err, "Request failed: %s", err)
+	bodyTargets, _ := io.ReadAll(response.Body)
+	reader1 := bytes.NewReader(bodyTargets)
+	targetId := getIdFromTargetResponse(reader1)
+	body := getAlertBody(NewGlob.Stream, targetId)
+	req, _ = NewGlob.QueryClient.NewRequest("POST", "/alerts", strings.NewReader(body))
+	response, err = NewGlob.QueryClient.Do(req)
+	require.NoErrorf(t, err, "Request failed: %s", err)
+	require.Equalf(t, 200, response.StatusCode, "Server returned http code: %s and response: %s", response.Status, readAsString(response.Body))
 }
 
 func TestSmokeGetAlert(t *testing.T) {
-	if NewGlob.IngestorUrl.String() == "" {
-		req, _ := NewGlob.QueryClient.NewRequest("GET", "/targets", nil)
-		response, err := NewGlob.QueryClient.Do(req)
-		require.NoErrorf(t, err, "Request failed: %s", err)
-		bodyTargets, _ := io.ReadAll(response.Body)
-		reader1 := bytes.NewReader(bodyTargets)
-		targetId := getIdFromTargetResponse(reader1)
-		req, _ = NewGlob.QueryClient.NewRequest("GET", "/alerts", nil)
-		response, err = NewGlob.QueryClient.Do(req)
-		require.NoErrorf(t, err, "Request failed: %s", err)
-		body, _ := io.ReadAll(response.Body)
-		reader1 = bytes.NewReader(body)
-		reader2 := bytes.NewReader(body)
-		expected := readAsString(reader1)
-		id, state := getIdStateFromAlertResponse(reader2)
-		require.Equalf(t, 200, response.StatusCode, "Server returned http code: %s and response: %s", response.Status, body)
-		res := createAlertResponse(id, state, NewGlob.Stream, targetId)
-		require.JSONEq(t, expected, res, "Get alert response doesn't match with Alert config returned")
-		DeleteAlert(t, NewGlob.QueryClient, id)
-		DeleteTarget(t, NewGlob.QueryClient, targetId)
-	}
+	req, _ := NewGlob.QueryClient.NewRequest("GET", "/targets", nil)
+	response, err := NewGlob.QueryClient.Do(req)
+	require.NoErrorf(t, err, "Request failed: %s", err)
+	bodyTargets, _ := io.ReadAll(response.Body)
+	reader1 := bytes.NewReader(bodyTargets)
+	targetId := getIdFromTargetResponse(reader1)
+	req, _ = NewGlob.QueryClient.NewRequest("GET", "/alerts", nil)
+	response, err = NewGlob.QueryClient.Do(req)
+	require.NoErrorf(t, err, "Request failed: %s", err)
+	body, _ := io.ReadAll(response.Body)
+	reader1 = bytes.NewReader(body)
+	reader2 := bytes.NewReader(body)
+	expected := readAsString(reader1)
+	id, state := getIdStateFromAlertResponse(reader2)
+	require.Equalf(t, 200, response.StatusCode, "Server returned http code: %s and response: %s", response.Status, body)
+	res := createAlertResponse(id, state, NewGlob.Stream, targetId)
+	require.JSONEq(t, expected, res, "Get alert response doesn't match with Alert config returned")
+	DeleteAlert(t, NewGlob.QueryClient, id)
+	DeleteTarget(t, NewGlob.QueryClient, targetId)
 	DeleteStream(t, NewGlob.QueryClient, NewGlob.Stream)
 }