From 291c665c50282ef6a1265cb7532448592ab5cad2 Mon Sep 17 00:00:00 2001 From: Michael CC <333mmcc@gmail.com> Date: Thu, 25 Apr 2024 21:02:33 +1000 Subject: [PATCH] Added testing --- .../aws-cdk-nlb-attributes-integ.assets.json | 4 ++-- ...aws-cdk-nlb-attributes-integ.template.json | 4 ---- .../cdk.out | 0 .../integ.json | 0 .../manifest.json | 2 +- ...efaultTestDeployAssert2D727654.assets.json | 0 ...aultTestDeployAssert2D727654.template.json | 0 .../tree.json | 4 ---- ...-attributes.ts => integ.nlb.attributes.ts} | 0 .../test/alb/load-balancer.test.ts | 19 +++++++++++++++---- .../test/nlb/load-balancer.test.ts | 19 +++++++++++++++---- 11 files changed, 33 insertions(+), 19 deletions(-) rename packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/{integ.nlb-attributes.js.snapshot => integ.nlb.attributes.js.snapshot}/aws-cdk-nlb-attributes-integ.assets.json (74%) rename packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/{integ.nlb-attributes.js.snapshot => integ.nlb.attributes.js.snapshot}/aws-cdk-nlb-attributes-integ.template.json (99%) rename packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/{integ.nlb-attributes.js.snapshot => integ.nlb.attributes.js.snapshot}/cdk.out (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/{integ.nlb-attributes.js.snapshot => integ.nlb.attributes.js.snapshot}/integ.json (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/{integ.nlb-attributes.js.snapshot => integ.nlb.attributes.js.snapshot}/manifest.json (98%) rename packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/{integ.nlb-attributes.js.snapshot => integ.nlb.attributes.js.snapshot}/nlbattlibutesintegDefaultTestDeployAssert2D727654.assets.json (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/{integ.nlb-attributes.js.snapshot => integ.nlb.attributes.js.snapshot}/nlbattlibutesintegDefaultTestDeployAssert2D727654.template.json (100%) rename packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/{integ.nlb-attributes.js.snapshot => integ.nlb.attributes.js.snapshot}/tree.json (99%) rename packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/{integ.nlb-attributes.ts => integ.nlb.attributes.ts} (100%) diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/aws-cdk-nlb-attributes-integ.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/aws-cdk-nlb-attributes-integ.assets.json similarity index 74% rename from packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/aws-cdk-nlb-attributes-integ.assets.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/aws-cdk-nlb-attributes-integ.assets.json index e77f03c32cea8..735a50310b09e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/aws-cdk-nlb-attributes-integ.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/aws-cdk-nlb-attributes-integ.assets.json @@ -1,7 +1,7 @@ { "version": "36.0.0", "files": { - "fde94b9ee2e36931660662e5ad6718e40f59c205fc43297b7480bf3e57157358": { + "07d7b501e39a18940f72d7c69e969b9cbae9ae21f85424c29235d75d73d23868": { "source": { "path": "aws-cdk-nlb-attributes-integ.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "fde94b9ee2e36931660662e5ad6718e40f59c205fc43297b7480bf3e57157358.json", + "objectKey": "07d7b501e39a18940f72d7c69e969b9cbae9ae21f85424c29235d75d73d23868.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/aws-cdk-nlb-attributes-integ.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/aws-cdk-nlb-attributes-integ.template.json similarity index 99% rename from packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/aws-cdk-nlb-attributes-integ.template.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/aws-cdk-nlb-attributes-integ.template.json index 92f24238a0511..6b0938a571195 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/aws-cdk-nlb-attributes-integ.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/aws-cdk-nlb-attributes-integ.template.json @@ -403,10 +403,6 @@ "Key": "load_balancing.cross_zone.enabled", "Value": "true" }, - { - "Key": "ipv6.deny_all_igw_traffic", - "Value": "true" - }, { "Key": "dns_record.client_routing_policy", "Value": "partial_availability_zone_affinity" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/cdk.out similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/cdk.out rename to packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/cdk.out diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/integ.json similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/integ.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/integ.json diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/manifest.json similarity index 98% rename from packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/manifest.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/manifest.json index 7e9b4e6aa18a8..a1c96857eb6ba 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/manifest.json @@ -18,7 +18,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}/fde94b9ee2e36931660662e5ad6718e40f59c205fc43297b7480bf3e57157358.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/07d7b501e39a18940f72d7c69e969b9cbae9ae21f85424c29235d75d73d23868.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/nlbattlibutesintegDefaultTestDeployAssert2D727654.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/nlbattlibutesintegDefaultTestDeployAssert2D727654.assets.json similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/nlbattlibutesintegDefaultTestDeployAssert2D727654.assets.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/nlbattlibutesintegDefaultTestDeployAssert2D727654.assets.json diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/nlbattlibutesintegDefaultTestDeployAssert2D727654.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/nlbattlibutesintegDefaultTestDeployAssert2D727654.template.json similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/nlbattlibutesintegDefaultTestDeployAssert2D727654.template.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/nlbattlibutesintegDefaultTestDeployAssert2D727654.template.json diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/tree.json similarity index 99% rename from packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/tree.json rename to packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/tree.json index dfe987eaa13bc..0d0cf8680c4d7 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.js.snapshot/tree.json @@ -670,10 +670,6 @@ "key": "load_balancing.cross_zone.enabled", "value": "true" }, - { - "key": "ipv6.deny_all_igw_traffic", - "value": "true" - }, { "key": "dns_record.client_routing_policy", "value": "partial_availability_zone_affinity" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.ts similarity index 100% rename from packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb-attributes.ts rename to packages/@aws-cdk-testing/framework-integ/test/aws-elasticloadbalancingv2/test/integ.nlb.attributes.ts diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts index bb3293a799d5b..db23ab34b246d 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/alb/load-balancer.test.ts @@ -99,10 +99,6 @@ describe('tests', () => { Key: 'deletion_protection.enabled', Value: 'true', }, - { - Key: 'ipv6.deny_all_igw_traffic', - Value: 'true', - }, { Key: 'routing.http2.enabled', Value: 'false', @@ -171,6 +167,21 @@ describe('tests', () => { }).toThrow('\'clientKeepAlive\' must be between 60 and 604800 seconds. Got: 100 milliseconds'); }); + test('throw error for denyAllIgwTraffic set to false for Ipv4 adressing.', () => { + // GIVEN + const stack = new cdk.Stack(); + const vpc = new ec2.Vpc(stack, 'Stack'); + + // THEN + expect(() => { + new elbv2.ApplicationLoadBalancer(stack, 'LB', { + vpc, + denyAllIgwTraffic: false, + ipAddressType: elbv2.IpAddressType.IPV4, + }); + }).toThrow('\'denyAllIgwTraffic\' cannot be false on load balancers with IPv4 addressing.'); + }); + describe('Desync mitigation mode', () => { test('Defensive', () => { // GIVEN diff --git a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts index 06aedaadf5be4..f28d7bacff1f5 100644 --- a/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts +++ b/packages/aws-cdk-lib/aws-elasticloadbalancingv2/test/nlb/load-balancer.test.ts @@ -91,10 +91,6 @@ describe('tests', () => { Key: 'load_balancing.cross_zone.enabled', Value: 'true', }, - { - Key: 'ipv6.deny_all_igw_traffic', - Value: 'true', - }, { Key: 'dns_record.client_routing_policy', Value: 'partial_availability_zone_affinity', @@ -488,6 +484,21 @@ describe('tests', () => { }).toThrow('Load balancer name: "my load balancer" must contain only alphanumeric characters or hyphens.'); }); + test('loadBalancerName unallowed: denyAllIgwTraffic set to false for Ipv4 adressing', () => { + // GIVEN + const stack = new cdk.Stack(); + const vpc = new ec2.Vpc(stack, 'Stack'); + + // THEN + expect(() => { + new elbv2.NetworkLoadBalancer(stack, 'NLB', { + vpc, + denyAllIgwTraffic: false, + ipAddressType: elbv2.IpAddressType.IPV4, + }); + }).toThrow('\'denyAllIgwTraffic\' cannot be false on load balancers with IPv4 addressing.'); + }); + test('imported network load balancer with no vpc specified throws error when calling addTargets', () => { // GIVEN const stack = new cdk.Stack();