From 57771c2fb964071c816587d4885498770b5ec52d Mon Sep 17 00:00:00 2001 From: Rob Day-Reynolds Date: Tue, 11 Oct 2016 16:39:39 -0700 Subject: [PATCH] Remove fs_index version/entry_key check * Fixes `Internal inconsistency: version 'qwertyuiopsha' vs '2' errors [#132106783] Signed-off-by: Ming Xiao --- releasedir/index/fs_index.go | 4 ---- releasedir/index/fs_index_test.go | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/releasedir/index/fs_index.go b/releasedir/index/fs_index.go index 24f59565c..d99ac82bc 100644 --- a/releasedir/index/fs_index.go +++ b/releasedir/index/fs_index.go @@ -189,10 +189,6 @@ func (i FSIndex) entries(name string) ([]indexEntry, error) { var entries []indexEntry for versionKey, entry := range schema.Builds { - if versionKey != entry.Version { - return nil, bosherr.Errorf("Internal inconsistency: version '%s' vs '%s'", versionKey, entry.Version) - } - entries = append(entries, indexEntry{ Key: versionKey, Version: entry.Version, diff --git a/releasedir/index/fs_index_test.go b/releasedir/index/fs_index_test.go index 48a2cfd57..f7665698b 100644 --- a/releasedir/index/fs_index_test.go +++ b/releasedir/index/fs_index_test.go @@ -103,15 +103,14 @@ format-version: "2"`) Expect(err).To(Equal(errors.New("fake-err"))) }) - It("returns error if found entry does not have matching version with its build key", func() { + It("does not require version to equal entry key", func() { fs.WriteFileString("/dir/name/index.yml", `--- builds: fp: {version: other-fp} format-version: "2"`) _, _, err := index.Find("name", "fp") - Expect(err).To(HaveOccurred()) - Expect(err.Error()).To(Equal("Internal inconsistency: version 'fp' vs 'other-fp'")) + Expect(err).ToNot(HaveOccurred()) }) It("returns error if name is empty", func() {