-
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 pull request #16581 from aws/bump/1.124.0
chore(release): 1.124.0
- Loading branch information
Showing
362 changed files
with
28,723 additions
and
14,649 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,3 +18,5 @@ nyc.config.js | |
| !.eslintrc.js | ||
|
|
||
| junit.xml | ||
|
|
||
| !jest.config.js | ||
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 |
|---|---|---|
|
|
@@ -23,4 +23,5 @@ tsconfig.json | |
| **/cdk.out | ||
| junit.xml | ||
|
|
||
| test/ | ||
| test/ | ||
| jest.config.js | ||
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
9 changes: 9 additions & 0 deletions
9
packages/@aws-cdk-containers/ecs-service-extensions/jest.config.js
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,9 @@ | ||
| const baseConfig = require('../../../tools/cdk-build-tools/config/jest.config'); | ||
| module.exports = { | ||
| ...baseConfig, | ||
| coverageThreshold: { | ||
| global: { | ||
| branches: 70, | ||
| } | ||
| } | ||
| }; |
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
154 changes: 154 additions & 0 deletions
154
packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/injecter.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,154 @@ | ||
| import * as ecs from '@aws-cdk/aws-ecs'; | ||
| import * as sns from '@aws-cdk/aws-sns'; | ||
| import { Service } from '../service'; | ||
| import { Container } from './container'; | ||
| import { ContainerMutatingHook, ServiceExtension } from './extension-interfaces'; | ||
|
|
||
| // Keep this import separate from other imports to reduce chance for merge conflicts with v2-main | ||
| // eslint-disable-next-line no-duplicate-imports, import/order | ||
| import { Construct } from '@aws-cdk/core'; | ||
|
|
||
| /** | ||
| * An interface that will be implemented by all the resources that can be published events or written data to. | ||
| */ | ||
| export interface Injectable { | ||
| environmentVariables(): { [key: string]: string }; | ||
| } | ||
|
|
||
| /** | ||
| * An interface that will be implemented by all the injectable resources that need to grant permissions to the task role. | ||
| */ | ||
| export interface GrantInjectable extends Injectable { | ||
| grant(taskDefinition: ecs.TaskDefinition): void; | ||
| } | ||
|
|
||
| /** | ||
| * The settings for the `InjectableTopic` class. | ||
| */ | ||
| export interface InjectableTopicProps { | ||
| /** | ||
| * The SNS Topic to publish events to. | ||
| */ | ||
| readonly topic: sns.ITopic; | ||
| } | ||
|
|
||
| /** | ||
| * The `InjectableTopic` class represents SNS Topic resource that can be published events to by the parent service. | ||
| */ | ||
|
|
||
| export class InjectableTopic implements GrantInjectable { | ||
| public readonly topic: sns.ITopic; | ||
|
|
||
| constructor(props: InjectableTopicProps) { | ||
| this.topic = props.topic; | ||
| } | ||
|
|
||
| public grant(taskDefinition: ecs.TaskDefinition) { | ||
| this.topic.grantPublish(taskDefinition.taskRole); | ||
| } | ||
|
|
||
| public environmentVariables(): { [key: string]: string } { | ||
| let environment: { [key: string]: string } = {}; | ||
| environment[`${this.topic.node.id.toUpperCase()}_TOPIC_ARN`] = this.topic.topicArn; | ||
| return environment; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * The settings for the Injecter extension. | ||
| */ | ||
| export interface InjecterExtensionProps { | ||
| /** | ||
| * The list of injectable resources for this service. | ||
| */ | ||
| readonly injectables: Injectable[]; | ||
| } | ||
|
|
||
| /** | ||
| * Settings for the hook which mutates the application container | ||
| * to add the injectable resource environment variables. | ||
| */ | ||
| interface ContainerMutatingProps { | ||
| /** | ||
| * The resource environment variables to be added to the container environment. | ||
| */ | ||
| readonly environment: { [key: string]: string }; | ||
| } | ||
|
|
||
| /** | ||
| * This hook modifies the application container's environment to | ||
| * add the injectable resource environment variables. | ||
| */ | ||
| class InjecterExtensionMutatingHook extends ContainerMutatingHook { | ||
| private environment: { [key: string]: string }; | ||
|
|
||
| constructor(props: ContainerMutatingProps) { | ||
| super(); | ||
| this.environment = props.environment; | ||
| } | ||
|
|
||
| public mutateContainerDefinition(props: ecs.ContainerDefinitionOptions): ecs.ContainerDefinitionOptions { | ||
| return { | ||
| ...props, | ||
|
|
||
| environment: { ...(props.environment || {}), ...this.environment }, | ||
| } as ecs.ContainerDefinitionOptions; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * This extension accepts a list of `Injectable` resources that the parent service can publish events or write data to. | ||
| * It sets up the corresponding permissions for the task role of the parent service. | ||
| */ | ||
| export class InjecterExtension extends ServiceExtension { | ||
| private props: InjecterExtensionProps; | ||
|
|
||
| private environment: { [key: string]: string } = {}; | ||
|
|
||
| constructor(props: InjecterExtensionProps) { | ||
| super('injecter'); | ||
|
|
||
| this.props = props; | ||
| } | ||
|
|
||
| // @ts-ignore - Ignore unused params that are required for abstract class extend | ||
| public prehook(service: Service, scope: Construct) { | ||
| this.parentService = service; | ||
|
|
||
| for (const injectable of this.props.injectables) { | ||
| for (const [key, val] of Object.entries(injectable.environmentVariables())) { | ||
| this.environment[key] = val; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Add hooks to the main application extension so that it is modified to | ||
| * add the injectable resource environment variables to the container environment. | ||
| */ | ||
| public addHooks() { | ||
| const container = this.parentService.serviceDescription.get('service-container') as Container; | ||
|
|
||
| if (!container) { | ||
| throw new Error('Injecter Extension requires an application extension'); | ||
| } | ||
|
|
||
| container.addContainerMutatingHook(new InjecterExtensionMutatingHook({ | ||
| environment: this.environment, | ||
| })); | ||
| } | ||
|
|
||
| /** | ||
| * After the task definition has been created, this hook grants the required permissions to the task role for the | ||
| * parent service. | ||
| * | ||
| * @param taskDefinition The created task definition | ||
| */ | ||
| public useTaskDefinition(taskDefinition: ecs.TaskDefinition) { | ||
| for (const injectable of this.props.injectables) { | ||
| if ((injectable as GrantInjectable).grant !== undefined) { | ||
| (injectable as GrantInjectable).grant(taskDefinition); | ||
| } | ||
| } | ||
| } | ||
| } |
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.