remove usage of isReady, add check to ConvertProviderData instead

daemitus · daemitus · commit 57dae5de51c8 · 2024-09-19T11:36:52.000-04:00
diff --git a/internal/clients/api_client.go b/internal/clients/api_client.go
@@ -154,6 +154,12 @@ func ConvertProviderData(providerData any) (*ApiClient, fwdiags.Diagnostics) {
 
 		return nil, diags
 	}
+	if client == nil {
+		diags.AddError(
+			"Unconfigured Client",
+			"Expected configured client. Please report this issue to the provider developers.",
+		)
+	}
 	return client, diags
 }
 
diff --git a/internal/elasticsearch/index/index/create.go b/internal/elasticsearch/index/index/create.go
@@ -16,10 +16,6 @@ import (
 var includeTypeNameMinUnsupportedVersion = version.Must(version.NewVersion("8.0.0"))
 
 func (r Resource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
-	if !r.resourceReady(&resp.Diagnostics) {
-		return
-	}
-
 	var planModel tfModel
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &planModel)...)
 	if resp.Diagnostics.HasError() {
diff --git a/internal/elasticsearch/index/index/delete.go b/internal/elasticsearch/index/index/delete.go
@@ -10,10 +10,6 @@ import (
 )
 
 func (r *Resource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
-	if !r.resourceReady(&resp.Diagnostics) {
-		return
-	}
-
 	var model tfModel
 	resp.Diagnostics.Append(req.State.Get(ctx, &model)...)
 	if resp.Diagnostics.HasError() {
diff --git a/internal/elasticsearch/index/index/read.go b/internal/elasticsearch/index/index/read.go
@@ -10,10 +10,6 @@ import (
 )
 
 func (r *Resource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
-	if !r.resourceReady(&resp.Diagnostics) {
-		return
-	}
-
 	var stateModel tfModel
 	resp.Diagnostics.Append(req.State.Get(ctx, &stateModel)...)
 	if resp.Diagnostics.HasError() {
diff --git a/internal/elasticsearch/index/index/resource.go b/internal/elasticsearch/index/index/resource.go
@@ -18,18 +18,6 @@ type Resource struct {
 	client *clients.ApiClient
 }
 
-func (r *Resource) resourceReady(dg *diag.Diagnostics) bool {
-	if r.client == nil {
-		dg.AddError(
-			"Unconfigured Client",
-			"Expected configured client. Please report this issue to the provider developers.",
-		)
-
-		return false
-	}
-	return true
-}
-
 func (r *Resource) Configure(ctx context.Context, request resource.ConfigureRequest, response *resource.ConfigureResponse) {
 	client, diags := clients.ConvertProviderData(request.ProviderData)
 	response.Diagnostics.Append(diags...)
diff --git a/internal/elasticsearch/index/index/update.go b/internal/elasticsearch/index/index/update.go
@@ -15,10 +15,6 @@ import (
 )
 
 func (r *Resource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
-	if !r.resourceReady(&resp.Diagnostics) {
-		return
-	}
-
 	var planModel tfModel
 	var stateModel tfModel
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &planModel)...)
diff --git a/internal/kibana/data_view/create.go b/internal/kibana/data_view/create.go
@@ -10,10 +10,6 @@ import (
 )
 
 func (r *Resource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) {
-	if !r.resourceReady(&response.Diagnostics) {
-		return
-	}
-
 	dataviewClient, err := r.client.GetDataViewsClient()
 	if err != nil {
 		response.Diagnostics.AddError("unable to get data view client", err.Error())
diff --git a/internal/kibana/data_view/delete.go b/internal/kibana/data_view/delete.go
@@ -8,10 +8,6 @@ import (
 )
 
 func (r *Resource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) {
-	if !r.resourceReady(&response.Diagnostics) {
-		return
-	}
-
 	dataviewClient, err := r.client.GetDataViewsClient()
 	if err != nil {
 		response.Diagnostics.AddError("unable to get data view client", err.Error())
diff --git a/internal/kibana/data_view/read.go b/internal/kibana/data_view/read.go
@@ -9,10 +9,6 @@ import (
 )
 
 func (r *Resource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) {
-	if !r.resourceReady(&response.Diagnostics) {
-		return
-	}
-
 	var model tfModelV0
 	response.Diagnostics.Append(request.State.Get(ctx, &model)...)
 	if response.Diagnostics.HasError() {
diff --git a/internal/kibana/data_view/schema.go b/internal/kibana/data_view/schema.go
@@ -179,18 +179,6 @@ type Resource struct {
 	client *clients.ApiClient
 }
 
-func (r *Resource) resourceReady(dg *diag.Diagnostics) bool {
-	if r.client == nil {
-		dg.AddError(
-			"Unconfigured Client",
-			"Expected configured client. Please report this issue to the provider developers.",
-		)
-
-		return false
-	}
-	return true
-}
-
 func (r *Resource) Configure(ctx context.Context, request resource.ConfigureRequest, response *resource.ConfigureResponse) {
 	client, diags := clients.ConvertProviderData(request.ProviderData)
 	response.Diagnostics.Append(diags...)
diff --git a/internal/kibana/data_view/update.go b/internal/kibana/data_view/update.go
@@ -8,10 +8,6 @@ import (
 )
 
 func (r *Resource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) {
-	if !r.resourceReady(&response.Diagnostics) {
-		return
-	}
-
 	dataviewClient, err := r.client.GetDataViewsClient()
 	if err != nil {
 		response.Diagnostics.AddError("unable to get data view client", err.Error())
diff --git a/internal/kibana/import_saved_objects/create.go b/internal/kibana/import_saved_objects/create.go
@@ -19,10 +19,6 @@ func (r *Resource) Create(ctx context.Context, request resource.CreateRequest, r
 }
 
 func (r *Resource) importObjects(ctx context.Context, plan tfsdk.Plan, state *tfsdk.State, diags *diag.Diagnostics) {
-	if !resourceReady(r, diags) {
-		return
-	}
-
 	var model modelV0
 
 	diags.Append(plan.Get(ctx, &model)...)
diff --git a/internal/kibana/import_saved_objects/schema.go b/internal/kibana/import_saved_objects/schema.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
-	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
@@ -124,18 +123,6 @@ type Resource struct {
 	client *clients.ApiClient
 }
 
-func resourceReady(r *Resource, dg *diag.Diagnostics) bool {
-	if r.client == nil {
-		dg.AddError(
-			"Unconfigured Client",
-			"Expected configured client. Please report this issue to the provider developers.",
-		)
-
-		return false
-	}
-	return true
-}
-
 func (r *Resource) Configure(ctx context.Context, request resource.ConfigureRequest, response *resource.ConfigureResponse) {
 	client, diags := clients.ConvertProviderData(request.ProviderData)
 	response.Diagnostics.Append(diags...)

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,12 @@ func ConvertProviderData(providerData any) (*ApiClient, fwdiags.Diagnostics) {`
`154`	`154`
`155`	`155`	`return nil, diags`
`156`	`156`	`}`
	`157`	`+ if client == nil {`
	`158`	`+ diags.AddError(`
	`159`	`+ "Unconfigured Client",`
	`160`	`+ "Expected configured client. Please report this issue to the provider developers.",`
	`161`	`+ )`
	`162`	`+ }`
`157`	`163`	`return client, diags`
`158`	`164`	`}`
`159`	`165`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,6 @@ func (r *Resource) Create(ctx context.Context, request resource.CreateRequest, r`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func (r Resource) importObjects(ctx context.Context, plan tfsdk.Plan, state tfsdk.State, diags *diag.Diagnostics) {`
`22`		`- if !resourceReady(r, diags) {`
`23`		`- return`
`24`		`- }`
`25`		`-`
`26`	`22`	`var model modelV0`
`27`	`23`
`28`	`24`	`diags.Append(plan.Get(ctx, &model)...)`