Fix: avoid updating backend state file if an unhandled error has occurred

SarahFrench · SarahFrench · commit afccc3f1b2f1 · 2025-10-01T19:01:28.000+01:00
diff --git a/internal/command/meta_backend.go b/internal/command/meta_backend.go
@@ -1693,11 +1693,11 @@ func (m *Meta) stateStore_C_s(c *configs.StateStore, cHash int, backendSMgr *cli
 				}
 			}
 			// TODO: handle if input is not enabled
-			// TODO: handle if non-default workspace is not used
-		} else if err != nil {
-			diags = diags.Append(err)
 		}
 	}
+	if diags.HasErrors() {
+		return nil, diags
+	}
 
 	// Update backend state file
 	if err := backendSMgr.WriteState(s); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1693,11 +1693,11 @@ func (m Meta) stateStore_C_s(c configs.StateStore, cHash int, backendSMgr *cli`
`1693`	`1693`	`}`
`1694`	`1694`	`}`
`1695`	`1695`	`// TODO: handle if input is not enabled`
`1696`		`- // TODO: handle if non-default workspace is not used`
`1697`		`- } else if err != nil {`
`1698`		`- diags = diags.Append(err)`
`1699`	`1696`	`}`
`1700`	`1697`	`}`
	`1698`	`+ if diags.HasErrors() {`
	`1699`	`+ return nil, diags`
	`1700`	`+ }`
`1701`	`1701`
`1702`	`1702`	`// Update backend state file`
`1703`	`1703`	`if err := backendSMgr.WriteState(s); err != nil {`