CheckCodeOwner: Improve debug log message if '*' is a code owner
Make it clearer that the user for which the code ownership is being
checked is a code owner when code ownership was assigned to the all
users wildcard (aka '*').
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ib0d07594b88306e2d6d22e3b4d94799f604cc59f
diff --git a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java
index 64bdf1e..9c4e144 100644
--- a/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java
+++ b/java/com/google/gerrit/plugins/codeowners/restapi/CheckCodeOwner.java
@@ -221,15 +221,17 @@
if (RefNames.isConfigRef(codeOwnerConfig.key().ref())) {
messages.add(
String.format(
- "found email %s as a code owner in the default code owner config",
- CodeOwnerResolver.ALL_USERS_WILDCARD));
+ "found the all users wildcard ('%s') as a code owner in the default code"
+ + " owner config which makes %s a code owner",
+ CodeOwnerResolver.ALL_USERS_WILDCARD, email));
isDefaultCodeOwner.set(true);
} else {
Path codeOwnerConfigFilePath = codeOwners.getFilePath(codeOwnerConfig.key());
messages.add(
String.format(
- "found email %s as a code owner in %s",
- CodeOwnerResolver.ALL_USERS_WILDCARD, codeOwnerConfigFilePath));
+ "found the all users wildcard ('%s') as a code owner in %s which makes %s a"
+ + " code owner",
+ CodeOwnerResolver.ALL_USERS_WILDCARD, codeOwnerConfigFilePath, email));
if (!codeOwnerConfigFilePaths.contains(codeOwnerConfigFilePath)) {
codeOwnerConfigFilePaths.add(codeOwnerConfigFilePath);
}
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java
index 7a1f811..4baef37 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java
@@ -286,8 +286,11 @@
assertThat(checkCodeOwnerInfo)
.hasDebugLogsThatContainAllOf(
String.format(
- "found email %s as a code owner in %s",
- CodeOwnerResolver.ALL_USERS_WILDCARD, getCodeOwnerConfigFilePath(ROOT_PATH)));
+ "found the all users wildcard ('%s') as a code owner in %s which makes %s a code"
+ + " owner",
+ CodeOwnerResolver.ALL_USERS_WILDCARD,
+ getCodeOwnerConfigFilePath(ROOT_PATH),
+ codeOwner.email()));
}
@Test
@@ -313,8 +316,11 @@
"found email %s as a code owner in %s",
codeOwner.email(), getCodeOwnerConfigFilePath(ROOT_PATH)),
String.format(
- "found email %s as a code owner in %s",
- CodeOwnerResolver.ALL_USERS_WILDCARD, getCodeOwnerConfigFilePath(ROOT_PATH)));
+ "found the all users wildcard ('%s') as a code owner in %s which makes %s a code"
+ + " owner",
+ CodeOwnerResolver.ALL_USERS_WILDCARD,
+ getCodeOwnerConfigFilePath(ROOT_PATH),
+ codeOwner.email()));
}
@Test
@@ -548,8 +554,10 @@
assertThat(checkCodeOwnerInfo)
.hasDebugLogsThatContainAllOf(
String.format(
- "found email %s as a code owner in %s",
- CodeOwnerResolver.ALL_USERS_WILDCARD, getCodeOwnerConfigFilePath(ROOT_PATH)));
+ "found the all users wildcard ('%s') as a code owner in %s which makes %s a code owner",
+ CodeOwnerResolver.ALL_USERS_WILDCARD,
+ getCodeOwnerConfigFilePath(ROOT_PATH),
+ CodeOwnerResolver.ALL_USERS_WILDCARD));
}
@Test
@@ -601,8 +609,9 @@
assertThat(checkCodeOwnerInfo)
.hasDebugLogsThatContainAllOf(
String.format(
- "found email %s as a code owner in the default code owner config",
- CodeOwnerResolver.ALL_USERS_WILDCARD),
+ "found the all users wildcard ('%s') as a code owner in the default code owner"
+ + " config which makes %s a code owner",
+ CodeOwnerResolver.ALL_USERS_WILDCARD, defaultCodeOwner.email()),
String.format(
"resolved email %s to account %s",
defaultCodeOwner.email(), defaultCodeOwner.id()));
@@ -1522,8 +1531,11 @@
ImmutableSet.of(
CodeOwnerAnnotations.NEVER_SUGGEST_ANNOTATION.key(), "OTHER_ANNOTATION")),
String.format(
- "found email %s as a code owner in %s",
- CodeOwnerResolver.ALL_USERS_WILDCARD, getCodeOwnerConfigFilePath("/foo/")),
+ "found the all users wildcard ('%s') as a code owner in %s which makes %s a code"
+ + " owner",
+ CodeOwnerResolver.ALL_USERS_WILDCARD,
+ getCodeOwnerConfigFilePath("/foo/"),
+ codeOwner.email()),
String.format(
"found annotations for the all users wildcard ('%s') which apply to %s: %s",
CodeOwnerResolver.ALL_USERS_WILDCARD,
