Merge pull request #190 from phylake/master

fix validation for longer resource IDs
adobe-platform · Aug 24, 2018 · fcf7460 · fcf7460
2 parents 6d8d132 + ece1ea7
commit fcf7460
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 `porter` is [semantically versioned](http://semver.org/spec/v2.0.0.html)
 
+### v5.2.2
+
+- fix regex validation which didn't support longer resource IDs
+
 ### v5.2.1
 
 - revert Go 1.10.3 to 1.8.7 which appears to fix hooks from being ran as noops

diff --git a/conf/conf.go b/conf/conf.go
@@ -47,8 +47,8 @@ var (
 	environmentNameRegex = regexp.MustCompile(`^[0-9a-zA-Z]+$`)
 	healthMethodRegex    = regexp.MustCompile(`^GET$`)
 	porterVersionRegex   = regexp.MustCompile(`^v\d+\.\d+\.\d+$`)
-	vpcIdRegex           = regexp.MustCompile(`^vpc-(\d|\w){8}$`)
-	subnetIdRegex        = regexp.MustCompile(`^subnet-(\d|\w){8}$`)
+	vpcIdRegex           = regexp.MustCompile(`^vpc-([a-z0-9]{8}|[a-z0-9]{17})$`)
+	subnetIdRegex        = regexp.MustCompile(`^subnet-([a-z0-9]{8}|[a-z0-9]{17})$`)
 	commonNameRegex      = regexp.MustCompile(`^(\w+\.)?[a-z]+$`)
 	regionRegex          = regexp.MustCompile(`^[a-z]{2}-[a-z]+-\d$`)
 	instanceTypeRegex    = regexp.MustCompile(`^[a-z0-9]{2}\.[a-z0-9]+$`)