fix [hashicorpGH-27358]

ziyeqf · Sep 18, 2024 · b3e9ea9 · b3e9ea9
1 parent 8916ae9
commit b3e9ea9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/internal/services/loganalytics/log_analytics_workspace_table_resource.go b/internal/services/loganalytics/log_analytics_workspace_table_resource.go
@@ -133,8 +133,12 @@ func (r LogAnalyticsWorkspaceTableResource) Create() sdk.ResourceFunc {
 
 			if model.Plan == string(tables.TablePlanEnumAnalytics) {
 				updateInput.Properties.RetentionInDays = pointer.To(model.RetentionInDays)
+			}
+
+			if model.TotalRetentionInDays != 0 {
 				updateInput.Properties.TotalRetentionInDays = pointer.To(model.TotalRetentionInDays)
 			}
+
 			if err := client.CreateOrUpdateThenPoll(ctx, id, updateInput); err != nil {
 				return fmt.Errorf("failed to update table %s in workspace %s in resource group %s: %s", tableName, workspaceId.WorkspaceName, workspaceId.ResourceGroupName, err)
 			}
@@ -183,10 +187,10 @@ func (r LogAnalyticsWorkspaceTableResource) Update() sdk.ResourceFunc {
 						if metadata.ResourceData.HasChange("retention_in_days") {
 							updateInput.Properties.RetentionInDays = pointer.To(state.RetentionInDays)
 						}
+					}
 
-						if metadata.ResourceData.HasChange("total_retention_in_days") {
-							updateInput.Properties.TotalRetentionInDays = pointer.To(state.TotalRetentionInDays)
-						}
+					if metadata.ResourceData.HasChange("total_retention_in_days") {
+						updateInput.Properties.TotalRetentionInDays = pointer.To(state.TotalRetentionInDays)
 					}
 
 					if err := client.CreateOrUpdateThenPoll(ctx, *id, updateInput); err != nil {
@@ -231,10 +235,8 @@ func (r LogAnalyticsWorkspaceTableResource) Read() sdk.ResourceFunc {
 
 			if model := resp.Model; model != nil {
 				if props := model.Properties; props != nil {
-					if pointer.From(props.Plan) == tables.TablePlanEnumAnalytics {
-						state.RetentionInDays = pointer.From(props.RetentionInDays)
-						state.TotalRetentionInDays = pointer.From(props.TotalRetentionInDays)
-					}
+					state.RetentionInDays = pointer.From(props.RetentionInDays)
+					state.TotalRetentionInDays = pointer.From(props.TotalRetentionInDays)
 					state.Plan = string(pointer.From(props.Plan))
 				}
 			}

diff --git a/internal/services/loganalytics/log_analytics_workspace_table_resource_test.go b/internal/services/loganalytics/log_analytics_workspace_table_resource_test.go
@@ -104,9 +104,10 @@ resource "azurerm_log_analytics_workspace" "test" {
   retention_in_days   = 30
 }
 resource "azurerm_log_analytics_workspace_table" "test" {
-  name         = "AppTraces"
-  workspace_id = azurerm_log_analytics_workspace.test.id
-  plan         = "Basic"
+  name                    = "AppTraces"
+  workspace_id            = azurerm_log_analytics_workspace.test.id
+  plan                    = "Basic"
+  total_retention_in_days = 32
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
 }