-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into brig/allow-regexp-in-filters
- Loading branch information
Showing
203 changed files
with
1,751 additions
and
583 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd"> | ||
| <profiles> | ||
| <profile> | ||
| <id>gha</id> | ||
| <properties> | ||
| <it.skipDocker>true</it.skipDocker> | ||
| </properties> | ||
| </profile> | ||
| </profiles> | ||
| </settings> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
agent/src/main/java/com/walmartlabs/concord/agent/AgentModule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package com.walmartlabs.concord.agent; | ||
|
|
||
| /*- | ||
| * ***** | ||
| * Concord | ||
| * ----- | ||
| * Copyright (C) 2017 - 2023 Walmart Inc. | ||
| * ----- | ||
| * 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. | ||
| * ===== | ||
| */ | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.google.inject.Binder; | ||
| import com.google.inject.Module; | ||
| import com.typesafe.config.Config; | ||
| import com.walmartlabs.concord.agent.cfg.*; | ||
| import com.walmartlabs.concord.agent.executors.runner.DefaultDependencies; | ||
| import com.walmartlabs.concord.agent.executors.runner.ProcessPool; | ||
| import com.walmartlabs.concord.agent.remote.ApiClientFactory; | ||
| import com.walmartlabs.concord.agent.remote.QueueClientProvider; | ||
| import com.walmartlabs.concord.common.ObjectMapperProvider; | ||
| import com.walmartlabs.concord.server.queueclient.QueueClient; | ||
| import com.walmartlabs.ollie.config.ConfigurationProcessor; | ||
| import com.walmartlabs.ollie.config.Environment; | ||
| import com.walmartlabs.ollie.config.EnvironmentSelector; | ||
|
|
||
| import javax.inject.Named; | ||
|
|
||
| import static com.google.inject.Scopes.SINGLETON; | ||
|
|
||
| @Named | ||
| public class AgentModule implements Module { | ||
|
|
||
| private final Config config; | ||
|
|
||
| public AgentModule() { | ||
| this(loadDefaultConfig()); | ||
| } | ||
|
|
||
| public AgentModule(Config config) { | ||
| this.config = config; | ||
| } | ||
|
|
||
| @Override | ||
| public void configure(Binder binder) { | ||
| binder.bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class); | ||
| binder.bind(Config.class).toInstance(config); | ||
|
|
||
| binder.bind(AgentConfiguration.class).in(SINGLETON); | ||
| binder.bind(DockerConfiguration.class).in(SINGLETON); | ||
| binder.bind(GitConfiguration.class).in(SINGLETON); | ||
| binder.bind(ImportConfiguration.class).in(SINGLETON); | ||
| binder.bind(PreForkConfiguration.class).in(SINGLETON); | ||
| binder.bind(RepositoryCacheConfiguration.class).in(SINGLETON); | ||
| binder.bind(RunnerV1Configuration.class).in(SINGLETON); | ||
| binder.bind(RunnerV2Configuration.class).in(SINGLETON); | ||
| binder.bind(ServerConfiguration.class).in(SINGLETON); | ||
|
|
||
| binder.bind(DefaultDependencies.class).in(SINGLETON); | ||
| binder.bind(ProcessPool.class).in(SINGLETON); | ||
| binder.bind(ApiClientFactory.class).in(SINGLETON); | ||
| binder.bind(QueueClient.class).toProvider(QueueClientProvider.class).in(SINGLETON); | ||
|
|
||
| binder.bind(Agent.class).in(SINGLETON); | ||
| } | ||
|
|
||
| private static Config loadDefaultConfig() { | ||
| Environment env = new EnvironmentSelector().select(); | ||
| return new ConfigurationProcessor("concord-agent", env, null, null).process(); | ||
| } | ||
| } |
Oops, something went wrong.