Merge pull request hashicorp#7402 from hashicorp/jbardin/inc-state-serial

jbardin · web-flow · commit 20240c0e52bc · 2016-06-28T19:26:19.000-04:00
core: increment the state serial whenever we upgrade
diff --git a/terraform/state.go b/terraform/state.go
@@ -1474,6 +1474,8 @@ func ReadState(src io.Reader) (*State, error) {
 			return nil, err
 		}
 
+		// increment the Serial whenever we upgrade state
+		v3State.Serial++
 		return v3State, nil
 	case 2:
 		v2State, err := ReadStateV2(jsonBytes)
@@ -1485,6 +1487,7 @@ func ReadState(src io.Reader) (*State, error) {
 			return nil, err
 		}
 
+		v3State.Serial++
 		return v3State, nil
 	case 3:
 		v3State, err := ReadStateV3(jsonBytes)

Original file line number	Diff line number	Diff line change
`@@ -1474,6 +1474,8 @@ func ReadState(src io.Reader) (*State, error) {`
`1474`	`1474`	`return nil, err`
`1475`	`1475`	`}`
`1476`	`1476`
	`1477`	`+ // increment the Serial whenever we upgrade state`
	`1478`	`+ v3State.Serial++`
`1477`	`1479`	`return v3State, nil`
`1478`	`1480`	`case 2:`
`1479`	`1481`	`v2State, err := ReadStateV2(jsonBytes)`
`@@ -1485,6 +1487,7 @@ func ReadState(src io.Reader) (*State, error) {`
`1485`	`1487`	`return nil, err`
`1486`	`1488`	`}`
`1487`	`1489`
	`1490`	`+ v3State.Serial++`
`1488`	`1491`	`return v3State, nil`
`1489`	`1492`	`case 3:`
`1490`	`1493`	`v3State, err := ReadStateV3(jsonBytes)`