bad tests but passing :^)

Author: aslilac

internal/provider/license_resource_test.go

@@ -24,7 +24,7 @@ func TestAccLicenseResource(t *testing.T) {
 		t.Skip("No license found for license resource tests, skipping")
 	}
 
-	cfg1 := testAccLicenseResourceconfig{
+	cfg1 := testAccLicenseResourceConfig{
 		URL:     client.URL.String(),
 		Token:   client.SessionToken(),
 		License: license,
@@ -42,13 +42,13 @@ func TestAccLicenseResource(t *testing.T) {
 	})
 }
 
-type testAccLicenseResourceconfig struct {
+type testAccLicenseResourceConfig struct {
 	URL     string
 	Token   string
 	License string
 }
 
-func (c testAccLicenseResourceconfig) String(t *testing.T) string {
+func (c testAccLicenseResourceConfig) String(t *testing.T) string {
 	t.Helper()
 	tpl := `
 provider coderd {

internal/provider/provider.go

@@ -139,6 +139,7 @@ func (p *CoderdProvider) Resources(ctx context.Context) []func() resource.Resour
 		NewWorkspaceProxyResource,
 		NewLicenseResource,
 		NewOrganizationResource,
+		NewProvisionerKeyResource,
 	}
 }
 

internal/provider/provisioner_key_resource.go

@@ -47,18 +47,21 @@ func (r *ProvisionerKeyResource) Schema(ctx context.Context, req resource.Schema
 			"organization_id": schema.StringAttribute{
 				CustomType:          UUIDType,
 				MarkdownDescription: "The organization that provisioners connected with this key will be connected to.",
+				Required:            true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifier.RequiresReplace(),
 				},
 			},
 			"name": schema.StringAttribute{
 				MarkdownDescription: "The name of the key.",
+				Required:            true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifier.RequiresReplace(),
 				},
 			},
 			"tags": schema.MapAttribute{
 				ElementType:         types.StringType,
+				Optional:            true,
 				MarkdownDescription: "The tags that the provisioner will accept jobs for.",
 				PlanModifiers: []planmodifier.Map{
 					mapplanmodifier.RequiresReplace(),

internal/provider/provisioner_key_resource_test.go

@@ -8,26 +8,38 @@ import (
 	"text/template"
 
 	"github.com/coder/terraform-provider-coderd/integration"
+	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/stretchr/testify/require"
 )
 
-func TestAccLicenseResource(t *testing.T) {
+func TestAccProvisionerKeyResource(t *testing.T) {
 	if os.Getenv("TF_ACC") == "" {
 		t.Skip("Acceptance tests are disabled.")
 	}
 	ctx := context.Background()
-	client := integration.StartCoder(ctx, t, "license_acc", false)
+	client := integration.StartCoder(ctx, t, "license_acc", true)
+	orgs, err := client.Organizations(ctx)
+	require.NoError(t, err)
+	firstOrg := orgs[0].ID
 
 	license := os.Getenv("CODER_ENTERPRISE_LICENSE")
 	if license == "" {
 		t.Skip("No license found for license resource tests, skipping")
 	}
 
-	cfg1 := testAccLicenseResourceconfig{
-		URL:     client.URL.String(),
-		Token:   client.SessionToken(),
-		License: license,
+	cfg1 := testAccProvisionerKeyResourceConfig{
+		URL:   client.URL.String(),
+		Token: client.SessionToken(),
+
+		OrganizationID: firstOrg,
+		Name:           "example-provisioner-key",
+	}
+
+	cfg2 := cfg1
+	cfg2.Name = "different-provisioner-key"
+	cfg2.Tags = map[string]string{
+		"wibble": "wobble",
 	}
 
 	resource.Test(t, resource.TestCase{
@@ -38,34 +50,44 @@ func TestAccLicenseResource(t *testing.T) {
 			{
 				Config: cfg1.String(t),
 			},
+			{
+				Config: cfg2.String(t),
+			},
 		},
 	})
 }
 
-type testAccLicenseResourceconfig struct {
-	URL     string
-	Token   string
-	License string
+type testAccProvisionerKeyResourceConfig struct {
+	URL   string
+	Token string
+
+	OrganizationID uuid.UUID
+	Name           string
+	Tags           map[string]string
 }
 
-func (c testAccLicenseResourceconfig) String(t *testing.T) string {
+func (c testAccProvisionerKeyResourceConfig) String(t *testing.T) string {
 	t.Helper()
 	tpl := `
 provider coderd {
 	url   = "{{.URL}}"
 	token = "{{.Token}}"
 }
 
-resource "coderd_license" "test" {
-	license = "{{.License}}"
+resource "coderd_provisioner_key" "test" {
+	organization_id = "{{.OrganizationID}}"
+	name            = "{{.Name}}"
+
+	tags = {
+		{{- range $key, $value := .Tags}}
+		{{$key}} = "{{$value}}"
+		{{- end}}
+	}
 }
 `
-	funcMap := template.FuncMap{
-		"orNull": PrintOrNull,
-	}
 
 	buf := strings.Builder{}
-	tmpl, err := template.New("licenseResource").Funcs(funcMap).Parse(tpl)
+	tmpl, err := template.New("provisionerKeyResource").Parse(tpl)
 	require.NoError(t, err)
 
 	err = tmpl.Execute(&buf, c)