From 5f31b9aad05c0fcfc9e86c7f50c0772bdfbd3ddc Mon Sep 17 00:00:00 2001 From: qiaozp <47812250+chivalryq@users.noreply.github.com> Date: Thu, 6 Jan 2022 11:48:34 +0800 Subject: [PATCH] Feat: add test for registry name in addon response (#2858) * add test for registry name when list addon Signed-off-by: qiaozp * revert Signed-off-by: qiaozp * fix Signed-off-by: qiaozp * fix test Signed-off-by: qiaozp --- pkg/addon/addon_test.go | 4 +++- test/e2e-apiserver-test/addon_test.go | 29 +++++++++++++++++---------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pkg/addon/addon_test.go b/pkg/addon/addon_test.go index a76a77cf7..081336c2c 100644 --- a/pkg/addon/addon_test.go +++ b/pkg/addon/addon_test.go @@ -122,9 +122,11 @@ func testReaderFunc(t *testing.T, reader AsyncReader) { assert.True(t, len(uiData.Definitions) > 0) // test get ui data - uiDataList, err := ListAddonUIDataFromReader(reader, registryMeta, "KubeVela", UIMetaOptions) + rName := "KubeVela" + uiDataList, err := ListAddonUIDataFromReader(reader, registryMeta, rName, UIMetaOptions) assert.True(t, strings.Contains(err.Error(), "#parameter.example: preference mark not allowed at this position")) assert.Equal(t, len(uiDataList), 3) + assert.Equal(t, uiDataList[0].RegistryName, rName) // test get install package installPkg, err := GetInstallPackageFromReader(reader, &testAddonMeta, uiData) diff --git a/test/e2e-apiserver-test/addon_test.go b/test/e2e-apiserver-test/addon_test.go index bc4087067..762705725 100644 --- a/test/e2e-apiserver-test/addon_test.go +++ b/test/e2e-apiserver-test/addon_test.go @@ -49,14 +49,15 @@ func get(path string) *http.Response { } var _ = Describe("Test addon rest api", func() { + registryName := "test-addon-registry" createReq := apis.CreateAddonRegistryRequest{ - Name: "test-addon-registry-1", + Name: registryName, Oss: &addon.OSSAddonSource{ Endpoint: "https://oss-cn-hangzhou.aliyuncs.com", - Bucket: "kubevela-addons", + Bucket: "fake-kubevela-addons", }, } - It("should add a registry and list addons from it", func() { + It("should add and delete a registry, list addons from default registry", func() { defer GinkgoRecover() By("add registry") @@ -72,15 +73,26 @@ var _ = Describe("Test addon rest api", func() { Expect(err).Should(BeNil()) Expect(rmeta.Name).Should(Equal(createReq.Name)) Expect(rmeta.Git).Should(Equal(createReq.Git)) + Expect(rmeta.OSS).Should(Equal(createReq.Oss)) - By("list addons") + deleteReq, err := http.NewRequest(http.MethodDelete, baseURL+"/api/v1/addon_registries/"+createReq.Name, nil) + Expect(err).Should(BeNil()) + deleteRes, err := http.DefaultClient.Do(deleteReq) + Expect(err).Should(BeNil()) + Expect(deleteRes).ShouldNot(BeNil()) + Expect(deleteRes.StatusCode).Should(Equal(200)) + }) + + It("list addons", func() { + DefaultRegistry := "KubeVela" listRes := get("/api/v1/addons/") defer listRes.Body.Close() var lres apis.ListAddonResponse - err = json.NewDecoder(listRes.Body).Decode(&lres) + err := json.NewDecoder(listRes.Body).Decode(&lres) Expect(err).Should(BeNil()) Expect(lres.Addons).ShouldNot(BeZero()) + Expect(lres.Addons[0].RegistryName).To(Equal(DefaultRegistry)) By("get addon detail") detailRes := get("/api/v1/addons/terraform-alibaba") @@ -92,6 +104,7 @@ var _ = Describe("Test addon rest api", func() { Expect(dres.Meta).ShouldNot(BeNil()) Expect(dres.UISchema).ShouldNot(BeNil()) Expect(dres.APISchema).ShouldNot(BeNil()) + Expect(dres.RegistryName).Should(Equal(DefaultRegistry)) }) PIt("should enable and disable an addon", func() { @@ -141,11 +154,5 @@ var _ = Describe("Test addon rest api", func() { It("should delete test registry", func() { defer GinkgoRecover() - deleteReq, err := http.NewRequest(http.MethodDelete, baseURL+"/api/v1/addon_registries/"+createReq.Name, nil) - Expect(err).Should(BeNil()) - deleteRes, err := http.DefaultClient.Do(deleteReq) - Expect(err).Should(BeNil()) - Expect(deleteRes).ShouldNot(BeNil()) - Expect(deleteRes.StatusCode).Should(Equal(200)) }) })