Skip to content

Commit e394fbe

Browse files
authored
Add apis for gitlab retry (#191)
* code style * add gitlab retry get and put apis
1 parent cdabcee commit e394fbe

20 files changed

+89
-30
lines changed

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<sonar.organization>rht-labs</sonar.organization>
2626
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
2727
<sonar.coverage.jacoco.xmlReportPaths>./target/jacoco-report/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
28-
<jacoco.version>0.8.7</jacoco.version>
2928
</properties>
3029
<dependencyManagement>
3130
<dependencies>

src/main/java/com/redhat/labs/lodestar/model/Author.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.redhat.labs.lodestar.model;
22

33
import lombok.*;
4-
import lombok.experimental.SuperBuilder;
54

65
@Data
76
@NoArgsConstructor

src/main/java/com/redhat/labs/lodestar/model/Engagement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ public class Engagement {
7676
//also checked before PUT/POST actions
7777
@DiffIgnore
7878
private Boolean writeable;
79-
80-
@Deprecated
79+
8180
/*
8281
@deprecated - delivered in a separate api separately
8382
*/
83+
@Deprecated(since = "2.0.0")
8484
@DiffIgnore
8585
private List<Commit> commits;
8686
@JsonbProperty("creation_details")

src/main/java/com/redhat/labs/lodestar/model/EngagementAttribute.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import lombok.ToString;
1111
import lombok.experimental.SuperBuilder;
1212
import org.javers.core.metamodel.annotation.DiffIgnore;
13-
import org.javers.core.metamodel.annotation.Id;
1413

1514
@Data
1615
@ToString

src/main/java/com/redhat/labs/lodestar/model/EngagementUser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import lombok.Builder;
88
import lombok.Data;
99
import lombok.NoArgsConstructor;
10-
import org.javers.core.metamodel.annotation.Id;
1110
import org.javers.core.metamodel.annotation.ValueObject;
1211

1312
@Data

src/main/java/com/redhat/labs/lodestar/resource/ArtifactResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public Response getArtifacts(@Context UriInfo uriInfo,
6969
}
7070
}
7171

72-
return artifactService.getArtifacts(filterOptions, engagementUuid, type, region, dashboardView);
72+
return artifactService.getArtifacts(filterOptions, engagementUuid, type, region);
7373
}
7474

7575
@GET

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,36 @@ public Response delete(@PathParam("id") String uuid) {
376376
engagementService.deleteEngagement(uuid);
377377
return Response.accepted().build();
378378
}
379+
380+
@GET
381+
@Path("/gitlab/check")
382+
@SecurityRequirement(name = "jwt")
383+
@APIResponses(value = { @APIResponse(responseCode = "200", description = "Gitlab / DB comparison fetched") })
384+
@Operation(summary = "Checks all engagements in the database vs what is in gitlab")
385+
public Set<String> getGitlabSet() {
386+
LOGGER.debug("checking gitlab");
387+
return engagementService.getGitlabSet();
388+
}
389+
390+
@PUT
391+
@SecurityRequirement(name = "jwt")
392+
@Path("/gitlab/repush")
393+
@APIResponses(value = { @APIResponse(responseCode = "401", description = "Missing or Invalid JWT"),
394+
@APIResponse(responseCode = "403", description = "Not authorized for engagement type"),
395+
@APIResponse(responseCode = "404", description = "Engagement resource not found to update"),
396+
@APIResponse(responseCode = "200", description = "Engagement resent to gitlab") })
397+
@Operation(summary = "Resends engagement data to gitlab.")
398+
public Response rePushChangesToGitlab(@QueryParam("uuid") String uuid, @QueryParam(value = "message") String message) {
399+
LOGGER.debug("re-pushing {} to gitlab", uuid);
400+
401+
Engagement engagement = engagementService.getByUuid(uuid);
402+
boolean writer = jwtUtils.isAllowedToWriteEngagement(jwt, configService.getPermission(engagement.getType()));
403+
if(!writer) {
404+
return forbiddenResponse(engagement.getType());
405+
}
406+
407+
return engagementService.rePushChangesToGitlab(uuid, message);
408+
}
379409

380410
private Response forbiddenResponse(String type) {
381411
String message = String.format("{\"message\": \"You cannot modify %s engagements\"}", type);

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,14 @@ List<Engagement> getEngagementsWithCategory(@QueryParam("page") int page, @Query
7373
@Path("refresh/state")
7474
Response refreshStates();
7575

76+
@GET
77+
@Path("gitlab")
78+
Set<String> getGitlabSet();
79+
80+
@PUT
81+
@Path("retry")
82+
Response rePushChangesToGitlab(@QueryParam("uuid") String uuid, @QueryParam("message") String message);
83+
7684
@GET
7785
@Path("suggest")
7886
Response suggest(@QueryParam("partial") String partial);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import javax.enterprise.context.ApplicationScoped;
99
import javax.ws.rs.*;
1010
import javax.ws.rs.core.*;
11-
import java.util.List;
1211
import java.util.Set;
1312

1413
@ApplicationScoped

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import javax.enterprise.context.*;
99
import javax.inject.*;
10-
import javax.ws.rs.*;
1110
import javax.ws.rs.core.*;
1211
import java.time.Instant;
1312
import java.util.*;

0 commit comments

Comments
 (0)