Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/v1.15/BUG FIXES-20260214-120000.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
kind: BUG FIXES
body: 'states: fixed a bug that caused Terraform to be unable to identify when two states had different output values. This may have caused issues in specific circumstances like backend migrations.'
time: 2026-02-14T12:00:00.000000+00:00
custom:
Issue: "38181"
2 changes: 1 addition & 1 deletion internal/states/state_equal.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func (s *State) RootOutputValuesEqual(s2 *State) bool {
return false
}

for k, v1 := range s2.RootOutputValues {
for k, v1 := range s.RootOutputValues {
v2, ok := s2.RootOutputValues[k]
if !ok || !v1.Equal(v2) {
return false
Expand Down
104 changes: 104 additions & 0 deletions internal/states/state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,110 @@ func TestStateHasRootOutputValues(t *testing.T) {

}

func TestStateRootOutputValuesEqual(t *testing.T) {
tests := map[string]struct {
SetupA func(ss *SyncState)
SetupB func(ss *SyncState)
Want bool
}{
"both empty": {
func(ss *SyncState) {},
func(ss *SyncState) {},
true,
},
"identical outputs": {
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "foo"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("bar"), false,
)
},
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "foo"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("bar"), false,
)
},
true,
},
"different values same key": {
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "foo"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("bar"), false,
)
},
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "foo"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("baz"), false,
)
},
false,
},
"different sensitivity same value": {
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "foo"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("bar"), false,
)
},
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "foo"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("bar"), true,
)
},
false,
},
"different keys same count": {
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "foo"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("val"), false,
)
},
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "bar"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("val"), false,
)
},
false,
},
"different count": {
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "foo"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("val"), false,
)
},
func(ss *SyncState) {
ss.SetOutputValue(
addrs.OutputValue{Name: "foo"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("val"), false,
)
ss.SetOutputValue(
addrs.OutputValue{Name: "bar"}.Absolute(addrs.RootModuleInstance),
cty.StringVal("val2"), false,
)
},
false,
},
}

for name, test := range tests {
t.Run(name, func(t *testing.T) {
stateA := BuildState(test.SetupA)
stateB := BuildState(test.SetupB)
got := stateA.RootOutputValuesEqual(stateB)
if got != test.Want {
t.Errorf("wrong result for stateA.RootOutputValuesEqual(stateB)\ngot: %t\nwant: %t", got, test.Want)
}
})
}
}

func TestState_MoveAbsResource(t *testing.T) {
// Set up a starter state for the embedded tests, which should start from a copy of this state.
state := NewState()
Expand Down