From 364b5648b4bcf0acb1442447ebb48b5859bd759e Mon Sep 17 00:00:00 2001 From: Daniele Rondina Date: Sat, 4 Jul 2020 20:07:32 +0200 Subject: [PATCH] repository loader now support .yaml extension --- pkg/repository/loader.go | 2 +- pkg/repository/repository_test.go | 12 +++++++++++- tests/fixtures/repos.conf.d/repo-test2.yaml | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 tests/fixtures/repos.conf.d/repo-test2.yaml diff --git a/pkg/repository/loader.go b/pkg/repository/loader.go index fffb2f83..2f3a0d7e 100644 --- a/pkg/repository/loader.go +++ b/pkg/repository/loader.go @@ -28,7 +28,7 @@ import ( ) func LoadRepositories(c *LuetConfig) error { - var regexRepo = regexp.MustCompile(`.yml$`) + var regexRepo = regexp.MustCompile(`.yml$|.yaml$`) for _, rdir := range c.RepositoriesConfDir { Debug("Parsing Repository Directory", rdir, "...") diff --git a/pkg/repository/repository_test.go b/pkg/repository/repository_test.go index 9a95b875..29cd914f 100644 --- a/pkg/repository/repository_test.go +++ b/pkg/repository/repository_test.go @@ -35,12 +35,22 @@ var _ = Describe("Repository", func() { It("Chec Load Repository 1", func() { Expect(err).Should(BeNil()) - Expect(len(cfg.SystemRepositories)).Should(Equal(1)) + Expect(len(cfg.SystemRepositories)).Should(Equal(2)) Expect(cfg.SystemRepositories[0].Name).Should(Equal("test1")) Expect(cfg.SystemRepositories[0].Priority).Should(Equal(999)) Expect(cfg.SystemRepositories[0].Type).Should(Equal("disk")) Expect(len(cfg.SystemRepositories[0].Urls)).Should(Equal(1)) Expect(cfg.SystemRepositories[0].Urls[0]).Should(Equal("tests/repos/test1")) }) + + It("Chec Load Repository 2", func() { + Expect(err).Should(BeNil()) + Expect(len(cfg.SystemRepositories)).Should(Equal(2)) + Expect(cfg.SystemRepositories[1].Name).Should(Equal("test2")) + Expect(cfg.SystemRepositories[1].Priority).Should(Equal(1000)) + Expect(cfg.SystemRepositories[1].Type).Should(Equal("disk")) + Expect(len(cfg.SystemRepositories[1].Urls)).Should(Equal(1)) + Expect(cfg.SystemRepositories[1].Urls[0]).Should(Equal("tests/repos/test2")) + }) }) }) diff --git a/tests/fixtures/repos.conf.d/repo-test2.yaml b/tests/fixtures/repos.conf.d/repo-test2.yaml new file mode 100644 index 00000000..df9b3a67 --- /dev/null +++ b/tests/fixtures/repos.conf.d/repo-test2.yaml @@ -0,0 +1,9 @@ +name: "test2" +description: "Test2 Repository" +type: "disk" +urls: + - "tests/repos/test2" +priority: 1000 +enable: true +# auth: +# token: "xxxxx"