spring-cloudGH-368: Update AWS code to the latest deps

Fixes spring-cloud#368

* Upgrade to `spring-cloud-aws-2.4.2`; fix respective package changes
* Remove `AutoConfigurationExclusionEnvironmentPostProcessor` since classes in the SC-AWS
are not considered as auto-configuration anymore.
Instead, add an explicit `@Import` into `AmazonS3Configuration`.
Not sure, though, why it was excluded before at all
* Fix `MetadataStoreAutoConfigurationTests` with the current state of code.
Looks like before it was designed for auto-configuration based on classpath content
* Re-enable other AWS S3 tests

This fix has helped to spot a bug in Spring Integration Testing framework:
spring-projects/spring-integration@e2d8eeb

Author: artembilan

Diff for: applications/sink/s3-sink/src/test/java/org/springframework/cloud/stream/app/s3/sink/AwsS3SinkTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -37,7 +37,6 @@
 import com.amazonaws.services.s3.transfer.internal.S3ProgressPublisher;
 import com.amazonaws.util.Md5Utils;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.ArgumentCaptor;
@@ -65,7 +64,6 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-@Disabled
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 		properties = {
 				"cloud.aws.stack.auto=false",

Diff for: applications/source/s3-source/src/test/java/org/springframework/cloud/stream/app/source/s3/AwsS3SourceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -56,7 +56,6 @@
 import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.Mockito.mock;
 
-@Disabled
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 		properties = {
 				"cloud.aws.stack.auto=false",

Diff for: functions/common/aws-s3-common/pom.xml

@@ -15,7 +15,7 @@
 
     <properties>
         <spring-integration-aws.version>2.5.2</spring-integration-aws.version>
-        <spring-cloud-aws.version>2.2.6.RELEASE</spring-cloud-aws.version>
+        <spring-cloud-aws.version>2.4.2</spring-cloud-aws.version>
     </properties>
 
     <dependencies>
@@ -25,7 +25,7 @@
             <version>${spring-integration-aws.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>io.awspring.cloud</groupId>
             <artifactId>spring-cloud-starter-aws</artifactId>
             <version>${spring-cloud-aws.version}</version>
         </dependency>

Diff for: functions/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -22,15 +22,25 @@
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.aws.context.annotation.ConditionalOnMissingAmazonClient;
-import org.springframework.cloud.aws.core.region.RegionProvider;
+
+import io.awspring.cloud.autoconfigure.context.ContextCredentialsAutoConfiguration;
+import io.awspring.cloud.autoconfigure.context.ContextRegionProviderAutoConfiguration;
+import io.awspring.cloud.context.annotation.ConditionalOnMissingAmazonClient;
+import io.awspring.cloud.context.config.annotation.ContextDefaultConfigurationRegistrar;
+import io.awspring.cloud.core.region.RegionProvider;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 
 /**
  * @author Artem Bilan
  */
 @AutoConfiguration
 @ConditionalOnMissingAmazonClient(AmazonS3.class)
+@Import({
+		ContextCredentialsAutoConfiguration.class,
+		ContextDefaultConfigurationRegistrar.class,
+		ContextRegionProviderAutoConfiguration.class
+})
 public class AmazonS3Configuration {
 
 	@Bean

Diff for: functions/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AutoConfigurationExclusionEnvironmentPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2020 the original author or authors.
+ * Copyright 2020-2022 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.
@@ -30,7 +30,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.aws.core.region.RegionProvider;
+import io.awspring.cloud.core.region.RegionProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.integration.aws.support.S3SessionFactory;
 import org.springframework.lang.Nullable;
@@ -39,6 +39,7 @@
 /**
  * @author Timo Salm
  * @author David Turanski
+ * @author Artem Bilan
  */
 @AutoConfiguration
 @EnableConfigurationProperties(AmazonS3Properties.class)

Diff for: functions/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/CompatibleStorageAmazonS3Configuration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2020 the original author or authors.
+ * Copyright 2020-2022 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.
@@ -26,8 +26,8 @@
 
 import org.springframework.boot.context.annotation.UserConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.aws.core.region.RegionProvider;
-import org.springframework.cloud.aws.core.region.StaticRegionProvider;
+import io.awspring.cloud.core.region.RegionProvider;
+import io.awspring.cloud.core.region.StaticRegionProvider;
 import org.springframework.context.annotation.Bean;
 
 /**

Diff for: functions/common/aws-s3-common/src/main/resources/META-INF/spring.factories

@@ -14,8 +14,8 @@
     <description>metadata-store common</description>
 
     <properties>
-        <aws-java-sdk.version>1.11.951</aws-java-sdk.version>
-        <spring-integration-aws.version>2.5.0</spring-integration-aws.version>
+        <aws-java-sdk.version>1.12.322</aws-java-sdk.version>
+        <spring-integration-aws.version>2.5.2</spring-integration-aws.version>
         <spring-integration-hazelcast.version>3.0.0</spring-integration-hazelcast.version>
         <curator.version>4.0.1</curator.version>
     </properties>

Diff for: functions/common/aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java

@@ -18,7 +18,6 @@
 
 import java.beans.Introspector;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Predicate;
 
@@ -28,10 +27,8 @@
 import com.amazonaws.services.dynamodbv2.model.DescribeTableResult;
 import io.awspring.cloud.core.region.RegionProvider;
 import org.apache.curator.test.TestingServer;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -57,14 +54,13 @@
 /**
  * @author Artem Bilan
  * @author Corneil du Plessis
+ *
  * @since 2.0.2
  */
-@RunWith(Parameterized.class)
-@Ignore
 public class MetadataStoreAutoConfigurationTests {
 
 	private final static List<Class<? extends ConcurrentMetadataStore>> METADATA_STORE_CLASSES =
-			Arrays.asList(
+			List.of(
 					RedisMetadataStore.class,
 					MongoDbMetadataStore.class,
 					JdbcMetadataStore.class,
@@ -73,15 +69,30 @@ public class MetadataStoreAutoConfigurationTests {
 					DynamoDbMetadataStore.class,
 					SimpleMetadataStore.class
 			);
-	private final ApplicationContextRunner contextRunner;
-	private final Class<? extends ConcurrentMetadataStore> classToInclude;
 
-	public MetadataStoreAutoConfigurationTests(Class<? extends ConcurrentMetadataStore> classToInclude) {
-		this.classToInclude = classToInclude;
-		this.contextRunner =
+	@ParameterizedTest
+	@MethodSource
+	public void testMetadataStore(Class<? extends ConcurrentMetadataStore> classToInclude) {
+		ApplicationContextRunner contextRunner =
 				new ApplicationContextRunner()
 						.withUserConfiguration(TestConfiguration.class)
+						.withPropertyValues("metadata.store.type=" +
+								classToInclude.getSimpleName()
+										.replaceFirst("MetadataStore", "")
+										.toLowerCase()
+										.replaceFirst("simple", "memory"))
 						.withClassLoader(filteredClassLoaderBut(classToInclude));
+		contextRunner
+				.run(context -> {
+					assertThat(context.getBeansOfType(MetadataStore.class)).hasSize(1);
+
+					assertThat(context.getBeanNamesForType(classToInclude))
+							.containsOnlyOnce(Introspector.decapitalize(classToInclude.getSimpleName()));
+				});
+	}
+
+	static List<Class<? extends ConcurrentMetadataStore>> testMetadataStore() {
+		return METADATA_STORE_CLASSES;
 	}
 
 	private static FilteredClassLoader filteredClassLoaderBut(Class<? extends ConcurrentMetadataStore> classToInclude) {
@@ -91,22 +102,6 @@ private static FilteredClassLoader filteredClassLoaderBut(Class<? extends Concur
 						.toArray(Class<?>[]::new));
 	}
 
-	@Parameterized.Parameters
-	public static Iterable<?> parameters() {
-		return METADATA_STORE_CLASSES;
-	}
-
-	@Test
-	public void testMetadataStore() {
-		this.contextRunner
-				.run(context -> {
-					assertThat(context.getBeansOfType(MetadataStore.class)).hasSize(1);
-
-					assertThat(context.getBeanNamesForType(this.classToInclude))
-							.containsOnlyOnce(Introspector.decapitalize(this.classToInclude.getSimpleName()));
-				});
-	}
-
 	@Configuration
 	@EnableAutoConfiguration
 	public static class TestConfiguration {

Diff for: functions/common/aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AutoConfigurationExclusionEnvironmentPostProcessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -30,6 +30,7 @@
 import com.amazonaws.services.s3.model.SetObjectAclRequest;
 import com.amazonaws.services.s3.transfer.PersistableTransfer;
 import com.amazonaws.services.s3.transfer.internal.S3ProgressListener;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -144,5 +145,7 @@ public S3MessageHandler.UploadMetadataProvider uploadMetadataProvider() {
 				}
 			};
 		}
+
 	}
+
 }

Diff for: functions/common/metadata-store-common/pom.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -28,7 +28,6 @@
 import com.amazonaws.services.s3.model.SetObjectAclRequest;
 import com.amazonaws.services.s3.transfer.internal.S3ProgressPublisher;
 import com.amazonaws.util.Md5Utils;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -41,7 +40,6 @@
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.verify;
 
-@Disabled
 @TestPropertySource(properties = "s3.consumer.acl=PublicReadWrite")
 public class AmazonS3UploadFileTests extends AbstractAwsS3ConsumerMockTests {