fix(appsync): revert to allow resolver creation from data source (#12973

) * Revert to old behavior of allowing a data source to create a resolver as UNIT resolvers stem from data sources. * Maintaining new behavior of having `GraphqlApi` create resolvers as PIPELINE resolvers stem from the `GraphqlApi` itself Fixes #12635 Fixes #11522 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Feb 22, 2021 · f0724d7 · f0724d7
1 parent fe645ed
commit f0724d7
Show file tree

Hide file tree

Showing 6 changed files with 240 additions and 237 deletions.
diff --git a/packages/@aws-cdk/aws-appsync/lib/data-source.ts b/packages/@aws-cdk/aws-appsync/lib/data-source.ts
@@ -126,7 +126,11 @@ export abstract class BaseDataSource extends CoreConstruct {
    * creates a new resolver for this datasource and API using the given properties
    */
   public createResolver(props: BaseResolverProps): Resolver {
-    return this.api.createResolver({ dataSource: this, ...props });
+    return new Resolver(this, `${props.typeName}${props.fieldName}Resolver`, {
+      api: this.api,
+      dataSource: this,
+      ...props,
+    });
   }
 
   /**

diff --git a/packages/@aws-cdk/aws-appsync/test/appsync.test.ts b/packages/@aws-cdk/aws-appsync/test/appsync.test.ts
@@ -55,8 +55,7 @@ test('appsync should error when creating pipeline resolver with data source', ()
 
   // THEN
   expect(() => {
-    api.createResolver({
-      dataSource: ds,
+    ds.createResolver({
       typeName: 'test',
       fieldName: 'test2',
       pipelineConfig: [test1, test2],

diff --git a/packages/@aws-cdk/aws-appsync/test/integ.api-import.expected.json b/packages/@aws-cdk/aws-appsync/test/integ.api-import.expected.json
@@ -135,7 +135,7 @@
           }
         }
       },
-      "ApiQuerygetTestsResolver025B8E0A": {
+      "ApidsQuerygetTestsResolver952F49EE": {
         "Type": "AWS::AppSync::Resolver",
         "Properties": {
           "ApiId": {
@@ -152,7 +152,7 @@
           "Apids0DB53FEA"
         ]
       },
-      "ApiMutationaddTestResolver7A08AE91": {
+      "ApidsMutationaddTestResolverBCF0400B": {
         "Type": "AWS::AppSync::Resolver",
         "Properties": {
           "ApiId": {

diff --git a/packages/@aws-cdk/aws-appsync/test/integ.auth-apikey.expected.json b/packages/@aws-cdk/aws-appsync/test/integ.auth-apikey.expected.json
@@ -121,7 +121,7 @@
         }
       }
     },
-    "ApiQuerygetTestsResolver025B8E0A": {
+    "ApitestDataSourceQuerygetTestsResolverA3BBB672": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
@@ -142,7 +142,7 @@
         "ApitestDataSource96AE54D5"
       ]
     },
-    "ApiMutationaddTestResolver7A08AE91": {
+    "ApitestDataSourceMutationaddTestResolver36203D6B": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {

diff --git a/packages/@aws-cdk/aws-appsync/test/integ.graphql-iam.expected.json b/packages/@aws-cdk/aws-appsync/test/integ.graphql-iam.expected.json
@@ -150,7 +150,7 @@
         }
       }
     },
-    "ApiQuerygetTestResolver4C1F8B0C": {
+    "ApidsQuerygetTestResolverCCED7EC2": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
@@ -171,7 +171,7 @@
         "ApiSchema510EECD7"
       ]
     },
-    "ApiQuerygetTestsResolver025B8E0A": {
+    "ApidsQuerygetTestsResolver952F49EE": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
@@ -192,7 +192,7 @@
         "ApiSchema510EECD7"
       ]
     },
-    "ApiMutationaddTestResolver7A08AE91": {
+    "ApidsMutationaddTestResolverBCF0400B": {
       "Type": "AWS::AppSync::Resolver",
       "Properties": {
         "ApiId": {
@@ -400,14 +400,12 @@
             ]
           }
         },
-        "Handler": "iam-query.handler",
         "Role": {
           "Fn::GetAtt": [
             "LambdaIAM687B49AF",
             "Arn"
           ]
         },
-        "Runtime": "nodejs12.x",
         "Environment": {
           "Variables": {
             "APPSYNC_ENDPOINT": {
@@ -417,7 +415,9 @@
               ]
             }
           }
-        }
+        },
+        "Handler": "iam-query.handler",
+        "Runtime": "nodejs12.x"
       },
       "DependsOn": [
         "LambdaIAMDefaultPolicy96DEA124",
@@ -496,14 +496,12 @@
             ]
           }
         },
-        "Handler": "iam-query.handler",
         "Role": {
           "Fn::GetAtt": [
             "testFailServiceRole9FF22F85",
             "Arn"
           ]
         },
-        "Runtime": "nodejs12.x",
         "Environment": {
           "Variables": {
             "APPSYNC_ENDPOINT": {
@@ -513,7 +511,9 @@
               ]
             }
           }
-        }
+        },
+        "Handler": "iam-query.handler",
+        "Runtime": "nodejs12.x"
       },
       "DependsOn": [
         "testFailServiceRole9FF22F85"