Bumping up the CDK exposes a couple more methods that were missing fr…

…om CDK 1.26.0, but apparently there are a few rough corners to fix still according to CDK tracking issue aws/aws-cdk#6765
umccr · Apr 8, 2020 · df65dad · df65dad
1 parent 88df2ac
commit df65dad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -137,9 +137,9 @@ dependencies {
         [group: 'software.amazon.awssdk', name: 's3', version: '2.8.5'],
 
         // Amazon server side dependencies (used to deploy the serverless Amazon IGV backend)
-        [group: 'software.amazon.awscdk', name: 'core', version: '1.26.0'],
-        [group: 'software.amazon.awscdk', name: 'cognito', version: '1.26.0'],
-        [group: 'software.amazon.awscdk', name: 's3', version: '1.26.0'],
+        [group: 'software.amazon.awscdk', name: 'core', version: '1.31.0'],
+        [group: 'software.amazon.awscdk', name: 'cognito', version: '1.31.0'],
+        [group: 'software.amazon.awscdk', name: 's3', version: '1.31.0'],
 
     )
 

diff --git a/src/main/java/org/umccr/awscdk/IGVAmazonCognitoStack.java b/src/main/java/org/umccr/awscdk/IGVAmazonCognitoStack.java
@@ -8,12 +8,10 @@
 import software.amazon.awscdk.core.Stack;
 import software.amazon.awscdk.core.StackProps;
 
-import software.amazon.awscdk.services.cognito.UserPool;
-import software.amazon.awscdk.services.cognito.CfnUserPoolIdentityProvider;
-import software.amazon.awscdk.services.cognito.UserPoolClient;
-import software.amazon.awscdk.services.cognito.CfnIdentityPool;
-import software.amazon.awscdk.services.cognito.CfnUserPoolDomain;
+import software.amazon.awscdk.services.cognito.*;
+import software.amazon.awscdk.services.cognito.CfnUserPoolProps;
 import software.amazon.awscdk.services.s3.Bucket;
+import software.amazon.awssdk.services.s3.model.MFADelete;
 
 import java.util.HashMap;
 import java.util.List;
@@ -65,11 +63,14 @@ public IGVAmazonCognitoStack(final Construct parent, final String id, final Stac
 
         final UserPool userPool = UserPool.Builder.create(this, "IGV User Pool")
                                                   .selfSignUpEnabled(false)
+                                                  .mfa(Mfa.OFF)
                                                   .build();
+
+
         final UserPoolClient userPoolClient = UserPoolClient.Builder.create(this, "IGV User Pool Client")
                                                                     .userPool(userPool)
                                                                     .userPoolClientName("IGV User Pool Client")
-                                                                    .generateSecret(true)
+                                                                    .generateSecret(true).enabledAuthFlows()
                                                                     .build();
 
 
@@ -78,6 +79,8 @@ public IGVAmazonCognitoStack(final Construct parent, final String id, final Stac
         userPoolID = userPool.getUserPoolId();
         userPoolARN = userPool.getUserPoolArn();
 
+
+        final CfnUserPoolProps cfnUserPoolProps = CfnUserPoolProps.
         final CfnUserPoolDomain cfnUserPoolDomain = CfnUserPoolDomain.Builder.create(this, "IGV User Pool Domain")
                 .domain(userPoolDomain)
                 .userPoolId(userPoolID)