ec2: correctly map vpn error message

Author: markpeek

tests/test_ec2.py

@@ -143,6 +143,12 @@ def test_vpn_conn_tunnel_options_specification(self):
                 PreSharedKey="0SAD_FEA_SDF", TunnelInsideCidr="192.168.16.0/30"
             )
 
+    def test_vpn_port_validator(self):
+        for port in (443, 1194):
+            vec2.validate_clientvpnendpoint_vpnport(port)
+        with self.assertRaises(ValueError):
+            vec2.validate_clientvpnendpoint_vpnport(22)
+
     def test_validate_placement_strategy(self):
         for s in ("cluster", "spread", "partition"):
             vec2.validate_placement_strategy(s)

troposphere/validators/ec2.py

@@ -188,7 +188,7 @@ def validate_clientvpnendpoint_vpnport(vpnport):
     if vpnport not in VALID_CLIENTVPNENDPOINT_VPNPORT:
         raise ValueError(
             "ClientVpnEndpoint VpnPort must be one of: %s"
-            % ", ".join(VALID_CLIENTVPNENDPOINT_VPNPORT)
+            % ", ".join(map(str, VALID_CLIENTVPNENDPOINT_VPNPORT))
         )
     return vpnport