-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into kinesis-analytics-l2
- Loading branch information
Showing
274 changed files
with
5,981 additions
and
758 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ jobs: | |
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Set up Node | ||
| uses: actions/[email protected].0 | ||
| uses: actions/[email protected].4 | ||
| with: | ||
| node-version: 10 | ||
|
|
||
|
|
@@ -55,12 +55,15 @@ jobs: | |
| lerna exec --parallel ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor | ||
| lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch | ||
| lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,${{ steps.list-packages.outputs.list }}' --target=minor | ||
| # This will create a brand new `yarn.lock` file (this is more efficient than `yarn install && yarn upgrade`) | ||
| - name: Run "yarn install --force" | ||
| run: yarn install --force | ||
| # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run) | ||
| - name: Run "yarn install" | ||
| run: yarn install | ||
|
|
||
| - name: Run "yarn upgrade" | ||
| run: yarn upgrade | ||
|
|
||
| - name: Make Pull Request | ||
| uses: peter-evans/create-pull-request@v2 | ||
| uses: peter-evans/create-pull-request@v3 | ||
| with: | ||
| # Git commit details | ||
| branch: automation/yarn-upgrade | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
packages/@aws-cdk/aws-apigateway/lib/authorizers/cognito.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| import * as cognito from '@aws-cdk/aws-cognito'; | ||
| import { Duration, Lazy, Names, Stack } from '@aws-cdk/core'; | ||
| import { Construct } from 'constructs'; | ||
| import { CfnAuthorizer } from '../apigateway.generated'; | ||
| import { Authorizer, IAuthorizer } from '../authorizer'; | ||
| import { AuthorizationType } from '../method'; | ||
| import { IRestApi } from '../restapi'; | ||
|
|
||
| /** | ||
| * Properties for CognitoUserPoolsAuthorizer | ||
| */ | ||
| export interface CognitoUserPoolsAuthorizerProps { | ||
| /** | ||
| * An optional human friendly name for the authorizer. Note that, this is not the primary identifier of the authorizer. | ||
| * | ||
| * @default - the unique construct ID | ||
| */ | ||
| readonly authorizerName?: string; | ||
|
|
||
| /** | ||
| * The user pools to associate with this authorizer. | ||
| */ | ||
| readonly cognitoUserPools: cognito.IUserPool[]; | ||
|
|
||
| /** | ||
| * How long APIGateway should cache the results. Max 1 hour. | ||
| * Disable caching by setting this to 0. | ||
| * | ||
| * @default Duration.minutes(5) | ||
| */ | ||
| readonly resultsCacheTtl?: Duration; | ||
|
|
||
| /** | ||
| * The request header mapping expression for the bearer token. This is typically passed as part of the header, in which case | ||
| * this should be `method.request.header.Authorizer` where Authorizer is the header containing the bearer token. | ||
| * @see https://docs.aws.amazon.com/apigateway/api-reference/link-relation/authorizer-create/#identitySource | ||
| * @default `IdentitySource.header('Authorization')` | ||
| */ | ||
| readonly identitySource?: string; | ||
| } | ||
|
|
||
| /** | ||
| * Cognito user pools based custom authorizer | ||
| * | ||
| * @resource AWS::ApiGateway::Authorizer | ||
| */ | ||
| export class CognitoUserPoolsAuthorizer extends Authorizer implements IAuthorizer { | ||
| /** | ||
| * The id of the authorizer. | ||
| * @attribute | ||
| */ | ||
| public readonly authorizerId: string; | ||
|
|
||
| /** | ||
| * The ARN of the authorizer to be used in permission policies, such as IAM and resource-based grants. | ||
| * @attribute | ||
| */ | ||
| public readonly authorizerArn: string; | ||
|
|
||
| /** | ||
| * The authorization type of this authorizer. | ||
| */ | ||
| public readonly authorizationType?: AuthorizationType; | ||
|
|
||
| private restApiId?: string; | ||
|
|
||
| constructor(scope: Construct, id: string, props: CognitoUserPoolsAuthorizerProps) { | ||
| super(scope, id); | ||
|
|
||
| const restApiId = this.lazyRestApiId(); | ||
| const resource = new CfnAuthorizer(this, 'Resource', { | ||
| name: props.authorizerName ?? Names.uniqueId(this), | ||
| restApiId, | ||
| type: 'COGNITO_USER_POOLS', | ||
| providerArns: props.cognitoUserPools.map(userPool => userPool.userPoolArn), | ||
| authorizerResultTtlInSeconds: props.resultsCacheTtl?.toSeconds(), | ||
| identitySource: props.identitySource || 'method.request.header.Authorization', | ||
| }); | ||
|
|
||
| this.authorizerId = resource.ref; | ||
| this.authorizerArn = Stack.of(this).formatArn({ | ||
| service: 'execute-api', | ||
| resource: restApiId, | ||
| resourceName: `authorizers/${this.authorizerId}`, | ||
| }); | ||
| this.authorizationType = AuthorizationType.COGNITO; | ||
| } | ||
|
|
||
| /** | ||
| * Attaches this authorizer to a specific REST API. | ||
| * @internal | ||
| */ | ||
| public _attachToApi(restApi: IRestApi): void { | ||
| if (this.restApiId && this.restApiId !== restApi.restApiId) { | ||
| throw new Error('Cannot attach authorizer to two different rest APIs'); | ||
| } | ||
|
|
||
| this.restApiId = restApi.restApiId; | ||
| } | ||
|
|
||
| /** | ||
| * Returns a token that resolves to the Rest Api Id at the time of synthesis. | ||
| * Throws an error, during token resolution, if no RestApi is attached to this authorizer. | ||
| */ | ||
| private lazyRestApiId() { | ||
| return Lazy.string({ | ||
| produce: () => { | ||
| if (!this.restApiId) { | ||
| throw new Error(`Authorizer (${this.node.path}) must be attached to a RestApi`); | ||
| } | ||
| return this.restApiId; | ||
| }, | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| export * from './lambda'; | ||
| export * from './identity-source'; | ||
| export * from './cognito'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.