Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

service/vpn: tech debt: replace custom validation functions #13022

Merged
merged 2 commits into from
May 12, 2020
Merged

service/vpn: tech debt: replace custom validation functions #13022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cab2bd
service/vpn: tech debt: replace custom validation functions
megubyte Apr 25, 2020
691e2de
r/vpn_connection: Remove case-insensitive mode parameter
megubyte May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 27 additions & 54 deletions aws/resource_aws_vpn_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ import (
"encoding/xml"
"fmt"
"log"
"net"
"regexp"
"sort"
"strings"
"time"

"github.com/aws/aws-sdk-go/aws"
Expand All @@ -17,6 +15,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
)

Expand Down Expand Up @@ -114,7 +113,7 @@ func resourceAwsVpnConnection() *schema.Resource {
Optional: true,
Computed: true,
ForceNew: true,
ValidateFunc: validateVpnConnectionTunnelInsideCIDR,
ValidateFunc: validateVpnConnectionTunnelInsideCIDR(),
},

"tunnel1_preshared_key": {
Expand All @@ -123,15 +122,15 @@ func resourceAwsVpnConnection() *schema.Resource {
Sensitive: true,
Computed: true,
ForceNew: true,
ValidateFunc: validateVpnConnectionTunnelPreSharedKey,
ValidateFunc: validateVpnConnectionTunnelPreSharedKey(),
},

"tunnel2_inside_cidr": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ForceNew: true,
ValidateFunc: validateVpnConnectionTunnelInsideCIDR,
ValidateFunc: validateVpnConnectionTunnelInsideCIDR(),
},

