fix: tag regex is too strict #6

awlsring · May 13, 2024 · c4c13bc · c4c13bc
1 parent 74d2fa7
commit c4c13bc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/headscale/tags/resource.go b/headscale/tags/resource.go
@@ -61,7 +61,7 @@ func (d *deviceTagsResource) Schema(_ context.Context, _ resource.SchemaRequest,
 				Validators: []validator.List{
 					listvalidator.UniqueValues(),
 					listvalidator.ValueStringsAre(
-						stringvalidator.RegexMatches(regexp.MustCompile("^tag:[\\w\\d]+$"), "tag must follow scheme of `tag:<value>`"),
+						stringvalidator.RegexMatches(regexp.MustCompile("^tag:.*"), "tag must follow scheme of `tag:<value>`"),
 					),
 				},
 			},

diff --git a/headscale/test/device_tagging_resource_test.go b/headscale/test/device_tagging_resource_test.go
@@ -19,6 +19,15 @@ func Test_DeviceTaggingResource(t *testing.T) {
 					resource.TestCheckResourceAttr("headscale_device_tags.test", "device_id", "1"),
 				),
 			},
+			{
+				Config: ProviderConfig + `resource "headscale_device_tags" "test" {
+					device_id = 1
+					tags = ["tag:terraform:tests"]
+				  }`,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("headscale_device_tags.test", "device_id", "1"),
+				),
+			},
 		},
 	})
 }
diff --git a/tools/tools.go b/tools/tools.go