Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3240547

Browse files
aslilacaslilac
committedNov 5, 2024·
chore: replace PtrTo with ptr.Ref 
1 parent ecc7a9a commit 3240547

10 files changed

+123
-118
lines changed
 

‎internal/provider/group_data_source_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99
"text/template"
1010

11+
"github.com/coder/coder/v2/coderd/util/ptr"
1112
"github.com/coder/coder/v2/codersdk"
1213
"github.com/coder/terraform-provider-coderd/integration"
1314
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -74,7 +75,7 @@ func TestAccGroupDataSource(t *testing.T) {
7475
cfg := testAccGroupDataSourceConfig{
7576
URL: client.URL.String(),
7677
Token: client.SessionToken(),
77-
ID: PtrTo(group.ID.String()),
78+
ID: ptr.Ref(group.ID.String()),
7879
}
7980
resource.Test(t, resource.TestCase{
8081
PreCheck: func() { testAccPreCheck(t) },
@@ -92,8 +93,8 @@ func TestAccGroupDataSource(t *testing.T) {
9293
cfg := testAccGroupDataSourceConfig{
9394
URL: client.URL.String(),
9495
Token: client.SessionToken(),
95-
OrganizationID: PtrTo(firstUser.OrganizationIDs[0].String()),
96-
Name: PtrTo("example-group"),
96+
OrganizationID: ptr.Ref(firstUser.OrganizationIDs[0].String()),
97+
Name: ptr.Ref("example-group"),
9798
}
9899
resource.Test(t, resource.TestCase{
99100
PreCheck: func() { testAccPreCheck(t) },
@@ -111,7 +112,7 @@ func TestAccGroupDataSource(t *testing.T) {
111112
cfg := testAccGroupDataSourceConfig{
112113
URL: client.URL.String(),
113114
Token: client.SessionToken(),
114-
Name: PtrTo("example-group"),
115+
Name: ptr.Ref("example-group"),
115116
}
116117
resource.Test(t, resource.TestCase{
117118
PreCheck: func() { testAccPreCheck(t) },
@@ -129,7 +130,7 @@ func TestAccGroupDataSource(t *testing.T) {
129130
cfg := testAccGroupDataSourceConfig{
130131
URL: client.URL.String(),
131132
Token: client.SessionToken(),
132-
OrganizationID: PtrTo(firstUser.OrganizationIDs[0].String()),
133+
OrganizationID: ptr.Ref(firstUser.OrganizationIDs[0].String()),
133134
}
134135
resource.Test(t, resource.TestCase{
135136
PreCheck: func() { testAccPreCheck(t) },

‎internal/provider/group_resource_test.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99
"text/template"
1010

11+
"github.com/coder/coder/v2/coderd/util/ptr"
1112
"github.com/coder/coder/v2/codersdk"
1213
"github.com/coder/terraform-provider-coderd/integration"
1314
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -44,17 +45,17 @@ func TestAccGroupResource(t *testing.T) {
4445
cfg1 := testAccGroupResourceconfig{
4546
URL: client.URL.String(),
4647
Token: client.SessionToken(),
47-
Name: PtrTo("example-group"),
48-
DisplayName: PtrTo("Example Group"),
49-
AvatarUrl: PtrTo("https://google.com"),
50-
QuotaAllowance: PtrTo(int32(100)),
51-
Members: PtrTo([]string{user1.ID.String()}),
48+
Name: ptr.Ref("example-group"),
49+
DisplayName: ptr.Ref("Example Group"),
50+
AvatarUrl: ptr.Ref("https://google.com"),
51+
QuotaAllowance: ptr.Ref(int32(100)),
52+
Members: ptr.Ref([]string{user1.ID.String()}),
5253
}
5354

5455
cfg2 := cfg1
55-
cfg2.Name = PtrTo("example-group-new")
56-
cfg2.DisplayName = PtrTo("Example Group New")
57-
cfg2.Members = PtrTo([]string{user2.ID.String()})
56+
cfg2.Name = ptr.Ref("example-group-new")
57+
cfg2.DisplayName = ptr.Ref("Example Group New")
58+
cfg2.Members = ptr.Ref([]string{user2.ID.String()})
5859

5960
cfg3 := cfg2
6061
cfg3.Members = nil
@@ -143,11 +144,11 @@ func TestAccGroupResourceAGPL(t *testing.T) {
143144
cfg1 := testAccGroupResourceconfig{
144145
URL: client.URL.String(),
145146
Token: client.SessionToken(),
146-
Name: PtrTo("example-group"),
147-
DisplayName: PtrTo("Example Group"),
148-
AvatarUrl: PtrTo("https://google.com"),
149-
QuotaAllowance: PtrTo(int32(100)),
150-
Members: PtrTo([]string{firstUser.ID.String()}),
147+
Name: ptr.Ref("example-group"),
148+
DisplayName: ptr.Ref("Example Group"),
149+
AvatarUrl: ptr.Ref("https://google.com"),
150+
QuotaAllowance: ptr.Ref(int32(100)),
151+
Members: ptr.Ref([]string{firstUser.ID.String()}),
151152
}
152153

153154
resource.Test(t, resource.TestCase{

‎internal/provider/organization_data_source_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99
"text/template"
1010

11+
"github.com/coder/coder/v2/coderd/util/ptr"
1112
"github.com/coder/coder/v2/codersdk"
1213
"github.com/coder/terraform-provider-coderd/integration"
1314
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -37,7 +38,7 @@ func TestAccOrganizationDataSource(t *testing.T) {
3738
cfg := testAccOrganizationDataSourceConfig{
3839
URL: client.URL.String(),
3940
Token: client.SessionToken(),
40-
ID: PtrTo(firstUser.OrganizationIDs[0].String()),
41+
ID: ptr.Ref(firstUser.OrganizationIDs[0].String()),
4142
}
4243
resource.Test(t, resource.TestCase{
4344
PreCheck: func() { testAccPreCheck(t) },
@@ -55,7 +56,7 @@ func TestAccOrganizationDataSource(t *testing.T) {
5556
cfg := testAccOrganizationDataSourceConfig{
5657
URL: client.URL.String(),
5758
Token: client.SessionToken(),
58-
Name: PtrTo("coder"),
59+
Name: ptr.Ref("coder"),
5960
}
6061
resource.Test(t, resource.TestCase{
6162
PreCheck: func() { testAccPreCheck(t) },
@@ -73,7 +74,7 @@ func TestAccOrganizationDataSource(t *testing.T) {
7374
cfg := testAccOrganizationDataSourceConfig{
7475
URL: client.URL.String(),
7576
Token: client.SessionToken(),
76-
IsDefault: PtrTo(true),
77+
IsDefault: ptr.Ref(true),
7778
}
7879
resource.Test(t, resource.TestCase{
7980
PreCheck: func() { testAccPreCheck(t) },
@@ -91,8 +92,8 @@ func TestAccOrganizationDataSource(t *testing.T) {
9192
cfg := testAccOrganizationDataSourceConfig{
9293
URL: client.URL.String(),
9394
Token: client.SessionToken(),
94-
IsDefault: PtrTo(true),
95-
Name: PtrTo("coder"),
95+
IsDefault: ptr.Ref(true),
96+
Name: ptr.Ref("coder"),
9697
}
9798
resource.Test(t, resource.TestCase{
9899
PreCheck: func() { testAccPreCheck(t) },

‎internal/provider/template_data_source_test.go

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1515
"github.com/stretchr/testify/require"
1616

17+
"github.com/coder/coder/v2/coderd/util/ptr"
1718
"github.com/coder/coder/v2/codersdk"
1819
"github.com/coder/terraform-provider-coderd/integration"
1920
)
@@ -49,21 +50,21 @@ func TestAccTemplateDataSource(t *testing.T) {
4950
Description: "An example template",
5051
Icon: "/path/to/icon.png",
5152
VersionID: version.ID,
52-
DefaultTTLMillis: PtrTo((10 * time.Hour).Milliseconds()),
53-
ActivityBumpMillis: PtrTo((4 * time.Hour).Milliseconds()),
53+
DefaultTTLMillis: ptr.Ref((10 * time.Hour).Milliseconds()),
54+
ActivityBumpMillis: ptr.Ref((4 * time.Hour).Milliseconds()),
5455
AutostopRequirement: &codersdk.TemplateAutostopRequirement{
5556
DaysOfWeek: []string{"sunday"},
5657
Weeks: 1,
5758
},
5859
AutostartRequirement: &codersdk.TemplateAutostartRequirement{
5960
DaysOfWeek: []string{"monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"},
6061
},
61-
AllowUserCancelWorkspaceJobs: PtrTo(true),
62-
AllowUserAutostart: PtrTo(true),
63-
AllowUserAutostop: PtrTo(true),
64-
FailureTTLMillis: PtrTo((1 * time.Hour).Milliseconds()),
65-
TimeTilDormantMillis: PtrTo((7 * 24 * time.Hour).Milliseconds()),
66-
TimeTilDormantAutoDeleteMillis: PtrTo((30 * 24 * time.Hour).Milliseconds()),
62+
AllowUserCancelWorkspaceJobs: ptr.Ref(true),
63+
AllowUserAutostart: ptr.Ref(true),
64+
AllowUserAutostop: ptr.Ref(true),
65+
FailureTTLMillis: ptr.Ref((1 * time.Hour).Milliseconds()),
66+
TimeTilDormantMillis: ptr.Ref((7 * 24 * time.Hour).Milliseconds()),
67+
TimeTilDormantAutoDeleteMillis: ptr.Ref((30 * 24 * time.Hour).Milliseconds()),
6768
DisableEveryoneGroupAccess: true,
6869
RequireActiveVersion: true,
6970
})
@@ -93,9 +94,9 @@ func TestAccTemplateDataSource(t *testing.T) {
9394
UpdateWorkspaceLastUsedAt: false,
9495
UpdateWorkspaceDormantAt: false,
9596
RequireActiveVersion: tpl.RequireActiveVersion,
96-
DeprecationMessage: PtrTo("This template is deprecated"),
97+
DeprecationMessage: ptr.Ref("This template is deprecated"),
9798
DisableEveryoneGroupAccess: true,
98-
MaxPortShareLevel: PtrTo(codersdk.WorkspaceAgentPortShareLevelOwner),
99+
MaxPortShareLevel: ptr.Ref(codersdk.WorkspaceAgentPortShareLevelOwner),
99100
})
100101
require.NoError(t, err)
101102

@@ -153,8 +154,8 @@ func TestAccTemplateDataSource(t *testing.T) {
153154
cfg := testAccTemplateDataSourceConfig{
154155
URL: client.URL.String(),
155156
Token: client.SessionToken(),
156-
OrganizationID: PtrTo(orgID.String()),
157-
Name: PtrTo(tpl.Name),
157+
OrganizationID: ptr.Ref(orgID.String()),
158+
Name: ptr.Ref(tpl.Name),
158159
}
159160
resource.Test(t, resource.TestCase{
160161
IsUnitTest: true,
@@ -173,7 +174,7 @@ func TestAccTemplateDataSource(t *testing.T) {
173174
cfg := testAccTemplateDataSourceConfig{
174175
URL: client.URL.String(),
175176
Token: client.SessionToken(),
176-
ID: PtrTo(tpl.ID.String()),
177+
ID: ptr.Ref(tpl.ID.String()),
177178
}
178179
resource.Test(t, resource.TestCase{
179180
IsUnitTest: true,
@@ -210,7 +211,7 @@ func TestAccTemplateDataSource(t *testing.T) {
210211
cfg := testAccTemplateDataSourceConfig{
211212
URL: client.URL.String(),
212213
Token: client.SessionToken(),
213-
Name: PtrTo(tpl.Name),
214+
Name: ptr.Ref(tpl.Name),
214215
}
215216
resource.Test(t, resource.TestCase{
216217
IsUnitTest: true,

‎internal/provider/template_resource.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"strings"
1111

1212
"cdr.dev/slog"
13+
"github.com/coder/coder/v2/coderd/util/ptr"
1314
"github.com/coder/coder/v2/codersdk"
1415
"github.com/coder/coder/v2/provisionersdk"
1516
"github.com/google/uuid"
@@ -1253,7 +1254,7 @@ func (r *TemplateResourceModel) toUpdateRequest(ctx context.Context, diag *diag.
12531254
TimeTilDormantAutoDeleteMillis: r.TimeTilDormantAutoDeleteMillis.ValueInt64(),
12541255
RequireActiveVersion: r.RequireActiveVersion.ValueBool(),
12551256
DeprecationMessage: r.DeprecationMessage.ValueStringPointer(),
1256-
MaxPortShareLevel: PtrTo(codersdk.WorkspaceAgentPortShareLevel(r.MaxPortShareLevel.ValueString())),
1257+
MaxPortShareLevel: ptr.Ref(codersdk.WorkspaceAgentPortShareLevel(r.MaxPortShareLevel.ValueString())),
12571258
// If we're managing ACL, we want to delete the everyone group
12581259
DisableEveryoneGroupAccess: !r.ACL.IsNull(),
12591260
}

‎internal/provider/template_resource_test.go

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
cp "github.com/otiai10/copy"
1818
"github.com/stretchr/testify/require"
1919

20+
"github.com/coder/coder/v2/coderd/util/ptr"
2021
"github.com/coder/coder/v2/codersdk"
2122
"github.com/coder/terraform-provider-coderd/integration"
2223
)
@@ -42,12 +43,12 @@ func TestAccTemplateResource(t *testing.T) {
4243
cfg1 := testAccTemplateResourceConfig{
4344
URL: client.URL.String(),
4445
Token: client.SessionToken(),
45-
Name: PtrTo("example-template"),
46+
Name: ptr.Ref("example-template"),
4647
Versions: []testAccTemplateVersionConfig{
4748
{
4849
// Auto-generated version name
4950
Directory: &exTemplateOne,
50-
Active: PtrTo(true),
51+
Active: ptr.Ref(true),
5152
},
5253
},
5354
ACL: testAccTemplateACLConfig{
@@ -57,28 +58,28 @@ func TestAccTemplateResource(t *testing.T) {
5758

5859
cfg2 := cfg1
5960
cfg2.Versions = slices.Clone(cfg2.Versions)
60-
cfg2.Name = PtrTo("example-template-new")
61+
cfg2.Name = ptr.Ref("example-template-new")
6162
cfg2.Versions[0].Directory = &exTemplateTwo
62-
cfg2.Versions[0].Name = PtrTo("new")
63+
cfg2.Versions[0].Name = ptr.Ref("new")
6364

6465
cfg3 := cfg2
6566
cfg3.Versions = slices.Clone(cfg3.Versions)
6667
cfg3.Versions = append(cfg3.Versions, testAccTemplateVersionConfig{
67-
Name: PtrTo("legacy-template"),
68+
Name: ptr.Ref("legacy-template"),
6869
Directory: &exTemplateOne,
69-
Active: PtrTo(false),
70+
Active: ptr.Ref(false),
7071
TerraformVariables: []testAccTemplateKeyValueConfig{
7172
{
72-
Key: PtrTo("name"),
73-
Value: PtrTo("world"),
73+
Key: ptr.Ref("name"),
74+
Value: ptr.Ref("world"),
7475
},
7576
},
7677
})
7778

7879
cfg4 := cfg3
7980
cfg4.Versions = slices.Clone(cfg4.Versions)
80-
cfg4.Versions[0].Active = PtrTo(false)
81-
cfg4.Versions[1].Active = PtrTo(true)
81+
cfg4.Versions[0].Active = ptr.Ref(false)
82+
cfg4.Versions[1].Active = ptr.Ref(true)
8283

8384
cfg5 := cfg4
8485
cfg5.Versions = slices.Clone(cfg5.Versions)
@@ -240,26 +241,26 @@ func TestAccTemplateResource(t *testing.T) {
240241
cfg1 := testAccTemplateResourceConfig{
241242
URL: client.URL.String(),
242243
Token: client.SessionToken(),
243-
Name: PtrTo("example-template2"),
244+
Name: ptr.Ref("example-template2"),
244245
Versions: []testAccTemplateVersionConfig{
245246
{
246247
// Auto-generated version name
247-
Directory: PtrTo("../../integration/template-test/example-template-2/"),
248+
Directory: ptr.Ref("../../integration/template-test/example-template-2/"),
248249
TerraformVariables: []testAccTemplateKeyValueConfig{
249250
{
250-
Key: PtrTo("name"),
251-
Value: PtrTo("world"),
251+
Key: ptr.Ref("name"),
252+
Value: ptr.Ref("world"),
252253
},
253254
},
254-
Active: PtrTo(true),
255+
Active: ptr.Ref(true),
255256
},
256257
{
257258
// Auto-generated version name
258-
Directory: PtrTo("../../integration/template-test/example-template-2/"),
259+
Directory: ptr.Ref("../../integration/template-test/example-template-2/"),
259260
TerraformVariables: []testAccTemplateKeyValueConfig{
260261
{
261-
Key: PtrTo("name"),
262-
Value: PtrTo("world"),
262+
Key: ptr.Ref("name"),
263+
Value: ptr.Ref("world"),
263264
},
264265
},
265266
},
@@ -271,28 +272,28 @@ func TestAccTemplateResource(t *testing.T) {
271272

272273
cfg2 := cfg1
273274
cfg2.Versions = slices.Clone(cfg2.Versions)
274-
cfg2.Versions[1].Name = PtrTo("new-name")
275+
cfg2.Versions[1].Name = ptr.Ref("new-name")
275276

276277
cfg3 := cfg2
277278
cfg3.Versions = slices.Clone(cfg3.Versions)
278-
cfg3.Versions[0].Name = PtrTo("new-name-one")
279-
cfg3.Versions[1].Name = PtrTo("new-name-two")
279+
cfg3.Versions[0].Name = ptr.Ref("new-name-one")
280+
cfg3.Versions[1].Name = ptr.Ref("new-name-two")
280281
cfg3.Versions[0], cfg3.Versions[1] = cfg3.Versions[1], cfg3.Versions[0]
281282

282283
cfg4 := cfg1
283284
cfg4.Versions = slices.Clone(cfg4.Versions)
284-
cfg4.Versions[0].Directory = PtrTo("../../integration/template-test/example-template/")
285+
cfg4.Versions[0].Directory = ptr.Ref("../../integration/template-test/example-template/")
285286

286287
cfg5 := cfg4
287288
cfg5.Versions = slices.Clone(cfg5.Versions)
288-
cfg5.Versions[1].Directory = PtrTo("../../integration/template-test/example-template/")
289+
cfg5.Versions[1].Directory = ptr.Ref("../../integration/template-test/example-template/")
289290

290291
cfg6 := cfg5
291292
cfg6.Versions = slices.Clone(cfg6.Versions)
292293
cfg6.Versions[0].TerraformVariables = []testAccTemplateKeyValueConfig{
293294
{
294-
Key: PtrTo("name"),
295-
Value: PtrTo("world2"),
295+
Key: ptr.Ref("name"),
296+
Value: ptr.Ref("world2"),
296297
},
297298
}
298299

@@ -368,18 +369,18 @@ func TestAccTemplateResource(t *testing.T) {
368369
cfg1 := testAccTemplateResourceConfig{
369370
URL: client.URL.String(),
370371
Token: client.SessionToken(),
371-
Name: PtrTo("example-template3"),
372+
Name: ptr.Ref("example-template3"),
372373
Versions: []testAccTemplateVersionConfig{
373374
{
374375
// Auto-generated version name
375-
Directory: PtrTo("../../integration/template-test/example-template-2/"),
376+
Directory: ptr.Ref("../../integration/template-test/example-template-2/"),
376377
TerraformVariables: []testAccTemplateKeyValueConfig{
377378
{
378-
Key: PtrTo("name"),
379-
Value: PtrTo("world"),
379+
Key: ptr.Ref("name"),
380+
Value: ptr.Ref("world"),
380381
},
381382
},
382-
Active: PtrTo(true),
383+
Active: ptr.Ref(true),
383384
},
384385
},
385386
ACL: testAccTemplateACLConfig{
@@ -391,8 +392,8 @@ func TestAccTemplateResource(t *testing.T) {
391392
cfg2.Versions = slices.Clone(cfg2.Versions)
392393
cfg2.Versions[0].TerraformVariables = []testAccTemplateKeyValueConfig{
393394
{
394-
Key: PtrTo("name"),
395-
Value: PtrTo("world2"),
395+
Key: ptr.Ref("name"),
396+
Value: ptr.Ref("world2"),
396397
},
397398
}
398399

@@ -436,47 +437,47 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
436437
cfg1 := testAccTemplateResourceConfig{
437438
URL: client.URL.String(),
438439
Token: client.SessionToken(),
439-
Name: PtrTo("example-template"),
440+
Name: ptr.Ref("example-template"),
440441
Versions: []testAccTemplateVersionConfig{
441442
{
442443
// Auto-generated version name
443-
Directory: PtrTo("../../integration/template-test/example-template"),
444-
Active: PtrTo(true),
444+
Directory: ptr.Ref("../../integration/template-test/example-template"),
445+
Active: ptr.Ref(true),
445446
},
446447
},
447448
ACL: testAccTemplateACLConfig{
448449
GroupACL: []testAccTemplateKeyValueConfig{
449450
{
450-
Key: PtrTo(firstUser.OrganizationIDs[0].String()),
451-
Value: PtrTo("use"),
451+
Key: ptr.Ref(firstUser.OrganizationIDs[0].String()),
452+
Value: ptr.Ref("use"),
452453
},
453454
{
454-
Key: PtrTo(group.ID.String()),
455-
Value: PtrTo("admin"),
455+
Key: ptr.Ref(group.ID.String()),
456+
Value: ptr.Ref("admin"),
456457
},
457458
},
458459
UserACL: []testAccTemplateKeyValueConfig{
459460
{
460-
Key: PtrTo(firstUser.ID.String()),
461-
Value: PtrTo("admin"),
461+
Key: ptr.Ref(firstUser.ID.String()),
462+
Value: ptr.Ref("admin"),
462463
},
463464
},
464465
},
465466
}
466467

467468
cfg2 := cfg1
468469
cfg2.ACL.GroupACL = slices.Clone(cfg2.ACL.GroupACL[1:])
469-
cfg2.MaxPortShareLevel = PtrTo("owner")
470+
cfg2.MaxPortShareLevel = ptr.Ref("owner")
470471

471472
cfg3 := cfg2
472473
cfg3.ACL.null = true
473-
cfg3.MaxPortShareLevel = PtrTo("public")
474+
cfg3.MaxPortShareLevel = ptr.Ref("public")
474475

475476
cfg4 := cfg3
476-
cfg4.AllowUserAutostart = PtrTo(false)
477+
cfg4.AllowUserAutostart = ptr.Ref(false)
477478
cfg4.AutostopRequirement = testAccAutostopRequirementConfig{
478-
DaysOfWeek: PtrTo([]string{"monday", "tuesday"}),
479-
Weeks: PtrTo(int64(2)),
479+
DaysOfWeek: ptr.Ref([]string{"monday", "tuesday"}),
480+
Weeks: ptr.Ref(int64(2)),
480481
}
481482

482483
resource.Test(t, resource.TestCase{
@@ -571,47 +572,47 @@ func TestAccTemplateResourceAGPL(t *testing.T) {
571572
cfg1 := testAccTemplateResourceConfig{
572573
URL: client.URL.String(),
573574
Token: client.SessionToken(),
574-
Name: PtrTo("example-template"),
575+
Name: ptr.Ref("example-template"),
575576
Versions: []testAccTemplateVersionConfig{
576577
{
577578
// Auto-generated version name
578-
Directory: PtrTo("../../integration/template-test/example-template/"),
579-
Active: PtrTo(true),
579+
Directory: ptr.Ref("../../integration/template-test/example-template/"),
580+
Active: ptr.Ref(true),
580581
},
581582
},
582-
AllowUserAutostart: PtrTo(false),
583+
AllowUserAutostart: ptr.Ref(false),
583584
}
584585

585586
cfg2 := cfg1
586587
cfg2.AllowUserAutostart = nil
587-
cfg2.AutostopRequirement.DaysOfWeek = PtrTo([]string{"monday", "tuesday"})
588+
cfg2.AutostopRequirement.DaysOfWeek = ptr.Ref([]string{"monday", "tuesday"})
588589

589590
cfg3 := cfg2
590591
cfg3.AutostopRequirement.null = true
591-
cfg3.AutostartRequirement = PtrTo([]string{})
592+
cfg3.AutostartRequirement = ptr.Ref([]string{})
592593

593594
cfg4 := cfg3
594-
cfg4.FailureTTL = PtrTo(int64(1))
595+
cfg4.FailureTTL = ptr.Ref(int64(1))
595596

596597
cfg5 := cfg4
597598
cfg5.FailureTTL = nil
598599
cfg5.AutostartRequirement = nil
599-
cfg5.RequireActiveVersion = PtrTo(true)
600+
cfg5.RequireActiveVersion = ptr.Ref(true)
600601

601602
cfg6 := cfg5
602603
cfg6.RequireActiveVersion = nil
603604
cfg6.ACL = testAccTemplateACLConfig{
604605
GroupACL: []testAccTemplateKeyValueConfig{
605606
{
606-
Key: PtrTo(firstUser.OrganizationIDs[0].String()),
607-
Value: PtrTo("use"),
607+
Key: ptr.Ref(firstUser.OrganizationIDs[0].String()),
608+
Value: ptr.Ref("use"),
608609
},
609610
},
610611
}
611612

612613
cfg7 := cfg6
613614
cfg7.ACL.null = true
614-
cfg7.MaxPortShareLevel = PtrTo("owner")
615+
cfg7.MaxPortShareLevel = ptr.Ref("owner")
615616

616617
for _, cfg := range []testAccTemplateResourceConfig{cfg1, cfg2, cfg3, cfg4} {
617618
resource.Test(t, resource.TestCase{

‎internal/provider/user_data_source_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99
"text/template"
1010

11+
"github.com/coder/coder/v2/coderd/util/ptr"
1112
"github.com/coder/coder/v2/codersdk"
1213
"github.com/coder/terraform-provider-coderd/integration"
1314
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -53,7 +54,7 @@ func TestAccUserDataSource(t *testing.T) {
5354
cfg := testAccUserDataSourceConfig{
5455
URL: client.URL.String(),
5556
Token: client.SessionToken(),
56-
Username: PtrTo(user.Username),
57+
Username: ptr.Ref(user.Username),
5758
}
5859
resource.Test(t, resource.TestCase{
5960
PreCheck: func() { testAccPreCheck(t) },
@@ -71,7 +72,7 @@ func TestAccUserDataSource(t *testing.T) {
7172
cfg := testAccUserDataSourceConfig{
7273
URL: client.URL.String(),
7374
Token: client.SessionToken(),
74-
ID: PtrTo(user.ID.String()),
75+
ID: ptr.Ref(user.ID.String()),
7576
}
7677
resource.Test(t, resource.TestCase{
7778
PreCheck: func() { testAccPreCheck(t) },

‎internal/provider/user_resource_test.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88
"text/template"
99

10+
"github.com/coder/coder/v2/coderd/util/ptr"
1011
"github.com/coder/terraform-provider-coderd/integration"
1112
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1213
"github.com/stretchr/testify/require"
@@ -22,22 +23,22 @@ func TestAccUserResource(t *testing.T) {
2223
cfg1 := testAccUserResourceConfig{
2324
URL: client.URL.String(),
2425
Token: client.SessionToken(),
25-
Username: PtrTo("example"),
26-
Name: PtrTo("Example User"),
27-
Email: PtrTo("example@coder.com"),
28-
Roles: PtrTo([]string{"owner", "auditor"}),
29-
LoginType: PtrTo("password"),
30-
Password: PtrTo("SomeSecurePassword!"),
26+
Username: ptr.Ref("example"),
27+
Name: ptr.Ref("Example User"),
28+
Email: ptr.Ref("example@coder.com"),
29+
Roles: ptr.Ref([]string{"owner", "auditor"}),
30+
LoginType: ptr.Ref("password"),
31+
Password: ptr.Ref("SomeSecurePassword!"),
3132
}
3233

3334
cfg2 := cfg1
34-
cfg2.Username = PtrTo("exampleNew")
35+
cfg2.Username = ptr.Ref("exampleNew")
3536

3637
cfg3 := cfg2
37-
cfg3.Name = PtrTo("Example New")
38+
cfg3.Name = ptr.Ref("Example New")
3839

3940
cfg4 := cfg3
40-
cfg4.LoginType = PtrTo("github")
41+
cfg4.LoginType = ptr.Ref("github")
4142
cfg4.Password = nil
4243

4344
resource.Test(t, resource.TestCase{

‎internal/provider/util.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ var (
2020
displayNameRegex = regexp.MustCompile(`^[^\s](.*[^\s])?$`)
2121
)
2222

23-
func PtrTo[T any](v T) *T {
24-
return &v
25-
}
26-
2723
func PrintOrNull(v any) string {
2824
if v == nil {
2925
return "null"

‎internal/provider/workspace_proxy_resource_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99
"text/template"
1010

11+
"github.com/coder/coder/v2/coderd/util/ptr"
1112
"github.com/coder/terraform-provider-coderd/integration"
1213
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1314
"github.com/stretchr/testify/require"
@@ -23,14 +24,14 @@ func TestAccWorkspaceProxyResource(t *testing.T) {
2324
cfg1 := testAccWorkspaceProxyResourceConfig{
2425
URL: client.URL.String(),
2526
Token: client.SessionToken(),
26-
Name: PtrTo("example"),
27-
DisplayName: PtrTo("Example WS Proxy"),
28-
Icon: PtrTo("/emojis/1f407.png"),
27+
Name: ptr.Ref("example"),
28+
DisplayName: ptr.Ref("Example WS Proxy"),
29+
Icon: ptr.Ref("/emojis/1f407.png"),
2930
}
3031

3132
cfg2 := cfg1
32-
cfg2.Name = PtrTo("example-new")
33-
cfg2.DisplayName = PtrTo("Example WS Proxy New")
33+
cfg2.Name = ptr.Ref("example-new")
34+
cfg2.DisplayName = ptr.Ref("Example WS Proxy New")
3435

3536
resource.Test(t, resource.TestCase{
3637
IsUnitTest: true,
@@ -64,9 +65,9 @@ func TestAccWorkspaceProxyResourceAGPL(t *testing.T) {
6465
cfg1 := testAccWorkspaceProxyResourceConfig{
6566
URL: client.URL.String(),
6667
Token: client.SessionToken(),
67-
Name: PtrTo("example"),
68-
DisplayName: PtrTo("Example WS Proxy"),
69-
Icon: PtrTo("/emojis/1f407.png"),
68+
Name: ptr.Ref("example"),
69+
DisplayName: ptr.Ref("Example WS Proxy"),
70+
Icon: ptr.Ref("/emojis/1f407.png"),
7071
}
7172

7273
resource.Test(t, resource.TestCase{

0 commit comments

Comments
 (0)
Please sign in to comment.