Merge branch 'master' into ib/pr-labels

Author: ibodrov

.github/workflows/build.yml

@@ -73,12 +73,9 @@ 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: |
           if [[ "${{ needs.check-labels.outputs.skip_tests }}" == "true" ]]; then
             ./mvnw -s .github/settings.xml -B clean install -Pgha -Pdocker -P${{ matrix.profile }} -DskipTests
           else
             ./mvnw -s .github/settings.xml -B clean install -Pgha -Pdocker -Pit -P${{ matrix.profile }}
           fi
-

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+wrapperVersion=3.3.2
+distributionType=only-script
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.mvn/wrapper/maven-wrapper.jar

@@ -1,4 +1,37 @@
-# Change log
+# Change Log
+
+## [2.17.0] - 2024-09-18
+
+### Added
+
+- runtime-v2: option for event batching for runner events
+([#949](https://github.com/walmartlabs/concord/pull/949));
+- runtime-v1: option for event batching for runner events
+([#950](https://github.com/walmartlabs/concord/pull/950));
+- console2, server: simple user info page
+([#952](https://github.com/walmartlabs/concord/pull/952)).
+
+### Changed
+
+- project: update Maven wrapper
+([#967](https://github.com/walmartlabs/concord/pull/967));
+- oidc: redirect back to auth in failed callbacks
+([#969](https://github.com/walmartlabs/concord/pull/969));
+- project: miscellaneous fixes for build-time warnings,
+add missing @deprecated annotations, remove redundant
+dependencies
+([#970](https://github.com/walmartlabs/concord/pull/970));
+- agent-operator: create agent pod client only for
+Running pods
+([#973](https://github.com/walmartlabs/concord/pull/973));
+- concord-server: remove GithubTriggerProcessor interface
+([#974](https://github.com/walmartlabs/concord/pull/974));
+- docker: configure safe.directory for git 2.35+
+([#976](https://github.com/walmartlabs/concord/pull/976)).
+
+
+
+### Changed
 
 ## [2.16.0] - 2024-09-05
 

.mvn/wrapper/maven-wrapper.properties

@@ -5,5 +5,31 @@
 Prefer explicit binding using `com.google.inject.Module` over `@Named` annotations.
 Use `@Named` for top-level modules and server plugins.
 
-Some classes require explicit bindings using `Multibinder.newSetBinder`:
-- com.walmartlabs.concord.server.sdk.ScheduledTask
+Some classes require explicit binding using `Multibinder.newSetBinder`:
+- ApiDescriptor
+- AuditLogListener
+- AuthenticationHandler
+- BackgroundTask
+- Component
+- ContextHandlerConfigurator
+- CustomEnqueueProcessor
+- ExceptionMapper
+- Filter
+- FilterChainConfigurator
+- FilterHolder
+- GaugeProvider
+- HttpServlet
+- ModeProcessor
+- PolicyApplier
+- ProcessEventListener
+- ProcessLogListener
+- ProcessStatusListener
+- ProcessWaitHandler
+- Realm
+- RepositoryRefreshListener
+- RequestErrorHandler
+- ScheduledTask
+- SecretStore
+- ServletContextListener
+- ServletHolder
+- UserInfoProvider

CHANGELOG.md

@@ -103,15 +103,15 @@ See the [examples](examples) directory.
 
 ## How To Release New Versions
 
-- perform the regular Maven release:
+- perform a regular Maven release:
   ```
   $ ./mvnw release:prepare release:perform
   ```
-- push the tags:
+- push the new tag:
   ```
-  $ git push --tags
+  $ git push origin RELEASE_TAG
   ```
-- sync to Central;
+- sync to [Central](https://central.sonatype.com/);
 - build and push the Docker images:
   ```
   $ git checkout RELEASE_TAG

NOTES.md

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.16.1-SNAPSHOT</version>
+        <version>2.17.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

README.md

@@ -9,9 +9,9 @@
  * 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.
@@ -48,10 +48,18 @@ public AgentClientFactory(boolean useMaintenanceMode) {
     }
 
     public AgentClient create(Pod pod) {
-        if (useMaintenanceMode && pod.getStatus() != null && pod.getStatus().getPodIP() != null) {
+        if (useMaintenanceMode && isRunning(pod) && hasIP(pod)) {
             return new DefaultAgentClient(httpClient, pod.getStatus().getPodIP());
         } else {
             return new NopAgentClient();
         }
     }
+
+    private static boolean isRunning(Pod pod) {
+        return pod.getStatus() != null && "Running".equals(pod.getStatus().getPhase());
+    }
+
+    private static boolean hasIP(Pod pod) {
+        return pod.getStatus() != null && pod.getStatus().getPodIP() != null;
+    }
 }

agent-operator/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.walmartlabs.concord</groupId>
         <artifactId>parent</artifactId>
-        <version>2.16.1-SNAPSHOT</version>
+        <version>2.17.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>