-
Notifications
You must be signed in to change notification settings - Fork 4k
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.
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
feat(iot): allow setting Actions of TopicRule #17110
Merged
Merged
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
7a72b32
feat(iot): Add IAction
yamatatsu 7511ed0
fix(iot): about feedbacks
yamatatsu 9c704cc
Merge branch 'master' into aws-iot-rule-action
yamatatsu db70b7f
feat(iot-actions): Add lambda action
yamatatsu e8e9652
fix(iot-actions): fix pkglint for depending on experimental aws-iot
yamatatsu dd965da
revert: yarn.lock
yamatatsu 3382316
fix: as feadback
yamatatsu 9058c33
Update packages/@aws-cdk/aws-iot-actions/lib/lambda-action.ts
yamatatsu 621cdf4
fix(iot): about feedbacks
yamatatsu 9eca063
refactor(iot-actions): rename files
yamatatsu c86e5f0
Merge branch 'master' into aws-iot-rule-action
mergify[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 @@ | ||
// this is placeholder for monocdk | ||
export const dummy = true; | ||
export * from './lambda-action'; |
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,31 @@ | ||||||
import * as iam from '@aws-cdk/aws-iam'; | ||||||
import * as iot from '@aws-cdk/aws-iot'; | ||||||
import * as lambda from '@aws-cdk/aws-lambda'; | ||||||
import { Stack } from '@aws-cdk/core'; | ||||||
|
||||||
/** | ||||||
* The action to invoke an AWS Lambda function, passing in an MQTT message. | ||||||
*/ | ||||||
export class LambdaAction implements iot.IAction { | ||||||
/** | ||||||
* @param func The lambda function to be invoked by this action | ||||||
*/ | ||||||
constructor(private readonly func: lambda.IFunction) {} | ||||||
|
||||||
bind(rule: iot.ITopicRule): iot.ActionConfig { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
this.func.addPermission('invokedByAwsIotRule', { | ||||||
action: 'lambda:InvokeFunction', | ||||||
principal: new iam.ServicePrincipal('iot.amazonaws.com'), | ||||||
sourceAccount: Stack.of(rule).account, | ||||||
yamatatsu marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
sourceArn: rule.topicRuleArn, | ||||||
}); | ||||||
|
||||||
return { | ||||||
configuration: { | ||||||
lambda: { | ||||||
functionArn: this.func.functionArn, | ||||||
}, | ||||||
}, | ||||||
}; | ||||||
} | ||||||
} |
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
97 changes: 97 additions & 0 deletions
97
packages/@aws-cdk/aws-iot-actions/test/lambda/integ.lambda-action.expected.json
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,97 @@ | ||
{ | ||
"Resources": { | ||
"MyFunctionServiceRole3C357FF2": { | ||
"Type": "AWS::IAM::Role", | ||
"Properties": { | ||
"AssumeRolePolicyDocument": { | ||
"Statement": [ | ||
{ | ||
"Action": "sts:AssumeRole", | ||
"Effect": "Allow", | ||
"Principal": { | ||
"Service": "lambda.amazonaws.com" | ||
} | ||
} | ||
], | ||
"Version": "2012-10-17" | ||
}, | ||
"ManagedPolicyArns": [ | ||
{ | ||
"Fn::Join": [ | ||
"", | ||
[ | ||
"arn:", | ||
{ | ||
"Ref": "AWS::Partition" | ||
}, | ||
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" | ||
] | ||
] | ||
} | ||
] | ||
} | ||
}, | ||
"MyFunction3BAA72D1": { | ||
"Type": "AWS::Lambda::Function", | ||
"Properties": { | ||
"Code": { | ||
"ZipFile": "\n exports.handler = (event) => {\n console.log(\"It is test for lambda action of AWS IoT Rule.\", event);\n };\"" | ||
}, | ||
"Role": { | ||
"Fn::GetAtt": [ | ||
"MyFunctionServiceRole3C357FF2", | ||
"Arn" | ||
] | ||
}, | ||
"Handler": "index.handler", | ||
"Runtime": "nodejs14.x" | ||
}, | ||
"DependsOn": [ | ||
"MyFunctionServiceRole3C357FF2" | ||
] | ||
}, | ||
"MyFunctioninvokedByAwsIotRule5581F304": { | ||
"Type": "AWS::Lambda::Permission", | ||
"Properties": { | ||
"Action": "lambda:InvokeFunction", | ||
"FunctionName": { | ||
"Fn::GetAtt": [ | ||
"MyFunction3BAA72D1", | ||
"Arn" | ||
] | ||
}, | ||
"Principal": "iot.amazonaws.com", | ||
"SourceAccount": { | ||
"Ref": "AWS::AccountId" | ||
}, | ||
"SourceArn": { | ||
"Fn::GetAtt": [ | ||
"TopicRule40A4EA44", | ||
"Arn" | ||
] | ||
} | ||
} | ||
}, | ||
"TopicRule40A4EA44": { | ||
"Type": "AWS::IoT::TopicRule", | ||
"Properties": { | ||
"TopicRulePayload": { | ||
"Actions": [ | ||
{ | ||
"Lambda": { | ||
"FunctionArn": { | ||
"Fn::GetAtt": [ | ||
"MyFunction3BAA72D1", | ||
"Arn" | ||
] | ||
} | ||
} | ||
} | ||
], | ||
"AwsIotSqlVersion": "2016-03-23", | ||
"Sql": "SELECT topic(2) as device_id, timestamp() as timestamp, temperature FROM 'device/+/data'" | ||
} | ||
} | ||
} | ||
} | ||
} |
31 changes: 31 additions & 0 deletions
31
packages/@aws-cdk/aws-iot-actions/test/lambda/integ.lambda-action.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,31 @@ | ||
/// !cdk-integ pragma:ignore-assets | ||
import * as iot from '@aws-cdk/aws-iot'; | ||
import * as lambda from '@aws-cdk/aws-lambda'; | ||
import * as cdk from '@aws-cdk/core'; | ||
import * as actions from '../../lib'; | ||
|
||
const app = new cdk.App(); | ||
|
||
class TestStack extends cdk.Stack { | ||
constructor(scope: cdk.App, id: string, props?: cdk.StackProps) { | ||
super(scope, id, props); | ||
|
||
const func = new lambda.Function(this, 'MyFunction', { | ||
runtime: lambda.Runtime.NODEJS_14_X, | ||
handler: 'index.handler', | ||
code: lambda.Code.fromInline(` | ||
exports.handler = (event) => { | ||
console.log("It is test for lambda action of AWS IoT Rule.", event); | ||
};"`, | ||
), | ||
}); | ||
|
||
new iot.TopicRule(this, 'TopicRule', { | ||
sql: iot.IotSql.fromStringAsVer20160323("SELECT topic(2) as device_id, timestamp() as timestamp, temperature FROM 'device/+/data'"), | ||
actions: [new actions.LambdaAction(func)], | ||
}); | ||
} | ||
} | ||
|
||
new TestStack(app, 'test-stack'); | ||
app.synth(); |
57 changes: 57 additions & 0 deletions
57
packages/@aws-cdk/aws-iot-actions/test/lambda/lambda-action.test.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,57 @@ | ||
import { Template } from '@aws-cdk/assertions'; | ||
import * as iot from '@aws-cdk/aws-iot'; | ||
import * as lambda from '@aws-cdk/aws-lambda'; | ||
import * as cdk from '@aws-cdk/core'; | ||
import * as actions from '../../lib'; | ||
|
||
test('create a topic rule with lambda action and a lambda permission to be invoked by the topic rule', () => { | ||
// GIVEN | ||
const stack = new cdk.Stack(); | ||
const topicRule = new iot.TopicRule(stack, 'MyTopicRule', { | ||
sql: iot.IotSql.fromStringAsVer20160323("SELECT topic(2) as device_id FROM 'device/+/data'"), | ||
}); | ||
const func = new lambda.Function(stack, 'MyFunction', { | ||
runtime: lambda.Runtime.NODEJS_14_X, | ||
handler: 'index.handler', | ||
code: lambda.Code.fromInline('console.log("foo")'), | ||
}); | ||
|
||
// WHEN | ||
topicRule.addAction(new actions.LambdaAction(func)); | ||
|
||
// THEN | ||
Template.fromStack(stack).hasResourceProperties('AWS::IoT::TopicRule', { | ||
TopicRulePayload: { | ||
Actions: [ | ||
{ | ||
Lambda: { | ||
FunctionArn: { | ||
'Fn::GetAtt': [ | ||
'MyFunction3BAA72D1', | ||
'Arn', | ||
], | ||
}, | ||
}, | ||
}, | ||
], | ||
}, | ||
}); | ||
|
||
Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Permission', { | ||
Action: 'lambda:InvokeFunction', | ||
FunctionName: { | ||
'Fn::GetAtt': [ | ||
'MyFunction3BAA72D1', | ||
'Arn', | ||
], | ||
}, | ||
Principal: 'iot.amazonaws.com', | ||
SourceAccount: { Ref: 'AWS::AccountId' }, | ||
SourceArn: { | ||
'Fn::GetAtt': [ | ||
'MyTopicRule4EC2091C', | ||
'Arn', | ||
], | ||
}, | ||
}); | ||
}); |
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 | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,24 @@ | ||||||
import { CfnTopicRule } from './iot.generated'; | ||||||
import { ITopicRule } from './topic-rule'; | ||||||
|
||||||
/** | ||||||
* An abstract action for TopicRule. | ||||||
*/ | ||||||
export interface IAction { | ||||||
/** | ||||||
* Returns the topic rule action specification. | ||||||
* | ||||||
* @param rule The TopicRule that would trigger this action. | ||||||
*/ | ||||||
bind(rule: ITopicRule): ActionConfig; | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
} | ||||||
|
||||||
/** | ||||||
* Properties for an topic rule action | ||||||
*/ | ||||||
export interface ActionConfig { | ||||||
/** | ||||||
* The configuration for this action. | ||||||
*/ | ||||||
readonly configuration: CfnTopicRule.ActionProperty; | ||||||
} |
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,3 +1,4 @@ | ||
export * from './action'; | ||
export * from './iot-sql'; | ||
export * from './topic-rule'; | ||
|
||
|
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's rename this to
LambdaFunctionAction
.