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

chore(assertion): migrate all tests to assertions library #933

Merged
merged 8 commits into from
Mar 24, 2023
Merged

chore(assertion): migrate all tests to assertions library #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
87436ce
stash first change
biffgaut Mar 21, 2023
778435d
First draft of assertion migration
biffgaut Mar 23, 2023
5f314bd
Merge branch 'main' into assertions-round2
biffgaut Mar 24, 2023
b27251a
Fix errors introduced to core
biffgaut Mar 24, 2023
40f97f8
Cleanup
biffgaut Mar 24, 2023
e57bac9
Cleanup
biffgaut Mar 24, 2023
1d3f49c
Cleanup
biffgaut Mar 24, 2023
6b90b60
CLeanup
biffgaut Mar 24, 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
125 changes: 67 additions & 58 deletions source/patterns/@aws-solutions-constructs/aws-alb-fargate/test/alb-fargate.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
*/

import { AlbToFargate, AlbToFargateProps } from "../lib";
// import * as ecs from '@aws-cdk/aws-ecs';
import * as elb from 'aws-cdk-lib/aws-elasticloadbalancingv2';
import * as cdk from "aws-cdk-lib";
import '@aws-cdk/assert/jest';
import * as defaults from '@aws-solutions-constructs/core';
import * as ec2 from 'aws-cdk-lib/aws-ec2';
import { Template } from "aws-cdk-lib/assertions";

test('Test new vpc, load balancer, service', () => {
// An environment with region is required to enable logging on an ALB
Expand All @@ -34,16 +33,17 @@ test('Test new vpc, load balancer, service', () => {

new AlbToFargate(stack, 'test-construct', testProps);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE'
});
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP'
});
expect(stack).not.toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
defaults.expectNonexistence(stack, 'AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTPS'
});
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true,
CidrBlock: '10.0.0.0/16',
});
Expand All @@ -64,17 +64,18 @@ test('Test new load balancer, service, existing vpc', () => {

new AlbToFargate(stack, 'test-construct', testProps);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE'
});
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP'
});
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true,
CidrBlock: '172.168.0.0/16'
});
expect(stack).toCountResources('AWS::EC2::VPC', 1);
template.resourceCountIs('AWS::EC2::VPC', 1);
});

test('Test new service, existing load balancer, vpc', () => {
Expand Down Expand Up @@ -103,23 +104,24 @@ test('Test new service, existing load balancer, vpc', () => {

new AlbToFargate(stack, 'test-construct', testProps);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE'
});
expect(stack).toCountResources('AWS::ECS::Service', 1);
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
template.resourceCountIs('AWS::ECS::Service', 1);
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP'
});
expect(stack).toCountResources('AWS::ElasticLoadBalancingV2::Listener', 1);
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::LoadBalancer', {
template.resourceCountIs('AWS::ElasticLoadBalancingV2::Listener', 1);
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::LoadBalancer', {
Name: testName
});
expect(stack).toCountResources('AWS::ElasticLoadBalancingV2::LoadBalancer', 1);
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.resourceCountIs('AWS::ElasticLoadBalancingV2::LoadBalancer', 1);
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true,
CidrBlock: '172.168.0.0/16'
});
expect(stack).toCountResources('AWS::EC2::VPC', 1);
template.resourceCountIs('AWS::EC2::VPC', 1);
});

test('Test existing load balancer, vpc, service', () => {
Expand Down Expand Up @@ -155,23 +157,24 @@ test('Test existing load balancer, vpc, service', () => {

new AlbToFargate(stack, 'test-construct', testProps);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE'
});
expect(stack).toCountResources('AWS::ECS::Service', 1);
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
template.resourceCountIs('AWS::ECS::Service', 1);
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP'
});
expect(stack).toCountResources('AWS::ElasticLoadBalancingV2::Listener', 1);
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::LoadBalancer', {
template.resourceCountIs('AWS::ElasticLoadBalancingV2::Listener', 1);
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::LoadBalancer', {
Name: testName
});
expect(stack).toCountResources('AWS::ElasticLoadBalancingV2::LoadBalancer', 1);
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.resourceCountIs('AWS::ElasticLoadBalancingV2::LoadBalancer', 1);
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true,
CidrBlock: '172.168.0.0/16'
});
expect(stack).toCountResources('AWS::EC2::VPC', 1);
template.resourceCountIs('AWS::EC2::VPC', 1);
});

