feat: add name to EIP

cloudshiftchris · cloudshiftchris · commit b5e8f75507f1 · 2024-08-01T11:16:12.000-07:00
diff --git a/src/main/kotlin/io/cloudshiftdev/awscdklib/customresource/Extensions.kt b/src/main/kotlin/io/cloudshiftdev/awscdklib/customresource/Extensions.kt
@@ -9,9 +9,7 @@ import io.cloudshiftdev.awscdklib.iam.PolicyStatementsBuilder
 public fun AwsCustomResource.Builder.policyStatements(block: (PolicyStatementsBuilder).() -> Unit) {
     policy(
         AwsCustomResourcePolicy.fromStatements(
-            io.cloudshiftdev.awscdklib.iam.policyStatements(block)
-        )
-    )
+            io.cloudshiftdev.awscdklib.iam.policyStatements(block)))
 }
 
 public fun AwsCustomResource.Builder.policyStatement(block: (PolicyStatement.Builder).() -> Unit) {
@@ -21,7 +19,5 @@ public fun AwsCustomResource.Builder.policyStatement(block: (PolicyStatement.Bui
 public fun AwsCustomResource.Builder.policyFromSdkCalls(vararg resources: String) {
     policy(
         AwsCustomResourcePolicy.fromSdkCalls(
-            SdkCallsPolicyOptions { resources(resources.toList()) }
-        )
-    )
+            SdkCallsPolicyOptions { resources(resources.toList()) }))
 }
diff --git a/src/main/kotlin/io/cloudshiftdev/awscdklib/network/Extensions.kt b/src/main/kotlin/io/cloudshiftdev/awscdklib/network/Extensions.kt
@@ -20,6 +20,7 @@ public fun Vpc.attachInternetGateway(): CfnInternetGateway {
     }
     return igw
 }
