chore: fix tests (#20)

coadler · web-flow · commit 746acae9c2db · 2024-07-12T11:28:38.000-05:00
diff --git a/internal/provider/example_data_source.go b/internal/provider/example_data_source.go
@@ -6,7 +6,6 @@ package provider
 import (
 	"context"
 	"fmt"
-	"net/http"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
@@ -23,7 +22,7 @@ func NewExampleDataSource() datasource.DataSource {
 
 // ExampleDataSource defines the data source implementation.
 type ExampleDataSource struct {
-	client *http.Client
+	data *CoderdProviderData
 }
 
 // ExampleDataSourceModel describes the data source data model.
@@ -60,18 +59,18 @@ func (d *ExampleDataSource) Configure(ctx context.Context, req datasource.Config
 		return
 	}
 
-	client, ok := req.ProviderData.(*http.Client)
+	client, ok := req.ProviderData.(*CoderdProviderData)
 
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Data Source Configure Type",
-			fmt.Sprintf("Expected *http.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),
+			fmt.Sprintf("Expected *CoderdProviderData, got: %T. Please report this issue to the provider developers.", req.ProviderData),
 		)
 
 		return
 	}
 
-	d.client = client
+	d.data = client
 }
 
 func (d *ExampleDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
diff --git a/internal/provider/example_data_source_test.go b/internal/provider/example_data_source_test.go
@@ -26,6 +26,11 @@ func TestAccExampleDataSource(t *testing.T) {
 }
 
 const testAccExampleDataSourceConfig = `
+provider coderd {
+	url = "https://dev.coder.com"
+	token = "iamnotarealtoken"
+}
+
 data "coderd_example" "test" {
   configurable_attribute = "example"
 }
diff --git a/internal/provider/user_resource.go b/internal/provider/user_resource.go
@@ -135,7 +135,7 @@ func (r *UserResource) Configure(ctx context.Context, req resource.ConfigureRequ
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Resource Configure Type",
-			fmt.Sprintf("Expected *codersdk.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),
+			fmt.Sprintf("Expected *CoderdProviderData, got: %T. Please report this issue to the provider developers.", req.ProviderData),
 		)
 
 		return

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ package provider`
`6`	`6`	`import (`
`7`	`7`	`"context"`
`8`	`8`	`"fmt"`
`9`		`- "net/http"`
`10`	`9`
`11`	`10`	`"github.com/hashicorp/terraform-plugin-framework/datasource"`
`12`	`11`	`"github.com/hashicorp/terraform-plugin-framework/datasource/schema"`
`@@ -23,7 +22,7 @@ func NewExampleDataSource() datasource.DataSource {`
`23`	`22`
`24`	`23`	`// ExampleDataSource defines the data source implementation.`
`25`	`24`	`type ExampleDataSource struct {`
`26`		`- client *http.Client`
	`25`	`+ data *CoderdProviderData`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`// ExampleDataSourceModel describes the data source data model.`
`@@ -60,18 +59,18 @@ func (d *ExampleDataSource) Configure(ctx context.Context, req datasource.Config`
`60`	`59`	`return`
`61`	`60`	`}`
`62`	`61`
`63`		`- client, ok := req.ProviderData.(*http.Client)`
	`62`	`+ client, ok := req.ProviderData.(*CoderdProviderData)`
`64`	`63`
`65`	`64`	`if !ok {`
`66`	`65`	`resp.Diagnostics.AddError(`
`67`	`66`	`"Unexpected Data Source Configure Type",`
`68`		`- fmt.Sprintf("Expected *http.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),`
	`67`	`+ fmt.Sprintf("Expected *CoderdProviderData, got: %T. Please report this issue to the provider developers.", req.ProviderData),`
`69`	`68`	`)`
`70`	`69`
`71`	`70`	`return`
`72`	`71`	`}`
`73`	`72`
`74`		`- d.client = client`
	`73`	`+ d.data = client`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`func (d ExampleDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp datasource.ReadResponse) {`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,11 @@ func TestAccExampleDataSource(t *testing.T) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	const testAccExampleDataSourceConfig = `
	`29`	`+provider coderd {`
	`30`	`+ url = "https://dev.coder.com"`
	`31`	`+ token = "iamnotarealtoken"`
	`32`	`+}`
	`33`	`+`
`29`	`34`	`data "coderd_example" "test" {`
`30`	`35`	`configurable_attribute = "example"`
`31`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func (r *UserResource) Configure(ctx context.Context, req resource.ConfigureRequ`
`135`	`135`	`if !ok {`
`136`	`136`	`resp.Diagnostics.AddError(`
`137`	`137`	`"Unexpected Resource Configure Type",`
`138`		`- fmt.Sprintf("Expected *codersdk.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),`
	`138`	`+ fmt.Sprintf("Expected *CoderdProviderData, got: %T. Please report this issue to the provider developers.", req.ProviderData),`
`139`	`139`	`)`
`140`	`140`
`141`	`141`	`return`