add TagsRegex defined helper

hashicorp · Aug 10, 2022 · 6e9d327 · 6e9d327
1 parent 9f796df
commit 6e9d327
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/workspace.go b/workspace.go
@@ -1072,15 +1072,15 @@ func (o WorkspaceCreateOptions) valid() error {
 		o.TriggerPatterns != nil && len(o.TriggerPatterns) > 0 {
 		return ErrUnsupportedBothTriggerPatternsAndPrefixes
 	}
-	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil &&
+	if tagRegexDefined(o.VCSRepo) &&
 		o.TriggerPatterns != nil && len(o.TriggerPatterns) > 0 {
 		return ErrUnsupportedBothTagsRegexAndTriggerPatterns
 	}
-	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil &&
+	if tagRegexDefined(o.VCSRepo) &&
 		o.TriggerPrefixes != nil && len(o.TriggerPrefixes) > 0 {
 		return ErrUnsupportedBothTagsRegexAndTriggerPrefixes
 	}
-	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil && *o.VCSRepo.TagsRegex != "" &&
+	if tagRegexDefined(o.VCSRepo) &&
 		o.FileTriggersEnabled != nil && *o.FileTriggersEnabled {
 		return ErrUnsupportedBothTagsRegexAndFileTriggersEnabled
 	}
@@ -1103,15 +1103,15 @@ func (o WorkspaceUpdateOptions) valid() error {
 		return ErrUnsupportedBothTriggerPatternsAndPrefixes
 	}
 
-	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil &&
+	if tagRegexDefined(o.VCSRepo) &&
 		o.TriggerPatterns != nil && len(o.TriggerPatterns) > 0 {
 		return ErrUnsupportedBothTagsRegexAndTriggerPatterns
 	}
-	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil &&
+	if tagRegexDefined(o.VCSRepo) &&
 		o.TriggerPrefixes != nil && len(o.TriggerPrefixes) > 0 {
 		return ErrUnsupportedBothTagsRegexAndTriggerPrefixes
 	}
-	if o.VCSRepo != nil && o.VCSRepo.TagsRegex != nil && *o.VCSRepo.TagsRegex != "" &&
+	if tagRegexDefined(o.VCSRepo) &&
 		o.FileTriggersEnabled != nil && *o.FileTriggersEnabled {
 		return ErrUnsupportedBothTagsRegexAndFileTriggersEnabled
 	}
@@ -1221,3 +1221,13 @@ func validateWorkspaceIncludeParams(params []WSIncludeOpt) error {
 
 	return nil
 }
+
+func tagRegexDefined(options *VCSRepoOptions) bool {
+	if options == nil {
+		return false
+	}
+	if options.TagsRegex != nil && *options.TagsRegex != "" {
+		return true
+	}
+	return false
+}