webhooks

Author: mcanoy

src/main/java/com/redhat/labs/omp/config/JsonMarshaller.java

@@ -1,12 +1,26 @@
 package com.redhat.labs.omp.config;
 
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.json.bind.Jsonb;
 import javax.json.bind.JsonbBuilder;
 import javax.json.bind.JsonbConfig;
 import javax.json.bind.config.PropertyNamingStrategy;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+
 import io.quarkus.runtime.StartupEvent;
 
 /**
@@ -16,16 +30,59 @@
  */
 @ApplicationScoped
 public class JsonMarshaller {
+    public static Logger LOGGER = LoggerFactory.getLogger(JsonMarshaller.class);
 
     private Jsonb jsonb;
 
+    private ObjectMapper om = new ObjectMapper(new YAMLFactory());
+    
     void onStart(@Observes StartupEvent event) { 
         JsonbConfig config = new JsonbConfig()
                 .withFormatting(true)
                 .withPropertyNamingStrategy(PropertyNamingStrategy.LOWER_CASE_WITH_UNDERSCORES);
         jsonb = JsonbBuilder.create(config);
+        
+    }
+    
+    /**
+     * Reads a file from the system and returns the contents transformed into a new object. Must be a list. If this fails
+     * for any IOException or the file is not readable it will return null 
+     * @param <T>
+     * @param yamlFile The path to the file on disk
+     * @param clazz The class that will be return as a list
+     * @return A list!
+     */
+    public <T> List<T> fromYamlFile(String yamlFile, Class<T> clazz) {
+        
+        Path path = Paths.get(yamlFile);
+        
+        if(Files.isReadable(path)) {
+            LOGGER.debug("Loading config file {}", yamlFile);
+            String yamlFileContent;
+            try {
+                yamlFileContent = new String(Files.readAllBytes(path));
+                return fromYaml(yamlFileContent, clazz);
+            } catch (IOException e) {
+                LOGGER.error(String.format("Found but unable to read file %s", yamlFile), e);
+            }
+        } 
+        
+        return null;
     }
 
+    public <T> List<T> fromYaml(String yamlContent, Class<T> clazz) {
+        JavaType type = om.getTypeFactory().constructCollectionType(List.class, clazz);
+        
+        try {
+            return om.readValue(yamlContent, type);
+        } catch (IOException e) {
+            LOGGER.error(String.format("Found but unable to map file %s", yamlContent), e);
+        }
+        
+        return null;
+    }
+    
+    
     public <T> String toJson(T object) {
         return jsonb.toJson(object);
     }
@@ -35,5 +92,8 @@ public <T> T fromJson(String json, Class<T> type) {
         return jsonb.fromJson(json, type);
     }
 
-    
+    public <T> T fromJson(String json, Type type) {
+        return jsonb.fromJson(json, type);
+    }
+
 }

src/main/java/com/redhat/labs/omp/models/gitlab/Group.java

