Add NOT_FOUND error handling to resources [2/n]

This should prevent terraform state divergence for the included resources when the resource is deleted out of band.
observeinc · Sep 9, 2024 · 5ca615f · 5ca615f
1 parent 386d685
commit 5ca615f
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 1 deletion.
diff --git a/observe/resource_app.go b/observe/resource_app.go
@@ -141,6 +141,10 @@ func resourceAppRead(ctx context.Context, data *schema.ResourceData, meta interf
 
 	app, err := client.GetApp(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return diag.Errorf("failed to read app: %s", err.Error())
 	}
 

diff --git a/observe/resource_app_datasource.go b/observe/resource_app_datasource.go
@@ -115,7 +115,11 @@ func resourceAppDataSourceRead(ctx context.Context, data *schema.ResourceData, m
 
 	appdatasource, err := client.GetAppDataSource(ctx, data.Id())
 	if err != nil {
-		return diag.Errorf("failed to read app: %s", err.Error())
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
+		return diag.Errorf("failed to read appdatasource: %s", err.Error())
 	}
 
 	return appDataSourceToResourceData(appdatasource, data)

diff --git a/observe/resource_board.go b/observe/resource_board.go
@@ -139,6 +139,10 @@ func resourceBoardRead(ctx context.Context, data *schema.ResourceData, meta inte
 	client := meta.(*observe.Client)
 	result, err := client.GetBoard(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return append(diags, diag.Diagnostic{
 			Severity: diag.Error,
 			Summary:  fmt.Sprintf("failed to retrieve board [id=%s]", data.Id()),

diff --git a/observe/resource_bookmark.go b/observe/resource_bookmark.go
@@ -149,6 +149,10 @@ func resourceBookmarkRead(ctx context.Context, data *schema.ResourceData, meta i
 	client := meta.(*observe.Client)
 	result, err := client.GetBookmark(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return append(diags, diag.Diagnostic{
 			Severity: diag.Error,
 			Summary:  fmt.Sprintf("failed to retrieve bookmark [id=%s]", data.Id()),

diff --git a/observe/resource_bookmark_group.go b/observe/resource_bookmark_group.go
@@ -141,6 +141,10 @@ func resourceBookmarkGroupRead(ctx context.Context, data *schema.ResourceData, m
 	client := meta.(*observe.Client)
 	result, err := client.GetBookmarkGroup(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return append(diags, diag.Diagnostic{
 			Severity: diag.Error,
 			Summary:  fmt.Sprintf("failed to retrieve bookmark group [id=%s]", data.Id()),

diff --git a/observe/resource_channel.go b/observe/resource_channel.go
@@ -133,6 +133,10 @@ func resourceChannelRead(ctx context.Context, data *schema.ResourceData, meta in
 
 	channel, err := client.GetChannel(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return diag.Errorf("failed to read channel: %s", err.Error())
 	}
 

diff --git a/observe/resource_channel_action.go b/observe/resource_channel_action.go
@@ -286,6 +286,10 @@ func resourceChannelActionRead(ctx context.Context, data *schema.ResourceData, m
 
 	channelActionPtr, err := client.GetChannelAction(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return diag.Errorf("failed to read channel action: %s", err.Error())
 	}
 	channelAction := *channelActionPtr

diff --git a/observe/resource_dashboard_link.go b/observe/resource_dashboard_link.go
@@ -150,6 +150,10 @@ func resourceDashboardLinkRead(ctx context.Context, data *schema.ResourceData, m
 
 	link, err := client.Meta.GetDashboardLink(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return diag.Errorf("failed to read dashboard link: %s", err.Error())
 	}
 

diff --git a/observe/resource_dataset.go b/observe/resource_dataset.go
@@ -342,6 +342,10 @@ func resourceDatasetRead(ctx context.Context, data *schema.ResourceData, meta in
 	client := meta.(*observe.Client)
 	result, err := client.GetDataset(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return append(diags, diag.Diagnostic{
 			Severity: diag.Error,
 			Summary:  fmt.Sprintf("failed to retrieve dataset [id=%s]", data.Id()),

diff --git a/observe/resource_datastream_token.go b/observe/resource_datastream_token.go
@@ -152,6 +152,10 @@ func resourceDatastreamTokenRead(ctx context.Context, data *schema.ResourceData,
 	client := meta.(*observe.Client)
 	result, err := client.GetDatastreamToken(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return append(diags, diag.Diagnostic{
 			Severity: diag.Error,
 			Summary:  fmt.Sprintf("failed to retrieve datastream [id=%s]", data.Id()),

diff --git a/observe/resource_default_dashboard.go b/observe/resource_default_dashboard.go
@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
 	observe "github.com/observeinc/terraform-provider-observe/client"
+	gql "github.com/observeinc/terraform-provider-observe/client/meta"
 	"github.com/observeinc/terraform-provider-observe/client/oid"
 )
 
@@ -57,6 +58,10 @@ func resourceDefaultDashboardRead(ctx context.Context, data *schema.ResourceData
 
 	dashid, err := client.GetDefaultDashboard(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return diag.Errorf("failed to read default dashboard: %s", err.Error())
 	}
 

diff --git a/observe/resource_folder.go b/observe/resource_folder.go
@@ -105,6 +105,10 @@ func resourceFolderRead(ctx context.Context, data *schema.ResourceData, meta int
 
 	folder, err := client.GetFolder(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return diag.Errorf("failed to read folder: %s", err.Error())
 	}
 

diff --git a/observe/resource_layered_setting_record.go b/observe/resource_layered_setting_record.go
@@ -148,6 +148,10 @@ func resourceLayeredSettingRecordRead(ctx context.Context, data *schema.Resource
 	client := meta.(*observe.Client)
 	result, err := client.GetLayeredSettingRecord(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return append(diags, diag.Diagnostic{
 			Severity: diag.Error,
 			Summary:  fmt.Sprintf("failed to retrieve layeredsetting [id=%s]", data.Id()),

diff --git a/observe/resource_link.go b/observe/resource_link.go
@@ -129,6 +129,10 @@ func resourceLinkRead(ctx context.Context, data *schema.ResourceData, meta inter
 
 	link, err := client.GetForeignKey(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		if link == nil {
 			return diag.Errorf("failed to read link: %s", err.Error())
 		}

diff --git a/observe/resource_poller.go b/observe/resource_poller.go
@@ -744,6 +744,10 @@ func resourcePollerRead(ctx context.Context, data *schema.ResourceData, meta int
 
 	poller, err := client.GetPoller(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return diag.Errorf("failed to read poller: %s", err.Error())
 	}
 

diff --git a/observe/resource_preferred_path.go b/observe/resource_preferred_path.go
@@ -199,6 +199,10 @@ func resourcePreferredPathRead(ctx context.Context, data *schema.ResourceData, m
 
 	path, err := client.GetPreferredPath(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		if path == nil {
 			return diag.Errorf("failed to read preferred path: %s", err)
 		}

diff --git a/observe/resource_source_dataset.go b/observe/resource_source_dataset.go
@@ -344,6 +344,10 @@ func resourceSourceDatasetRead(ctx context.Context, data *schema.ResourceData, m
 	client := meta.(*observe.Client)
 	result, err := client.GetSourceDataset(ctx, data.Id())
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		return append(diags, diag.Diagnostic{
 			Severity: diag.Error,
 			Summary:  fmt.Sprintf("failed to retrieve dataset [id=%s]", data.Id()),

diff --git a/observe/resource_worksheet.go b/observe/resource_worksheet.go
@@ -137,6 +137,10 @@ func resourceWorksheetCreate(ctx context.Context, data *schema.ResourceData, met
 	id, _ := oid.NewOID(data.Get("workspace").(string))
 	result, err := client.CreateWorksheet(ctx, id.Id, config)
 	if err != nil {
+		if gql.HasErrorCode(err, gql.ErrNotFound) {
+			data.SetId("")
+			return nil
+		}
 		diags = append(diags, diag.Diagnostic{
 			Severity: diag.Error,
 			Summary:  "failed to create worksheet",