Skip to content

Commit cc62729

Browse files
committed
review
1 parent 0edeff0 commit cc62729

File tree

5 files changed

+24
-26
lines changed

5 files changed

+24
-26
lines changed

docs/data-sources/user.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ An existing user on the coder deployment
1717

1818
### Optional
1919

20-
- `id` (String) The ID of the user to retrieve. This field will be populated if a username is supplied
21-
- `username` (String) The username of the user to retrieve. This field will be populated if an ID is supplied
20+
- `id` (String) The ID of the user to retrieve. This field will be populated if a username is supplied.
21+
- `username` (String) The username of the user to retrieve. This field will be populated if an ID is supplied.
2222

2323
### Read-Only
2424

internal/provider/provider.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// Copyright (c) HashiCorp, Inc.
2-
// SPDX-License-Identifier: MPL-2.0
3-
41
package provider
52

63
import (

internal/provider/user_data_source_test.go

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
// Copyright (c) HashiCorp, Inc.
2-
// SPDX-License-Identifier: MPL-2.0
3-
41
package provider
52

63
/*
74
import (
5+
"html/template"
86
"strings"
97
"testing"
108
@@ -20,7 +18,7 @@ func TestAccUserDataSource(t *testing.T) {
2018
{
2119
Config: testAccUserDataSourceConfig{
2220
Username: "example",
23-
}.String(),
21+
}.String(t),
2422
Check: resource.ComposeAggregateTestCheckFunc(
2523
resource.TestCheckResourceAttr("coderd_user.test", "username", "example"),
2624
resource.TestCheckResourceAttr("coderd_user.test", "name", "Example User"),
@@ -43,7 +41,7 @@ func TestAccUserDataSource(t *testing.T) {
4341
{
4442
Config: testAccUserDataSourceConfig{
4543
ID: "example",
46-
}.String(),
44+
}.String(t),
4745
Check: resource.ComposeAggregateTestCheckFunc(
4846
resource.TestCheckResourceAttr("coderd_user.test", "username", "example"),
4947
resource.TestCheckResourceAttr("coderd_user.test", "name", "Example User"),
@@ -65,16 +63,25 @@ type testAccUserDataSourceConfig struct {
6563
Username string
6664
}
6765
68-
func (c testAccUserDataSourceConfig) String() string {
69-
sb := strings.Builder{}
70-
sb.WriteString(`data "coderd_user" "test" {` + "\n")
71-
if c.ID != "" {
72-
sb.WriteString(` id = "` + c.ID + `"` + "\n")
73-
}
74-
if c.Username != "" {
75-
sb.WriteString(` username = "` + c.Username + `"` + "\n")
66+
func (c testAccUserDataSourceConfig) String(t *testing.T) string {
67+
tpl := `
68+
data "coderd_user" "test" {
69+
{{- if .ID }}
70+
id = "{{ .ID }}"
71+
{{- end }}
72+
{{- if .Username }}
73+
username = "{{ .Username }}"
74+
{{- end }}
75+
}`
76+
77+
tmpl := template.Must(template.New("userDataSource").Parse(tpl))
78+
79+
buf := strings.Builder{}
80+
err := tmpl.Execute(&buf, c)
81+
if err != nil {
82+
panic(err)
7683
}
77-
sb.WriteString(`}`)
78-
return sb.String()
84+
85+
return buf.String()
7986
}
8087
*/

internal/provider/user_resource.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// Copyright (c) HashiCorp, Inc.
2-
// SPDX-License-Identifier: MPL-2.0
3-
41
package provider
52

63
import (

internal/provider/user_resource_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// Copyright (c) HashiCorp, Inc.
2-
// SPDX-License-Identifier: MPL-2.0
3-
41
package provider
52

63
/*

0 commit comments

Comments
 (0)