Merge pull request #11 from mcanoy/legacy

support for legacy engagement.json

Author: mcanoy

src/main/java/com/redhat/labs/lodestar/model/gitlab/Action.java

@@ -0,0 +1,32 @@
+package com.redhat.labs.lodestar.model.gitlab;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Action {
+
+    @Builder.Default
+    private String action = "update";
+    private String filePath;
+    private String content;
+    @Builder.Default
+    private String encoding = "base64";
+
+    public static class ActionBuilder {
+
+        public ActionBuilder content(String content) {
+            byte[] encodedContents = Base64.getEncoder().encode(content.getBytes());
+            this.content = new String(encodedContents, StandardCharsets.UTF_8);
+            return this;
+        }
+    }
+}

src/main/java/com/redhat/labs/lodestar/model/gitlab/Commit.java

@@ -0,0 +1,21 @@
+package com.redhat.labs.lodestar.model.gitlab;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Commit {
+
+    private String branch;
+    private String commitMessage;
+    private List<Action> actions;
+    private String authorName;
+    private String authorEmail;
+}

src/main/java/com/redhat/labs/lodestar/rest/client/GitlabRestClient.java

@@ -1,14 +1,8 @@
 package com.redhat.labs.lodestar.rest.client;
 
-import javax.ws.rs.Encoded;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.*;
 
+import com.redhat.labs.lodestar.model.gitlab.Commit;
 import org.apache.http.NoHttpResponseException;
 import org.eclipse.microprofile.faulttolerance.Retry;
 import org.eclipse.microprofile.rest.client.annotation.RegisterClientHeaders;
