add tests (#5058)

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>

e2e/addon/mock/testrepo/helm-repo/index.yaml

@@ -34,4 +34,30 @@ entries:
       urls:
         - http://127.0.0.1:9098/helm/vela-workflow-v0.3.1.tgz
       version: v0.3.1
+  foo:
+    - created: "2022-10-29T09:11:16.865230605Z"
+      description: Vela test addon named foo
+      home:  https://www.foo.com/icon
+      icon: https://www.foo.com
+      name: foo
+      urls:
+        - http://127.0.0.1:9098/helm/foo-v1.0.0.tgz
+      version: v1.0.0
+  bar:
+    - created: "2022-10-29T09:11:16.865230605Z"
+      description: Vela test addon named bar
+      home:  https://www.bar.com/icon
+      icon: https://www.bar.com
+      name: foo
+      urls:
+        - http://127.0.0.1:9098/helm/bar-v1.0.0.tgz
+      version: v1.0.0
+    - created: "2022-10-29T09:11:16.865230605Z"
+      description: Vela test addon named bar
+      home:  https://www.bar.com/icon
+      icon: https://www.bar.com
+      name: foo
+      urls:
+        - http://127.0.0.1:9098/helm/bar-v2.0.0.tgz
+      version: v2.0.0
 generated: "2022-06-15T13:17:04.733573+08:00"

e2e/addon/mock/vela_addon_mock_server.go

@@ -131,6 +131,24 @@ var helmHandler http.HandlerFunc = func(rw http.ResponseWriter, req *http.Reques
 			_, _ = rw.Write([]byte(err.Error()))
 		}
 		rw.Write(file)
+	case strings.Contains(req.URL.Path, "foo-v1.0.0.tgz"):
+		file, err := os.ReadFile("./e2e/addon/mock/testrepo/helm-repo/foo-v1.0.0.tgz")
+		if err != nil {
+			_, _ = rw.Write([]byte(err.Error()))
+		}
+		rw.Write(file)
+	case strings.Contains(req.URL.Path, "bar-v1.0.0.tgz"):
+		file, err := os.ReadFile("./e2e/addon/mock/testrepo/helm-repo/bar-v1.0.0.tgz")
+		if err != nil {
+			_, _ = rw.Write([]byte(err.Error()))
+		}
+		rw.Write(file)
+	case strings.Contains(req.URL.Path, "bar-v2.0.0.tgz"):
+		file, err := os.ReadFile("./e2e/addon/mock/testrepo/helm-repo/bar-v2.0.0.tgz")
+		if err != nil {
+			_, _ = rw.Write([]byte(err.Error()))
+		}
+		rw.Write(file)
 	}
 
 }

pkg/addon/addon.go

@@ -953,7 +953,7 @@ func (h *Installer) installDependency(addon *InstallPackage) error {
 			continue
 		}
 		// always install addon's latest version
-		depAddon, err := h.loadInstallPackage(dep.Name, "")
+		depAddon, err := h.loadInstallPackage(dep.Name, dep.Version)
 		if err != nil {
 			return err
 		}

pkg/addon/type.go

@@ -105,7 +105,8 @@ type DeployTo struct {
 
 // Dependency defines the other addons it depends on
 type Dependency struct {
-	Name string `json:"name,omitempty"`
+	Name    string `json:"name,omitempty"`
+	Version string `json:"version,omitempty"`
 }
 
 // ElementFile can be addon's definition or addon's component

test/e2e-apiserver-test/addon_test.go

@@ -213,4 +213,23 @@ var _ = Describe("Test addon rest api", func() {
 			Expect(strings.Contains(errResponse.Message, "fail to install"))
 		})
 	})
+
+	Describe("Test addon dependency installed version", func() {
+		It("Test Operation of enabling foo addon will enable bar addon automatically", func() {
+			req := apisv1.EnableAddonRequest{}
+			res := post("/addons/foo/enable", req)
+			defer res.Body.Close()
+			var addon apisv1.AddonStatusResponse
+			Expect(decodeResponseBody(res, &addon)).Should(Succeed())
+			Expect(addon.Name).Should(BeEquivalentTo("foo"))
+
+			Eventually(func(g Gomega) {
+				status := get("/addons/bar/status")
+				var newaddonStatus apisv1.AddonStatusResponse
+				g.Expect(decodeResponseBody(status, &newaddonStatus)).Should(Succeed())
+				g.Expect(newaddonStatus.Name).Should(BeEquivalentTo("bar"))
+				g.Expect(newaddonStatus.InstalledVersion).Should(BeEquivalentTo("v1.0.0"))
+			}, 30*time.Second, 300*time.Millisecond).Should(Succeed())
+		})
+	})
 })