Skip to content

Commit 08998c5

Browse files
engel80engel80
authored
.
.
1 parent 30b4971 commit 08998c5

File tree

11 files changed

+26
-100
lines changed

11 files changed

+26
-100
lines changed

‎1.txt‎

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

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Table of Contents
1313
## Prerequisites
1414

1515
```bash
16-
npm install -g aws-cdk@2.25.0
16+
npm install -g aws-cdk@2.33.0
1717

1818
# install packages in the root folder
1919
npm install
@@ -121,6 +121,7 @@ SSM parameter:
121121
│   └── apigw.png
122122
└── tsconfig.json
123123
```
124+
124125
## Reference
125126

126127
* [CloudFormation quotas](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cloudformation-limits.html)

‎build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ sonarqube {
1717
property "sonar.projectKey", "cdk-lambda-apigateway"
1818
property "sonar.sourceEncoding", "UTF-8"
1919
property "sonar.sources", "."
20-
property "sonar.exclusions", "**/node_modules/**"
20+
property "sonar.exclusions", "**/node_modules/**, **/cdk.out/**"
2121
property "sonar.cpd.exclusions", "**/*index.ts"
22+
property "sonar.issue.ignore.multicriteria", "e1"
23+
property "sonar.issue.ignore.multicriteria.e1.ruleKey", "typescript:S1848"
24+
property "sonar.issue.ignore.multicriteria.e1.resourceKey", "**/*.ts"
25+
property "sonar.host.url", "http://127.0.0.1:9000"
2226
property "sonar.links.ci", "https://github.com/engel80/cdk-lambda-apigateway"
2327
property "sonar.log.level", "DEBUG"
2428
}

‎device-api/lib/device-api-stack.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Stack, StackProps, CfnOutput } from 'aws-cdk-lib';
1+
import { Stack } from 'aws-cdk-lib';
22
import * as lambda from 'aws-cdk-lib/aws-lambda';
33
import * as apigateway from 'aws-cdk-lib/aws-apigateway';
44
import * as ssm from 'aws-cdk-lib/aws-ssm';
@@ -15,8 +15,6 @@ export class DeviceApiStack extends Stack {
1515
constructor(scope: Construct, id: string, props: StackCommonProps) {
1616
super(scope, id, props);
1717

18-
const stage = props.stage;
19-
2018
const restApiId = ssm.StringParameter.valueForStringParameter(this, `${SSM_PREFIX}/rest-api-id`);
2119
const rootResourceId = ssm.StringParameter.valueForStringParameter(this, `${SSM_PREFIX}/root-resource-id`);
2220
const rootApi = apigateway.RestApi.fromRestApiAttributes(this, "root-api", { restApiId, rootResourceId });
@@ -28,10 +26,7 @@ export class DeviceApiStack extends Stack {
2826
});
2927

3028
const servicea = rootApi.root.addResource('device');
31-
const v1 = servicea.addResource('v1');
32-
const v1DeviceId = v1.addResource('{deviceid}').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
33-
34-
const v2 = servicea.addResource('v2');
35-
const v2DeviceId = v2.addResource('{deviceid}').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
29+
servicea.addResource('v1').addResource('{deviceid}').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
30+
servicea.addResource('v2').addResource('{deviceid}').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
3631
}
3732
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"typescript": "~3.9.7"
2121
},
2222
"dependencies": {
23-
"aws-cdk-lib": "2.15.0",
23+
"aws-cdk-lib": "2.33.0",
2424
"constructs": "^10.0.0"
2525
}
2626
}

