Skip to content

Commit ea3d024

Browse files
committed
fix tests'
1 parent fc7d119 commit ea3d024

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

internal/controlplane/controlplane.go

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ func (d *dashboardClient) Update(ctx context.Context, tctx *translator.Translate
7474
return err
7575
}
7676
} else {
77-
ssl.Snis = append(ssl.Snis, oldssl.Snis...)
77+
// array union is done to avoid host duplication
78+
ssl.Snis = arrayUnion(ssl.Snis, oldssl.Snis)
7879
if _, err := d.c.Cluster(name).SSL().Update(ctx, ssl); err != nil {
7980
return err
8081
}
@@ -83,6 +84,25 @@ func (d *dashboardClient) Update(ctx context.Context, tctx *translator.Translate
8384
return nil
8485
}
8586

87+
func arrayUnion(arr1 []string, arr2 []string) []string {
88+
// return a union of elements from both array
89+
presentEle := make(map[string]bool)
90+
newArr := make([]string, 0)
91+
for _, ele := range arr1 {
92+
if !presentEle[ele] {
93+
presentEle[ele] = true
94+
newArr = append(newArr, ele)
95+
}
96+
}
97+
for _, ele := range arr2 {
98+
if !presentEle[ele] {
99+
presentEle[ele] = true
100+
newArr = append(newArr, ele)
101+
}
102+
}
103+
return newArr
104+
}
105+
86106
func (d *dashboardClient) Delete(ctx context.Context, obj client.Object) error {
87107
clusters := d.c.ListClusters()
88108
kindLabel := dashboard.ListByKindLabelOptions{

test/e2e/gatewayapi/gateway.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,15 +227,6 @@ spec:
227227
assert.Len(GinkgoT(), tls, 1, "tls number not expect")
228228
assert.Equal(GinkgoT(), Cert, tls[0].Cert, "tls cert not expect")
229229
assert.Equal(GinkgoT(), []string{host}, tls[0].Snis)
230-
231-
By("Delete Gateway")
232-
err = s.DeleteResource("Gateway", "api7ee")
233-
Expect(err).NotTo(HaveOccurred(), "deleting Gateway")
234-
time.Sleep(5 * time.Second)
235-
236-
tls, err = s.DefaultDataplaneResource().SSL().List(context.Background())
237-
assert.Nil(GinkgoT(), err, "list tls error")
238-
assert.Len(GinkgoT(), tls, 0, "tls number not expect")
239230
})
240231

241232
Context("Gateway SSL with and without hostname", func() {

0 commit comments

Comments
 (0)