@@ -29,11 +23,10 @@ public interface GitlabRestClient {
      * Files
      */
 
-    @PUT
-    @Path("/projects/{id}/repository/files/{file_path}")
+    @POST
+    @Path("/projects/{id}/repository/commits")
     @Produces("application/json")
-    File updateFile(@PathParam("id") @Encoded Long projectId, @PathParam("file_path") @Encoded String filePath,
-            File file);
+    void createCommit(@PathParam("id") long projectId, Commit commit);
 
     @GET
     @Path("/projects/{id}/repository/files/{file_path}")

src/main/java/com/redhat/labs/lodestar/service/ArtifactService.java

@@ -9,6 +9,12 @@
 import javax.json.bind.Jsonb;
 import javax.ws.rs.WebApplicationException;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.redhat.labs.lodestar.model.gitlab.Action;
+import com.redhat.labs.lodestar.model.gitlab.Commit;
 import io.quarkus.panache.common.Sort;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
@@ -59,6 +65,8 @@ public class ArtifactService {
     @Inject
     Jsonb jsonb;
 
+    Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
     private static final Javers JAVERS = JaversBuilder.javers()
             .withListCompareAlgorithm(ListCompareAlgorithm.LEVENSHTEIN_DISTANCE).build();
 
@@ -150,7 +158,7 @@ public void updateArtifacts(String engagementUuid, String region, List<Artifact>
                 processObjectChange(cbo, requestArtifacts);
 
                 commitMessage.append(cbo.toString());
-                updateArtifactsFile(engagementUuid, authorEmail, authorName, Optional.ofNullable(commitMessage.toString()));
+                updateArtifactsFile(engagementUuid, authorEmail.orElse(defaultAuthorEmail), authorName.orElse(defaultAuthorName), Optional.ofNullable(commitMessage.toString()));
                 if(existing.size() != requestArtifacts.size()) {
                     engagementRestClient.updateEngagement(engagementUuid, requestArtifacts.size());
                 }
@@ -336,45 +344,41 @@ void updateArtifact(Artifact artifact, Artifact existing) {
      * @param authorName
      * @param commitMessage
      */
-    public void updateArtifactsFile(String engagementUuid, Optional<String> authorEmail,
-            Optional<String> authorName, Optional<String> commitMessage) {
+    public void updateArtifactsFile(String engagementUuid, String authorEmail,
+            String authorName, Optional<String> commitMessage) {
 
         // find project by engagement
         Engagement project = engagementRestClient.getEngagementByUuid(engagementUuid);
 
         List<Artifact> artifacts = Artifact.findAllByEngagementUuid(engagementUuid);
         String content = jsonb.toJson(artifacts);
 
-        // create
-        File file = createArtifactsFile(content, defaultBranch, authorName, authorEmail, commitMessage);
+        List<Action> actions = List.of(
+                Action.builder().filePath(artifactsFile).content(content).build(),
+                createLegacyEngagementAction(project.getProjectId(), content)
+        );
+
+        Commit commit = Commit.builder().commitMessage(commitMessage.orElse("Artifact Update")).branch(defaultBranch)
+                .authorEmail(authorEmail).authorName(authorName).actions(actions).build();
 
         // update in git
-        gitlabRestClient.updateFile(project.getProjectId(), artifactsFile, file);
+        gitlabRestClient.createCommit(project.getProjectId(), commit);
     }
 
-    /**
-     * Creates and returns a {@link File} with the given parameters and encodes the
-     * content.
-     * 
-     * @param content
-     * @param branch
-     * @param authorName
-     * @param authorEmail
-     * @param commitMessage
-     * @return
-     */
-    File createArtifactsFile(String content, String branch, Optional<String> authorName, Optional<String> authorEmail,
-            Optional<String> commitMessage) {
+    Action createLegacyEngagementAction(long projectId, String artifactContent) {
+        File f = gitlabRestClient.getFile(projectId, "engagement.json", defaultBranch);
+        f.decodeFileAttributes();
+
+        JsonElement element = gson.fromJson(f.getContent(), JsonElement.class);
+        JsonObject engagement = element.getAsJsonObject();
 
-        // create file
-        File artifactFile = File.builder().filePath(artifactsFile).content(content)
-                .authorEmail(authorEmail.orElse(defaultAuthorEmail)).authorName(authorName.orElse(defaultAuthorName))
-                .branch(branch).commitMessage(commitMessage.orElse(defaultCommitMessage)).build();
+        element = gson.fromJson(artifactContent, JsonElement.class);
 
-        // encode before sending
-        artifactFile.encodeFileAttributes();
+        engagement.add("artifacts", element);
+        JsonObject sorted = new JsonObject();
+        engagement.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEach(es -> sorted.add(es.getKey(), es.getValue()));
 
-        return artifactFile;
+        return Action.builder().filePath("engagement.json").content(gson.toJson(sorted)).build();
 
     }
 

src/test/java/com/redhat/labs/mock/ExternalApiWireMock.java

@@ -46,21 +46,22 @@ public Map<String, String> start() {
                 .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(body)));
 
         body = ResourceLoader.load("project-91-artifacts-file.json");
-        
+
         stubFor(get(urlEqualTo("/api/v4/projects/91/repository/files/engagement%2Fartifacts.json?ref=master"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(body)));
 
         stubFor(get(urlEqualTo("/api/v4/projects/92/repository/files/engagement%2Fartifacts.json?ref=master"))
                 .willReturn(aResponse().withStatus(404)));
 
-        // update existing artifacts.json
+        body = ResourceLoader.loadGitlabFile("engagement-gitlab-file-1.json");
 
-        stubFor(put(urlEqualTo("/api/v4/projects/1/repository/files/engagement%2Fartifacts.json"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(200)));
+        stubFor(get(urlEqualTo("/api/v4/projects/1/repository/files/engagement.json?ref=master"))
+                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(body)));
 
-        stubFor(put(urlEqualTo("/api/v4/projects/2/repository/files/engagement%2Fartifacts.json"))
-                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(200)));
+        // update existing artifacts.json
 
+        stubFor(post(urlMatching("/api/v4/projects/[1-2]/repository/commits"))
+                .willReturn(aResponse().withHeader("Content-Type", "application/json").withStatus(200)));
 
         stubFor(put(urlMatching("/api/v2/engagements/1111/artifacts/[0-9]")).willReturn(aResponse().withStatus(200)));
 

src/test/java/com/redhat/labs/mock/ResourceLoader.java

@@ -1,7 +1,9 @@
 package com.redhat.labs.mock;
 
+import com.google.gson.Gson;
 import org.apache.commons.io.IOUtils;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -14,4 +16,15 @@ public static String load(String resourceName) {
             throw new RuntimeException(e);
         }
     }
+
+    public static String loadGitlabFile(String gitlabResourceName) {
+        String content = load(gitlabResourceName);
+
+        com.redhat.labs.lodestar.model.gitlab.File f = com.redhat.labs.lodestar.model.gitlab.File.builder()
+                .filePath("a.json").content(content).build();
+        f.encodeFileAttributes();
+
+        return new Gson().toJson(f);
+
+    }
 }

src/test/resources/engagement-gitlab-file-1.json

@@ -0,0 +1,4 @@
+{
+  "customer_name": "X",
+  "name": "Y"
+}