Skip to content

Commit 2d8b97c

Browse files
committed
upgrade CDK to version 2
1 parent 8752ab8 commit 2d8b97c

File tree

10 files changed

+159
-2178
lines changed

10 files changed

+159
-2178
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ node_modules
77

88
# CDK asset staging directory
99
.cdk.staging
10-
cdk.out
10+
cdk.out
11+
.python-version

textract-pipeline/bin/textract-pipeline.d.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

textract-pipeline/bin/textract-pipeline.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

textract-pipeline/bin/textract-pipeline.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22
import 'source-map-support/register';
3-
import * as cdk from '@aws-cdk/core';
3+
import * as cdk from 'aws-cdk-lib';
44
import { TextractPipelineStack } from '../lib/textract-pipeline-stack';
55

66
const app = new cdk.App();

textract-pipeline/cdk.context.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"@aws-cdk/core:enableStackNameDuplicates": "true",
32
"aws-cdk:enableDiffNoFail": "true"
43
}

textract-pipeline/lib/textract-pipeline-stack.d.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

textract-pipeline/lib/textract-pipeline-stack.js

Lines changed: 0 additions & 267 deletions
This file was deleted.

textract-pipeline/lib/textract-pipeline-stack.ts

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import * as cdk from '@aws-cdk/core';
2-
import events = require('@aws-cdk/aws-events');
3-
import iam = require('@aws-cdk/aws-iam');
4-
import { S3EventSource, SqsEventSource, SnsEventSource, DynamoEventSource } from '@aws-cdk/aws-lambda-event-sources';
5-
import sns = require('@aws-cdk/aws-sns');
6-
import snsSubscriptions = require("@aws-cdk/aws-sns-subscriptions");
7-
import sqs = require('@aws-cdk/aws-sqs');
8-
import dynamodb = require('@aws-cdk/aws-dynamodb');
9-
import lambda = require('@aws-cdk/aws-lambda');
10-
import s3 = require('@aws-cdk/aws-s3');
11-
import {LambdaFunction} from "@aws-cdk/aws-events-targets";
1+
import * as cdk from 'aws-cdk-lib';
2+
import events = require('aws-cdk-lib/aws-events');
3+
import iam = require('aws-cdk-lib/aws-iam');
4+
import { S3EventSource, SqsEventSource, SnsEventSource, DynamoEventSource } from 'aws-cdk-lib/aws-lambda-event-sources';
5+
import sns = require('aws-cdk-lib/aws-sns');
6+
import snsSubscriptions = require("aws-cdk-lib/aws-sns-subscriptions");
7+
import sqs = require('aws-cdk-lib/aws-sqs');
8+
import dynamodb = require('aws-cdk-lib/aws-dynamodb');
9+
import lambda = require('aws-cdk-lib/aws-lambda');
10+
import s3 = require('aws-cdk-lib/aws-s3');
11+
import {LambdaFunction} from "aws-cdk-lib/aws-events-targets";
12+
import { Construct } from 'constructs';
1213

1314
export class TextractPipelineStack extends cdk.Stack {
14-
constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) {
15+
constructor(scope: Construct, id: string, props?: cdk.StackProps) {
1516
super(scope, id, props);
1617

1718
// The code that defines your stack goes here
@@ -109,7 +110,7 @@ export class TextractPipelineStack extends cdk.Stack {
109110
// S3 Event processor
110111
const s3Processor = new lambda.Function(this, 'S3Processor', {
111112
runtime: lambda.Runtime.PYTHON_3_7,
112-
code: lambda.Code.asset('lambda/s3processor'),
113+
code: lambda.Code.fromAsset('lambda/s3processor'),
113114
handler: 'lambda_function.lambda_handler',
114115
timeout: cdk.Duration.seconds(30),
115116
environment: {
@@ -148,7 +149,7 @@ export class TextractPipelineStack extends cdk.Stack {
148149
// S3 Batch Operations Event processor
149150
const s3BatchProcessor = new lambda.Function(this, 'S3BatchProcessor', {
150151
runtime: lambda.Runtime.PYTHON_3_7,
151-
code: lambda.Code.asset('lambda/s3batchprocessor'),
152+
code: lambda.Code.fromAsset('lambda/s3batchprocessor'),
152153
handler: 'lambda_function.lambda_handler',
153154
timeout: cdk.Duration.seconds(30),
154155
environment: {
@@ -173,7 +174,7 @@ export class TextractPipelineStack extends cdk.Stack {
173174
// Document processor (Router to Sync/Async Pipeline)
174175
const documentProcessor = new lambda.Function(this, 'TaskProcessor', {
175176
runtime: lambda.Runtime.PYTHON_3_7,
176-
code: lambda.Code.asset('lambda/documentprocessor'),
177+
code: lambda.Code.fromAsset('lambda/documentprocessor'),
177178
handler: 'lambda_function.lambda_handler',
178179
timeout: cdk.Duration.seconds(900),
179180
environment: {
@@ -198,7 +199,7 @@ export class TextractPipelineStack extends cdk.Stack {
198199
// Sync Jobs Processor (Process jobs using sync APIs)
199200
const syncProcessor = new lambda.Function(this, 'SyncProcessor', {
200201
runtime: lambda.Runtime.PYTHON_3_7,
201-
code: lambda.Code.asset('lambda/syncprocessor'),
202+
code: lambda.Code.fromAsset('lambda/syncprocessor'),
202203
handler: 'lambda_function.lambda_handler',
203204
reservedConcurrentExecutions: 1,
204205
timeout: cdk.Duration.seconds(25),
@@ -232,7 +233,7 @@ export class TextractPipelineStack extends cdk.Stack {
232233
// Async Job Processor (Start jobs using Async APIs)
233234
const asyncProcessor = new lambda.Function(this, 'ASyncProcessor', {
234235
runtime: lambda.Runtime.PYTHON_3_7,
235-
code: lambda.Code.asset('lambda/asyncprocessor'),
236+
code: lambda.Code.fromAsset('lambda/asyncprocessor'),
236237
handler: 'lambda_function.lambda_handler',
237238
reservedConcurrentExecutions: 1,
238239
timeout: cdk.Duration.seconds(60),
@@ -278,7 +279,7 @@ export class TextractPipelineStack extends cdk.Stack {
278279
// Async Jobs Results Processor
279280
const jobResultProcessor = new lambda.Function(this, 'JobResultProcessor', {
280281
runtime: lambda.Runtime.PYTHON_3_7,
281-
code: lambda.Code.asset('lambda/jobresultprocessor'),
282+
code: lambda.Code.fromAsset('lambda/jobresultprocessor'),
282283
handler: 'lambda_function.lambda_handler',
283284
memorySize: 2000,
284285
reservedConcurrentExecutions: 50,
@@ -312,7 +313,7 @@ export class TextractPipelineStack extends cdk.Stack {
312313
// PDF Generator
313314
const pdfGenerator = new lambda.Function(this, 'PdfGenerator', {
314315
runtime: lambda.Runtime.JAVA_8,
315-
code: lambda.Code.asset('lambda/pdfgenerator'),
316+
code: lambda.Code.fromAsset('lambda/pdfgenerator'),
316317
handler: 'DemoLambdaV2::handleRequest',
317318
memorySize: 3000,
318319
timeout: cdk.Duration.seconds(900),

0 commit comments

Comments
 (0)