missing commits from 19688

command/command_test.go

@@ -729,7 +729,7 @@ func testBackendState(t *testing.T, s *terraform.State, c int) (*terraform.State
 	state.Backend = &terraform.BackendState{
 		Type:      "http",
 		ConfigRaw: json.RawMessage(fmt.Sprintf(`{"address":%q}`, srv.URL)),
-		Hash:      hash,
+		Hash:      uint64(hash),
 	}
 
 	return state, srv

command/init_test.go

@@ -470,7 +470,7 @@ func TestInit_backendReinitWithExtra(t *testing.T) {
 		t.Errorf("wrong config\ngot:  %s\nwant: %s", got, want)
 	}
 
-	if state.Backend.Hash != cHash {
+	if state.Backend.Hash != uint64(cHash) {
 		t.Fatal("mismatched state and config backend hashes")
 	}
 
@@ -482,7 +482,7 @@ func TestInit_backendReinitWithExtra(t *testing.T) {
 	if got, want := normalizeJSON(t, state.Backend.ConfigRaw), `{"path":"hello","workspace_dir":null}`; got != want {
 		t.Errorf("wrong config\ngot:  %s\nwant: %s", got, want)
 	}
-	if state.Backend.Hash != cHash {
+	if state.Backend.Hash != uint64(cHash) {
 		t.Fatal("mismatched state and config backend hashes")
 	}
 }

command/meta_backend_test.go

@@ -1750,7 +1750,7 @@ func TestMetaBackend_configureWithExtra(t *testing.T) {
 
 	// Check the state
 	s := testDataStateRead(t, filepath.Join(DefaultDataDir, backendLocal.DefaultStateFilename))
-	if s.Backend.Hash != cHash {
+	if s.Backend.Hash != uint64(cHash) {
 		t.Fatal("mismatched state and config backend hashes")
 	}
 
@@ -1766,7 +1766,7 @@ func TestMetaBackend_configureWithExtra(t *testing.T) {
 
 	// Check the state
 	s = testDataStateRead(t, filepath.Join(DefaultDataDir, backendLocal.DefaultStateFilename))
-	if s.Backend.Hash != cHash {
+	if s.Backend.Hash != uint64(cHash) {
 		t.Fatal("mismatched state and config backend hashes")
 	}
 }