feat: add support to define destination cidr

ticketplushq · Aug 7, 2023 · 9f5a457 · 9f5a457
1 parent 4eeac38
commit 9f5a457
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -36,6 +36,8 @@ The `@static-ip` pragma allows you to configure the network configuration.
 - The `ips` entry allow you to define number of ips
 - The `private-subnets` entry allow you to define each private subnet cidr
 - The `public-subnets` entry allow you to define each public subnet cidr
+- The `destination-cidr` entry allow to define destination cidr for public route table
+  * The default value is `0.0.0.0/0`
 
 #### Example
 

diff --git a/src/_get-static-ip-options.js b/src/_get-static-ip-options.js
@@ -9,6 +9,7 @@ module.exports = (staticIp) => {
   let privateSubnets = []
   let publicSubnets = []
   let ips = 1
+  let destinationCidr = '0.0.0.0/0'
 
   if (staticIp) {
     const privateIndex = staticIp.findIndex((param) => param['private-subnets'])
@@ -36,11 +37,18 @@ module.exports = (staticIp) => {
         throw ReferenceError(`Invalid static ip params: Number of ips (${ips}) is greater than the number of public subnets (${publicSubnets.length})`)
       }
     }
+
+    const destinationCidrIndex = staticIp.findIndex((param) => Array.isArray(param) && param[0] == 'destination-cidr')
+    if (destinationCidrIndex >= 0) {
+      destinationCidr = staticIp[destinationCidrIndex][1]
+      validateCidr(destinationCidr)
+    }
   }
 
   return {
     privateSubnets,
     publicSubnets,
-    ips
+    ips,
+    destinationCidr
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -10,7 +10,7 @@ module.exports = {
       const staticIp = arc['static-ip']
       if (!staticIp) return cfn
 
-      const { privateSubnets, publicSubnets, ips } = getStaticIpOptions(staticIp)
+      const { privateSubnets, publicSubnets, ips, destinationCidr } = getStaticIpOptions(staticIp)
 
       cfn.Resources['VPC'] = {
         Type: 'AWS::EC2::VPC',
@@ -52,7 +52,7 @@ module.exports = {
         Type: 'AWS::EC2::Route',
         Properties: {
           RouteTableId: { Ref: 'PublicRouteTable' },
-          DestinationCidrBlock: '0.0.0.0/0',
+          DestinationCidrBlock: destinationCidr,
           GatewayId: { Ref: 'InternetGateway' }
         },
         DependsOn: 'AttachGateway'

diff --git a/test/unit/src/_get-static-ip-options-test.js b/test/unit/src/_get-static-ip-options-test.js
@@ -31,6 +31,45 @@ public-subnets
   t.deepEqual(publicSubnets, expectedPublicSubnets, 'Got correct public subnets')
 })
 
+test('Specify destination cidr', async (t) => {
+  t.plan(1)
+  let rawArc = `
+@app
+app
+@static-ip
+private-subnets
+  10.0.1.0/24
+  10.0.2.0/24
+public-subnets
+  10.0.3.0/24
+  10.0.4.0/24
+destination-cidr 1.0.10.0/24
+`
+  let { inv } = await _inventory({ rawArc })
+  let arc = inv._project.arc
+  let { destinationCidr } = getStaticIpOptions(arc['static-ip'])
+  t.equal(destinationCidr, '1.0.10.0/24', 'Got correct destination cidr')
+})
+
+test('Get default destination cidr', async (t) => {
+  t.plan(1)
+  let rawArc = `
+@app
+app
+@static-ip
+private-subnets
+  10.0.1.0/24
+  10.0.2.0/24
+public-subnets
+  10.0.3.0/24
+  10.0.4.0/24
+`
+  let { inv } = await _inventory({ rawArc })
+  let arc = inv._project.arc
+  let { destinationCidr } = getStaticIpOptions(arc['static-ip'])
+  t.equal(destinationCidr, '0.0.0.0/0', 'Got correct default destination cidr')
+})
+
 test('Custom number of ips', async (t) => {
   t.plan(1)
   let rawArc = `