Add integration tests against a generated project

.github/workflows/ci.yml

@@ -16,11 +16,47 @@ jobs:
           java-version: 11
       - name: Build with Gradle
         run: ./gradlew build
+
+  integration-test:
+    name: "integration-test (Spring Boot version ${{ matrix.spring-boot-version }})"
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      matrix:
+        include:
+          - spring-boot-version: 2.5.+
+            experimental: false
+          - spring-boot-version: 2.6.+
+            experimental: false
+          - spring-boot-version: 2.+
+            experimental: true
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Run integration test
+        run: ./gradlew check -p integration-tests -PspringBootVersion=${{ matrix.spring-boot-version }}
+
+  publish:
+    needs:
+      - build
+      - integration-test
+    if: ${{ github.ref == 'refs/heads/main' || startswith(github.ref, 'refs/tags/') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
       - name: Publish
-        if: ${{ github.ref == 'refs/heads/main' || startswith(github.ref, 'refs/tags/') }}
         env:
           SIGNING_PRIVATE_KEY: ${{ secrets.MAVEN_CENTRAL_GPG_KEY }}
           SIGNING_PASSWORD: ${{ secrets.MAVEN_CENTRAL_GPG_PASSWORD }}
           ORG_GRADLE_PROJECT_sonatype_username: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
           ORG_GRADLE_PROJECT_sonatype_password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
-        run: ./gradlew publish
+        run: ./gradlew publish

contentcloud-spring-boot-autoconfigure/build.gradle

@@ -1,17 +1,35 @@
 plugins {
     id 'java-library'
+    id 'maven-publish'
 }
 
-// apply from: "${rootDir}/gradle/publish.gradle"
-
 repositories {
     mavenCentral()
 }
 
+configurations {
+    compileOnly {
+        extendsFrom(annotationProcessor)
+    }
+
+    testAnnotationProcessor {
+        extendsFrom(annotationProcessor)
+    }
+}
+
 dependencies {
-    implementation platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
+    annotationProcessor platform(project(':contentcloud-spring-boot-platform'))
+    annotationProcessor 'org.projectlombok:lombok'
+
+    implementation platform(project(':contentcloud-spring-boot-platform'))
+    implementation 'org.springframework.boot:spring-boot-autoconfigure'
+
+    compileOnly "com.github.paulcwarren:spring-content-autoconfigure"
+    compileOnly "com.github.paulcwarren:spring-content-s3"
 
     testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation 'org.springframework:spring-test'
+    testImplementation 'com.github.paulcwarren:spring-content-s3-boot-starter'
 }
 
 tasks.named('test') {

contentcloud-spring-boot-autoconfigure/src/main/java/eu/xenit/contentcloud/spring/autoconfigure/s3/S3RegionAutoConfiguration.java

@@ -0,0 +1,70 @@
+package eu.xenit.contentcloud.spring.autoconfigure.s3;
+
+import internal.org.springframework.content.s3.boot.autoconfigure.S3ContentAutoConfiguration;
+import internal.org.springframework.content.s3.boot.autoconfigure.S3ContentAutoConfiguration.S3Properties;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Stream;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import software.amazon.awssdk.services.s3.S3Client;
+
+@Configuration
+// @AutoConfigureAfter uses a string because the class may not be present on the classpath,
+// and we don't want an exception in that case
+@AutoConfigureBefore(name="internal.org.springframework.content.s3.boot.autoconfigure.S3ContentAutoConfiguration")
+@ConditionalOnClass({S3Client.class, S3ContentAutoConfiguration.class})
+@ConditionalOnProperty(
+        prefix="spring.content.storage.type",
+        name = "default",
+        havingValue = "s3",
+        matchIfMissing=true)
+public class S3RegionAutoConfiguration {
+    @Component
+    @ConfigurationProperties(prefix = "spring.content.s3")
+    @Data
+    public static class S3AdditionalProperties {
+        private String region;
+    }
+
+    /**
+     * This component will be registered (and created) before S3Client,
+     * and is thus able to set a property that is later picked up by the S3Client.
+     */
+    @Component
+    @AllArgsConstructor(onConstructor_= @Autowired)
+    static class S3RegionConfigurer implements InitializingBean {
+        private final S3Properties s3Properties;
+        private final S3AdditionalProperties s3AdditionalProperties;
+
+        @Override
+        public void afterPropertiesSet() throws Exception {
+            if(StringUtils.hasText(s3Properties.endpoint)) {
+                System.setProperty("aws.region", "fake");
+            }
+            if(StringUtils.hasText(s3AdditionalProperties.getRegion())) {
+                System.setProperty("aws.region", s3AdditionalProperties.getRegion());
+            }
+        }
+    }
+}

contentcloud-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+eu.xenit.contentcloud.spring.autoconfigure.s3.S3RegionAutoConfiguration

contentcloud-spring-boot-autoconfigure/src/test/java/eu/xenit/contentcloud/spring/autoconfigure/s3/S3RegionAutoConfigurationTest.java

@@ -0,0 +1,118 @@
+package eu.xenit.contentcloud.spring.autoconfigure.s3;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
+
+import java.util.Arrays;
+import java.util.Properties;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.boot.autoconfigure.AutoConfigurationPackage;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.awscore.client.config.AwsClientOption;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+class S3RegionAutoConfigurationTest {
+    private Properties systemPropertiesBackup;
+
+    @BeforeEach
+    void backupSystemProperties() {
+        systemPropertiesBackup = new Properties();
+        systemPropertiesBackup.putAll(System.getProperties());
+    }
+
+    @AfterEach
+    void restoreSystemProperties() {
+        System.setProperties(systemPropertiesBackup);
+    }
+
+    @SneakyThrows
+    private static SdkClientConfiguration extractConfiguration(S3Client s3Client) {
+        Class<? extends S3Client> s3clazz = s3Client.getClass();
+        var sdkClientConfigField = Arrays.stream(s3clazz.getDeclaredFields())
+                .filter(field -> field.getType() == SdkClientConfiguration.class)
+                .findAny()
+                .get();
+
+        sdkClientConfigField.setAccessible(true);
+        return (SdkClientConfiguration) sdkClientConfigField.get(s3Client);
+    }
+
+    @Test
+    @ResourceLock(value = SYSTEM_PROPERTIES)
+    void setsRegionWhenConfiguredExplicitly() {
+        System.setProperty("spring.content.s3.region", "my-region");
+
+        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
+        applicationContext.register(TestConfig.class);
+        applicationContext.refresh();
+
+        S3Client client = applicationContext.getBean(S3Client.class);
+
+        SdkClientConfiguration configuration = extractConfiguration(client);
+
+        assertEquals(Region.of("my-region"), configuration.option(AwsClientOption.AWS_REGION));
+    }
+
+    @Test
+    @ResourceLock(value = SYSTEM_PROPERTIES)
+    void setsFakeRegionWhenConfiguredWithEndpoint() {
+        System.setProperty("spring.content.s3.endpoint", "https://some-endpoint:1234/");
+
+        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
+        applicationContext.register(TestConfig.class);
+        applicationContext.refresh();
+
+        S3Client client = applicationContext.getBean(S3Client.class);
+
+        SdkClientConfiguration configuration = extractConfiguration(client);
+
+        assertEquals(Region.of("fake"), configuration.option(AwsClientOption.AWS_REGION));
+    }
+
+
+    @Test
+    @ResourceLock(value = SYSTEM_PROPERTIES)
+    void setsNoRegionWhenNotConfigured() {
+        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
+        applicationContext.register(TestConfig.class);
+
+        BeanCreationException beanCreationException = assertThrows(BeanCreationException.class, () -> {
+            applicationContext.refresh();
+        });
+
+        assertInstanceOf(SdkClientException.class, beanCreationException.getRootCause());
+    }
+
+    @Test
+    @ResourceLock(value = SYSTEM_PROPERTIES)
+    void setsNoRegionWhenS3NotEnabled() {
+        System.setProperty("spring.content.storage.type.default", "fs");
+        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
+        applicationContext.register(TestConfig.class);
+        applicationContext.refresh();
+
+        assertThrows(NoSuchBeanDefinitionException.class, () -> {
+            applicationContext.getBean(S3Client.class);
+        });
+    }
+
+
+    @Configuration
+    @EnableAutoConfiguration
+    @AutoConfigurationPackage
+    public static class TestConfig {
+
+    }
+
+}

contentcloud-spring-boot-starter/build.gradle

@@ -21,6 +21,8 @@ dependencies {
 
     api 'com.querydsl:querydsl-jpa'
 
+    implementation project(':contentcloud-spring-boot-autoconfigure')
+
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'org.postgresql:postgresql'
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'

integration-tests/build.gradle

@@ -0,0 +1,20 @@
+plugins {
+    id 'base'
+}
+
+import java.util.stream.Collectors;
+
+def integTestTasks(taskName) {
+    return gradle.includedBuilds.stream()
+            .filter(build -> build.name.startsWith('it-'))
+            .map(build -> build.task(taskName))
+            .collect(Collectors.toList())
+}
+
+check {
+    dependsOn(integTestTasks(':check'))
+}
+
+clean {
+    dependsOn(integTestTasks(':clean'))
+}

integration-tests/integration-tests-spring/.gitignore

@@ -0,0 +1,36 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/

integration-tests/integration-tests-spring/build.gradle

@@ -0,0 +1,31 @@
+plugins {
+	id 'org.springframework.boot' version '2.6.2'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'java'
+}
+
+group = 'eu.xenit.contentcloud.userapps.holmes'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '11'
+
+configurations {
+	compileOnly {
+		extendsFrom annotationProcessor
+	}
+}
+
+repositories {
+	mavenCentral()
+	maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+}
+
+dependencies {
+	implementation 'eu.xenit.contentcloud.starter:contentcloud-spring-boot-starter:0.1.0-SNAPSHOT'
+	annotationProcessor 'eu.xenit.contentcloud.starter:contentcloud-spring-boot-starter-annotations:0.1.0-SNAPSHOT'
+	annotationProcessor 'org.projectlombok:lombok'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+test {
+	useJUnitPlatform()
+}

integration-tests/integration-tests-spring/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists