Deployment data source should treat stopped deployments consistently …

…to the deployment resource. (#688) * Deployment data source should treat stopped deployments consistently to the deployment resource * Changelog
elastic · Aug 15, 2023 · 857bdec · 857bdec
1 parent 8d3948a
commit 857bdec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.changelog/688.txt b/.changelog/688.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+datasource/deployment: Prevent a provider crash when the deployment data source is referencing a deleted deployment
+```
diff --git a/ec/ecdatasource/deploymentdatasource/datasource.go b/ec/ecdatasource/deploymentdatasource/datasource.go
@@ -30,6 +30,7 @@ import (
 	"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi/deputil"
 	"github.com/elastic/cloud-sdk-go/pkg/models"
 
+	"github.com/elastic/terraform-provider-ec/ec/ecresource/deploymentresource"
 	"github.com/elastic/terraform-provider-ec/ec/internal"
 	"github.com/elastic/terraform-provider-ec/ec/internal/converters"
 	"github.com/elastic/terraform-provider-ec/ec/internal/util"
@@ -87,6 +88,10 @@ func (d DataSource) Read(ctx context.Context, request datasource.ReadRequest, re
 		return
 	}
 
+	if !deploymentresource.HasRunningResources(res) {
+		return
+	}
+
 	response.Diagnostics.Append(modelToState(ctx, res, &newState)...)
 	if response.Diagnostics.HasError() {
 		return

diff --git a/ec/ecresource/deploymentresource/read.go b/ec/ecresource/deploymentresource/read.go
@@ -96,7 +96,8 @@ func (r *Resource) read(ctx context.Context, id string, state *deploymentv2.Depl
 	}
 
 	response, err := deploymentapi.Get(deploymentapi.GetParams{
-		API: r.client, DeploymentID: id,
+		API:          r.client,
+		DeploymentID: id,
 		QueryParams: deputil.QueryParams{
 			ShowSettings:     true,
 			ShowPlans:        true,