From e706b5d4a3443297e1962bfd482add73882945cf Mon Sep 17 00:00:00 2001
From: wyike <wangyike.wyk@alibaba-inc.com>
Date: Tue, 15 Nov 2022 13:16:11 +0800
Subject: [PATCH] add tests (#5058)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: 楚岳 <wangyike.wyk@alibaba-inc.com>
---
 .../mock/testrepo/helm-repo/bar-v1.0.0.tgz    | Bin 0 -> 231 bytes
 .../mock/testrepo/helm-repo/bar-v2.0.0.tgz    | Bin 0 -> 234 bytes
 .../mock/testrepo/helm-repo/foo-v1.0.0.tgz    | Bin 0 -> 252 bytes
 e2e/addon/mock/testrepo/helm-repo/index.yaml  |  26 ++++++++++++++++++
 e2e/addon/mock/vela_addon_mock_server.go      |  18 ++++++++++++
 pkg/addon/addon.go                            |   2 +-
 pkg/addon/type.go                             |   3 +-
 test/e2e-apiserver-test/addon_test.go         |  19 +++++++++++++
 8 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 e2e/addon/mock/testrepo/helm-repo/bar-v1.0.0.tgz
 create mode 100644 e2e/addon/mock/testrepo/helm-repo/bar-v2.0.0.tgz
 create mode 100644 e2e/addon/mock/testrepo/helm-repo/foo-v1.0.0.tgz

diff --git a/e2e/addon/mock/testrepo/helm-repo/bar-v1.0.0.tgz b/e2e/addon/mock/testrepo/helm-repo/bar-v1.0.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..4005866026f275689a1d33879e6baa414bf25249
GIT binary patch
literal 231
zcmV<D02u!tiwFQbwsB(s1MQOG4uT*M$NkJx+!G+E;O2w${S+#fq65_R_Mx@5YW2;v
zmcOz6H|`GZ_*0^dqm^Nd<wC%sQZCAp?5a0_XK5N%BDn;{gYXE%+KtT&&Z7;jOlS`0
z`lR3Gg|z+t!#TG(?)oE?!T(l!ROpeOv29kkBfN*qviJV;Jbm(CBtk~OR_Nu0Klk5Y
zs|yIffQ;I@x-$igoHELY(yp>~@0Y!uZV<e79#E;yz+9%5vbvh%NAG)A#PKvu)S#tR
h*T!>%47PcUme(jD<lCcfY;0`&H5Xf*s$u{N0060$ek%X~

literal 0
HcmV?d00001

diff --git a/e2e/addon/mock/testrepo/helm-repo/bar-v2.0.0.tgz b/e2e/addon/mock/testrepo/helm-repo/bar-v2.0.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..a53310f88f27a6f22ae04a6db146cdac67cdbb25
GIT binary patch
literal 234
zcmV<G02TiqiwFQvwsB(s1MQMgj=~@ihWpGZ<^*)06q6pr_i4f1#+DjD8*eYI#$+|_
zTVss<LNW>e49xITlh3n-LBvg2!W^}pBT99RH$bSONUIP+0t%^7WKb^M*u*hJ@~M@P
z+|Rk)+gEuhZMXa9oZB4t_#xEE|K3J26p5dy?-sZty@yunwf|yMJosNqr8B?<dU@i@
z{dd&c3eqoNC+kByxC%~^BS&UzXncE!^WN5W1kr{FWX#}TDl>Cg+f4dzjE7L=`8bZ;
kk>}0O=aa&YzWb}zSCujL?$K9PR#v{63uPXg&;SYm04H*HE&u=k

literal 0
HcmV?d00001

diff --git a/e2e/addon/mock/testrepo/helm-repo/foo-v1.0.0.tgz b/e2e/addon/mock/testrepo/helm-repo/foo-v1.0.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..e835e8848c6365fcefebe813f96fd07e82af006c
GIT binary patch
literal 252
zcmV<Y00aLYiwFQ1wsB(s1MQMaZo?oDhP~z#bAe)vfk-|`_ER%%QEhAiiIv+IJ5d*D
z)16hd^(Ul}=Ectp-8h!T#t0z}TEl9MS*?)jYHvWL>N+2(j0RCjQ_BMM*1{G}F=5D3
zX7n!?_ePKMa$47Y)93b%5Bp2#^8N=(XfYwb;LvYyN1lgK>hb=iuI~1)<v|r7Hqi2k
zf4+Z@12vF;0XtKOZuAYDD=xTTmSP*+lvdx7dW1wV0a`nHSjy~L=GrCxn$i@TvYh9c
zXD@HZp<E*D6#6ftEcc(tTk@@=*f4m4tCVL93;^!cu%8~(&d$!xALAVnFM#U+3IG6R
CZF_S7

literal 0
HcmV?d00001

diff --git a/e2e/addon/mock/testrepo/helm-repo/index.yaml b/e2e/addon/mock/testrepo/helm-repo/index.yaml
index 8d5bc3211..f10666a8c 100644
--- a/e2e/addon/mock/testrepo/helm-repo/index.yaml
+++ b/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"
\ No newline at end of file
diff --git a/e2e/addon/mock/vela_addon_mock_server.go b/e2e/addon/mock/vela_addon_mock_server.go
index 2808a4c69..a9e399a6b 100644
--- a/e2e/addon/mock/vela_addon_mock_server.go
+++ b/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)
 	}
 
 }
diff --git a/pkg/addon/addon.go b/pkg/addon/addon.go
index 70b28a852..a3d2c4f8b 100644
--- a/pkg/addon/addon.go
+++ b/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
 		}
diff --git a/pkg/addon/type.go b/pkg/addon/type.go
index f3326babf..1633cd43c 100644
--- a/pkg/addon/type.go
+++ b/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
diff --git a/test/e2e-apiserver-test/addon_test.go b/test/e2e-apiserver-test/addon_test.go
index fc8dc4fd9..2636e381b 100644
--- a/test/e2e-apiserver-test/addon_test.go
+++ b/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())
+		})
+	})
 })