"tunnel2_preshared_key": {
Expand All @@ -140,7 +139,7 @@ func resourceAwsVpnConnection() *schema.Resource {
Sensitive: true,
Computed: true,
ForceNew: true,
ValidateFunc: validateVpnConnectionTunnelPreSharedKey,
ValidateFunc: validateVpnConnectionTunnelPreSharedKey(),
},

"tags": tagsSchema(),
Expand Down Expand Up @@ -618,55 +617,29 @@ func xmlConfigToTunnelInfo(xmlConfig string) (*TunnelInfo, error) {
return &tunnelInfo, nil
}

func validateVpnConnectionTunnelPreSharedKey(v interface{}, k string) (ws []string, errors []error) {
value := v.(string)

if (len(value) < 8) || (len(value) > 64) {
errors = append(errors, fmt.Errorf("%q must be between 8 and 64 characters in length", k))
}

if strings.HasPrefix(value, "0") {
errors = append(errors, fmt.Errorf("%q cannot start with zero character", k))
}

if !regexp.MustCompile(`^[0-9a-zA-Z_.]+$`).MatchString(value) {
errors = append(errors, fmt.Errorf("%q can only contain alphanumeric, period and underscore characters", k))
}

return
func validateVpnConnectionTunnelPreSharedKey() schema.SchemaValidateFunc {
return validation.All(
validation.StringLenBetween(8, 64),
validation.StringDoesNotMatch(regexp.MustCompile(`(?i)^0`), "cannot start with zero character"),
anGie44 marked this conversation as resolved.
Show resolved Hide resolved
validation.StringMatch(regexp.MustCompile(`^[0-9a-zA-Z_.]+$`), "can only contain alphanumeric, period and underscore characters"),
)
}

// https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_VpnTunnelOptionsSpecification.html
func validateVpnConnectionTunnelInsideCIDR(v interface{}, k string) (ws []string, errors []error) {
value := v.(string)
_, ipnet, err := net.ParseCIDR(value)

if err != nil {
errors = append(errors, fmt.Errorf("%q must contain a valid CIDR, got error parsing: %s", k, err))
return
}

if !strings.HasSuffix(ipnet.String(), "/30") {
errors = append(errors, fmt.Errorf("%q must be /30 CIDR", k))
}

if !strings.HasPrefix(ipnet.String(), "169.254.") {
errors = append(errors, fmt.Errorf("%q must be within 169.254.0.0/16", k))
} else if ipnet.String() == "169.254.0.0/30" {
errors = append(errors, fmt.Errorf("%q cannot be 169.254.0.0/30", k))
} else if ipnet.String() == "169.254.1.0/30" {
errors = append(errors, fmt.Errorf("%q cannot be 169.254.1.0/30", k))
} else if ipnet.String() == "169.254.2.0/30" {
errors = append(errors, fmt.Errorf("%q cannot be 169.254.2.0/30", k))
} else if ipnet.String() == "169.254.3.0/30" {
errors = append(errors, fmt.Errorf("%q cannot be 169.254.3.0/30", k))
} else if ipnet.String() == "169.254.4.0/30" {
errors = append(errors, fmt.Errorf("%q cannot be 169.254.4.0/30", k))
} else if ipnet.String() == "169.254.5.0/30" {
errors = append(errors, fmt.Errorf("%q cannot be 169.254.5.0/30", k))
} else if ipnet.String() == "169.254.169.252/30" {
errors = append(errors, fmt.Errorf("%q cannot be 169.254.169.252/30", k))
}

return
func validateVpnConnectionTunnelInsideCIDR() schema.SchemaValidateFunc {
disallowedCidrs := []string{
"169.254.0.0/30",
"169.254.1.0/30",
"169.254.2.0/30",
"169.254.3.0/30",
"169.254.4.0/30",
"169.254.5.0/30",
"169.254.169.252/30",
}

return validation.All(
validation.IsCIDRNetwork(30, 30),
validation.StringMatch(regexp.MustCompile(`^169\.254\.`), "must be within 169.254.0.0/16"),
validation.StringNotInSlice(disallowedCidrs, false),
)
}
23 changes: 12 additions & 11 deletions aws/resource_aws_vpn_connection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ func TestAccAWSVpnConnection_TransitGatewayID(t *testing.T) {
}

func TestAccAWSVpnConnection_tunnelOptions(t *testing.T) {
badCidrRangeErr := regexp.MustCompile(`expected \w+ to not be any of \[[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/30\s?]+\]`)
rBgpAsn := acctest.RandIntRange(64512, 65534)
resourceName := "aws_vpn_connection.test"
var vpn ec2.VpnConnection
Expand All @@ -153,53 +154,53 @@ func TestAccAWSVpnConnection_tunnelOptions(t *testing.T) {
// Checking CIDR blocks
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "not-a-cidr"),
ExpectError: regexp.MustCompile(`must contain a valid CIDR`),
ExpectError: regexp.MustCompile(`invalid CIDR address: not-a-cidr`),
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "169.254.254.0/31"),
ExpectError: regexp.MustCompile(`must be /30 CIDR`),
ExpectError: regexp.MustCompile(`expected "\w+" to contain a network Value with between 30 and 30 significant bits`),
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "172.16.0.0/30"),
ExpectError: regexp.MustCompile(`must be within 169.254.0.0/16`),
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "169.254.0.0/30"),
ExpectError: regexp.MustCompile(`cannot be 169.254.0.0/30`),
ExpectError: badCidrRangeErr,
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "169.254.1.0/30"),
ExpectError: regexp.MustCompile(`cannot be 169.254.1.0/30`),
ExpectError: badCidrRangeErr,
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "169.254.2.0/30"),
ExpectError: regexp.MustCompile(`cannot be 169.254.2.0/30`),
ExpectError: badCidrRangeErr,
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "169.254.3.0/30"),
ExpectError: regexp.MustCompile(`cannot be 169.254.3.0/30`),
ExpectError: badCidrRangeErr,
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "169.254.4.0/30"),
ExpectError: regexp.MustCompile(`cannot be 169.254.4.0/30`),
ExpectError: badCidrRangeErr,
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "169.254.5.0/30"),
ExpectError: regexp.MustCompile(`cannot be 169.254.5.0/30`),
ExpectError: badCidrRangeErr,
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "12345678", "169.254.169.252/30"),
ExpectError: regexp.MustCompile(`cannot be 169.254.169.252/30`),
ExpectError: badCidrRangeErr,
},

// Checking PreShared Key
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "1234567", "169.254.254.0/30"),
ExpectError: regexp.MustCompile(`must be between 8 and 64 characters in length`),
ExpectError: regexp.MustCompile(`expected length of \w+ to be in the range \(8 - 64\)`),
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, acctest.RandStringFromCharSet(65, acctest.CharSetAlpha), "169.254.254.0/30"),
ExpectError: regexp.MustCompile(`must be between 8 and 64 characters in length`),
ExpectError: regexp.MustCompile(`expected length of \w+ to be in the range \(8 - 64\)`),
},
{
Config: testAccAwsVpnConnectionConfigSingleTunnelOptions(rBgpAsn, "01234567", "169.254.254.0/30"),
Expand Down