test('Test add a second target with rules', () => {
Expand Down Expand Up @@ -203,15 +206,16 @@ test('Test add a second target with rules', () => {

new AlbToFargate(stack, 'test-two-construct', testPropsTwo);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE'
});
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP'
});
expect(stack).toCountResources('AWS::ElasticLoadBalancingV2::TargetGroup', 2);
expect(stack).toCountResources('AWS::ElasticLoadBalancingV2::ListenerRule', 1);
expect(stack).toHaveResourceLike('AWS::ElasticLoadBalancingV2::ListenerRule', {
template.resourceCountIs('AWS::ElasticLoadBalancingV2::TargetGroup', 2);
template.resourceCountIs('AWS::ElasticLoadBalancingV2::ListenerRule', 1);
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::ListenerRule', {
Conditions: [
{
Field: "path-pattern",
Expand All @@ -223,11 +227,11 @@ test('Test add a second target with rules', () => {
}
],
});
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true,
CidrBlock: '172.168.0.0/16'
});
expect(stack).toCountResources('AWS::EC2::VPC', 1);
template.resourceCountIs('AWS::EC2::VPC', 1);
});

test('Test new vpc, load balancer, service - custom Service Props', () => {
Expand All @@ -249,17 +253,18 @@ test('Test new vpc, load balancer, service - custom Service Props', () => {

new AlbToFargate(stack, 'test-construct', testProps);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE',
ServiceName: serviceName,
});
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP'
});
expect(stack).not.toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
defaults.expectNonexistence(stack, 'AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTPS'
});
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true
});
});
Expand All @@ -281,16 +286,17 @@ test('Test new vpc, load balancer, service - custom VPC Props', () => {

new AlbToFargate(stack, 'test-construct', testProps);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE',
});
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP'
});
expect(stack).not.toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
defaults.expectNonexistence(stack, 'AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTPS'
});
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true,
CidrBlock: testCidr,
});
Expand Down Expand Up @@ -319,22 +325,23 @@ test('Test new vpc, load balancer, service - custom LoadBalancer and targetGroup

new AlbToFargate(stack, 'test-construct', testProps);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE',
});
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP'
});
expect(stack).not.toHaveResource('AWS::ElasticLoadBalancingV2::Listener', {
defaults.expectNonexistence(stack, 'AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTPS'
});
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true,
});
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::LoadBalancer', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::LoadBalancer', {
Name: testLoadBalancerName
});
expect(stack).toHaveResource('AWS::ElasticLoadBalancingV2::TargetGroup', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::TargetGroup', {
Name: testTargetGroupName
});
});
Expand All @@ -356,10 +363,11 @@ test('Test HTTPS API with new vpc, load balancer, service', () => {

new AlbToFargate(stack, 'test-construct', testProps);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE'
});
expect(stack).toHaveResourceLike('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP',
DefaultActions: [
{
Expand All @@ -372,11 +380,11 @@ test('Test HTTPS API with new vpc, load balancer, service', () => {
}
],
});
expect(stack).toHaveResourceLike('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTPS',
Port: 443,
});
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true
});
});
Expand All @@ -398,10 +406,11 @@ test('Test HTTPS API with new vpc, load balancer, service and private API', () =

new AlbToFargate(stack, 'test-construct', testProps);

expect(stack).toHaveResourceLike("AWS::ECS::Service", {
const template = Template.fromStack(stack);
template.hasResourceProperties("AWS::ECS::Service", {
LaunchType: 'FARGATE'
});
expect(stack).toHaveResourceLike('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTP',
DefaultActions: [
{
Expand All @@ -414,15 +423,15 @@ test('Test HTTPS API with new vpc, load balancer, service and private API', () =
}
],
});
expect(stack).toHaveResourceLike('AWS::ElasticLoadBalancingV2::Listener', {
template.hasResourceProperties('AWS::ElasticLoadBalancingV2::Listener', {
Protocol: 'HTTPS',
Port: 443,
});
expect(stack).toHaveResource('AWS::EC2::VPC', {
template.hasResourceProperties('AWS::EC2::VPC', {
EnableDnsHostnames: true,
});
expect(stack).toCountResources("AWS::EC2::Subnet", 3);
expect(stack).toHaveResource("AWS::EC2::Subnet", {
template.resourceCountIs("AWS::EC2::Subnet", 3);
template.hasResourceProperties("AWS::EC2::Subnet", {
Tags: [
{
Key: "aws-cdk:subnet-name",
Expand All @@ -438,7 +447,7 @@ test('Test HTTPS API with new vpc, load balancer, service and private API', () =
}
]
});
expect(stack).not.toHaveResource("AWS::EC2::Subnet", {
defaults.expectNonexistence(stack, "AWS::EC2::Subnet", {
Tags: [
{
Key: "aws-cdk:subnet-name",
Expand Down
Loading