Add PipelineV2ServerST test

src/main/java/io/odh/test/platform/KFPv2Client.java

@@ -0,0 +1,271 @@
+/*
+ * Copyright Skodjob authors.
+ * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
+ */
+package io.odh.test.platform;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import io.odh.test.TestUtils;
+import io.odh.test.platform.httpClient.MultipartFormDataBodyPublisher;
+import lombok.SneakyThrows;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Assertions;
+
+import javax.annotation.Nonnull;
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static io.odh.test.TestUtils.DEFAULT_TIMEOUT_DURATION;
+import static io.odh.test.TestUtils.DEFAULT_TIMEOUT_UNIT;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+// https://www.kubeflow.org/docs/components/pipelines/v2/reference/api/kubeflow-pipeline-api-spec/
+public class KFPv2Client {
+    private final ObjectMapper objectMapper = new ObjectMapper()
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
+    private final HttpClient httpClient = HttpClient.newBuilder()
+            .version(HttpClient.Version.HTTP_2)
+            .followRedirects(HttpClient.Redirect.NORMAL)
+            .build();
+
+    private final String baseUrl;
+
+    public KFPv2Client(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    @SneakyThrows
+    public Pipeline importPipeline(String name, String description, String filePath) {
+        MultipartFormDataBodyPublisher requestBody = new MultipartFormDataBodyPublisher()
+                .addFile("uploadfile", Path.of(filePath), "application/yaml");
+
+        HttpRequest createPipelineRequest = HttpRequest.newBuilder()
+                .uri(new URI(baseUrl + "/apis/v2beta1/pipelines/upload?name=%s&description=%s".formatted(name, description)))
+                .header("Content-Type", requestBody.contentType())
+                .POST(requestBody)
+                .timeout(Duration.of(DEFAULT_TIMEOUT_DURATION, DEFAULT_TIMEOUT_UNIT.toChronoUnit()))
+                .build();
+        HttpResponse<String> responseCreate = httpClient.send(createPipelineRequest, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(responseCreate.body(), responseCreate.statusCode(), Matchers.is(200));
+
+        return objectMapper.readValue(responseCreate.body(), Pipeline.class);
+    }
+
+    @SneakyThrows
+    public @Nonnull List<Pipeline> listPipelines() {
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/apis/v2beta1/pipelines"))
+                .GET()
+                .timeout(Duration.of(DEFAULT_TIMEOUT_DURATION, DEFAULT_TIMEOUT_UNIT.toChronoUnit()))
+                .build();
+
+        HttpResponse<String> reply = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        Assertions.assertEquals(reply.statusCode(), 200, reply.body());
+
+        ListPipelinesResponse json = objectMapper.readValue(reply.body(), ListPipelinesResponse.class);
+        List<Pipeline> pipelines = json.pipelines;
+
+        return pipelines == null ? Collections.emptyList() : pipelines;
+    }
+
+    @SneakyThrows
+    public @Nonnull List<PipelineVersion> listPipelineVersions(String pipelineId) {
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/apis/v2beta1/pipelines/" + pipelineId + "/versions"))
+                .GET()
+                .timeout(Duration.of(DEFAULT_TIMEOUT_DURATION, DEFAULT_TIMEOUT_UNIT.toChronoUnit()))
+                .build();
+
+        HttpResponse<String> reply = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        Assertions.assertEquals(reply.statusCode(), 200, reply.body());
+
+        ListPipelineVersionsResponse json = objectMapper.readValue(reply.body(), ListPipelineVersionsResponse.class);
+        List<PipelineVersion> pipelineVersions = json.pipelineVersions;
+
+        return pipelineVersions == null ? Collections.emptyList() : pipelineVersions;
+    }
+
+    @SneakyThrows
+    public PipelineRun runPipeline(String pipelineTestRunBasename, String pipelineId, Map parameters, String immediate) {
+        Assertions.assertEquals(immediate, "Immediate");
+
+        PipelineRun pipelineRun = new PipelineRun();
+        pipelineRun.displayName = pipelineTestRunBasename;
+        pipelineRun.pipelineVersionReference = new PipelineVersionReference();
+        pipelineRun.pipelineVersionReference.pipelineId = pipelineId;
+        if (parameters != null) {
+            pipelineRun.runtimeConfig = new RuntimeConfig();
+            pipelineRun.runtimeConfig.parameters = parameters;
+        }
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/apis/v2beta1/runs"))
+                .POST(HttpRequest.BodyPublishers.ofString(objectMapper.writeValueAsString(pipelineRun)))
+                .timeout(Duration.of(DEFAULT_TIMEOUT_DURATION, DEFAULT_TIMEOUT_UNIT.toChronoUnit()))
+                .build();
+        HttpResponse<String> reply = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+        Assertions.assertEquals(reply.statusCode(), 200, reply.body());
+        return objectMapper.readValue(reply.body(), PipelineRun.class);
+    }
+
+    @SneakyThrows
+    public List<PipelineRun> getPipelineRunStatus() {
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/apis/v2beta1/runs"))
+                .GET()
+                .timeout(Duration.of(DEFAULT_TIMEOUT_DURATION, DEFAULT_TIMEOUT_UNIT.toChronoUnit()))
+                .build();
+        HttpResponse<String> reply = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+        Assertions.assertEquals(reply.statusCode(), 200, reply.body());
+        return objectMapper.readValue(reply.body(), ApiListRunsResponse.class).runs;
+    }
+
+    @SneakyThrows
+    public PipelineRun waitForPipelineRun(String pipelineRunId) {
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/apis/v2beta1/runs/" + pipelineRunId))
+                .GET()
+                .timeout(Duration.of(DEFAULT_TIMEOUT_DURATION, DEFAULT_TIMEOUT_UNIT.toChronoUnit()))
+                .build();
+
+        AtomicReference<PipelineRun> run = new AtomicReference<>();
+        TestUtils.waitFor("pipelineRun to complete", 5000, 10 * 60 * 1000, () -> {
+            try {
+                HttpResponse<String> reply = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+                Assertions.assertEquals(reply.statusCode(), 200, reply.body());
+                run.set(objectMapper.readValue(reply.body(), PipelineRun.class));
+                String state = run.get().state;
+                if (state == null) {
+                    return false; // e.g. pod has not been deployed
+                }
+                // https://github.com/kubeflow/pipelines/issues/7705
+                return switch (state) {
+                    case "SUCCEEDED" -> true;
+                    case "PENDING", "RUNNING" -> false;
+                    case "SKIPPED", "FAILED", "CANCELING", "CANCELED", "PAUSED" ->
+                            throw new AssertionError("Pipeline run failed: " + state + run.get().error);
+                    default -> throw new AssertionError("Unexpected pipeline run status: " + state + run.get().error);
+                };
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        return run.get();
+    }
+
+    @SneakyThrows
+    public void deletePipelineRun(String runId) {
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/apis/v2beta1/runs/" + runId))
+                .DELETE()
+                .timeout(Duration.of(DEFAULT_TIMEOUT_DURATION, DEFAULT_TIMEOUT_UNIT.toChronoUnit()))
+                .build();
+        HttpResponse<String> reply = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        Assertions.assertEquals(200, reply.statusCode(), reply.body());
+    }
+
+    @SneakyThrows
+    public void deletePipeline(String pipelineId) {
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/apis/v2beta1/pipelines/" + pipelineId))
+                .DELETE()
+                .timeout(Duration.of(DEFAULT_TIMEOUT_DURATION, DEFAULT_TIMEOUT_UNIT.toChronoUnit()))
+                .build();
+        HttpResponse<String> reply = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        Assertions.assertEquals(200, reply.statusCode(), reply.body());
+    }
+
+    @SneakyThrows
+    public void deletePipelineVersion(String pipelineId, String pipelineVersionId) {
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/apis/v2beta1/pipelines/" + pipelineId + "/versions/" + pipelineVersionId))
+                .DELETE()
+                .timeout(Duration.of(DEFAULT_TIMEOUT_DURATION, DEFAULT_TIMEOUT_UNIT.toChronoUnit()))
+                .build();
+        HttpResponse<String> reply = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+        Assertions.assertEquals(200, reply.statusCode(), reply.body());
+    }
+
+    /// helpers for reading json responses
+    /// there is openapi spec, so this can be generated
+
+    public static class ListPipelinesResponse {
+        public List<Pipeline> pipelines;
+        public int totalSize;
+        public String nextPageToken;
+    }
+
+    public static class Pipeline {
+        public String pipelineId;
+        public String displayName;
+    }
+
+    public static class ListPipelineVersionsResponse {
+        public List<PipelineVersion> pipelineVersions;
+        public int totalSize;
+        public String nextPageToken;
+    }
+
+    public static class PipelineVersion {
+        public String pipelineVersionId;
+        public String displayName;
+    }
+
+    public static class ApiListRunsResponse {
+        public List<PipelineRun> runs;
+        public int totalSize;
+        public String nextPageToken;
+    }
+
+    public static class PipelineRun {
+        public String runId;
+        public String displayName;
+        public String pipelineVersionId;
+        public PipelineVersionReference pipelineVersionReference;
+        public RuntimeConfig runtimeConfig;
+
+        public String createdAt;
+        public String scheduledAt;
+        public String finishedAt;
+        public RunDetails runDetails;
+
+        public String state; // "PENDING", ...
+        public String error;
+    }
+
+    public static class RunDetails {
+        public String pipelineContextId;
+        public String pipelineRunContextId;
+        public Object taskDetails;
+    }
+
+    public static class PipelineVersionReference {
+        public String pipelineId;
+        public String pipelineVersionId;
+    }
+
+    public static class RuntimeConfig {
+        public Object parameters;
+        public String pipelineRoot;
+    }
+}

src/test/java/io/odh/test/e2e/standard/PipelineServerST.java

@@ -25,7 +25,6 @@
 import io.odh.test.OdhAnnotationsLabels;
 import io.odh.test.TestConstants;
 import io.odh.test.TestUtils;
-import io.odh.test.framework.listeners.ResourceManagerDeleteHandler;
 import io.odh.test.framework.manager.ResourceManager;
 import io.odh.test.platform.KFPv1Client;
 import io.odh.test.utils.DscUtils;
@@ -45,7 +44,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,7 +68,6 @@
         @Step(value = "Delete ODH operator and all created resources", expected = "Operator is removed and all other resources as well")
     }
 )
-@ExtendWith(ResourceManagerDeleteHandler.class)
 public class PipelineServerST extends StandardAbstract {
     private static final Logger LOGGER = LoggerFactory.getLogger(PipelineServerST.class);