Merge pull request #23089 from megubyte/lint/v001/worklink

service/worklink: tech debt: fix V001 linter errors
hashicorp · Feb 10, 2022 · f45acbb · f45acbb
2 parents cc22059 + eecad82
commit f45acbb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/internal/service/worklink/fleet.go b/internal/service/worklink/fleet.go
@@ -3,6 +3,7 @@ package worklink
 import (
 	"fmt"
 	"log"
+	"regexp"
 	"strings"
 	"time"
 
@@ -33,10 +34,13 @@ func ResourceFleet() *schema.Resource {
 				Computed: true,
 			},
 			"name": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validFleetName,
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+				ValidateFunc: validation.All(
+					validation.StringMatch(regexp.MustCompile(`^[a-z0-9](?:[a-z0-9\-]{0,46}[a-z0-9])?$`), "must contain only alphanumeric characters"),
+					validation.StringLenBetween(1, 48),
+				),
 			},
 			"display_name": {
 				Type:         schema.TypeString,

diff --git a/internal/service/worklink/validate.go b/internal/service/worklink/validate.go