PR feedback

Author: tobio

internal/clients/kibana_oapi/data_views.go

@@ -95,6 +95,11 @@ func GetDefaultDataView(ctx context.Context, client *Client, spaceID string) (*s
 		return nil, diagutil.FrameworkDiagFromError(err)
 	}
 
+	// We don't check for a 404 here. The API doesn't document a 404 response for this endpoint.
+	// In testing, there's no case where a 404 is returned:
+	// - If no default data view is set, the API returns 200 with an empty string as the data view ID.
+	// - If the space doesn't exist, the API still returns 200 with an empty string as the data view ID.
+	// Therefore, we only handle the 200 response and treat any other status code as an error.
 	switch resp.StatusCode() {
 	case http.StatusOK:
 		if resp.JSON200 != nil && resp.JSON200.DataViewId != nil && *resp.JSON200.DataViewId != "" {

internal/kibana/default_data_view/create.go

@@ -8,7 +8,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
-	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 func (r *DefaultDataViewResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
@@ -43,8 +42,11 @@ func (r *DefaultDataViewResource) setDefaultDataView(ctx context.Context, plan t
 		return diags
 	}
 
-	// Use the space_id as the resource ID
-	model.ID = types.StringValue(spaceID)
+	model, readDiags := r.read(ctx, client, model)
+	diags.Append(readDiags...)
+	if diags.HasError() {
+		return diags
+	}
 
 	diags = state.Set(ctx, model)
 	return diags

internal/kibana/default_data_view/read.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients/kibana_oapi"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
@@ -22,19 +23,28 @@ func (r *DefaultDataViewResource) Read(ctx context.Context, req resource.ReadReq
 		return
 	}
 
-	spaceID := state.SpaceID.ValueString()
-	defaultDataViewID, diags := kibana_oapi.GetDefaultDataView(ctx, client, spaceID)
+	state, diags = r.read(ctx, client, state)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
+	diags = resp.State.Set(ctx, state)
+	resp.Diagnostics.Append(diags...)
+}
+
+func (r *DefaultDataViewResource) read(ctx context.Context, client *kibana_oapi.Client, state defaultDataViewModel) (defaultDataViewModel, diag.Diagnostics) {
+	spaceID := state.SpaceID.ValueString()
+	defaultDataViewID, diags := kibana_oapi.GetDefaultDataView(ctx, client, spaceID)
+	if diags.HasError() {
+		return state, diags
+	}
+
 	// Update state with current default data view
 	state.DataViewID = types.StringPointerValue(defaultDataViewID)
 
 	// Use the space_id as the resource ID
 	state.ID = types.StringValue(spaceID)
 
-	diags = resp.State.Set(ctx, state)
-	resp.Diagnostics.Append(diags...)
+	return state, nil
 }