@@ -3,6 +3,8 @@
 import javax.json.bind.annotation.JsonbProperty;
 import javax.validation.constraints.NotBlank;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -22,6 +24,8 @@ public class Group {
     @NotBlank
     @JsonbProperty("path")
     private String path;
+    @JsonProperty("full_path")
+    private String fullPath;
     @JsonbProperty("description")
     private String description;
     @JsonbProperty("membership_lock")

src/main/java/com/redhat/labs/omp/models/gitlab/Hook.java

@@ -0,0 +1,31 @@
+package com.redhat.labs.omp.models.gitlab;
+
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Hook {
+
+    private Integer id;
+    
+    private String url;
+    
+    private Integer projectId;
+    
+    private Boolean pushEvents;
+    
+    private String pushEventsBranchFilter;
+    
+    private Date createdAt;
+    
+    //Token not provide in GET requests
+    private String token;
+    
+}

src/main/java/com/redhat/labs/omp/models/gitlab/HookConfig.java

@@ -0,0 +1,30 @@
+package com.redhat.labs.omp.models.gitlab;
+
+import javax.json.bind.annotation.JsonbProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HookConfig {
+    
+    private String name;
+    
+    @JsonbProperty("baseUrl")
+    private String baseUrl;
+    
+    @JsonbProperty("pushDvent")
+    private boolean pushEvent;
+    
+    @JsonbProperty("pushEventsBranchFilter")
+    private String pushEventsBranchFilter;
+    
+    @JsonbProperty("token")
+    private String token;
+
+}

src/main/java/com/redhat/labs/omp/resource/ConfigResource.java

@@ -1,5 +1,7 @@
 package com.redhat.labs.omp.resource;
 
+import java.util.List;
+
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -15,6 +17,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.redhat.labs.omp.models.gitlab.File;
+import com.redhat.labs.omp.models.gitlab.HookConfig;
 import com.redhat.labs.omp.service.ConfigService;
 
 @Path("/api")
@@ -29,6 +32,7 @@ public class ConfigResource {
     @GET
     @Path("/v1/config")
     public File get() {
+        LOGGER.info("V1 or undefined is deprecated");
         return configService.getConfigFile();
     }
 
@@ -38,12 +42,20 @@ public Response getJson() {
         File configFile = configService.getConfigFile();
         ObjectMapper om = new ObjectMapper(new YAMLFactory());
         try {
-            LOGGER.debug(configFile.getContent());
+            LOGGER.trace(configFile.getContent());
             Object content =  om.readValue(configFile.getContent(), Object.class);
             return Response.ok(content).build();
         } catch (JsonProcessingException e) {
             LOGGER.error(String.format("Error processing config file %s", configFile.getFilePath()), e);
             return Response.serverError().build();
         }
     }
+    
+    @GET
+    @Path("/v2/config/webhooks")
+    public Response getWebhooks() {
+        List<HookConfig> hooks = configService.getHookConfig();
+        
+        return Response.ok(hooks).build();
+    }
 }

src/main/java/com/redhat/labs/omp/resource/EngagementResource.java

@@ -19,10 +19,12 @@
 import org.eclipse.microprofile.metrics.MetricUnits;
 import org.eclipse.microprofile.metrics.annotation.Counted;
 import org.eclipse.microprofile.metrics.annotation.Timed;
+import org.jboss.resteasy.annotations.jaxrs.PathParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.redhat.labs.omp.models.Engagement;
+import com.redhat.labs.omp.models.gitlab.Hook;
 import com.redhat.labs.omp.models.gitlab.Project;
 import com.redhat.labs.omp.service.EngagementService;
 
@@ -51,12 +53,42 @@ public Response createEngagement(Engagement engagement, @Context UriInfo uriInfo
     }
 
     @GET
-    @Counted(name = "get-engagement", description = "How many enagement requests have been requested")
+    @Counted(name = "get-all-engagement", description = "Count of get all engagements")
     @Timed(name = "performedEngagementGetAll", description = "Time to get all engagements", unit = MetricUnits.MILLISECONDS)
     public Response findAllEngagements() {
         List<Engagement> engagements = engagementService.getAllEngagements();
 
         return Response.ok().entity(engagements).build();
     }
+    
+    @GET
+    @Path("/customer/{customer}/{engagement}")
+    @Counted(name = "get-engagement", description = "Count of get engagement")
+    @Timed(name = "performedEngagementGet", description = "Time to get an engagement", unit = MetricUnits.MILLISECONDS)
+    public Response getEngagment(@PathParam("customer") String customer, @PathParam("engagement") String engagement) {
+        Engagement response = engagementService.getEngagement(customer, engagement);
+
+        return Response.ok().entity(response).build();
+    }
+    
+    @POST
+    @Path("customer/{customer}/{engagement}/hooks")
+    @Counted(name = "create-engagement-hook", description = "Count of create-hook requestst")
+    @Timed(name = "performedHookCreate", description = "Time to create hook", unit = MetricUnits.MILLISECONDS)
+    public Response createProjectHook(Hook hook, @PathParam("customer") String customer, @PathParam("engagement") String engagement) {
+        
+        Response response = engagementService.createHook(customer, engagement, hook);
+        return response;
+    }
+    
+    @GET
+    @Path("customer/{customer}/{engagement}/hooks")
+    @Counted(name = "get-hook", description = "Count of get-hook requests")
+    @Timed(name = "performedHookGetAll", description = "Time to get all hooks", unit = MetricUnits.MILLISECONDS)
+    public Response findAllProjectHooks(@PathParam("customer") String customer, @PathParam("engagement") String engagement) {
+        List<Hook> engagements = engagementService.getHooks(customer, engagement);
+
+        return Response.ok().entity(engagements).build();
+    }
 
 }

src/main/java/com/redhat/labs/omp/rest/client/GitLabService.java

@@ -20,6 +20,7 @@
 import com.redhat.labs.omp.models.gitlab.CommitMultiple;
 import com.redhat.labs.omp.models.gitlab.File;
 import com.redhat.labs.omp.models.gitlab.Group;
+import com.redhat.labs.omp.models.gitlab.Hook;
 import com.redhat.labs.omp.models.gitlab.Project;
 import com.redhat.labs.omp.models.gitlab.ProjectSearchResults;
 import com.redhat.labs.omp.resources.filter.Logged;
@@ -61,6 +62,12 @@ public interface GitLabService {
     @Path("/groups")
     @Produces("application/json")
     List<Group> getGroupByName(@QueryParam("search") @Encoded String name);
+    
+    @GET
+    @Logged
+    @Path("/groups/{idOrPath}")
+    @Produces("application/json")
+    Group getGroupByIdOrPath(@PathParam("idOrPath") @Encoded String idOrPath);
 
     @DELETE
     @Logged
@@ -86,7 +93,7 @@ public interface GitLabService {
     @Logged
     @Path("/projects/{id}")
     @Produces("application/json")
-    Project getProjectById(@PathParam("id") @Encoded Integer projectId);
+    Project getProjectById(@PathParam("id") @Encoded String projectId);
 
     @POST
     @Logged
@@ -105,6 +112,25 @@ public interface GitLabService {
     @Logged
     @Path("/projects/{id}")
     void deleteProjectById(@PathParam("id") @Encoded Integer projectId);
+    
+    @POST
+    @Logged
+    @Path("/projects/{id}/hooks")
+    @Produces("application/json")
+    Response createProjectHook(@PathParam("id") @Encoded Integer projectId, Hook hook);
+    
+    @PUT
+    @Logged
+    @Path("/projects/{id}/hooks/{hookId}")
+    @Produces("application/json")
+    Response updateProjectHook(@PathParam("id") @Encoded Integer projectId, @PathParam("hookId") @Encoded Integer hookId, Hook hook);
+    
+    @GET
+    @Logged
+    @Path("/projects/{id}/hooks")
+    @Produces("application/json")
+    @Consumes("application/json")
+    List<Hook> getProjectHooks(@PathParam("id") @Encoded Integer projectId);
 
     // FILES