chore: migrate constructs to use "constructs" module (#10606)

This commits expands on a previous [commit]. The remaining
CDK modules have been migrated to use the `Construct` and
`IConstruct` from the "constructs" module instead of the
"@aws-cdk/core" module.

Migrating modules to use the "constructs" module, prevents merge
conflicts from arising in these files when the construct compatibility
layer in "@aws-cdk/core" module is removed in the v2 branch.

[commit]: c179699

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

Author: Niranjan Jayakar

packages/@aws-cdk/aws-amplify/lib/app.ts

@@ -1,6 +1,7 @@
 import * as codebuild from '@aws-cdk/aws-codebuild';
 import * as iam from '@aws-cdk/aws-iam';
-import { Construct, IResource, Lazy, Resource, SecretValue } from '@aws-cdk/core';
+import { IResource, Lazy, Resource, SecretValue } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { CfnApp } from './amplify.generated';
 import { BasicAuth } from './basic-auth';
 import { Branch, BranchOptions } from './branch';

packages/@aws-cdk/aws-amplify/lib/basic-auth.ts

@@ -1,6 +1,10 @@
 import * as kms from '@aws-cdk/aws-kms';
 import * as secretsmanager from '@aws-cdk/aws-secretsmanager';
-import { Construct, SecretValue } from '@aws-cdk/core';
+import { SecretValue } from '@aws-cdk/core';
+
+// v2 - keep this import as a separate section to reduce merge conflict when forward merging with the v2 branch.
+// eslint-disable-next-line
+import { Construct as CoreConstruct } from '@aws-cdk/core';
 
 /**
  * Properties for a BasicAuth
@@ -78,7 +82,7 @@ export class BasicAuth {
   /**
    * Binds this Basic Auth configuration to an App
    */
-  public bind(scope: Construct, id: string): BasicAuthConfig {
+  public bind(scope: CoreConstruct, id: string): BasicAuthConfig {
     const config = {
       enableBasicAuth: true,
       username: this.props.username,

packages/@aws-cdk/aws-amplify/lib/branch.ts

@@ -1,5 +1,6 @@
 import * as codebuild from '@aws-cdk/aws-codebuild';
-import { Construct, IResource, Lazy, Resource } from '@aws-cdk/core';
+import { IResource, Lazy, Resource } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { CfnBranch } from './amplify.generated';
 import { IApp } from './app';
 import { BasicAuth } from './basic-auth';

packages/@aws-cdk/aws-amplify/lib/domain.ts

@@ -1,4 +1,5 @@
-import { Construct, Lazy, Resource, IResolvable } from '@aws-cdk/core';
+import { Lazy, Resource, IResolvable } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { CfnDomain } from './amplify.generated';
 import { IApp } from './app';
 import { IBranch } from './branch';

packages/@aws-cdk/aws-amplify/package.json

@@ -54,7 +54,10 @@
   },
   "cdk-build": {
     "cloudformation": "AWS::Amplify",
-    "jest": true
+    "jest": true,
+    "env": {
+      "AWSLINT_BASE_CONSTRUCT": true
+    }
   },
   "keywords": [
     "aws",

packages/@aws-cdk/aws-appsync/lib/data-source.ts

@@ -1,11 +1,16 @@
 import { ITable } from '@aws-cdk/aws-dynamodb';
 import { IGrantable, IPrincipal, IRole, Role, ServicePrincipal } from '@aws-cdk/aws-iam';
 import { IFunction } from '@aws-cdk/aws-lambda';
-import { Construct, IResolvable } from '@aws-cdk/core';
+import { IResolvable } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { CfnDataSource } from './appsync.generated';
 import { IGraphqlApi } from './graphqlapi-base';
 import { BaseResolverProps, Resolver } from './resolver';
 
+// v2 - keep this import as a separate section to reduce merge conflict when forward merging with the v2 branch.
+// eslint-disable-next-line
+import { Construct as CoreConstruct } from '@aws-cdk/core';
+
 /**
  * Base properties for an AppSync datasource
  */
@@ -83,7 +88,7 @@ export interface ExtendedDataSourceProps {
 /**
  * Abstract AppSync datasource implementation. Do not use directly but use subclasses for concrete datasources
  */
-export abstract class BaseDataSource extends Construct {
+export abstract class BaseDataSource extends CoreConstruct {
   /**
    * the name of the data source
    */

packages/@aws-cdk/aws-appsync/lib/graphqlapi.ts

@@ -1,6 +1,7 @@
 import { IUserPool } from '@aws-cdk/aws-cognito';
 import { ManagedPolicy, Role, ServicePrincipal, Grant, IGrantable } from '@aws-cdk/aws-iam';
-import { CfnResource, Construct, Duration, Expiration, IResolvable, Stack } from '@aws-cdk/core';
+import { CfnResource, Duration, Expiration, IResolvable, Stack } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { CfnApiKey, CfnGraphQLApi, CfnGraphQLSchema } from './appsync.generated';
 import { IGraphqlApi, GraphqlApiBase } from './graphqlapi-base';
 import { Schema } from './schema';

packages/@aws-cdk/aws-appsync/lib/resolver.ts

@@ -1,9 +1,13 @@
-import { Construct } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { CfnResolver } from './appsync.generated';
 import { BaseDataSource } from './data-source';
 import { IGraphqlApi } from './graphqlapi-base';
 import { MappingTemplate } from './mapping-template';
 
+// v2 - keep this import as a separate section to reduce merge conflict when forward merging with the v2 branch.
+// eslint-disable-next-line
+import { Construct as CoreConstruct } from '@aws-cdk/core';
+
 /**
  * Basic properties for an AppSync resolver
  */
@@ -56,7 +60,7 @@ export interface ResolverProps extends BaseResolverProps {
 /**
  * An AppSync resolver
  */
-export class Resolver extends Construct {
+export class Resolver extends CoreConstruct {
   /**
    * the ARN of the resolver
    */

packages/@aws-cdk/aws-appsync/package.json

@@ -53,7 +53,10 @@
   },
   "cdk-build": {
     "cloudformation": "AWS::AppSync",
-    "jest": true
+    "jest": true,
+    "env": {
+      "AWSLINT_BASE_CONSTRUCT": true
+    }
   },
   "keywords": [
     "aws",

packages/@aws-cdk/aws-autoscaling-hooktargets/package.json

@@ -103,6 +103,9 @@
   },
   "maturity": "stable",
   "cdk-build": {
-    "jest": true
+    "jest": true,
+    "env": {
+      "AWSLINT_BASE_CONSTRUCT": true
+    }
   }
 }