+
 /*
 
 public fun Vpc.deleteDefaultNetworkAcls() {
diff --git a/src/main/kotlin/io/cloudshiftdev/awscdklib/network/firewall/NetworkFirewall.kt b/src/main/kotlin/io/cloudshiftdev/awscdklib/network/firewall/NetworkFirewall.kt
@@ -52,11 +52,9 @@ public class FirewallPolicy(
                     CfnFirewallPolicy.FirewallPolicyProperty {
                         statelessDefaultActions(statelessDefaultActions.map { it.value })
                         statelessFragmentDefaultActions(
-                            statelessFragmentDefaultActions.map { it.value }
-                        )
+                            statelessFragmentDefaultActions.map { it.value })
                         statefulDefaultActions(statefulDefaultActions.map { it.value })
-                    }
-                )
+                    })
             }
 
         firewallPolicyId = policy.attrFirewallPolicyId()
diff --git a/src/main/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/RouterProvider.kt b/src/main/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/RouterProvider.kt
@@ -58,8 +58,7 @@ internal class EgressNetworkFirewallRouterProvider(
                 id = "FirewallPolicy",
                 // TODO: make these configurable
                 statelessDefaultActions = listOf(StatelessStandardAction.PASS),
-                statelessFragmentDefaultActions = listOf(StatelessStandardAction.PASS)
-            )
+                statelessFragmentDefaultActions = listOf(StatelessStandardAction.PASS))
 
         val firewall =
             NetworkFirewall(
@@ -68,8 +67,7 @@ internal class EgressNetworkFirewallRouterProvider(
                 vpc = vpc,
                 subnetMappings = routerSubnet,
                 firewallName = "Firewall",
-                firewallPolicy = firewallPolicy
-            )
+                firewallPolicy = firewallPolicy)
 
         val protectedSubnets =
             egressSubnets.flatMap { vpc.selectSubnets(it).subnets() }.map { it as Subnet }
@@ -92,8 +90,7 @@ internal class EgressNetworkFirewallRouterProvider(
                     endpointId = azEntry.value,
                     protectedSubnets =
                         protectedSubnets.filter { it.availabilityZone() == azEntry.key },
-                    ingressSubnets = ingress.filter { it.availabilityZone() == azEntry.key }
-                )
+                    ingressSubnets = ingress.filter { it.availabilityZone() == azEntry.key })
             }
         azRouteInfo.forEach { routeInfo ->
             routeInfo.protectedSubnets.forEach { protectedSubnet ->
@@ -119,9 +116,7 @@ internal class EgressNetworkFirewallRouterProvider(
                             mapOf(
                                 "DestinationCidrBlock" to vpc.vpcCidrBlock(),
                                 "RouteTableId" to routeTableId,
-                                "VpcEndpointId" to routeInfo.endpointId
-                            )
-                        )
+                                "VpcEndpointId" to routeInfo.endpointId))
                         physicalResourceId(PhysicalResourceId.of(routeTableId))
                     }
                     onUpdate {
@@ -131,9 +126,7 @@ internal class EgressNetworkFirewallRouterProvider(
                             mapOf(
                                 "DestinationCidrBlock" to vpc.vpcCidrBlock(),
                                 "RouteTableId" to routeTableId,
-                                "VpcEndpointId" to routeInfo.endpointId
-                            )
-                        )
+                                "VpcEndpointId" to routeInfo.endpointId))
                         physicalResourceId(PhysicalResourceId.of(routeTableId))
                     }
                     onDelete {
@@ -143,9 +136,7 @@ internal class EgressNetworkFirewallRouterProvider(
                             mapOf(
                                 "DestinationCidrBlock" to vpc.vpcCidrBlock(),
                                 "RouteTableId" to routeTableId,
-                                "LocalTarget" to true
-                            )
-                        )
+                                "LocalTarget" to true))
                         physicalResourceId(PhysicalResourceId.of(routeTableId))
                     }
                     installLatestAwsSdk(false)
@@ -156,10 +147,8 @@ internal class EgressNetworkFirewallRouterProvider(
                                     service("ec2")
                                     resource("route-table")
                                     resourceName(routeTableId)
-                                }
-                            )
-                        }
-                    )
+                                })
+                        })
                 }
             }
         }
diff --git a/src/main/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/SecureNetwork.kt b/src/main/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/SecureNetwork.kt
@@ -61,8 +61,7 @@ public class SecureNetwork(scope: Construct, id: String, block: (SecureNetworkBu
                 LogFormat.PKT_SRC_AWS_SERVICE,
                 LogFormat.PKT_DST_AWS_SERVICE,
                 LogFormat.FLOW_DIRECTION,
-                LogFormat.TRAFFIC_PATH
-            )
+                LogFormat.TRAFFIC_PATH)
         }
     }
 
diff --git a/src/main/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/SecureNetworkBuilder.kt b/src/main/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/SecureNetworkBuilder.kt
@@ -82,8 +82,7 @@ internal class SecureNetworkBuilderImpl : SecureNetworkBuilder {
             defaultInstanceTenancy = this.defaultInstanceTenancy,
             createInternetGateway = this.createInternetGateway,
             subnetGroups = subnetsBuilder.build(),
-            routerProviders = routersBuilder.build()
-        )
+            routerProviders = routersBuilder.build())
     }
 
     override fun availabilityZones(azs: List<String>) {
@@ -344,8 +343,7 @@ internal class NatGatewayRouterBuilderImpl : BaseNatRouterBuilder(), NatGatewayR
         return NatRouterProvider(
             routerSubnet = routerSubnet ?: SubnetPredicates.publicSubnets(),
             natGatewayCount = natGateways,
-            NatProvider.gateway(props)
-        )
+            NatProvider.gateway(props))
     }
 }
 
@@ -360,8 +358,7 @@ internal class NatInstanceRouterBuilderImpl : BaseNatRouterBuilder(), NatInstanc
         return NatRouterProvider(
             routerSubnet = routerSubnet ?: SubnetPredicates.publicSubnets(),
             natGatewayCount = natGateways,
-            NatProvider.instanceV2(props)
-        )
+            NatProvider.instanceV2(props))
     }
 }
 
@@ -371,10 +368,7 @@ internal class NetworkFirewallRouterBuilderImpl :
 
     fun build(): RouterProvider {
         return EgressNetworkFirewallRouterProvider(
-            routerSubnet ?: SubnetPredicates.privateSubnets(),
-            routableSubnets,
-            egressSubnets
-        )
+            routerSubnet ?: SubnetPredicates.privateSubnets(), routableSubnets, egressSubnets)
     }
 
     override fun egressSubnets(subnetSelections: List<SubnetSelection>) {
diff --git a/src/test/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/NetworkFirewallTest.kt b/src/test/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/NetworkFirewallTest.kt
@@ -33,8 +33,7 @@ class NetworkFirewallTest :
                         vpc = vpc,
                         subnetMappings = SubnetPredicates.publicSubnets(),
                         firewallName = "MyFirewall",
-                        firewallPolicy = firewallPolicy
-                    )
+                        firewallPolicy = firewallPolicy)
             }
 
             val resources = ctx.stack.resources
@@ -75,8 +74,7 @@ class NetworkFirewallTest :
         }
       }
                } """
-                            .trimIndent()
-                    )
+                            .trimIndent())
                 }
                 resources.filterByType("AWS::EC2::InternetGateway").shouldBeSingleton()
                 resources
@@ -92,8 +90,7 @@ class NetworkFirewallTest :
                 resources.filterByType("AWS::EC2::NatGateway").shouldHaveSize(2)
 
                 ctx.shouldEqualJsonResource(
-                    "/cloudshift/awscdk/networkfirewall/NetworkFirewall-simple.json"
-                )
+                    "/cloudshift/awscdk/networkfirewall/NetworkFirewall-simple.json")
             }
         }
     })
diff --git a/src/test/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/SecureNetworkTest.kt b/src/test/kotlin/io/cloudshiftdev/awscdklib/network/securenetwork/SecureNetworkTest.kt
@@ -51,8 +51,7 @@ internal class SecureNetworkTest : FunSpec() {
                 resources.filterByType("AWS::EC2::NatGateway").shouldHaveSize(2)
 
                 ctx.shouldEqualJsonResource(
-                    "/cloudshift/awscdk/securevpc/SecureNetworkTest-simple.json"
-                )
+                    "/cloudshift/awscdk/securevpc/SecureNetworkTest-simple.json")
             }
         }
 
@@ -96,8 +95,7 @@ internal class SecureNetworkTest : FunSpec() {
                 resources.filterByType("AWS::EC2::NatGateway").shouldHaveSize(2)
 
                 ctx.shouldEqualJsonResource(
-                    "/cloudshift/awscdk/securevpc/SecureNetworkTest-NetworkFirewall.json"
-                )
+                    "/cloudshift/awscdk/securevpc/SecureNetworkTest-NetworkFirewall.json")
             }
         }
     }
diff --git a/src/test/kotlin/io/cloudshiftdev/awscdklib/s3/S3BucketTest.kt b/src/test/kotlin/io/cloudshiftdev/awscdklib/s3/S3BucketTest.kt
@@ -44,8 +44,7 @@ class S3BucketTest : FunSpec() {
                         "DeletionPolicy": "Retain"
                     }
                     """
-                        .trimIndent()
-                )
+                        .trimIndent())
             }
         }
     }
diff --git a/src/testFixtures/kotlin/io/cloudshiftdev/awscdklib/testing/CdkTestBuilder.kt b/src/testFixtures/kotlin/io/cloudshiftdev/awscdklib/testing/CdkTestBuilder.kt
@@ -36,8 +36,7 @@ fun Collection<*>.toJsonElement(): JsonElement = JsonArray(mapNotNull { it.toJso
 fun Map<*, *>.toJsonElement(): JsonElement =
     JsonObject(
         mapNotNull { (it.key as? String ?: return@mapNotNull null) to it.value.toJsonElement() }
-            .toMap()
-    )
+            .toMap())
 
 fun Any?.toJsonElement(): JsonElement =
     when (this) {
diff --git a/src/testFixtures/kotlin/io/cloudshiftdev/awscdklib/testing/ResourceTransformingSerializer.kt b/src/testFixtures/kotlin/io/cloudshiftdev/awscdklib/testing/ResourceTransformingSerializer.kt
@@ -35,8 +35,7 @@ object ResourceTransformingSerializer : JsonTransformingSerializer<List<Resource
                                 tags.associate {
                                     it.jsonObject["Key"]!!.jsonPrimitive.content to
                                         it.jsonObject["Value"]!!
-                                }
-                            )
+                                })
                     }
                     val propsMap = props.toMutableMap()
                     propsMap.remove("Tags")

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public fun Vpc.attachInternetGateway(): CfnInternetGateway {`
`20`	`20`	`}`
`21`	`21`	`return igw`
`22`	`22`	`}`
	`23`	`+`
`23`	`24`	`/*`
`24`	`25`
`25`	`26`	`public fun Vpc.deleteDefaultNetworkAcls() {`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ public class SecureNetwork(scope: Construct, id: String, block: (SecureNetworkBu`
`61`	`61`	`LogFormat.PKT_SRC_AWS_SERVICE,`
`62`	`62`	`LogFormat.PKT_DST_AWS_SERVICE,`
`63`	`63`	`LogFormat.FLOW_DIRECTION,`
`64`		`- LogFormat.TRAFFIC_PATH`
`65`		`- )`
	`64`	`+ LogFormat.TRAFFIC_PATH)`
`66`	`65`	`}`
`67`	`66`	`}`
`68`	`67`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,7 @@ internal class SecureNetworkBuilderImpl : SecureNetworkBuilder {`
`82`	`82`	`defaultInstanceTenancy = this.defaultInstanceTenancy,`
`83`	`83`	`createInternetGateway = this.createInternetGateway,`
`84`	`84`	`subnetGroups = subnetsBuilder.build(),`
`85`		`- routerProviders = routersBuilder.build()`
`86`		`- )`
	`85`	`+ routerProviders = routersBuilder.build())`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`override fun availabilityZones(azs: List<String>) {`
`@@ -344,8 +343,7 @@ internal class NatGatewayRouterBuilderImpl : BaseNatRouterBuilder(), NatGatewayR`
`344`	`343`	`return NatRouterProvider(`
`345`	`344`	`routerSubnet = routerSubnet ?: SubnetPredicates.publicSubnets(),`
`346`	`345`	`natGatewayCount = natGateways,`
`347`		`- NatProvider.gateway(props)`
`348`		`- )`
	`346`	`+ NatProvider.gateway(props))`
`349`	`347`	`}`
`350`	`348`	`}`
`351`	`349`
`@@ -360,8 +358,7 @@ internal class NatInstanceRouterBuilderImpl : BaseNatRouterBuilder(), NatInstanc`
`360`	`358`	`return NatRouterProvider(`
`361`	`359`	`routerSubnet = routerSubnet ?: SubnetPredicates.publicSubnets(),`
`362`	`360`	`natGatewayCount = natGateways,`
`363`		`- NatProvider.instanceV2(props)`
`364`		`- )`
	`361`	`+ NatProvider.instanceV2(props))`
`365`	`362`	`}`
`366`	`363`	`}`
`367`	`364`
`@@ -371,10 +368,7 @@ internal class NetworkFirewallRouterBuilderImpl :`
`371`	`368`
`372`	`369`	`fun build(): RouterProvider {`
`373`	`370`	`return EgressNetworkFirewallRouterProvider(`
`374`		`- routerSubnet ?: SubnetPredicates.privateSubnets(),`
`375`		`- routableSubnets,`
`376`		`- egressSubnets`
`377`		`- )`
	`371`	`+ routerSubnet ?: SubnetPredicates.privateSubnets(), routableSubnets, egressSubnets)`
`378`	`372`	`}`
`379`	`373`
`380`	`374`	`override fun egressSubnets(subnetSelections: List<SubnetSelection>) {`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ class NetworkFirewallTest :`
`33`	`33`	`vpc = vpc,`
`34`	`34`	`subnetMappings = SubnetPredicates.publicSubnets(),`
`35`	`35`	`firewallName = "MyFirewall",`
`36`		`- firewallPolicy = firewallPolicy`
`37`		`- )`
	`36`	`+ firewallPolicy = firewallPolicy)`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`val resources = ctx.stack.resources`
`@@ -75,8 +74,7 @@ class NetworkFirewallTest :`
`75`	`74`	`}`
`76`	`75`	`}`
`77`	`76`	`} """`
`78`		`- .trimIndent()`
`79`		`- )`
	`77`	`+ .trimIndent())`
`80`	`78`	`}`
`81`	`79`	`resources.filterByType("AWS::EC2::InternetGateway").shouldBeSingleton()`
`82`	`80`	`resources`
`@@ -92,8 +90,7 @@ class NetworkFirewallTest :`
`92`	`90`	`resources.filterByType("AWS::EC2::NatGateway").shouldHaveSize(2)`
`93`	`91`
`94`	`92`	`ctx.shouldEqualJsonResource(`
`95`		`- "/cloudshift/awscdk/networkfirewall/NetworkFirewall-simple.json"`
`96`		`- )`
	`93`	`+ "/cloudshift/awscdk/networkfirewall/NetworkFirewall-simple.json")`
`97`	`94`	`}`
`98`	`95`	`}`
`99`	`96`	`})`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ internal class SecureNetworkTest : FunSpec() {`
`51`	`51`	`resources.filterByType("AWS::EC2::NatGateway").shouldHaveSize(2)`
`52`	`52`
`53`	`53`	`ctx.shouldEqualJsonResource(`
`54`		`- "/cloudshift/awscdk/securevpc/SecureNetworkTest-simple.json"`
`55`		`- )`
	`54`	`+ "/cloudshift/awscdk/securevpc/SecureNetworkTest-simple.json")`
`56`	`55`	`}`
`57`	`56`	`}`
`58`	`57`
`@@ -96,8 +95,7 @@ internal class SecureNetworkTest : FunSpec() {`
`96`	`95`	`resources.filterByType("AWS::EC2::NatGateway").shouldHaveSize(2)`
`97`	`96`
`98`	`97`	`ctx.shouldEqualJsonResource(`
`99`		`- "/cloudshift/awscdk/securevpc/SecureNetworkTest-NetworkFirewall.json"`
`100`		`- )`
	`98`	`+ "/cloudshift/awscdk/securevpc/SecureNetworkTest-NetworkFirewall.json")`
`101`	`99`	`}`
`102`	`100`	`}`
`103`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ class S3BucketTest : FunSpec() {`
`44`	`44`	`"DeletionPolicy": "Retain"`
`45`	`45`	`}`
`46`	`46`	`"""`
`47`		`- .trimIndent()`
`48`		`- )`
	`47`	`+ .trimIndent())`
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`	`}`