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

Jump to bottom

feat(app-mesh): support port property on weighted targets #26114

Merged
merged 7 commits into from
Jul 7, 2023
Merged

feat(app-mesh): support port property on weighted targets #26114

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2094ae8
[app-mesh] Add missing port property WeightedTarget
neovasili Jun 26, 2023
21cc300
[app-mesh] Add some unit tests
neovasili Jun 26, 2023
fa1700c
[tests] Update integration tests
neovasili Jun 26, 2023
1dcef42
Merge branch 'main' into fix/app-mesh-missing-port-property-weighted-…
mrgrain Jul 5, 2023
36ad010
Merge branch 'main' into fix/app-mesh-missing-port-property-weighted-…
mrgrain Jul 7, 2023
1ea3f3b
Merge branch 'main' into fix/app-mesh-missing-port-property-weighted-…
mrgrain Jul 7, 2023
f8ac9f4
Merge branch 'main' into fix/app-mesh-missing-port-property-weighted-…
mergify[bot] Jul 7, 2023
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 ...ing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ...work-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "32.0.0",
"files": {
"22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391": {
"7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db": {
"source": {
"path": "mesh-stack.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391.json",
"objectKey": "7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
1 change: 1 addition & 0 deletions ...rk-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@
"Action": {
"WeightedTargets": [
{
"Port": 1234,
"VirtualNode": {
"Fn::GetAtt": [
"meshgrpcnode5DE90B75",
Expand Down
7 changes: 4 additions & 3 deletions ...testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,8 @@
"VirtualNodeName"
]
},
"weight": 1
"weight": 1,
"port": 1234
}
]
},
Expand Down Expand Up @@ -1264,7 +1265,7 @@
"path": "appmesh-routes-port-matchers/DefaultTest/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.26"
"version": "10.2.55"
}
},
"DeployAssert": {
Expand Down Expand Up @@ -1310,7 +1311,7 @@
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.2.26"
"version": "10.2.55"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ httpRouter.addRoute('http-route', {

grpcRouter.addRoute('grpc-route', {
routeSpec: appmesh.RouteSpec.grpc({
weightedTargets: [{ virtualNode: grpcNode }],
weightedTargets: [{ virtualNode: grpcNode, port: 1234 }],
match: {
port: 1234,
},
Expand Down
8 changes: 8 additions & 0 deletions packages/aws-cdk-lib/aws-appmesh/lib/route-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ export interface WeightedTarget {
* @default 1
*/
readonly weight?: number;

/**
* The port to match from the request.
*
* @default - do not match on port
*/
readonly port?: number;
}

/**
Expand Down Expand Up @@ -603,6 +610,7 @@ function renderWeightedTargets(weightedTargets: WeightedTarget[]): CfnRoute.Weig
renderedTargets.push({
virtualNode: t.virtualNode.virtualNodeName,
weight: t.weight == undefined ? 1 : t.weight,
port: t.port,
});
}
return renderedTargets;
Expand Down
117 changes: 117 additions & 0 deletions packages/aws-cdk-lib/aws-appmesh/test/route.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,123 @@ describe('route', () => {

});

test('should allow weighted targets with port specified', () => {
// GIVEN
const stack = new cdk.Stack();
const mesh = new appmesh.Mesh(stack, 'mesh', {
meshName: 'test-mesh',
});
const router = new appmesh.VirtualRouter(stack, 'router', {
mesh,
});

// WHEN
const node = mesh.addVirtualNode('test-node', {
serviceDiscovery: appmesh.ServiceDiscovery.dns('test'),
listeners: [appmesh.VirtualNodeListener.http()],
});

router.addRoute('test-http-route', {
routeSpec: appmesh.RouteSpec.http({
weightedTargets: [
{
virtualNode: node,
port: 1234,
},
],
match: {
path: appmesh.HttpRoutePathMatch.startsWith('/node'),
},
timeout: {
idle: cdk.Duration.seconds(10),
perRequest: cdk.Duration.seconds(11),
},
}),
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::AppMesh::Route', {
Spec: {
HttpRoute: {
Action: {
WeightedTargets: [
{
VirtualNode: {
'Fn::GetAtt': [
'meshtestnodeF93946D4',
'VirtualNodeName',
],
},
Weight: 1,
Port: 1234,
},
],
},
},
},
RouteName: 'test-http-route',
});

});

test('should not have weighted targets port when not specified', () => {
// GIVEN
const stack = new cdk.Stack();
const mesh = new appmesh.Mesh(stack, 'mesh', {
meshName: 'test-mesh',
});
const router = new appmesh.VirtualRouter(stack, 'router', {
mesh,
});

// WHEN
const node = mesh.addVirtualNode('test-node', {
serviceDiscovery: appmesh.ServiceDiscovery.dns('test'),
listeners: [appmesh.VirtualNodeListener.http()],
});

router.addRoute('test-http-route', {
routeSpec: appmesh.RouteSpec.http({
weightedTargets: [
{
virtualNode: node,
},
],
match: {
path: appmesh.HttpRoutePathMatch.startsWith('/node'),
},
timeout: {
idle: cdk.Duration.seconds(10),
perRequest: cdk.Duration.seconds(11),
},
}),
});

// THEN
Template.fromStack(stack).hasResourceProperties('AWS::AppMesh::Route', {
Spec: {
HttpRoute: {
Action: {
WeightedTargets: [
{
VirtualNode: {
'Fn::GetAtt': [
'meshtestnodeF93946D4',
'VirtualNodeName',
],
},
Weight: 1,
Port: Match.absent(),
},
],
},
},
},
RouteName: 'test-http-route',
});

});

test('should allow http retries', () => {
// GIVEN
const stack = new cdk.Stack();
Expand Down