fixup again

Author: ethanndickson

internal/provider/group_resource_test.go

@@ -131,7 +131,7 @@ resource "coderd_group" "test" {
 	}
 
 	buf := strings.Builder{}
-	tmpl, err := template.New("test").Funcs(funcMap).Parse(tpl)
+	tmpl, err := template.New("groupResource").Funcs(funcMap).Parse(tpl)
 	require.NoError(t, err)
 
 	err = tmpl.Execute(&buf, c)

internal/provider/user_data_source_test.go

@@ -120,28 +120,27 @@ type testAccUserDataSourceConfig struct {
 }
 
 func (c testAccUserDataSourceConfig) String(t *testing.T) string {
+	t.Helper()
 	tpl := `
 provider coderd {
 	url = "{{.URL}}"
 	token = "{{.Token}}"
 }
 
 data "coderd_user" "test" {
-{{- if .ID }}
-  id = "{{ .ID }}"
-{{- end }}
-{{- if .Username }}
-  username = "{{ .Username }}"
-{{- end }}
+	id = {{orNull .ID}}
+	username = {{orNull .Username}}
 }`
 
-	tmpl := template.Must(template.New("userDataSource").Parse(tpl))
+	funcMap := template.FuncMap{
+		"orNull": PrintOrNull(t),
+	}
 
 	buf := strings.Builder{}
-	err := tmpl.Execute(&buf, c)
-	if err != nil {
-		panic(err)
-	}
+	tmpl, err := template.New("userDataSource").Funcs(funcMap).Parse(tpl)
+	require.NoError(t, err)
 
+	err = tmpl.Execute(&buf, c)
+	require.NoError(t, err)
 	return buf.String()
 }