‎product-api/lib/product-api-stack.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Stack, StackProps, CfnOutput } from 'aws-cdk-lib';
1+
import { Stack } from 'aws-cdk-lib';
22
import * as lambda from 'aws-cdk-lib/aws-lambda';
33
import * as apigateway from 'aws-cdk-lib/aws-apigateway';
44
import * as ssm from 'aws-cdk-lib/aws-ssm';
@@ -15,8 +15,6 @@ export class ProductApiStack extends Stack {
1515
constructor(scope: Construct, id: string, props: StackCommonProps) {
1616
super(scope, id, props);
1717

18-
const stage = props.stage;
19-
2018
const restApiId = ssm.StringParameter.valueForStringParameter(this, `${SSM_PREFIX}/rest-api-id`);
2119
const rootResourceId = ssm.StringParameter.valueForStringParameter(this, `${SSM_PREFIX}/root-resource-id`);
2220
const rootApi = apigateway.RestApi.fromRestApiAttributes(this, "root-api", { restApiId, rootResourceId });
@@ -29,11 +27,11 @@ export class ProductApiStack extends Stack {
2927

3028
const servicea = rootApi.root.addResource('product');
3129
const v1 = servicea.addResource('v1');
32-
const v1Categories = v1.addResource('categories').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
33-
const v1CcategoryId = v1.addResource('{categoryid}').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
30+
v1.addResource('categories').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
31+
v1.addResource('{categoryid}').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
3432

3533
const v2 = servicea.addResource('v2');
36-
const v2Categories = v2.addResource('categories').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
37-
const v2CcategoryId = v2.addResource('{categoryid}').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
34+
v2.addResource('categories').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
35+
v2.addResource('{categoryid}').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
3836
}
3937
}

‎root-api/build.gradle‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ archivesBaseName = 'cdk-lambda-apigateway'
55
buildscript {
66
repositories {
77
mavenCentral()
8+
maven {
9+
url "https://plugins.gradle.org/m2/"
10+
}
811
}
912
dependencies {
10-
classpath("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5")
13+
classpath("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513")
1114
}
1215
}
1316

@@ -19,6 +22,9 @@ sonarqube {
1922
property "sonar.sources", "."
2023
property "sonar.exclusions", "**/node_modules/**"
2124
property "sonar.cpd.exclusions", "**/*index.ts"
25+
property "sonar.issue.ignore.multicriteria", "e1"
26+
property "sonar.issue.ignore.multicriteria.e1.ruleKey", "typescript:S1848"
27+
property "sonar.issue.ignore.multicriteria.e1.resourceKey", "**/*.ts"
2228
property "sonar.links.ci", "https://github.com/engel80/cdk-lambda-apigateway"
2329
property "sonar.log.level", "DEBUG"
2430
}

‎root-api/lib/root-api-stack.ts‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Stack, StackProps, CfnOutput } from 'aws-cdk-lib';
1+
import { Stack } from 'aws-cdk-lib';
22
import * as lambda from 'aws-cdk-lib/aws-lambda';
33
import * as apigateway from 'aws-cdk-lib/aws-apigateway';
44
import * as ssm from 'aws-cdk-lib/aws-ssm';
@@ -14,13 +14,7 @@ export class RootApiStack extends Stack {
1414

1515
const stage = props.stage;
1616

17-
const lambda1 = new lambda.Function(this, 'lambda1', {
18-
runtime: lambda.Runtime.NODEJS_14_X,
19-
code: lambda.Code.fromAsset('../app'),
20-
handler: 'hello.handler'
21-
});
22-
23-
const lambda2 = new lambda.Function(this, 'lambda2', {
17+
const lambdaPing = new lambda.Function(this, 'lambd-aping', {
2418
runtime: lambda.Runtime.NODEJS_14_X,
2519
code: lambda.Code.fromAsset('../app'),
2620
handler: 'hello.handler'
@@ -32,8 +26,7 @@ export class RootApiStack extends Stack {
3226
}
3327
});
3428
const servicea = api.root.addResource('dummy-for-import');
35-
const v1 = servicea.addResource('v1');
36-
const v1Ping = v1.addResource('ping').addMethod('GET', new apigateway.LambdaIntegration(lambda1, { proxy: true }));
29+
servicea.addResource('v1').addResource('ping').addMethod('GET', new apigateway.LambdaIntegration(lambdaPing, { proxy: true }));
3730

3831
new ssm.StringParameter(this, 'api-id', { parameterName: `${SSM_PREFIX}/rest-api-id`, stringValue: api.restApiId });
3932
new ssm.StringParameter(this, 'root-resource-id', { parameterName: `${SSM_PREFIX}/root-resource-id`, stringValue: api.root.resourceId });

‎test/apigw-test.test.d.ts‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/apigw-test.test.js‎

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

0 commit comments

Comments
 (0)