Skip to content

Commit b606af1

Browse files
committed
nevermind about pointers
1 parent f920756 commit b606af1

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

internal/provider/provisioner_key_resource_test.go

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ import (
77
"testing"
88
"text/template"
99

10-
"github.com/coder/coder/v2/coderd/util/ptr"
1110
"github.com/coder/terraform-provider-coderd/integration"
1211
"github.com/google/uuid"
1312
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
13+
"github.com/hashicorp/terraform-plugin-testing/knownvalue"
1414
"github.com/hashicorp/terraform-plugin-testing/plancheck"
15+
"github.com/hashicorp/terraform-plugin-testing/statecheck"
16+
"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
1517
"github.com/stretchr/testify/require"
1618
)
1719

@@ -20,7 +22,7 @@ func TestAccProvisionerKeyResource(t *testing.T) {
2022
t.Skip("Acceptance tests are disabled.")
2123
}
2224
ctx := context.Background()
23-
client := integration.StartCoder(ctx, t, "license_acc", true)
25+
client := integration.StartCoder(ctx, t, "provisioner_key_acc", true)
2426
orgs, err := client.Organizations(ctx)
2527
require.NoError(t, err)
2628
firstOrg := orgs[0].ID
@@ -29,17 +31,17 @@ func TestAccProvisionerKeyResource(t *testing.T) {
2931
URL: client.URL.String(),
3032
Token: client.SessionToken(),
3133

32-
OrganizationID: &firstOrg,
33-
Name: ptr.Ref("example-provisioner-key"),
34+
OrganizationID: firstOrg,
35+
Name: "example-provisioner-key",
3436
}
3537

3638
cfg2 := cfg1
37-
cfg2.Tags = ptr.Ref(map[string]string{
39+
cfg2.Tags = map[string]string{
3840
"wibble": "wobble",
39-
})
41+
}
4042

4143
cfg3 := cfg2
42-
cfg3.Name = ptr.Ref("different-provisioner-key")
44+
cfg3.Name = "different-provisioner-key"
4345

4446
resource.Test(t, resource.TestCase{
4547
IsUnitTest: true,
@@ -56,13 +58,8 @@ func TestAccProvisionerKeyResource(t *testing.T) {
5658
plancheck.ExpectResourceAction("coderd_provisioner_key.test", plancheck.ResourceActionReplace),
5759
},
5860
},
59-
},
60-
{
61-
Config: cfg2.String(t),
62-
ConfigPlanChecks: resource.ConfigPlanChecks{
63-
PreApply: []plancheck.PlanCheck{
64-
plancheck.ExpectResourceAction("coderd_provisioner_key.test", plancheck.ResourceActionReplace),
65-
},
61+
ConfigStateChecks: []statecheck.StateCheck{
62+
statecheck.ExpectKnownValue("coderd_provisioner_key.test", tfjsonpath.New("tags").AtMapKey("wibble"), knownvalue.StringExact("wobble")),
6663
},
6764
},
6865
{
@@ -81,13 +78,14 @@ type testAccProvisionerKeyResourceConfig struct {
8178
URL string
8279
Token string
8380

84-
OrganizationID *uuid.UUID
85-
Name *string
86-
Tags *map[string]string
81+
OrganizationID uuid.UUID
82+
Name string
83+
Tags map[string]string
8784
}
8885

8986
func (c testAccProvisionerKeyResourceConfig) String(t *testing.T) string {
9087
t.Helper()
88+
9189
tpl := `
9290
provider coderd {
9391
url = "{{.URL}}"

internal/provider/template_resource_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ func TestAccTemplateResourceEnterprise(t *testing.T) {
424424
t.Skip("Acceptance tests are disabled.")
425425
}
426426
ctx := context.Background()
427-
client := integration.StartCoder(ctx, t, "template_acc", true)
427+
client := integration.StartCoder(ctx, t, "template_resource_acc", true)
428428
firstUser, err := client.User(ctx, codersdk.Me)
429429
require.NoError(t, err)
430430

@@ -565,7 +565,7 @@ func TestAccTemplateResourceAGPL(t *testing.T) {
565565
t.Skip("Acceptance tests are disabled.")
566566
}
567567
ctx := context.Background()
568-
client := integration.StartCoder(ctx, t, "template_acc", false)
568+
client := integration.StartCoder(ctx, t, "template_resource_agpl_acc", false)
569569
firstUser, err := client.User(ctx, codersdk.Me)
570570
require.NoError(t, err)
571571

@@ -689,7 +689,7 @@ resource "coderd_template" "sample" {
689689
}`
690690

691691
ctx := context.Background()
692-
client := integration.StartCoder(ctx, t, "template_acc", false)
692+
client := integration.StartCoder(ctx, t, "template_resource_variables_acc", false)
693693

694694
cfg = fmt.Sprintf(cfg, client.URL.String(), client.SessionToken())
695695

0 commit comments

Comments
 (0)