Merge branch 'stable-3.4' into stable-3.5
* stable-3.4:
Fix typos in docs
Receive stream events from events-broker directly
Change-Id: If5fd5db6db6f1820f7400d65b82c16e31ec8dcc9
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d392f0e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.jar
diff --git a/example-setup/Dockerfile b/example-setup/Dockerfile
new file mode 100644
index 0000000..167b9f5
--- /dev/null
+++ b/example-setup/Dockerfile
@@ -0,0 +1,20 @@
+FROM gerritcodereview/gerrit:3.5.4-almalinux8
+
+USER root
+
+RUN yum install -y gettext
+
+ARG JAVA_OPTS='--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED'
+
+RUN java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit && \
+ java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
+
+RUN git config -f /var/gerrit/etc/secure.config --add auth.bearerToken "theSecretBearerToken"
+
+COPY --chown=gerrit:gerrit pull-replication.jar /var/gerrit/plugins/pull-replication.jar
+COPY --chown=gerrit:gerrit pull-replication.jar /var/gerrit/lib/pull-replication.jar
+COPY --chown=gerrit:gerrit entrypoint.sh /tmp/
+COPY --chown=gerrit:gerrit configs/replication.config.template /var/gerrit/etc/
+COPY --chown=gerrit:gerrit configs/gerrit.config.template /var/gerrit/etc/
+
+ENTRYPOINT [ "/tmp/entrypoint.sh" ]
diff --git a/example-setup/README.md b/example-setup/README.md
new file mode 100644
index 0000000..e52ad45
--- /dev/null
+++ b/example-setup/README.md
@@ -0,0 +1,17 @@
+# What is this for?
+
+This docker compose set up a primary replica using pull-replication to replicate the data
+over git http across the 2 nodes.
+
+To spin up your environment:
+1) copy the pull-replication artefact to test in te example-setup directory:
+
+```bash
+cp $GERRIT_HOME/bazel-bin/plugins/pull-replication/pull-replication.jar .
+```
+
+2) spin up the docker compose
+
+```bash
+docker-compose up
+```
\ No newline at end of file
diff --git a/example-setup/configs/gerrit.config.template b/example-setup/configs/gerrit.config.template
new file mode 100644
index 0000000..db97a37
--- /dev/null
+++ b/example-setup/configs/gerrit.config.template
@@ -0,0 +1,28 @@
+[gerrit]
+ basePath = git
+ serverId = 69ec38f0-350e-4d9c-96d4-bc956f2faaac
+ canonicalWebUrl = http://localhost:8080
+ instanceId = $INSTANCE_ID
+[container]
+ javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance"
+ javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance"
+ javaOptions = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:$DEBUG_PORT"
+ replica = $REPLICA
+[index]
+ type = LUCENE
+[auth]
+ type = DEVELOPMENT_BECOME_ANY_ACCOUNT
+[receive]
+ enableSignedPush = false
+[sendemail]
+ smtpServer = localhost
+[sshd]
+ listenAddress = *:29418
+ advertisedAddress = *:29418
+[httpd]
+ listenUrl = http://*:8080/
+ requestLog = true
+[cache]
+ directory = cache
+[plugins]
+ allowRemoteAdmin = true
diff --git a/example-setup/configs/replication.config.template b/example-setup/configs/replication.config.template
new file mode 100644
index 0000000..7e81055
--- /dev/null
+++ b/example-setup/configs/replication.config.template
@@ -0,0 +1,25 @@
+[gerrit]
+ autoReload = true
+ replicateOnStartup = false
+[replication]
+ excludeRefs = ^refs/users/\\d\\d/\\d+/edit-\\d+/\\d+$
+ lockErrorMaxRetries = 5
+ maxRetries = 100
+ useCGitClient = false
+ consumeStreamEvents = false
+ syncRefs="ALL REFS ASYNC"
+ maxApiPayloadSize=40000
+[remote "$REMOTE"]
+ url = http://$REMOTE_URL:8080/#{name}#.git
+ apiUrl = http://$REMOTE_URL:8080
+ fetch = +refs/*:refs/*
+ mirror = true
+ timeout = 60 # In seconds
+ connectionTimeout = 120000 # In mseconds
+ rescheduleDelay = 15
+ replicationDelay = 1
+ threads = 4
+ createMissingRepositories = true
+ replicateProjectDeletions = true
+ replicateHiddenProjects = true
+ tagopt= --no-tags
\ No newline at end of file
diff --git a/example-setup/docker-compose.yaml b/example-setup/docker-compose.yaml
new file mode 100644
index 0000000..af90341
--- /dev/null
+++ b/example-setup/docker-compose.yaml
@@ -0,0 +1,28 @@
+version: '3'
+services:
+ gerrit1:
+ build: .
+ environment:
+ - INSTANCE_ID=primary
+ - REPLICA=false
+ - REMOTE=replica-1
+ - REMOTE_URL=gerrit2
+ - DEBUG_PORT=5005
+ ports:
+ - "8080:8080"
+ - "29418:29418"
+ - "5005:5005"
+ gerrit2:
+ build: .
+ environment:
+ - INSTANCE_ID=replica-1
+ - REPLICA=true
+ - REMOTE=primary
+ - REMOTE_URL=gerrit1
+ - DEBUG_PORT=5006
+ ports:
+ - "8081:8080"
+ - "29419:29418"
+ - "5006:5006"
+ depends_on:
+ - gerrit1
diff --git a/example-setup/entrypoint.sh b/example-setup/entrypoint.sh
new file mode 100755
index 0000000..412c487
--- /dev/null
+++ b/example-setup/entrypoint.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -x
+
+function setup_replication_config {
+
+ echo "Replacing variables for file /var/gerrit/etc/replication.config.template"
+ cat /var/gerrit/etc/replication.config.template | envsubst | sed 's/#{name}#/${name}/g' > /var/gerrit/etc/replication.config
+
+ cat /var/gerrit/etc/replication.config
+}
+
+function setup_gerrit_config {
+ echo "Replacing variables for file /var/gerrit/etc/gerrit.config.template"
+ cat /var/gerrit/etc/gerrit.config.template | envsubst > /var/gerrit/etc/gerrit.config
+}
+
+setup_replication_config
+setup_gerrit_config
+
+echo "Running Gerrit ..."
+exec /var/gerrit/bin/gerrit.sh run
\ No newline at end of file
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/DeleteProjectTask.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/DeleteProjectTask.java
index 527b746..2882482 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/DeleteProjectTask.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/DeleteProjectTask.java
@@ -67,7 +67,7 @@
} catch (URISyntaxException | IOException e) {
String errorMessage =
String.format("Cannot delete project %s on remote site %s.", project, uri);
- logger.atWarning().withCause(e).log(errorMessage);
+ logger.atWarning().withCause(e).log("%s", errorMessage);
repLog.warn(errorMessage);
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchOne.java
index 4fad8f9..d8da65e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchOne.java
@@ -36,7 +36,6 @@
import com.googlesource.gerrit.plugins.replication.pull.fetch.Fetch;
import com.googlesource.gerrit.plugins.replication.pull.fetch.FetchFactory;
import com.googlesource.gerrit.plugins.replication.pull.fetch.RefUpdateState;
-import com.jcraft.jsch.JSchException;
import java.io.IOException;
import java.util.Collection;
import java.util.HashSet;
@@ -330,9 +329,7 @@
stateLog.error("Cannot replicate from " + uri, e, getStatesAsArray());
} catch (TransportException e) {
Throwable cause = e.getCause();
- if (cause instanceof JSchException && cause.getMessage().startsWith("UnknownHostKey:")) {
- repLog.error("Cannot replicate from {}: {}", uri, cause.getMessage());
- } else if (e instanceof LockFailureException) {
+ if (e instanceof LockFailureException) {
lockRetryCount++;
// The LockFailureException message contains both URI and reason
// for this failure.
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchRefReplicatedEvent.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchRefReplicatedEvent.java
index 8bf257e..0eabf42 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchRefReplicatedEvent.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchRefReplicatedEvent.java
@@ -15,30 +15,23 @@
package com.googlesource.gerrit.plugins.replication.pull;
import com.google.gerrit.entities.Project;
-import com.google.gerrit.server.events.RefEvent;
+import com.googlesource.gerrit.plugins.replication.events.RemoteRefReplicationEvent;
import java.util.Objects;
import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.transport.URIish;
-public class FetchRefReplicatedEvent extends RefEvent {
+public class FetchRefReplicatedEvent extends RemoteRefReplicationEvent {
static final String TYPE = "fetch-ref-replicated";
- final String project;
- final String ref;
- final String sourceNode;
- final String status;
final RefUpdate.Result refUpdateResult;
public FetchRefReplicatedEvent(
String project,
String ref,
- String sourceNode,
+ URIish sourceUri,
ReplicationState.RefFetchResult status,
RefUpdate.Result refUpdateResult) {
- super(TYPE);
- this.project = project;
- this.ref = ref;
- this.sourceNode = sourceNode;
- this.status = status.toString();
+ super(TYPE, project, ref, sourceUri, status.toString());
this.refUpdateResult = refUpdateResult;
}
@@ -63,7 +56,7 @@
if (!Objects.equals(event.ref, this.ref)) {
return false;
}
- if (!Objects.equals(event.sourceNode, this.sourceNode)) {
+ if (!Objects.equals(event.targetUri, this.targetUri)) {
return false;
}
if (!Objects.equals(event.status, this.status)) {
@@ -81,8 +74,4 @@
public String getRefName() {
return ref;
}
-
- public String getSourceNode() {
- return sourceNode;
- }
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchReplicationScheduledEvent.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchReplicationScheduledEvent.java
index 9a29c86..4f96a8f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchReplicationScheduledEvent.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchReplicationScheduledEvent.java
@@ -15,20 +15,14 @@
package com.googlesource.gerrit.plugins.replication.pull;
import com.google.gerrit.entities.Project;
-import com.google.gerrit.server.events.RefEvent;
+import com.googlesource.gerrit.plugins.replication.events.RemoteRefReplicationEvent;
+import org.eclipse.jgit.transport.URIish;
-public class FetchReplicationScheduledEvent extends RefEvent {
+public class FetchReplicationScheduledEvent extends RemoteRefReplicationEvent {
static final String TYPE = "fetch-ref-replication-scheduled";
- final String project;
- final String ref;
- final String sourceNode;
-
- public FetchReplicationScheduledEvent(String project, String ref, String sourceNode) {
- super(TYPE);
- this.project = project;
- this.ref = ref;
- this.sourceNode = sourceNode;
+ public FetchReplicationScheduledEvent(String project, String ref, URIish sourceUri) {
+ super(TYPE, project, ref, sourceUri, null);
}
@Override
@@ -40,8 +34,4 @@
public Project.NameKey getProjectNameKey() {
return Project.nameKey(project);
}
-
- public String getSourceNode() {
- return sourceNode;
- }
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchResultProcessing.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchResultProcessing.java
index ab16318..eb94ecc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchResultProcessing.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/FetchResultProcessing.java
@@ -55,7 +55,7 @@
// Default doing nothing
}
- public static String resolveNodeName(URIish uri) {
+ private static String resolveNodeName(URIish uri) {
StringBuilder sb = new StringBuilder();
if (uri.isRemote()) {
sb.append(uri.getHost());
@@ -120,8 +120,7 @@
try {
Context.setLocalEvent(true);
dispatcher.postEvent(
- new FetchRefReplicatedEvent(
- project, ref, resolveNodeName(uri), status, refUpdateResult));
+ new FetchRefReplicatedEvent(project, ref, uri, status, refUpdateResult));
} catch (PermissionBackendException e) {
logger.atSevere().withCause(e).log(
"Cannot post event for ref '%s', project %s", ref, project);
@@ -189,8 +188,7 @@
URIish uri,
ReplicationState.RefFetchResult result,
RefUpdate.Result refUpdateResult) {
- postEvent(
- new FetchRefReplicatedEvent(project, ref, resolveNodeName(uri), result, refUpdateResult));
+ postEvent(new FetchRefReplicatedEvent(project, ref, uri, result, refUpdateResult));
}
@Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/GerritConfigOps.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/GerritConfigOps.java
index 2437d80..bca2219 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/GerritConfigOps.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/GerritConfigOps.java
@@ -46,7 +46,7 @@
uri = new URIish("file://" + basePath + "/" + projectName);
return Optional.of(uri);
} catch (URISyntaxException e) {
- logger.atSevere().withCause(e).log("Unsupported URI for project " + projectName);
+ logger.atSevere().withCause(e).log("Unsupported URI for project %s", projectName);
}
return Optional.empty();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java
index 6bf4c21..3170eb5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/Source.java
@@ -15,7 +15,6 @@
package com.googlesource.gerrit.plugins.replication.pull;
import static com.googlesource.gerrit.plugins.replication.ReplicationFileBasedConfig.replaceName;
-import static com.googlesource.gerrit.plugins.replication.pull.FetchResultProcessing.resolveNodeName;
import static com.googlesource.gerrit.plugins.replication.pull.ReplicationType.SYNC;
import com.google.common.base.Throwables;
@@ -796,10 +795,9 @@
private void postReplicationScheduledEvent(FetchOne fetchOp, String inputRef) {
Set<String> refs = inputRef == null ? fetchOp.getRefs() : ImmutableSet.of(inputRef);
Project.NameKey project = fetchOp.getProjectNameKey();
- String targetNode = resolveNodeName(fetchOp.getURI());
for (String ref : refs) {
FetchReplicationScheduledEvent event =
- new FetchReplicationScheduledEvent(project.get(), ref, targetNode);
+ new FetchReplicationScheduledEvent(project.get(), ref, fetchOp.getURI());
try {
eventDispatcher.get().postEvent(BranchNameKey.create(project, ref), event);
} catch (PermissionBackendException e) {
@@ -810,13 +808,16 @@
private void postReplicationFailedEvent(FetchOne fetchOp, RefUpdate.Result result) {
Project.NameKey project = fetchOp.getProjectNameKey();
- String sourceNode = resolveNodeName(fetchOp.getURI());
try {
Context.setLocalEvent(true);
for (String ref : fetchOp.getRefs()) {
FetchRefReplicatedEvent event =
new FetchRefReplicatedEvent(
- project.get(), ref, sourceNode, ReplicationState.RefFetchResult.FAILED, result);
+ project.get(),
+ ref,
+ fetchOp.getURI(),
+ ReplicationState.RefFetchResult.FAILED,
+ result);
try {
eventDispatcher.get().postEvent(BranchNameKey.create(project, ref), event);
} catch (PermissionBackendException e) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
index ab9c634..aff1266 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourceConfiguration.java
@@ -211,4 +211,9 @@
public int getSlowLatencyThreshold() {
return slowLatencyThreshold;
}
+
+ @Override
+ public int getPushBatchSize() {
+ return 0;
+ }
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourcesCollection.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourcesCollection.java
index 7be4971..53adaaa 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourcesCollection.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/SourcesCollection.java
@@ -27,7 +27,11 @@
import com.googlesource.gerrit.plugins.replication.RemoteConfiguration;
import com.googlesource.gerrit.plugins.replication.ReplicationConfig;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import org.eclipse.jgit.errors.ConfigInvalidException;
@Singleton
@@ -35,7 +39,7 @@
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final Source.Factory sourceFactory;
- private volatile List<Source> sources;
+ private volatile Map<String, Source> sources;
private boolean shuttingDown;
private final Provider<ReplicationQueue> replicationQueue;
@@ -56,22 +60,26 @@
@Override
public List<Source> getAll() {
- return sources.stream().filter(Objects::nonNull).collect(toList());
+ return sources.values().stream().filter(Objects::nonNull).collect(toList());
}
- private List<Source> allSources(
+ public Optional<Source> getByRemoteName(String remoteName) {
+ return Optional.ofNullable(sources.get(remoteName));
+ }
+
+ private Map<String, Source> allSources(
Source.Factory sourceFactory, List<RemoteConfiguration> sourceConfigurations) {
return sourceConfigurations.stream()
.filter((c) -> c instanceof SourceConfiguration)
.map((c) -> (SourceConfiguration) c)
.map(sourceFactory::create)
- .collect(toList());
+ .collect(Collectors.toMap(Source::getRemoteConfigName, Function.identity()));
}
@Override
public void startup(WorkQueue workQueue) {
shuttingDown = false;
- for (Source cfg : sources) {
+ for (Source cfg : sources.values()) {
cfg.start(workQueue);
}
}
@@ -96,7 +104,7 @@
}
int discarded = 0;
- for (Source cfg : sources) {
+ for (Source cfg : sources.values()) {
discarded += cfg.shutdown();
}
return discarded;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/UpdateHeadTask.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/UpdateHeadTask.java
index e169eb3..fabe3cd 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/UpdateHeadTask.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/UpdateHeadTask.java
@@ -72,7 +72,7 @@
String.format(
"Cannot update HEAD of project %s remote site %s",
project.get(), apiURI.toASCIIString());
- logger.atWarning().withCause(e).log(errorMessage);
+ logger.atWarning().withCause(e).log("%s", errorMessage);
repLog.warn(errorMessage);
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectCommand.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectCommand.java
index b27d8b7..c268ba1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectCommand.java
@@ -31,6 +31,8 @@
import com.googlesource.gerrit.plugins.replication.pull.PullReplicationStateLogger;
import com.googlesource.gerrit.plugins.replication.pull.ReplicationState;
import com.googlesource.gerrit.plugins.replication.pull.ReplicationState.RefFetchResult;
+import com.googlesource.gerrit.plugins.replication.pull.Source;
+import com.googlesource.gerrit.plugins.replication.pull.SourcesCollection;
import com.googlesource.gerrit.plugins.replication.pull.api.data.RevisionData;
import com.googlesource.gerrit.plugins.replication.pull.api.exception.MissingParentObjectException;
import com.googlesource.gerrit.plugins.replication.pull.api.exception.RefUpdateException;
@@ -57,17 +59,20 @@
private final ApplyObject applyObject;
private final ApplyObjectMetrics metrics;
private final DynamicItem<EventDispatcher> eventDispatcher;
+ private final SourcesCollection sourcesCollection;
@Inject
public ApplyObjectCommand(
PullReplicationStateLogger fetchStateLog,
ApplyObject applyObject,
ApplyObjectMetrics metrics,
- DynamicItem<EventDispatcher> eventDispatcher) {
+ DynamicItem<EventDispatcher> eventDispatcher,
+ SourcesCollection sourcesCollection) {
this.fetchStateLog = fetchStateLog;
this.applyObject = applyObject;
this.metrics = metrics;
this.eventDispatcher = eventDispatcher;
+ this.sourcesCollection = sourcesCollection;
}
public void applyObject(
@@ -94,16 +99,23 @@
try {
Context.setLocalEvent(true);
+ Source source =
+ sourcesCollection
+ .getByRemoteName(sourceLabel)
+ .orElseThrow(
+ () ->
+ new IllegalStateException(
+ String.format("Could not find URI for %s remote", sourceLabel)));
eventDispatcher
.get()
.postEvent(
new FetchRefReplicatedEvent(
name.get(),
refName,
- sourceLabel,
+ source.getURI(name),
getStatus(refUpdateState),
refUpdateState.getResult()));
- } catch (PermissionBackendException e) {
+ } catch (PermissionBackendException | IllegalStateException e) {
logger.atSevere().withCause(e).log(
"Cannot post event for ref '%s', project %s", refName, name);
} finally {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/BearerAuthenticationFilter.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/BearerAuthenticationFilter.java
index 8147149..be71946 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/BearerAuthenticationFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/BearerAuthenticationFilter.java
@@ -44,6 +44,7 @@
public class BearerAuthenticationFilter extends AllRequestFilter {
private static final String BEARER_TOKEN = "BearerToken";
+ private static final String BEARER_TOKEN_PREFIX = "Bearer";
private final DynamicItem<WebSession> session;
private final String pluginName;
private final PullReplicationInternalUser pluginUser;
@@ -79,13 +80,14 @@
HttpServletRequest httpRequest = (HttpServletRequest) servletRequest;
HttpServletResponse httpResponse = (HttpServletResponse) servletResponse;
String requestURI = httpRequest.getRequestURI();
+ Optional<String> authorizationHeader =
+ Optional.ofNullable(httpRequest.getHeader("Authorization"));
if (isBasicAuthenticationRequest(requestURI)) {
filterChain.doFilter(servletRequest, servletResponse);
- } else if (isPullReplicationApiRequest(requestURI) || isGitUploadPackRequest(httpRequest)) {
- Optional<String> authorizationHeader =
- Optional.ofNullable(httpRequest.getHeader("Authorization"));
-
+ } else if (isPullReplicationApiRequest(requestURI)
+ || (isGitUploadPackRequest(httpRequest)
+ && isAuthenticationHeaderWithBearerToken(authorizationHeader))) {
if (isBearerTokenAuthenticated(authorizationHeader, bearerToken))
try (ManualRequestContext ctx =
new ManualRequestContext(pluginUser, threadLocalRequestContext.get())) {
@@ -137,4 +139,8 @@
}
return Optional.empty();
}
+
+ private boolean isAuthenticationHeaderWithBearerToken(Optional<String> authorizationHeader) {
+ return authorizationHeader.map(h -> h.startsWith(BEARER_TOKEN_PREFIX)).orElse(false);
+ }
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/DeleteRefCommand.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/DeleteRefCommand.java
index 40e03f1..d86287a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/DeleteRefCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/DeleteRefCommand.java
@@ -34,6 +34,8 @@
import com.googlesource.gerrit.plugins.replication.pull.LocalGitRepositoryManagerProvider;
import com.googlesource.gerrit.plugins.replication.pull.PullReplicationStateLogger;
import com.googlesource.gerrit.plugins.replication.pull.ReplicationState;
+import com.googlesource.gerrit.plugins.replication.pull.Source;
+import com.googlesource.gerrit.plugins.replication.pull.SourcesCollection;
import com.googlesource.gerrit.plugins.replication.pull.fetch.ApplyObject;
import com.googlesource.gerrit.plugins.replication.pull.fetch.RefUpdateState;
import java.io.IOException;
@@ -41,6 +43,7 @@
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.transport.URIish;
public class DeleteRefCommand {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@@ -49,6 +52,7 @@
private final ApplyObject applyObject;
private final DynamicItem<EventDispatcher> eventDispatcher;
private final ProjectCache projectCache;
+ private final SourcesCollection sourcesCollection;
private final PermissionBackend permissionBackend;
private final GitRepositoryManager gitManager;
@@ -56,6 +60,7 @@
public DeleteRefCommand(
PullReplicationStateLogger fetchStateLog,
ProjectCache projectCache,
+ SourcesCollection sourcesCollection,
ApplyObject applyObject,
PermissionBackend permissionBackend,
DynamicItem<EventDispatcher> eventDispatcher,
@@ -64,6 +69,7 @@
this.projectCache = projectCache;
this.applyObject = applyObject;
this.eventDispatcher = eventDispatcher;
+ this.sourcesCollection = sourcesCollection;
this.permissionBackend = permissionBackend;
this.gitManager = gitManagerProvider.get();
}
@@ -77,6 +83,15 @@
throw new ResourceNotFoundException(String.format("Project %s was not found", name));
}
+ Source source =
+ sourcesCollection
+ .getByRemoteName(sourceLabel)
+ .orElseThrow(
+ () ->
+ new IllegalStateException(
+ String.format("Could not find URI for %s remote", sourceLabel)));
+ URIish sourceUri = source.getURI(name);
+
try {
projectState.get().checkStatePermitsWrite();
permissionBackend
@@ -94,7 +109,7 @@
new FetchRefReplicatedEvent(
name.get(),
refName,
- sourceLabel,
+ sourceUri,
ReplicationState.RefFetchResult.SUCCEEDED,
RefUpdate.Result.FORCED));
} catch (PermissionBackendException e) {
@@ -109,14 +124,14 @@
new FetchRefReplicatedEvent(
name.get(),
refName,
- sourceLabel,
+ sourceUri,
ReplicationState.RefFetchResult.FAILED,
RefUpdate.Result.LOCK_FAILURE));
String message =
String.format(
"RefUpdate lock failure for: sourceLabel=%s, project=%s, refName=%s",
sourceLabel, name, refName);
- logger.atSevere().withCause(e).log(message);
+ logger.atSevere().withCause(e).log("%s", message);
fetchStateLog.error(message);
throw e;
} finally {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/FetchCommand.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/FetchCommand.java
index 3a502ef..dd06875 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/FetchCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/FetchCommand.java
@@ -81,8 +81,7 @@
ReplicationState state =
fetchReplicationStateFactory.create(
new FetchResultProcessing.CommandProcessing(this, eventDispatcher.get()));
- Optional<Source> source =
- sources.getAll().stream().filter(s -> s.getRemoteConfigName().equals(label)).findFirst();
+ Optional<Source> source = sources.getByRemoteName(label);
if (!source.isPresent()) {
String msg = String.format("Remote configuration section %s not found", label);
fetchStateLog.error(msg, state);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/auth/PullReplicationGroupBackend.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/auth/PullReplicationGroupBackend.java
index 9521004..7bcf3d2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/auth/PullReplicationGroupBackend.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/auth/PullReplicationGroupBackend.java
@@ -27,6 +27,8 @@
import com.google.inject.Singleton;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
/** Backend to expose the pull-replication internal user group membership. */
@Singleton
@@ -81,10 +83,9 @@
@Override
public Collection<GroupReference> suggest(String name, ProjectState project) {
- return Arrays.asList(
- NAME_PREFIX.contains(name.toLowerCase())
- ? GroupReference.create(INTERNAL_GROUP_UUID, INTERNAL_GROUP_NAME)
- : GroupReference.create(name));
+ return NAME_PREFIX.contains(name.toLowerCase())
+ ? List.of(GroupReference.create(INTERNAL_GROUP_UUID, INTERNAL_GROUP_NAME))
+ : Collections.emptyList();
}
@Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/client/FetchRestApiClient.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/client/FetchRestApiClient.java
index 0afbecf..cbc2cf7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/client/FetchRestApiClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/client/FetchRestApiClient.java
@@ -272,7 +272,7 @@
try {
req.addHeader(new BasicScheme().authenticate(creds, req, null));
} catch (AuthenticationException e) {
- logger.atFine().log(String.format("Anonymous Basic Authentication for uri: %s", targetUri));
+ logger.atFine().log("Anonymous Basic Authentication for uri: %s", targetUri);
}
}
return req;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/FetchGitUpdateProcessingTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/FetchGitUpdateProcessingTest.java
index 77dc947..68044b4 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/FetchGitUpdateProcessingTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/FetchGitUpdateProcessingTest.java
@@ -35,6 +35,7 @@
private GitUpdateProcessing gitUpdateProcessing;
private CommandProcessing commandProcessing;
private Command sshCommandMock;
+ private static URIish sourceUri;
@Before
public void setUp() throws Exception {
@@ -42,6 +43,7 @@
gitUpdateProcessing = new GitUpdateProcessing(dispatcherMock);
sshCommandMock = mock(Command.class);
commandProcessing = new CommandProcessing(sshCommandMock, dispatcherMock);
+ sourceUri = new URIish("git://someHost/someProject.git");
}
@Test
@@ -51,14 +53,14 @@
new FetchRefReplicatedEvent(
"someProject",
"refs/heads/master",
- "someHost",
+ sourceUri,
RefFetchResult.SUCCEEDED,
RefUpdate.Result.NEW);
gitUpdateProcessing.onOneProjectReplicationDone(
"someProject",
"refs/heads/master",
- new URIish("git://someHost/someProject.git"),
+ sourceUri,
RefFetchResult.SUCCEEDED,
RefUpdate.Result.NEW);
verify(dispatcherMock, times(1)).postEvent(eq(expectedEvent));
@@ -71,7 +73,7 @@
new FetchRefReplicatedEvent(
"someProject",
"refs/heads/master",
- "someHost",
+ sourceUri,
RefFetchResult.SUCCEEDED,
RefUpdate.Result.NEW);
@@ -90,7 +92,7 @@
new FetchRefReplicatedEvent(
"someProject",
"refs/changes/01/1/1",
- "someHost",
+ sourceUri,
RefFetchResult.FAILED,
RefUpdate.Result.REJECTED_OTHER_REASON);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectCommandTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectCommandTest.java
index d73a6e7..9b5ef46 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectCommandTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/ApplyObjectCommandTest.java
@@ -31,6 +31,8 @@
import com.googlesource.gerrit.plugins.replication.pull.ApplyObjectMetrics;
import com.googlesource.gerrit.plugins.replication.pull.FetchRefReplicatedEvent;
import com.googlesource.gerrit.plugins.replication.pull.PullReplicationStateLogger;
+import com.googlesource.gerrit.plugins.replication.pull.Source;
+import com.googlesource.gerrit.plugins.replication.pull.SourcesCollection;
import com.googlesource.gerrit.plugins.replication.pull.api.data.RevisionData;
import com.googlesource.gerrit.plugins.replication.pull.api.data.RevisionObjectData;
import com.googlesource.gerrit.plugins.replication.pull.api.exception.MissingParentObjectException;
@@ -38,9 +40,12 @@
import com.googlesource.gerrit.plugins.replication.pull.fetch.ApplyObject;
import com.googlesource.gerrit.plugins.replication.pull.fetch.RefUpdateState;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.util.Collections;
+import java.util.Optional;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.transport.URIish;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -55,6 +60,7 @@
private static final String TEST_REF_NAME = "refs/changes/01/1/1";
private static final NameKey TEST_PROJECT_NAME = Project.nameKey("test-project");
private static final String TEST_REMOTE_NAME = "test-remote-name";
+ private static URIish TEST_REMOTE_URI;
private String sampleCommitObjectId = "9f8d52853089a3cf00c02ff7bd0817bd4353a95a";
private String sampleTreeObjectId = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
@@ -66,20 +72,26 @@
@Mock private DynamicItem<EventDispatcher> eventDispatcherDataItem;
@Mock private EventDispatcher eventDispatcher;
@Mock private Timer1.Context<String> timetContext;
+ @Mock private SourcesCollection sourceCollection;
+ @Mock private Source source;
@Captor ArgumentCaptor<Event> eventCaptor;
private ApplyObjectCommand objectUnderTest;
@Before
- public void setup() throws MissingParentObjectException, IOException {
+ public void setup() throws MissingParentObjectException, IOException, URISyntaxException {
RefUpdateState state = new RefUpdateState(TEST_REMOTE_NAME, RefUpdate.Result.NEW);
+ TEST_REMOTE_URI = new URIish("git://some.remote.uri");
when(eventDispatcherDataItem.get()).thenReturn(eventDispatcher);
when(metrics.start(anyString())).thenReturn(timetContext);
when(timetContext.stop()).thenReturn(100L);
when(applyObject.apply(any(), any(), any())).thenReturn(state);
+ when(sourceCollection.getByRemoteName(TEST_SOURCE_LABEL)).thenReturn(Optional.of(source));
+ when(source.getURI(TEST_PROJECT_NAME)).thenReturn(TEST_REMOTE_URI);
objectUnderTest =
- new ApplyObjectCommand(fetchStateLog, applyObject, metrics, eventDispatcherDataItem);
+ new ApplyObjectCommand(
+ fetchStateLog, applyObject, metrics, eventDispatcherDataItem, sourceCollection);
}
@Test
@@ -95,6 +107,7 @@
FetchRefReplicatedEvent fetchEvent = (FetchRefReplicatedEvent) sentEvent;
assertThat(fetchEvent.getProjectNameKey()).isEqualTo(TEST_PROJECT_NAME);
assertThat(fetchEvent.getRefName()).isEqualTo(TEST_REF_NAME);
+ assertThat(fetchEvent.targetUri).isEqualTo(TEST_REMOTE_URI.toASCIIString());
}
private RevisionData createSampleRevisionData() {
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/BearerAuthenticationFilterTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/BearerAuthenticationFilterTest.java
index 824496a..ca69f06 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/BearerAuthenticationFilterTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/BearerAuthenticationFilterTest.java
@@ -16,7 +16,6 @@
import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
import static org.mockito.Mockito.atMost;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -108,17 +107,53 @@
}
@Test
- public void shouldAuthenticateWhenGitUploadPacket() throws ServletException, IOException {
+ public void shouldAuthenticateWhenGitUploadPack() throws ServletException, IOException {
authenticateAndFilter("any-prefix/git-upload-pack", NO_QUERY_PARAMETERS);
}
@Test
- public void shouldAuthenticateWhenGitUploadPacketInQueryParameter()
+ public void shouldAuthenticateWhenGitUploadPackInQueryParameter()
throws ServletException, IOException {
authenticateAndFilter("any-prefix", GIT_UPLOAD_PACK_QUERY_PARAMETER);
}
@Test
+ public void shouldGoNextInChainWhenGitUploadPackWithoutAuthenticationHeader()
+ throws ServletException, IOException {
+ when(httpServletRequest.getRequestURI()).thenReturn("any-prefix/git-upload-pack");
+
+ final BearerAuthenticationFilter filter =
+ new BearerAuthenticationFilter(
+ session,
+ pluginName,
+ pluginUser,
+ threadLocalRequestContextProvider,
+ "some-bearer-token");
+ filter.doFilter(httpServletRequest, httpServletResponse, filterChain);
+
+ verify(httpServletRequest).getHeader("Authorization");
+ verify(filterChain).doFilter(httpServletRequest, httpServletResponse);
+ }
+
+ @Test
+ public void shouldGoNextInChainWhenGitUploadPackWithAuthenticationHeaderDifferentThanBearer()
+ throws ServletException, IOException {
+ when(httpServletRequest.getRequestURI()).thenReturn("any-prefix/git-upload-pack");
+ when(httpServletRequest.getHeader("Authorization")).thenReturn("some-authorization");
+ final BearerAuthenticationFilter filter =
+ new BearerAuthenticationFilter(
+ session,
+ pluginName,
+ pluginUser,
+ threadLocalRequestContextProvider,
+ "some-bearer-token");
+ filter.doFilter(httpServletRequest, httpServletResponse, filterChain);
+
+ verify(httpServletRequest).getHeader("Authorization");
+ verify(filterChain).doFilter(httpServletRequest, httpServletResponse);
+ }
+
+ @Test
public void shouldBe401WhenBearerTokenDoesNotMatch() throws ServletException, IOException {
when(httpServletRequest.getRequestURI()).thenReturn("any-prefix/pull-replication~fetch");
when(httpServletRequest.getHeader("Authorization"))
@@ -171,6 +206,7 @@
filter.doFilter(httpServletRequest, httpServletResponse, filterChain);
verify(httpServletRequest).getRequestURI();
+ verify(httpServletRequest).getHeader("Authorization");
verify(httpServletResponse).sendError(SC_UNAUTHORIZED);
}
@@ -187,7 +223,7 @@
"some-bearer-token");
filter.doFilter(httpServletRequest, httpServletResponse, filterChain);
- verify(httpServletRequest, times(2)).getRequestURI();
+ verify(httpServletRequest).getHeader("Authorization");
verify(filterChain).doFilter(httpServletRequest, httpServletResponse);
}
@@ -206,7 +242,7 @@
"some-bearer-token");
filter.doFilter(httpServletRequest, httpServletResponse, filterChain);
- verify(httpServletRequest).getRequestURI();
+ verify(httpServletRequest).getHeader("Authorization");
verify(filterChain).doFilter(httpServletRequest, httpServletResponse);
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/DeleteRefCommandTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/DeleteRefCommandTest.java
index eb4d322..2adf72f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/DeleteRefCommandTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/DeleteRefCommandTest.java
@@ -35,6 +35,8 @@
import com.googlesource.gerrit.plugins.replication.pull.FetchRefReplicatedEvent;
import com.googlesource.gerrit.plugins.replication.pull.LocalGitRepositoryManagerProvider;
import com.googlesource.gerrit.plugins.replication.pull.PullReplicationStateLogger;
+import com.googlesource.gerrit.plugins.replication.pull.Source;
+import com.googlesource.gerrit.plugins.replication.pull.SourcesCollection;
import com.googlesource.gerrit.plugins.replication.pull.fetch.ApplyObject;
import java.util.Optional;
import org.eclipse.jgit.lib.Ref;
@@ -42,6 +44,7 @@
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.RefUpdate.Result;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.transport.URIish;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -55,6 +58,7 @@
private static final String TEST_SOURCE_LABEL = "test-source-label";
private static final String TEST_REF_NAME = "refs/changes/01/1/1";
private static final NameKey TEST_PROJECT_NAME = Project.nameKey("test-project");
+ private static URIish TEST_REMOTE_URI;
@Mock private PullReplicationStateLogger fetchStateLog;
@Mock private DynamicItem<EventDispatcher> eventDispatcherDataItem;
@@ -62,6 +66,8 @@
@Mock private ProjectCache projectCache;
@Mock private ApplyObject applyObject;
@Mock private ProjectState projectState;
+ @Mock private SourcesCollection sourceCollection;
+ @Mock private Source source;
@Mock private PermissionBackend permissionBackend;
@Mock private WithUser currentUser;
@Mock private ForProject forProject;
@@ -79,6 +85,9 @@
public void setup() throws Exception {
when(eventDispatcherDataItem.get()).thenReturn(eventDispatcher);
when(projectCache.get(any())).thenReturn(Optional.of(projectState));
+ when(sourceCollection.getByRemoteName(TEST_SOURCE_LABEL)).thenReturn(Optional.of(source));
+ TEST_REMOTE_URI = new URIish("git://some.remote.uri");
+ when(source.getURI(TEST_PROJECT_NAME)).thenReturn(TEST_REMOTE_URI);
when(permissionBackend.currentUser()).thenReturn(currentUser);
when(currentUser.project(any())).thenReturn(forProject);
when(forProject.ref(any())).thenReturn(forRef);
@@ -92,6 +101,7 @@
new DeleteRefCommand(
fetchStateLog,
projectCache,
+ sourceCollection,
applyObject,
permissionBackend,
eventDispatcherDataItem,
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/FetchCommandTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/FetchCommandTest.java
index 9af2d10..c093719 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/FetchCommandTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/api/FetchCommandTest.java
@@ -25,7 +25,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.common.collect.Lists;
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.server.events.EventDispatcher;
@@ -76,8 +75,7 @@
label = "instance-1-label";
when(fetchReplicationStateFactory.create(any())).thenReturn(state);
- when(source.getRemoteConfigName()).thenReturn(label);
- when(sources.getAll()).thenReturn(Lists.newArrayList(source));
+ when(sources.getByRemoteName(label)).thenReturn(Optional.of(source));
when(source.schedule(eq(projectName), eq(REF_NAME_TO_FETCH), eq(state), any(), any()))
.thenReturn(CompletableFuture.completedFuture(null));
objectUnderTest =
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/auth/PullReplicationGroupBackendIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/auth/PullReplicationGroupBackendIT.java
index 87738e3..df7da98 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/auth/PullReplicationGroupBackendIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/auth/PullReplicationGroupBackendIT.java
@@ -58,6 +58,13 @@
}
@Test
+ public void shouldSuggestEmptyListIfNameNotMatched() {
+ Collection<GroupReference> groups = groupBackend.suggest("nonMatchablePrefix", null);
+
+ assertThat(groups).isEmpty();
+ }
+
+ @Test
public void pullReplicationInternalUserShouldHaveMembershipOfInternalGroupAndAnonymousUsers() {
assertMemberOfInternalAndAnonymousUsers(
groupBackend.membershipsOf(getPullReplicationInternalUser()));
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/event/EventsSerializationTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/event/EventsSerializationTest.java
new file mode 100644
index 0000000..efa521c
--- /dev/null
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/event/EventsSerializationTest.java
@@ -0,0 +1,83 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.replication.pull.event;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.base.Objects;
+import com.google.gerrit.server.events.EventGsonProvider;
+import com.google.gson.Gson;
+import com.googlesource.gerrit.plugins.replication.pull.FetchRefReplicatedEvent;
+import com.googlesource.gerrit.plugins.replication.pull.FetchReplicationScheduledEvent;
+import com.googlesource.gerrit.plugins.replication.pull.ReplicationState;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.transport.URIish;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EventsSerializationTest {
+ private static URIish sourceUri;
+ private static final Gson eventGson = new EventGsonProvider().get();
+ private static final String TEST_PROJECT = "test_project";
+ private static final String TEST_REF = "refs/heads/master";
+
+ @Before
+ public void setUp() throws Exception {
+ sourceUri = new URIish(String.format("git://aSourceNode/%s.git", TEST_PROJECT));
+ }
+
+ @Test
+ public void shouldSerializeFetchRefReplicatedEvent() {
+ FetchRefReplicatedEvent origEvent =
+ new FetchRefReplicatedEvent(
+ TEST_PROJECT,
+ TEST_REF,
+ sourceUri,
+ ReplicationState.RefFetchResult.SUCCEEDED,
+ RefUpdate.Result.FAST_FORWARD);
+
+ assertThat(origEvent)
+ .isEqualTo(eventGson.fromJson(eventGson.toJson(origEvent), FetchRefReplicatedEvent.class));
+ }
+
+ @Test
+ public void shouldSerializeFetchReplicationScheduledEvent() {
+ FetchReplicationScheduledEvent origEvent =
+ new FetchReplicationScheduledEvent(TEST_PROJECT, TEST_REF, sourceUri);
+
+ assertTrue(
+ equals(
+ origEvent,
+ eventGson.fromJson(eventGson.toJson(origEvent), FetchReplicationScheduledEvent.class)));
+ }
+
+ private boolean equals(FetchReplicationScheduledEvent scheduledEvent, Object other) {
+ if (!(other instanceof FetchReplicationScheduledEvent)) {
+ return false;
+ }
+ FetchReplicationScheduledEvent event = (FetchReplicationScheduledEvent) other;
+ if (!Objects.equal(event.project, scheduledEvent.project)) {
+ return false;
+ }
+ if (!Objects.equal(event.ref, scheduledEvent.ref)) {
+ return false;
+ }
+ if (!Objects.equal(event.targetUri, scheduledEvent.targetUri)) {
+ return false;
+ }
+ return Objects.equal(event.status, scheduledEvent.status);
+ }
+}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/event/FetchRefReplicatedEventHandlerTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/event/FetchRefReplicatedEventHandlerTest.java
index e528eca..81a4fc0 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/pull/event/FetchRefReplicatedEventHandlerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/pull/event/FetchRefReplicatedEventHandlerTest.java
@@ -28,17 +28,20 @@
import com.googlesource.gerrit.plugins.replication.pull.FetchRefReplicatedEvent;
import com.googlesource.gerrit.plugins.replication.pull.ReplicationState;
import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.transport.URIish;
import org.junit.Before;
import org.junit.Test;
public class FetchRefReplicatedEventHandlerTest {
private ChangeIndexer changeIndexerMock;
private FetchRefReplicatedEventHandler fetchRefReplicatedEventHandler;
+ private static URIish sourceUri;
@Before
public void setUp() throws Exception {
changeIndexerMock = mock(ChangeIndexer.class);
fetchRefReplicatedEventHandler = new FetchRefReplicatedEventHandler(changeIndexerMock);
+ sourceUri = new URIish("git://aSourceNode/testProject.git");
}
@Test
@@ -52,7 +55,7 @@
new FetchRefReplicatedEvent(
projectNameKey.get(),
ref,
- "aSourceNode",
+ sourceUri,
ReplicationState.RefFetchResult.SUCCEEDED,
RefUpdate.Result.FAST_FORWARD));
verify(changeIndexerMock, times(1)).index(eq(projectNameKey), eq(changeId));
@@ -70,7 +73,7 @@
new FetchRefReplicatedEvent(
projectNameKey.get(),
ref,
- "aSourceNode",
+ sourceUri,
ReplicationState.RefFetchResult.SUCCEEDED,
RefUpdate.Result.FAST_FORWARD));
verify(changeIndexerMock, never()).index(eq(projectNameKey), eq(changeId));
@@ -85,7 +88,7 @@
new FetchRefReplicatedEvent(
projectNameKey.get(),
ref,
- "aSourceNode",
+ sourceUri,
ReplicationState.RefFetchResult.SUCCEEDED,
RefUpdate.Result.FAST_FORWARD));
verify(changeIndexerMock, never()).index(eq(projectNameKey), eq(changeId));
@@ -97,7 +100,7 @@
new FetchRefReplicatedEvent(
Project.nameKey("testProject").get(),
"invalidRef",
- "aSourceNode",
+ sourceUri,
ReplicationState.RefFetchResult.SUCCEEDED,
RefUpdate.Result.FAST_FORWARD));
verify(changeIndexerMock, never()).index(any(), any());
@@ -111,7 +114,7 @@
new FetchRefReplicatedEvent(
projectNameKey.get(),
ref,
- "aSourceNode",
+ sourceUri,
ReplicationState.RefFetchResult.FAILED,
RefUpdate.Result.FAST_FORWARD));
verify(changeIndexerMock, never()).index(any(), any());
@@ -125,7 +128,7 @@
new FetchRefReplicatedEvent(
projectNameKey.get(),
ref,
- "aSourceNode",
+ sourceUri,
ReplicationState.RefFetchResult.NOT_ATTEMPTED,
RefUpdate.Result.FAST_FORWARD));
verify(changeIndexerMock, never()).index(any(), any());
