From 5c94fabdbbe1c97a79ce66cde52105ff4a5ff5fb Mon Sep 17 00:00:00 2001
From: Bill Wang <wanzhiji@amazon.com>
Date: Mon, 4 Jan 2021 22:27:35 +0000
Subject: [PATCH] Squashed commit of the following
commit 04e49a0d
Author: zhijie wang <wanzhiji@amazon.com>
Date: Mon Dec 28 2020 19:10:30 GMT-0800 (Pacific Standard Time)
fix Cognito region services
commit fca15a32
Author: zhijie wang <wanzhiji@amazon.com>
Date: Mon Dec 28 2020 13:56:14 GMT-0800 (Pacific Standard Time)
commit eaf5dcc4
Author: zhijie wang <wanzhiji@amazon.com>
Date: Mon Dec 28 2020 13:35:25 GMT-0800 (Pacific Standard Time)
fix cognito client
commit 9ceee335
Author: zhijie wang <wanzhiji@amazon.com>
Date: Mon Dec 28 2020 13:20:15 GMT-0800 (Pacific Standard Time)
bump core service version
commit 30d44fe4
Author: zhijie wang <wanzhiji@amazon.com>
Date: Mon Dec 21 2020 15:03:10 GMT-0800 (Pacific Standard Time)
fix pom version
---
provider/notification-aws/build-aws/buildspec.yaml | 6 +++---
provider/notification-aws/pom.xml | 2 +-
.../provider/aws/utils/AwsCognitoClient.java | 10 ++++++----
.../osdu/notification/util/AwsCognitoClient.java | 13 +++++++++----
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/provider/notification-aws/build-aws/buildspec.yaml b/provider/notification-aws/build-aws/buildspec.yaml
index c5c22facf..d711e4398 100644
--- a/provider/notification-aws/build-aws/buildspec.yaml
+++ b/provider/notification-aws/build-aws/buildspec.yaml
@@ -28,8 +28,8 @@ phases:
java: corretto8
commands:
- if [ $(echo $CODEBUILD_SOURCE_VERSION | grep -c ^refs/heads.*) -eq 1 ]; then echo "Branch name found"; else echo "This build only supports branch builds" && exit 1; fi
- - apt-get update -y
- - apt-get install -y maven
+ - apt-get update -y -qq > /dev/null
+ - apt-get install -y maven -qq >/dev/null
- java -version
- mvn -version
- mkdir -p /root/.m2
@@ -56,7 +56,7 @@ phases:
- printenv
- echo "Building primary service assemblies..."
- - mvn -B test install -pl notification-core,provider/notification-aws -Ddeployment.environment=prod
+ - mvn -ntp -B test install -pl notification-core,provider/notification-aws -Ddeployment.environment=prod
- echo "Building integration testing assemblies and gathering artifacts..."
- ./testing/notification-test-aws/build-aws/prepare-dist.sh
diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml
index 52bb168f5..afadab041 100644
--- a/provider/notification-aws/pom.xml
+++ b/provider/notification-aws/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.3.14</version>
+ <version>0.3.16</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-secretsmanager -->
diff --git a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/utils/AwsCognitoClient.java b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/utils/AwsCognitoClient.java
index d8c9fe163..ea906d1ee 100644
--- a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/utils/AwsCognitoClient.java
+++ b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/utils/AwsCognitoClient.java
@@ -79,10 +79,12 @@ public class AwsCognitoClient {
public static AWSCognitoIdentityProvider generateCognitoClient(String region)
{
- return AWSCognitoIdentityProviderClientBuilder.standard()
- .withCredentials(IAMConfig.amazonAWSCredentials())
- .withRegion(region)
- .build();
+ if (System.getenv("AWS_COGNITO_REGION") != null) {
+ region = System.getenv("AWS_COGNITO_REGION");
+ }
+ return AWSCognitoIdentityProviderClientBuilder.standard().
+ withCredentials(IAMConfig.amazonAWSCredentials()).
+ withRegion(region).build();
}
public void setPassword(String username, String password,String userPoolId){
diff --git a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/util/AwsCognitoClient.java b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/util/AwsCognitoClient.java
index e63144347..5bfb1f859 100644
--- a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/util/AwsCognitoClient.java
+++ b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/util/AwsCognitoClient.java
@@ -85,9 +85,14 @@ public class AwsCognitoClient {
public static AWSCognitoIdentityProvider generateCognitoClient()
{
- return AWSCognitoIdentityProviderClientBuilder.standard()
- .withCredentials(IAMConfig.amazonAWSCredentials())
- .withRegion(AwsConfig.getAwsRegion())
- .build();
+ String region = System.getenv("AWS_COGNITO_REGION");
+ AWSCognitoIdentityProviderClientBuilder builder = AWSCognitoIdentityProviderClientBuilder.standard()
+ .withCredentials(IAMConfig.amazonAWSCredentials());
+ if ( region!= null) {
+ builder.withRegion(region);
+ }else{
+ builder.withRegion(AwsConfig.getAwsRegion());
+ }
+ return builder.build();
}
}
--
GitLab