Merge pull request #25 from MarcioMeier/fix/aws-cdk-lib-imports

flaviostutz · Jun 28, 2024 · 947dbf2 · 947dbf2
2 parents 2cf9934 + dfb32ca
commit 947dbf2
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 90 deletions.
diff --git a/examples/pnpm-lock.yaml b/examples/pnpm-lock.yaml
diff --git a/examples/src/apigateway/cdk.ts b/examples/src/apigateway/cdk.ts
@@ -2,8 +2,8 @@
 import { Construct } from 'constructs';
 import { LambdaOperation, OpenApiGatewayLambda } from 'cdk-practical-constructs';
 import { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi';
+import { RemovalPolicy } from 'aws-cdk-lib/core';
 import { z } from 'zod';
-import { RemovalPolicy } from 'aws-cdk-lib';
 
 import { StageStackProps } from '../cdk/types/StageStackProps';
 

diff --git a/lib/.eslintrc.js b/lib/.eslintrc.js
@@ -8,5 +8,13 @@ module.exports = {
   rules: {
     'import/group-exports': 'off',
     'fp/no-class': 'off',
+    'no-restricted-imports': [
+      'error',
+      {
+        name: 'aws-cdk-lib',
+        message:
+          'Import from specialized package like `aws-cdk-lib/core` or `aws-cdk-lib/aws-iam` instead of aws-cdk-lib.',
+      },
+    ],
   },
 };
diff --git a/lib/package.json b/lib/package.json
@@ -63,11 +63,16 @@
     "zod": "^3.23.8"
   },
   "peerDependencies": {
-    "zod": "3.x",
-    "@asteasolutions/zod-to-openapi": "7.x"
+    "@asteasolutions/zod-to-openapi": "7.x",
+    "zod": "3.x"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
+  },
+  "pnpm": {
+    "overrides": {
+      "braces@<3.0.3": ">=3.0.3"
+    }
   }
 }
diff --git a/lib/pnpm-lock.yaml b/lib/pnpm-lock.yaml
diff --git a/lib/src/apigateway/openapi-gateway-lambda.ts b/lib/src/apigateway/openapi-gateway-lambda.ts
@@ -15,7 +15,7 @@ import {
 } from 'aws-cdk-lib/aws-apigateway';
 import type { oas30, oas31 } from 'openapi3-ts';
 import { Construct } from 'constructs';
-import { ScopedAws, Size } from 'aws-cdk-lib';
+import { ScopedAws, Size } from 'aws-cdk-lib/core';
 import { ILogGroup, LogGroup, RetentionDays } from 'aws-cdk-lib/aws-logs';
 import { ServicePrincipal } from 'aws-cdk-lib/aws-iam';
 import { OpenAPIRegistry, OpenApiGeneratorV31, RouteConfig } from '@asteasolutions/zod-to-openapi';

diff --git a/lib/src/lambda/lambda-base.ts b/lib/src/lambda/lambda-base.ts
@@ -13,7 +13,7 @@ import {
   ServiceNamespace,
 } from 'aws-cdk-lib/aws-applicationautoscaling';
 import { ServicePrincipal } from 'aws-cdk-lib/aws-iam';
-import { RemovalPolicy } from 'aws-cdk-lib';
+import { RemovalPolicy } from 'aws-cdk-lib/core';
 import { StringParameter } from 'aws-cdk-lib/aws-ssm';
 
 import { vpcFromConfig } from '../utils';

diff --git a/lib/src/wso2/utils.ts b/lib/src/wso2/utils.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { existsSync } from 'fs';
 
-import { Duration, ScopedAws } from 'aws-cdk-lib';
+import { Duration, ScopedAws } from 'aws-cdk-lib/core';
 import { PolicyStatement } from 'aws-cdk-lib/aws-iam';
 import { Runtime } from 'aws-cdk-lib/aws-lambda';
 import { RetentionDays } from 'aws-cdk-lib/aws-logs';