Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(aws-apigateway-iot and aws-cloudfront-apigateway-lambda): fixed deprecated warnings #554

Merged
merged 6 commits into from
Dec 21, 2021
Merged

fix(aws-apigateway-iot and aws-cloudfront-apigateway-lambda): fixed deprecated warnings #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
334db07
updated README for iot-sqs and kinesisstreams-gluejob
mickychetta Dec 20, 2021
852387e
Merge branch 'main' of https://github.com/mickychetta/aws-solutions-c…
mickychetta Dec 20, 2021
0a7e0ff
fixed deprecated warnings
mickychetta Dec 20, 2021
a5eaacf
empty commit
mickychetta Dec 20, 2021
23e4ab8
Merge branch 'main' into 551
mickychetta Dec 21, 2021
9f4e139
Merge branch 'main' into 551
mickychetta Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/patterns/@aws-solutions-constructs/aws-apigateway-iot/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Out of the box implementation of the Construct without any override will set the

### Amazon API Gateway

* Deploy an edge-optimized API endpoint
* Deploy an edge-optimized API Endpoint
* Creates API Resources with `POST` Method to publish messages to IoT Topics
* Creates API Resources with `POST` Method to publish messages to ThingShadow & NamedShadows
* Enable CloudWatch logging for API Gateway
Expand Down
8 changes: 2 additions & 6 deletions ...onstructs/aws-cloudfront-apigateway-lambda/test/test.cloudfront-apigateway-lambda.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,7 @@ test('override api gateway properties with existingLambdaObj', () => {
new CloudFrontToApiGatewayToLambda(stack, 'test-cloudfront-apigateway-lambda', {
existingLambdaObj: fn,
apiGatewayProps: {
options: {
description: "Override description"
}
description: "Override description"
}
});

Expand Down Expand Up @@ -184,9 +182,7 @@ test('override api gateway properties without existingLambdaObj', () => {
endpointConfiguration: {
types: [api.EndpointType.PRIVATE],
},
options: {
description: "Override description"
}
description: "Override description"
}
});

Expand Down
29 changes: 16 additions & 13 deletions source/patterns/@aws-solutions-constructs/core/lib/apigateway-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,23 @@ function configureLambdaRestApi(scope: Construct, defaultApiGatewayProps: api.La
cwRole = configureCloudwatchRoleForApi(scope, _api);
}

let usagePlanProps: api.UsagePlanProps = {
// Configure Usage Plan
const usagePlanProps: api.UsagePlanProps = {
apiStages: [{
api: _api,
stage: _api.deploymentStage
}]
};
// If requireApiKey param is set to true, create a api key & associate to Usage Plan

const plan = _api.addUsagePlan('UsagePlan', usagePlanProps);

// If requireApiKey param is set to true, create a api key & associate to Usage Plan
if (apiGatewayProps?.defaultMethodOptions?.apiKeyRequired === true) {
const extraParams = { apiKey: _api.addApiKey('ApiKey')};
usagePlanProps = Object.assign(usagePlanProps, extraParams);
// Configure Usage Plan with API Key
const key = _api.addApiKey('ApiKey');
plan.addApiKey(key);
}

// Configure Usage Plan
_api.addUsagePlan('UsagePlan', usagePlanProps);

// Return the API and CW Role
return [_api, cwRole];
}
Expand Down Expand Up @@ -152,22 +154,23 @@ function configureRestApi(scope: Construct, defaultApiGatewayProps: api.RestApiP
cwRole = configureCloudwatchRoleForApi(scope, _api);
}

let usagePlanProps: api.UsagePlanProps = {
// Configure Usage Plan
const usagePlanProps: api.UsagePlanProps = {
apiStages: [{
api: _api,
stage: _api.deploymentStage
}]
};

const plan = _api.addUsagePlan('UsagePlan', usagePlanProps);

// If requireApiKey param is set to true, create a api key & associate to Usage Plan
if (apiGatewayProps?.defaultMethodOptions?.apiKeyRequired === true) {
const extraParams = { apiKey: _api.addApiKey('ApiKey')};
usagePlanProps = Object.assign(usagePlanProps, extraParams);
// Configure Usage Plan with API Key
const key = _api.addApiKey('ApiKey');
plan.addApiKey(key);
}

// Configure Usage Plan
_api.addUsagePlan('UsagePlan', usagePlanProps);

// Return the API and CW Role
return [_api, cwRole];
}
Expand Down