-
-
Notifications
You must be signed in to change notification settings - Fork 305
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add localstack docker compose support (#1123)
Co-authored-by: Dominik Kovacs <dominik.kovacs.ext@uniqa.at>
- Loading branch information
1 parent
4fceb0f
commit e3530a8
Showing
17 changed files
with
434 additions
and
0 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,34 @@ | ||
[#spring-cloud-aws-docker-compose] | ||
== Docker Compose | ||
|
||
Spring Cloud AWS provides Docker Compose support for https://docs.localstack.cloud/references/docker-images/[LocalStack docker images] which simplifies local development of Spring Cloud AWS based projects. | ||
|
||
Maven coordinates, using <<index.adoc#bill-of-materials, Spring Cloud AWS BOM>>: | ||
|
||
[source,xml] | ||
---- | ||
<dependency> | ||
<groupId>io.awspring.cloud</groupId> | ||
<artifactId>spring-cloud-aws-docker-compose</artifactId> | ||
</dependency> | ||
---- | ||
|
||
For more information about Spring Docker Compose support please refer to https://docs.spring.io/spring-boot/reference/features/docker-compose.html[official Spring documentation] | ||
|
||
=== Example docker-compose.yaml file | ||
|
||
[source,yaml] | ||
---- | ||
services: | ||
localstack: | ||
image: localstack/localstack | ||
environment: | ||
AWS_ACCESS_KEY_ID: noop | ||
AWS_SECRET_ACCESS_KEY: noop | ||
AWS_DEFAULT_REGION: eu-central-1 | ||
ports: | ||
- "4566:4566" | ||
---- | ||
|
||
`AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and `AWS_DEFAULT_REGION` are required environment variables to ensure proper integration. | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<parent> | ||
<artifactId>spring-cloud-aws</artifactId> | ||
<groupId>io.awspring.cloud</groupId> | ||
<version>3.2.0-SNAPSHOT</version> | ||
</parent> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<artifactId>spring-cloud-aws-docker-compose</artifactId> | ||
<name>Spring Cloud AWS Docker Compose</name> | ||
<description>Spring Cloud AWS Docker Compose Integration</description> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>io.awspring.cloud</groupId> | ||
<artifactId>spring-cloud-aws-autoconfigure</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-docker-compose</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.springframework</groupId> | ||
<artifactId>spring-test</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
|
||
</project> |
82 changes: 82 additions & 0 deletions
82
.../main/java/io/awspring/cloud/docker/compose/AwsDockerComposeConnectionDetailsFactory.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 @@ | ||
/* | ||
* Copyright 2013-2024 the original author or authors. | ||
* | ||
* 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 | ||
* | ||
* https://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. | ||
*/ | ||
package io.awspring.cloud.docker.compose; | ||
|
||
import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails; | ||
import java.net.URI; | ||
import org.springframework.boot.docker.compose.core.RunningService; | ||
import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionDetailsFactory; | ||
import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionSource; | ||
|
||
/** | ||
* {@link DockerComposeConnectionDetailsFactory} to create {@link AwsConnectionDetails} for a {@code localstack} | ||
* service. | ||
* | ||
* @author Dominik Kovács | ||
* @since 3.2.0 | ||
*/ | ||
class AwsDockerComposeConnectionDetailsFactory extends DockerComposeConnectionDetailsFactory<AwsConnectionDetails> { | ||
|
||
private static final String[] LOCALSTACK_CONTAINER_NAMES = { "localstack/localstack", "localstack/localstack-pro" }; | ||
|
||
private static final int LOCALSTACK_PORT = 4566; | ||
|
||
AwsDockerComposeConnectionDetailsFactory() { | ||
super(LOCALSTACK_CONTAINER_NAMES); | ||
} | ||
|
||
@Override | ||
protected AwsConnectionDetails getDockerComposeConnectionDetails(DockerComposeConnectionSource source) { | ||
return new AwsDockerComposeConnectionDetails(source.getRunningService()); | ||
} | ||
|
||
/** | ||
* {@link DockerComposeConnectionDetails} backed by a {@code localstack} {@link RunningService}. | ||
*/ | ||
private static final class AwsDockerComposeConnectionDetails extends DockerComposeConnectionDetails | ||
implements AwsConnectionDetails { | ||
|
||
private final LocalStackEnvironment environment; | ||
|
||
private final URI endpoint; | ||
|
||
private AwsDockerComposeConnectionDetails(RunningService service) { | ||
super(service); | ||
this.environment = new LocalStackEnvironment(service.env()); | ||
this.endpoint = URI.create("http://%s:%s".formatted(service.host(), service.ports().get(LOCALSTACK_PORT))); | ||
} | ||
|
||
@Override | ||
public URI getEndpoint() { | ||
return this.endpoint; | ||
} | ||
|
||
@Override | ||
public String getRegion() { | ||
return this.environment.getRegion(); | ||
} | ||
|
||
@Override | ||
public String getAccessKey() { | ||
return this.environment.getAccessKey(); | ||
} | ||
|
||
@Override | ||
public String getSecretKey() { | ||
return this.environment.getSecretKey(); | ||
} | ||
} | ||
} |
51 changes: 51 additions & 0 deletions
51
...-docker-compose/src/main/java/io/awspring/cloud/docker/compose/LocalStackEnvironment.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,51 @@ | ||
/* | ||
* Copyright 2013-2024 the original author or authors. | ||
* | ||
* 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 | ||
* | ||
* https://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. | ||
*/ | ||
package io.awspring.cloud.docker.compose; | ||
|
||
import java.util.Map; | ||
|
||
/** | ||
* LocalStack environment details. | ||
* | ||
* @author Dominik Kovács | ||
* @since 3.2.0 | ||
*/ | ||
class LocalStackEnvironment { | ||
|
||
private final String region; | ||
|
||
private final String accessKey; | ||
|
||
private final String secretKey; | ||
|
||
LocalStackEnvironment(Map<String, String> env) { | ||
this.region = env.get("AWS_DEFAULT_REGION"); | ||
this.accessKey = env.get("AWS_ACCESS_KEY_ID"); | ||
this.secretKey = env.get("AWS_SECRET_ACCESS_KEY"); | ||
} | ||
|
||
String getRegion() { | ||
return this.region; | ||
} | ||
|
||
String getAccessKey() { | ||
return this.accessKey; | ||
} | ||
|
||
String getSecretKey() { | ||
return this.secretKey; | ||
} | ||
} |
6 changes: 6 additions & 0 deletions
6
...cloud-aws-docker-compose/src/main/java/io/awspring/cloud/docker/compose/package-info.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,6 @@ | ||
/** | ||
* Docker Compose integration. | ||
*/ | ||
@org.springframework.lang.NonNullApi | ||
@org.springframework.lang.NonNullFields | ||
package io.awspring.cloud.docker.compose; |
2 changes: 2 additions & 0 deletions
2
spring-cloud-aws-docker-compose/src/main/resources/META-INF/spring.factories
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,2 @@ | ||
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\ | ||
io.awspring.cloud.docker.compose.AwsDockerComposeConnectionDetailsFactory |
50 changes: 50 additions & 0 deletions
50
...t/java/io/awspring/cloud/docker/compose/AwsDockerComposeConnectionDetailsFactoryTest.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,50 @@ | ||
package io.awspring.cloud.docker.compose; | ||
|
||
import io.awspring.cloud.autoconfigure.core.AwsConnectionDetails; | ||
import org.junit.jupiter.api.AfterAll; | ||
import org.junit.jupiter.api.Test; | ||
import org.springframework.boot.SpringApplication; | ||
import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails; | ||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.core.io.ClassPathResource; | ||
import org.springframework.core.io.Resource; | ||
|
||
import java.io.IOException; | ||
import java.net.URI; | ||
import java.util.LinkedHashMap; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
class AwsDockerComposeConnectionDetailsFactoryTest { | ||
|
||
private final Resource dockerComposeResource = new ClassPathResource("docker-compose.yaml"); | ||
|
||
@AfterAll | ||
static void shutDown() { | ||
var shutdownHandlers = SpringApplication.getShutdownHandlers(); | ||
((Runnable) shutdownHandlers).run(); | ||
} | ||
|
||
@Test | ||
void runCreatesConnectionDetailsThatCanAccessLocalStack() throws IOException { | ||
var application = new SpringApplication(Config.class); | ||
var properties = new LinkedHashMap<String, Object>(); | ||
properties.put("spring.docker.compose.skip.in-tests", "false"); | ||
properties.put("spring.docker.compose.file", dockerComposeResource.getFile()); | ||
properties.put("spring.docker.compose.stop.command", "down"); | ||
application.setDefaultProperties(properties); | ||
var connectionDetails = application.run().getBean(AwsConnectionDetails.class); | ||
|
||
assertThat(connectionDetails.getAccessKey()).isEqualTo("noop"); | ||
assertThat(connectionDetails.getSecretKey()).isEqualTo("noop"); | ||
assertThat(connectionDetails.getRegion()).isEqualTo("eu-central-1"); | ||
assertThat(connectionDetails.getEndpoint()).satisfiesAnyOf( | ||
endpoint -> assertThat(endpoint).isEqualTo(URI.create("http://localhost:4566")), | ||
endpoint -> assertThat(endpoint).isEqualTo(URI.create("http://127.0.0.1:4566"))); | ||
} | ||
|
||
@Configuration(proxyBeanMethods = false) | ||
static class Config { | ||
|
||
} | ||
} |
61 changes: 61 additions & 0 deletions
61
...ker-compose/src/test/java/io/awspring/cloud/docker/compose/LocalStackEnvironmentTest.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,61 @@ | ||
/* | ||
* Copyright 2013-2024 the original author or authors. | ||
* | ||
* 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 | ||
* | ||
* https://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. | ||
*/ | ||
package io.awspring.cloud.docker.compose; | ||
|
||
import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
|
||
import java.util.Collections; | ||
import java.util.Map; | ||
import org.junit.jupiter.api.Test; | ||
|
||
class LocalStackEnvironmentTest { | ||
|
||
@Test | ||
void getRegionWhenRegionIsNotSet() { | ||
var environment = new LocalStackEnvironment(Collections.emptyMap()); | ||
assertThat(environment.getRegion()).isNull(); | ||
} | ||
|
||
@Test | ||
void getRegionWhenRegionIsSet() { | ||
var environment = new LocalStackEnvironment(Map.of("AWS_DEFAULT_REGION", "us-west-1")); | ||
assertThat(environment.getRegion()).isEqualTo("us-west-1"); | ||
} | ||
|
||
@Test | ||
void getAccessKeyWhenAccessKeyIsNotSet() { | ||
var environment = new LocalStackEnvironment(Collections.emptyMap()); | ||
assertThat(environment.getAccessKey()).isNull(); | ||
} | ||
|
||
@Test | ||
void getAccessKeyWhenAccessKeyIsSet() { | ||
var environment = new LocalStackEnvironment(Map.of("AWS_ACCESS_KEY_ID", "access-key")); | ||
assertThat(environment.getAccessKey()).isEqualTo("access-key"); | ||
} | ||
|
||
@Test | ||
void getSecretKeyWhenSecretKeyIsNotSet() { | ||
var environment = new LocalStackEnvironment(Collections.emptyMap()); | ||
assertThat(environment.getSecretKey()).isNull(); | ||
} | ||
|
||
@Test | ||
void getSecretKeyWhenSecretKeyIsSet() { | ||
var environment = new LocalStackEnvironment(Map.of("AWS_SECRET_ACCESS_KEY", "secret-key")); | ||
assertThat(environment.getSecretKey()).isEqualTo("secret-key"); | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
spring-cloud-aws-docker-compose/src/test/resources/docker-compose.yaml
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,9 @@ | ||
services: | ||
localstack: | ||
image: localstack/localstack | ||
environment: | ||
AWS_ACCESS_KEY_ID: noop | ||
AWS_SECRET_ACCESS_KEY: noop | ||
AWS_DEFAULT_REGION: eu-central-1 | ||
ports: | ||
- "4566:4566" |
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
11 changes: 11 additions & 0 deletions
11
spring-cloud-aws-samples/spring-cloud-aws-docker-compose-sample/docker-compose.yaml
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,11 @@ | ||
services: | ||
localstack: | ||
image: localstack/localstack | ||
container_name: localstack | ||
environment: | ||
SERVICES: sqs | ||
AWS_ACCESS_KEY_ID: noop | ||
AWS_SECRET_ACCESS_KEY: noop | ||
AWS_DEFAULT_REGION: eu-central-1 | ||
ports: | ||
- "4566:4566" |
Oops, something went wrong.