Merge branch 'master' into ib/oidc-auth-redirect

Author: ibodrov

.github/workflows/build.yml

@@ -49,6 +49,4 @@ jobs:
       - name: Build and test with Maven
         env:
           SKIP_DOCKER_TESTS: "true"
-          # re-enable old agent tests once we are several versions ahead
-          SKIP_OLD_AGENT_TESTS: "true"
         run: ./mvnw -s .github/settings.xml -B clean install -Pgha -Pdocker -Pit -P${{ matrix.profile }}

it/compat/pom.xml

@@ -16,7 +16,8 @@
     <properties>
         <!-- version of Agent to use in tests -->
         <!-- should be one or more release versions behind the current version -->
-        <prev.concord.version>1.55.0</prev.concord.version>
+        <!-- must be a multi-arch image to pass tests on both x86 and arm64 -->
+        <prev.concord.version>2.14.2</prev.concord.version>
 
         <server.image>walmartlabs/concord-server</server.image>
         <prev.agent.image>walmartlabs/concord-agent:${prev.concord.version}</prev.agent.image>

server/impl/src/main/java/com/walmartlabs/concord/server/events/EventModule.java

@@ -34,5 +34,6 @@ public class EventModule implements Module {
     public void configure(Binder binder) {
         newSetBinder(binder, ProcessEventListener.class);
         binder.bind(GithubTriggerProcessor.class).in(SINGLETON);
+        newSetBinder(binder, GithubTriggerProcessor.EventEnricher.class).addBinding().to(GithubTriggerProcessor.RepositoryInfoEnricher.class);
     }
 }

server/impl/src/main/java/com/walmartlabs/concord/server/events/github/GithubTriggerProcessor.java

@@ -54,12 +54,12 @@ public class GithubTriggerProcessor {
     private static final Logger log = LoggerFactory.getLogger(GithubTriggerProcessor.class);
 
     private final Dao dao;
-    private final List<EventEnricher> eventEnrichers;
+    private final Set<EventEnricher> eventEnrichers;
     private final boolean isDisableReposOnDeletedRef;
 
     @Inject
     public GithubTriggerProcessor(Dao dao,
-                                  List<EventEnricher> eventEnrichers,
+                                  Set<EventEnricher> eventEnrichers,
                                   GithubConfiguration githubCfg) {
         this.dao = dao;
         this.eventEnrichers = eventEnrichers;
@@ -203,8 +203,7 @@ public interface EventEnricher {
      * Adds {@link Trigger#REPOSITORY_INFO} property to the event, but only if
      * the trigger's conditions contained the clause with the same key.
      */
-    @Named
-    private static class RepositoryInfoEnricher implements EventEnricher {
+    public static class RepositoryInfoEnricher implements EventEnricher {
 
         private final Dao dao;