Merge pull request #7370 from tpounds/show-tf-ver-on-state-mismatch

Show Terraform version on state version mismatch.

terraform/state.go

@@ -1496,8 +1496,8 @@ func ReadState(src io.Reader) (*State, error) {
 		}
 		return v3State, nil
 	default:
-		return nil, fmt.Errorf("State version %d not supported, please update.",
-			versionIdentifier.Version)
+		return nil, fmt.Errorf("Terraform %s does not support state version %d, please update.",
+			SemVersion.String(), versionIdentifier.Version)
 	}
 }
 
@@ -1524,8 +1524,8 @@ func ReadStateV2(jsonBytes []byte) (*State, error) {
 	// Check the version, this to ensure we don't read a future
 	// version that we don't understand
 	if state.Version > StateVersion {
-		return nil, fmt.Errorf("State version %d not supported, please update.",
-			state.Version)
+		return nil, fmt.Errorf("Terraform %s does not support state version %d, please update.",
+			SemVersion.String(), state.Version)
 	}
 
 	// Make sure the version is semantic
@@ -1556,8 +1556,8 @@ func ReadStateV3(jsonBytes []byte) (*State, error) {
 	// Check the version, this to ensure we don't read a future
 	// version that we don't understand
 	if state.Version > StateVersion {
-		return nil, fmt.Errorf("State version %d not supported, please update.",
-			state.Version)
+		return nil, fmt.Errorf("Terraform %s does not support state version %d, please update.",
+			SemVersion.String(), state.Version)
 	}
 
 	// Make sure the version is semantic

terraform/state_test.go

@@ -1348,7 +1348,7 @@ func TestReadStateNewVersion(t *testing.T) {
 	if s != nil {
 		t.Fatalf("unexpected: %#v", s)
 	}
-	if !strings.Contains(err.Error(), "not supported") {
+	if !strings.Contains(err.Error(), "does not support state version") {
 		t.Fatalf("err: %v", err)
 	}
 }