Merge branch 'master' into docker-fix-log-capture

Author: ibodrov

.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,150 @@
-# 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
+
+### Added
+
+- runtime-v2: option to update meta only on termination or
+suspend
+([#948](https://github.com/walmartlabs/concord/pull/948));
+- policy-engine: allow rewriting with multiple values in
+`dependencyRewrite` policies
+([#952](https://github.com/walmartlabs/concord/pull/952));
+- concord-server: allow non-standard runtimes
+([#954](https://github.com/walmartlabs/concord/pull/954));
+- oidc: support "from" when logging out
+([#958](https://github.com/walmartlabs/concord/pull/958)).
+
+### Changed
+
+- runtime-v1: update bpm library to fix saving variables
+before suspend
+([#955](https://github.com/walmartlabs/concord/pull/955));
+- concord-server: fix DB change set 1580200-a when
+`superuserAvailable` is set to `false`
+([#957](https://github.com/walmartlabs/concord/pull/957));
+- concord-server: skip pull\_request process start when
+useEventCommitId is enabled and event is from a different repo
+([#959](https://github.com/walmartlabs/concord/pull/959));
+- docker-images: update ansible galaxy community.docker version
+([#960](https://github.com/walmartlabs/concord/pull/960));
+- cli: fix duplicate step logs
+([#963](https://github.com/walmartlabs/concord/pull/963)).
+
+
+
+## [2.15.0] - 2024-08-07
+
+### Added
+
+- agent: configure host/ip for maintenance-mode endpoint
+([#945](https://github.com/walmartlabs/concord/pull/945));
+- concord-task: new method to wait and check that processes
+have finished
+([#943](https://github.com/walmartlabs/concord/pull/943));
+- agent-operator: use maintenance mode before terminating
+agent
+([#946](https://github.com/walmartlabs/concord/pull/946));
+
+### Changed
+
+- pfed-sso: fix to not return null for not permanently
+disabled users
+([#947](https://github.com/walmartlabs/concord/pull/947)).
+ - agent-operator: consider pods already marked for deletion
+during downscaling
+([#951](https://github.com/walmartlabs/concord/pull/951)).
+
+
+
+## [2.14.0] - 2024-07-13
+
+### Added
+
+- concord-server: calculate total process RUNNING time
+([#933](https://github.com/walmartlabs/concord/pull/933));
+- concord-server: expose websocket channels
+([#935](https://github.com/walmartlabs/concord/pull/935));
+- resource-tasks: add versions of writeAs* methods that
+accept destination
+([#937](https://github.com/walmartlabs/concord/pull/937));
+- runtime-v1: option to update meta only on termination
+or suspend
+([#938](https://github.com/walmartlabs/concord/pull/938));
+- project: add JDK 21 profiles
+([#941](https://github.com/walmartlabs/concord/pull/941)).
+
+### Changed
+
+- project: update Groovy to 2.5.23
+([#940](https://github.com/walmartlabs/concord/pull/940));
+- dependency-manager: resolve only unique dependencies 
+([#936](https://github.com/walmartlabs/concord/pull/936)); 
+- concord-server: move com.walmartlabs.concord.server.ansible.*
+into ansible plugin
+([#502](https://github.com/walmartlabs/concord/pull/502));
+- concord-server: migrate to PROCESS_META and
+PROCESS_TRIGGER_INFO tables
+([#669](https://github.com/walmartlabs/concord/pull/669));
+- runtime-v2: use draft-07 of JSON Schema for better tool
+compatibility
+([#939](https://github.com/walmartlabs/concord/pull/939));
+- project: update dependency versions in the parent pom
+([#942](https://github.com/walmartlabs/concord/pull/942)).
+
+
+
+## [2.13.0] - 2024-06-19
+
+### Added
+
+- runtime-v2: "suspend" status support for log segments
+([#927](https://github.com/walmartlabs/concord/pull/927));
+- mocks: examples, support for storing the input, add
+`throwError`
+([#928](https://github.com/walmartlabs/concord/pull/928));
+- runtime-v2: add more events to execution listeners
+([#931](https://github.com/walmartlabs/concord/pull/931)).
+
+### Changed
+
+- runtime-v2: rename MultiException and limit stack trace depth
+([#930](https://github.com/walmartlabs/concord/pull/930)).
+
+
 
 ## [2.12.0] - 2024-06-12
 
@@ -2881,7 +3027,7 @@ called in an expression.
 
 
 
-## [1.37.1] - 2010-01-06
+## [1.37.1] - 2020-01-06
 
 ### Changed
 

.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.12.1-SNAPSHOT</version>
+        <version>2.17.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -103,6 +103,12 @@
             <artifactId>commons-collections</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.immutables</groupId>
+            <artifactId>value</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
         <!-- testing -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

README.md

@@ -21,6 +21,7 @@
  */
 
 
+import com.walmartlabs.concord.agentoperator.agent.AgentClientFactory;
 import com.walmartlabs.concord.agentoperator.crd.AgentPool;
 import com.walmartlabs.concord.agentoperator.crd.AgentPoolList;
 import com.walmartlabs.concord.agentoperator.scheduler.AutoScalerFactory;
@@ -52,11 +53,13 @@ public static void main(String[] args) {
 
         String baseUrl = getEnv("CONCORD_BASE_URL", "http://192.168.99.1:8001"); // use minikube/vbox host's default address
         String apiToken = getEnv("CONCORD_API_TOKEN", null);
+        boolean useMaintenanceMode = Boolean.parseBoolean(getEnv("USE_AGENT_MAINTENANCE_MODE", "false"));
 
         // TODO use secrets for the token?
         Scheduler.Configuration cfg = new Scheduler.Configuration(baseUrl, apiToken);
         AutoScalerFactory autoScalerFactory = new AutoScalerFactory(cfg, client);
-        Scheduler scheduler = new Scheduler(autoScalerFactory, client);
+        AgentClientFactory agentClientFactory = new AgentClientFactory(useMaintenanceMode);
+        Scheduler scheduler = new Scheduler(autoScalerFactory, client, agentClientFactory);
         scheduler.start();
 
         // TODO retries