diff --git a/example/test/__snapshots__/main.test.ts.snap b/example/test/__snapshots__/main.test.ts.snap index 67ed51f..5fbad1b 100644 --- a/example/test/__snapshots__/main.test.ts.snap +++ b/example/test/__snapshots__/main.test.ts.snap @@ -446,6 +446,30 @@ Object { }, "Type": "AWS::EC2::Route", }, + "VpcPrivateSubnet1Routev420217135432D6C5308F": Object { + "Properties": Object { + "DestinationCidrBlock": "20.217.135.4/32", + "NetworkInterfaceId": Object { + "Ref": "VpcPublicSubnet1ENI19CFC6EA2", + }, + "RouteTableId": Object { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500", + }, + }, + "Type": "AWS::EC2::Route", + }, + "VpcPrivateSubnet1Routev4202171355324A167654": Object { + "Properties": Object { + "DestinationCidrBlock": "20.217.135.5/32", + "NetworkInterfaceId": Object { + "Ref": "VpcPublicSubnet1ENI19CFC6EA2", + }, + "RouteTableId": Object { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500", + }, + }, + "Type": "AWS::EC2::Route", + }, "VpcPrivateSubnet1Routev4202338314532BB4620DB": Object { "Properties": Object { "DestinationCidrBlock": "20.233.83.145/32", @@ -590,6 +614,30 @@ Object { }, "Type": "AWS::EC2::Route", }, + "VpcPrivateSubnet1Routev4422511198326CDB9080": Object { + "Properties": Object { + "DestinationCidrBlock": "4.225.11.198/32", + "NetworkInterfaceId": Object { + "Ref": "VpcPublicSubnet1ENI19CFC6EA2", + }, + "RouteTableId": Object { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500", + }, + }, + "Type": "AWS::EC2::Route", + }, + "VpcPrivateSubnet1Routev442251120032D7E74D74": Object { + "Properties": Object { + "DestinationCidrBlock": "4.225.11.200/32", + "NetworkInterfaceId": Object { + "Ref": "VpcPublicSubnet1ENI19CFC6EA2", + }, + "RouteTableId": Object { + "Ref": "VpcPrivateSubnet1RouteTableB2C5B500", + }, + }, + "Type": "AWS::EC2::Route", + }, "VpcPrivateSubnet1Routev4423722383282E6406C": Object { "Properties": Object { "DestinationCidrBlock": "4.237.22.38/32", @@ -875,6 +923,30 @@ Object { }, "Type": "AWS::EC2::Route", }, + "VpcPrivateSubnet2Routev420217135432E035D4EB": Object { + "Properties": Object { + "DestinationCidrBlock": "20.217.135.4/32", + "NetworkInterfaceId": Object { + "Ref": "VpcPublicSubnet2ENI1B54F9B30", + }, + "RouteTableId": Object { + "Ref": "VpcPrivateSubnet2RouteTableA678073B", + }, + }, + "Type": "AWS::EC2::Route", + }, + "VpcPrivateSubnet2Routev4202171355326A7F529B": Object { + "Properties": Object { + "DestinationCidrBlock": "20.217.135.5/32", + "NetworkInterfaceId": Object { + "Ref": "VpcPublicSubnet2ENI1B54F9B30", + }, + "RouteTableId": Object { + "Ref": "VpcPrivateSubnet2RouteTableA678073B", + }, + }, + "Type": "AWS::EC2::Route", + }, "VpcPrivateSubnet2Routev4202338314532DACB293A": Object { "Properties": Object { "DestinationCidrBlock": "20.233.83.145/32", @@ -1019,6 +1091,30 @@ Object { }, "Type": "AWS::EC2::Route", }, + "VpcPrivateSubnet2Routev442251119832EA56C92F": Object { + "Properties": Object { + "DestinationCidrBlock": "4.225.11.198/32", + "NetworkInterfaceId": Object { + "Ref": "VpcPublicSubnet2ENI1B54F9B30", + }, + "RouteTableId": Object { + "Ref": "VpcPrivateSubnet2RouteTableA678073B", + }, + }, + "Type": "AWS::EC2::Route", + }, + "VpcPrivateSubnet2Routev442251120032A33540FF": Object { + "Properties": Object { + "DestinationCidrBlock": "4.225.11.200/32", + "NetworkInterfaceId": Object { + "Ref": "VpcPublicSubnet2ENI1B54F9B30", + }, + "RouteTableId": Object { + "Ref": "VpcPrivateSubnet2RouteTableA678073B", + }, + }, + "Type": "AWS::EC2::Route", + }, "VpcPrivateSubnet2Routev44237223832ABB97160": Object { "Properties": Object { "DestinationCidrBlock": "4.237.22.38/32", @@ -1164,7 +1260,7 @@ Object { }, "Type": "AWS::EC2::NatGateway", }, - "VpcPublicSubnet1NatInstance57B636B84881b7056e2e754c": Object { + "VpcPublicSubnet1NatInstance57B636B894cb38c7cf75e967": Object { "CreationPolicy": Object { "ResourceSignal": Object { "Count": 1, @@ -1236,7 +1332,7 @@ User=sshuttle Restart=always Type=forking WorkingDirectory=/home/sshuttle -ExecStart=/usr/local/bin/sshuttle -D --listen 0.0.0.0:0 -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /home/sshuttle/.ssh/id_rsa_remote' -r $REMOTE_HOST 192.30.252.0/22 185.199.108.0/22 140.82.112.0/20 143.55.64.0/20 20.201.28.151/32 20.205.243.166/32 20.87.245.0/32 4.237.22.38/32 20.207.73.82/32 20.27.177.113/32 20.200.245.247/32 20.175.192.147/32 20.233.83.145/32 20.29.134.23/32 20.199.39.232/32 4.208.26.197/32 20.26.156.215/32 20.201.28.152/32 20.205.243.160/32 20.87.245.4/32 4.237.22.40/32 20.207.73.83/32 20.27.177.118/32 20.200.245.248/32 20.175.192.146/32 20.233.83.149/32 20.29.134.19/32 20.199.39.227/32 4.208.26.198/32 20.26.156.214/32 +ExecStart=/usr/local/bin/sshuttle -D --listen 0.0.0.0:0 -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /home/sshuttle/.ssh/id_rsa_remote' -r $REMOTE_HOST 192.30.252.0/22 185.199.108.0/22 140.82.112.0/20 143.55.64.0/20 20.201.28.151/32 20.205.243.166/32 20.87.245.0/32 4.237.22.38/32 20.207.73.82/32 20.27.177.113/32 20.200.245.247/32 20.175.192.147/32 20.233.83.145/32 20.29.134.23/32 20.199.39.232/32 20.217.135.5/32 4.225.11.198/32 4.208.26.197/32 20.26.156.215/32 20.201.28.152/32 20.205.243.160/32 20.87.245.4/32 4.237.22.40/32 20.207.73.83/32 20.27.177.118/32 20.200.245.248/32 20.175.192.146/32 20.233.83.149/32 20.29.134.19/32 20.199.39.227/32 20.217.135.4/32 4.225.11.200/32 4.208.26.198/32 20.26.156.214/32 ExecStop=killall sshuttle [Install] WantedBy=multi-user.target @@ -1384,7 +1480,7 @@ systemctl restart amazon-ssm-agent.service", "", Array [ "#!/bin/bash -# fingerprint: 2d83859fde5fabfe +# fingerprint: 91a14725a6e19037 ( set +e /opt/aws/bin/cfn-init -v --region ", @@ -1395,7 +1491,7 @@ systemctl restart amazon-ssm-agent.service", Object { "Ref": "AWS::StackName", }, - " --resource VpcPublicSubnet1NatInstance57B636B84881b7056e2e754c -c default + " --resource VpcPublicSubnet1NatInstance57B636B894cb38c7cf75e967 -c default /opt/aws/bin/cfn-signal -e $? --region ", Object { "Ref": "AWS::Region", @@ -1404,7 +1500,7 @@ systemctl restart amazon-ssm-agent.service", Object { "Ref": "AWS::StackName", }, - " --resource VpcPublicSubnet1NatInstance57B636B84881b7056e2e754c + " --resource VpcPublicSubnet1NatInstance57B636B894cb38c7cf75e967 cat /var/log/cfn-init.log >&2 )", ], @@ -1583,7 +1679,7 @@ systemctl restart amazon-ssm-agent.service", }, "Type": "AWS::EC2::NatGateway", }, - "VpcPublicSubnet2NatInstance746890A79464b9321bacaace": Object { + "VpcPublicSubnet2NatInstance746890A742934bd20cfb521e": Object { "CreationPolicy": Object { "ResourceSignal": Object { "Count": 1, @@ -1655,7 +1751,7 @@ User=sshuttle Restart=always Type=forking WorkingDirectory=/home/sshuttle -ExecStart=/usr/local/bin/sshuttle -D --listen 0.0.0.0:0 -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /home/sshuttle/.ssh/id_rsa_remote' -r $REMOTE_HOST 192.30.252.0/22 185.199.108.0/22 140.82.112.0/20 143.55.64.0/20 20.201.28.151/32 20.205.243.166/32 20.87.245.0/32 4.237.22.38/32 20.207.73.82/32 20.27.177.113/32 20.200.245.247/32 20.175.192.147/32 20.233.83.145/32 20.29.134.23/32 20.199.39.232/32 4.208.26.197/32 20.26.156.215/32 20.201.28.152/32 20.205.243.160/32 20.87.245.4/32 4.237.22.40/32 20.207.73.83/32 20.27.177.118/32 20.200.245.248/32 20.175.192.146/32 20.233.83.149/32 20.29.134.19/32 20.199.39.227/32 4.208.26.198/32 20.26.156.214/32 +ExecStart=/usr/local/bin/sshuttle -D --listen 0.0.0.0:0 -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /home/sshuttle/.ssh/id_rsa_remote' -r $REMOTE_HOST 192.30.252.0/22 185.199.108.0/22 140.82.112.0/20 143.55.64.0/20 20.201.28.151/32 20.205.243.166/32 20.87.245.0/32 4.237.22.38/32 20.207.73.82/32 20.27.177.113/32 20.200.245.247/32 20.175.192.147/32 20.233.83.145/32 20.29.134.23/32 20.199.39.232/32 20.217.135.5/32 4.225.11.198/32 4.208.26.197/32 20.26.156.215/32 20.201.28.152/32 20.205.243.160/32 20.87.245.4/32 4.237.22.40/32 20.207.73.83/32 20.27.177.118/32 20.200.245.248/32 20.175.192.146/32 20.233.83.149/32 20.29.134.19/32 20.199.39.227/32 20.217.135.4/32 4.225.11.200/32 4.208.26.198/32 20.26.156.214/32 ExecStop=killall sshuttle [Install] WantedBy=multi-user.target @@ -1803,7 +1899,7 @@ systemctl restart amazon-ssm-agent.service", "", Array [ "#!/bin/bash -# fingerprint: abc41bee2b577c66 +# fingerprint: 6e7f7bcc9149a2e7 ( set +e /opt/aws/bin/cfn-init -v --region ", @@ -1814,7 +1910,7 @@ systemctl restart amazon-ssm-agent.service", Object { "Ref": "AWS::StackName", }, - " --resource VpcPublicSubnet2NatInstance746890A79464b9321bacaace -c default + " --resource VpcPublicSubnet2NatInstance746890A742934bd20cfb521e -c default /opt/aws/bin/cfn-signal -e $? --region ", Object { "Ref": "AWS::Region", @@ -1823,7 +1919,7 @@ systemctl restart amazon-ssm-agent.service", Object { "Ref": "AWS::StackName", }, - " --resource VpcPublicSubnet2NatInstance746890A79464b9321bacaace + " --resource VpcPublicSubnet2NatInstance746890A742934bd20cfb521e cat /var/log/cfn-init.log >&2 )", ], @@ -1952,6 +2048,12 @@ systemctl restart amazon-ssm-agent.service", ], ], }, + "Tags": Array [ + Object { + "Key": "Name", + "Value": "test/Vpc", + }, + ], "VpcEndpointType": "Gateway", "VpcId": Object { "Ref": "Vpc8378EB38", @@ -1987,6 +2089,12 @@ systemctl restart amazon-ssm-agent.service", ], ], }, + "Tags": Array [ + Object { + "Key": "Name", + "Value": "test/Vpc", + }, + ], "VpcEndpointType": "Gateway", "VpcId": Object { "Ref": "Vpc8378EB38",