chore: revert "chore: pr feedback"

This reverts commit 74cf0dc.
sobolk · Jul 13, 2023 · 95f0f8b · 95f0f8b
1 parent 4d791a6
commit 95f0f8b
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 12 deletions.
diff --git a/...tils/awscloudformation/auth-stack-builder/__snapshots__/auth-stack-transform.test.ts.snap b/...tils/awscloudformation/auth-stack-builder/__snapshots__/auth-stack-transform.test.ts.snap
@@ -1614,6 +1614,7 @@ exports.handler = (event, context, callback) => {
     },
     "UserPoolClient": {
       "DependsOn": [
+        "HostedUIProvidersCustomResourceInputs",
         "UserPool",
       ],
       "Properties": {
@@ -1715,6 +1716,7 @@ exports.handler = (event, context, callback) => {
     },
     "UserPoolClientWeb": {
       "DependsOn": [
+        "HostedUIProvidersCustomResourceInputs",
         "UserPool",
       ],
       "Properties": {

diff --git a/...uth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts b/...uth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts
@@ -787,6 +787,9 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
       },
     });
     this.hostedUIProvidersCustomResourceInputs.node.addDependency(this.hostedUIProvidersCustomResourceLogPolicy);
+    // this can be removed when hostedUI Custom resource is removed
+    this.userPoolClient?.node.addDependency(this.hostedUIProvidersCustomResourceInputs);
+    this.userPoolClientWeb?.node.addDependency(this.hostedUIProvidersCustomResourceInputs);
   }
 
   /**

diff --git a/...tests/src/__tests__/migration_tests_v10/__snapshots__/auth-add-all.migration.test.ts.snap b/...tests/src/__tests__/migration_tests_v10/__snapshots__/auth-add-all.migration.test.ts.snap
@@ -54,8 +54,14 @@ Resources
  │   └─ ["https://signin1/"]
  ├─ [+] LogoutURLs
  │   └─ ["https://signout1/"]
- └─ [+] SupportedIdentityProviders
-     └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ ├─ [+] SupportedIdentityProviders
+ │   └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ └─ [~] DependsOn
+     └─ @@ -1,3 +1,4 @@
+        [ ] [
+        [+]   "HostedUIProvidersCustomResourceInputs",
+        [ ]   "UserPool"
+        [ ] ]
 [~] AWS::Cognito::UserPoolClient UserPoolClient 
  ├─ [+] AllowedOAuthFlows
  │   └─ ["code"]
@@ -67,8 +73,14 @@ Resources
  │   └─ ["https://signin1/"]
  ├─ [+] LogoutURLs
  │   └─ ["https://signout1/"]
- └─ [+] SupportedIdentityProviders
-     └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ ├─ [+] SupportedIdentityProviders
+ │   └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ └─ [~] DependsOn
+     └─ @@ -1,3 +1,4 @@
+        [ ] [
+        [+]   "HostedUIProvidersCustomResourceInputs",
+        [ ]   "UserPool"
+        [ ] ]
 [~] AWS::IAM::Role UserPoolClientRole 
  └─ [-] DependsOn
      └─ ["UserPoolClient"]

diff --git a/.../src/__tests__/migration_tests_v12/__snapshots__/auth-oauth-lambda-migration.test.ts.snap b/.../src/__tests__/migration_tests_v12/__snapshots__/auth-oauth-lambda-migration.test.ts.snap
@@ -41,8 +41,14 @@ Resources
  │   └─ ["https://sin1/","https://sin2/"]
  ├─ [+] LogoutURLs
  │   └─ ["https://sout1/","https://sout2/"]
- └─ [+] SupportedIdentityProviders
-     └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ ├─ [+] SupportedIdentityProviders
+ │   └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ └─ [~] DependsOn
+     └─ @@ -1,3 +1,4 @@
+        [ ] [
+        [+]   "HostedUIProvidersCustomResourceInputs",
+        [ ]   "UserPool"
+        [ ] ]
 [~] AWS::Cognito::UserPoolClient UserPoolClient 
  ├─ [+] AllowedOAuthFlows
  │   └─ ["code"]
@@ -54,8 +60,14 @@ Resources
  │   └─ ["https://sin1/","https://sin2/"]
  ├─ [+] LogoutURLs
  │   └─ ["https://sout1/","https://sout2/"]
- └─ [+] SupportedIdentityProviders
-     └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ ├─ [+] SupportedIdentityProviders
+ │   └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ └─ [~] DependsOn
+     └─ @@ -1,3 +1,4 @@
+        [ ] [
+        [+]   "HostedUIProvidersCustomResourceInputs",
+        [ ]   "UserPool"
+        [ ] ]
 [~] AWS::IAM::Role UserPoolClientRole 
  └─ [-] DependsOn
      └─ ["UserPoolClient"]
@@ -107,8 +119,14 @@ Resources
  │   └─ ["https://sin1/","https://sin2/"]
  ├─ [+] LogoutURLs
  │   └─ ["https://sout1/","https://sout2/"]
- └─ [+] SupportedIdentityProviders
-     └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ ├─ [+] SupportedIdentityProviders
+ │   └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ └─ [~] DependsOn
+     └─ @@ -1,3 +1,4 @@
+        [ ] [
+        [+]   "HostedUIProvidersCustomResourceInputs",
+        [ ]   "UserPool"
+        [ ] ]
 [~] AWS::Cognito::UserPoolClient UserPoolClient 
  ├─ [+] AllowedOAuthFlows
  │   └─ ["code"]
@@ -120,8 +138,14 @@ Resources
  │   └─ ["https://sin1/","https://sin2/"]
  ├─ [+] LogoutURLs
  │   └─ ["https://sout1/","https://sout2/"]
- └─ [+] SupportedIdentityProviders
-     └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ ├─ [+] SupportedIdentityProviders
+ │   └─ ["Facebook","Google","LoginWithAmazon","SignInWithApple","COGNITO"]
+ └─ [~] DependsOn
+     └─ @@ -1,3 +1,4 @@
+        [ ] [
+        [+]   "HostedUIProvidersCustomResourceInputs",
+        [ ]   "UserPool"
+        [ ] ]
 [~] AWS::IAM::Role UserPoolClientRole 
  └─ [-] DependsOn
      └─ ["UserPoolClient"]