Skip to content
Snippets Groups Projects
Commit bd5af934 authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

Merge branch 'malowe/main/staging-patches' into 'main'

Add strict mode flag for GH webhook (re)processing

See merge request !126
parents 777bb8e9 6f236f3c
No related branches found
No related tags found
1 merge request!126Add strict mode flag for GH webhook (re)processing
Pipeline #15441 passed
...@@ -9,6 +9,7 @@ services: ...@@ -9,6 +9,7 @@ services:
- CONFIG_SECRET_PATH=/var/run/secrets/secret.properties - CONFIG_SECRET_PATH=/var/run/secrets/secret.properties
volumes: volumes:
- ./config/application/secret.properties:/var/run/secrets/secret.properties - ./config/application/secret.properties:/var/run/secrets/secret.properties
- ./config/application/pubkey.pem:/var/run/secrets/pubkey.pem
depends_on: depends_on:
- "mariadb" - "mariadb"
deploy: deploy:
......
...@@ -85,7 +85,7 @@ public abstract class ValidationResponse { ...@@ -85,7 +85,7 @@ public abstract class ValidationResponse {
/** @param error message to add to the API response */ /** @param error message to add to the API response */
public void addError(String hash, String error, APIStatusCode code) { public void addError(String hash, String error, APIStatusCode code) {
if (getTrackedProject()) { if (this.getTrackedProject() || this.getStrictMode()) {
getCommits().computeIfAbsent(getHashKey(hash), k -> CommitStatus.builder().build()).addError(error, code); getCommits().computeIfAbsent(getHashKey(hash), k -> CommitStatus.builder().build()).addError(error, code);
} else { } else {
addWarning(hash, error, code); addWarning(hash, error, code);
......
...@@ -26,6 +26,7 @@ import javax.ws.rs.Path; ...@@ -26,6 +26,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.rest.client.inject.RestClient; import org.eclipse.microprofile.rest.client.inject.RestClient;
...@@ -170,7 +171,7 @@ public class GithubWebhooksResource { ...@@ -170,7 +171,7 @@ public class GithubWebhooksResource {
sb.append("/pull/"); sb.append("/pull/");
sb.append(tracking.getPullRequestNumber()); sb.append(tracking.getPullRequestNumber());
// redirect to the pull request page on successful trigger of the webhook // redirect to the pull request page on successful trigger of the webhook
return Response.temporaryRedirect(URI.create(sb.toString())).build(); return Response.status(Status.FOUND).location(URI.create(sb.toString())).build();
} }
/** /**
...@@ -303,6 +304,7 @@ public class GithubWebhooksResource { ...@@ -303,6 +304,7 @@ public class GithubWebhooksResource {
.builder() .builder()
.setProvider(ProviderType.GITHUB) .setProvider(ProviderType.GITHUB)
.setRepoUrl(URI.create(repositoryUrl)) .setRepoUrl(URI.create(repositoryUrl))
.setStrictMode(true)
.setCommits(commits .setCommits(commits
.stream() .stream()
.map(c -> Commit .map(c -> Commit
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment