Merge pull request #12 from mineiros-io/mariux/fix

fix: members validation
mineiros-io · Mar 14, 2022 · 2a74362 · 2a74362
2 parents c81d1ee + 16f4a58
commit 2a74362
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.4]
+
+### Fixed
+
+- Fix validation to `members` variable
+
 ## [0.0.3]
 
 ### Added
@@ -17,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-Add validation to `var.members` variable to catch exceptions on `terraform plan`
+- Add validation to `members` variable to catch exceptions on `terraform plan`
 
 ## [0.0.1]
 
@@ -27,7 +33,8 @@ Add validation to `var.members` variable to catch exceptions on `terraform plan`
 
 <!-- markdown-link-check-disable -->
 
-[unreleased]: https://github.com/mineiros-io/terraform-google-pubsub-topic-iam/compare/v0.0.3...HEAD
+[unreleased]: https://github.com/mineiros-io/terraform-google-pubsub-topic-iam/compare/v0.0.4...HEAD
+[0.0.4]: https://github.com/mineiros-io/terraform-google-pubsub-topic-iam/compare/v0.0.3...v0.0.4
 [0.0.3]: https://github.com/mineiros-io/terraform-google-pubsub-topic-iam/compare/v0.0.2...v0.0.3
 [0.0.2]: https://github.com/mineiros-io/terraform-google-pubsub-topic-iam/compare/v0.0.1...v0.0.2
 

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ Most basic usage just setting required arguments:
 
 ```hcl
 module "terraform-google-pubsub-topic-iam" {
-  source = "github.com/mineiros-io/terraform-google-pubsub-topic-iam?ref=v0.0.3"
+  source = "github.com/mineiros-io/terraform-google-pubsub-topic-iam?ref=v0.0.4"
 
   topic   = "example-topic"
   role    = "roles/editor"

diff --git a/README.tfdoc.hcl b/README.tfdoc.hcl
@@ -65,7 +65,7 @@ section {
 
       ```hcl
       module "terraform-google-pubsub-topic-iam" {
-        source = "github.com/mineiros-io/terraform-google-pubsub-topic-iam?ref=v0.0.3"
+        source = "github.com/mineiros-io/terraform-google-pubsub-topic-iam?ref=v0.0.4"
 
         topic   = "example-topic"
         role    = "roles/editor"

diff --git a/variables.tf b/variables.tf
@@ -31,7 +31,7 @@ variable "members" {
   default     = []
 
   validation {
-    condition     = alltrue([for member in var.members : can(regex("^(allUsers|allAuthenticatedUsers|(user|serviceAccount|group|domain|projectOwner|projectEditor|projectViewer):)$", member))])
+    condition     = alltrue([for member in var.members : can(regex("^(?:allUsers|allAuthenticatedUsers|(?:user|serviceAccount|group|domain|projectOwner|projectEditor|projectViewer):.*)$", member))])
     error_message = "Each member in 'var.members' can have one of the following values: 'allUsers', 'allAuthenticatedUsers', 'user:{emailid}', 'serviceAccount:{emailid}', 'group:{emailid}', 'domain:{domain}', 'projectOwner:projectid', 'projectEditor:projectid', 'projectViewer:projectid'."
   }
 }