fix: r

Signed-off-by: ashing <[email protected]>

Author: ronething

test/e2e/framework/dashboard.go

@@ -2,30 +2,24 @@ package framework
 
 import (
 	"bytes"
-	"context"
+	_ "embed"
 	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
 	"os"
-	"os/exec"
 	"text/template"
 	"time"
 
 	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
 	"github.com/api7/gopkg/pkg/log"
 	"github.com/google/uuid"
-	"github.com/onsi/gomega"
+	. "github.com/onsi/gomega"
 	"golang.org/x/net/html"
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/cli"
 
 	"helm.sh/helm/v3/pkg/kube"
-	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/util/yaml"
-
-	testutils "github.com/api7/api7-ingress-controller/test/utils"
 )
 
 var (
@@ -204,6 +198,10 @@ dp_manager_configuration:
   database:
     dsn: {{ .DSN }}
 prometheus:
+  server:
+    persistence:
+      enabled: false
+postgresql:
 {{- if ne .DB "postgres" }}
   builtin: false
 {{- end }}
@@ -273,70 +271,44 @@ func (f *Framework) deploy() {
 		"memory",
 		debug,
 	)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "init helm action config")
+	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "init helm action config")
 
 	install := action.NewInstall(actionConfig)
 	install.Namespace = f.kubectlOpts.Namespace
 	install.ReleaseName = "api7ee3"
-	install.Wait = true
-	install.Version = dashboardVersion
-	install.Timeout = 600 * time.Second
 
 	chartPath, err := install.LocateChart("api7/api7ee3", cli.New())
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "locate helm chart")
 
-	chartObj, err := loader.Load(chartPath)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	chart, err := loader.Load(chartPath)
+	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "load helm chart")
 
-	dsn := fmt.Sprintf(
-		"host=%s port=%d user=%s password=%s dbname=%s sslmode=disable",
-		"api7ee3-postgresql", 5432, "postgres", "postgres", "api7",
-	)
-	DB := "postgres"
-
-	valuesBuf := &bytes.Buffer{}
-	err = valuesTemplate.Execute(valuesBuf, struct {
-		Tag string
-		DSN string
-		DB  string
-	}{
-		Tag: dashboardVersion,
-		DSN: dsn,
-		DB:  DB,
+	buf := bytes.NewBuffer(nil)
+	_ = valuesTemplate.Execute(buf, map[string]any{
+		"DB":  _db,
+		"DSN": getDSN(),
+		"Tag": dashboardVersion,
 	})
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-	vals := make(map[string]any)
-	gomega.Expect(yaml.Unmarshal(valuesBuf.Bytes(), &vals)).NotTo(gomega.HaveOccurred())
 
-	_, err = install.Run(chartObj, vals)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-	err = f.ExecuteWithRetry(func() error {
-		cmd := exec.Command("kubectl", "get", "service", "api7ee3-dashboard", "-n", f.DeployNamespace())
-		_, err := testutils.Run(cmd)
-		return err
-	}, f.DeployNamespace())
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	var v map[string]any
+	err = yaml.Unmarshal(buf.Bytes(), &v)
+	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "unmarshal values")
+	_, err = install.Run(chart, v)
+	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "install dashboard")
 
 	err = f.ensureService("api7ee3-dashboard", _namespace, 1)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "ensuring dashboard service")
+	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "ensuring dashboard service")
 
 	err = f.ensureService("api7-postgresql", _namespace, 1)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "ensuring postgres service")
+	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "ensuring postgres service")
 
 	err = f.ensureService("api7-prometheus-server", _namespace, 1)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "ensuring prometheus-server service")
+	f.GomegaT.Expect(err).ShouldNot(HaveOccurred(), "ensuring prometheus-server service")
 }
 
 func (f *Framework) initDashboard() {
-	// Wait for dashboard to be ready
-	err := f.ExecuteWithRetry(func() error {
-		cmd := exec.Command("kubectl", "get", "service", "api7ee3-dashboard", "-n", f.DeployNamespace())
-		_, err := testutils.Run(cmd)
-		return err
-	}, f.DeployNamespace())
-	f.GomegaT.Expect(err).ShouldNot(gomega.HaveOccurred(), "waiting for dashboard to be ready")
+	f.deletePods("app.kubernetes.io/name=api7ee3")
+	time.Sleep(5 * time.Second)
 }
 
 // ParseHTML will parse the doc from login page and generate a map contains id and action.
@@ -387,44 +359,23 @@ func (f *Framework) GetTokenFromDashboard(gatewayGroupID string) (string, error)
 }
 
 func (f *Framework) GetDataplaneCertificates(gatewayGroupID string) *v1.DataplaneCertificate {
-	req, err := http.NewRequest(
-		http.MethodGet,
-		fmt.Sprintf("http://127.0.0.1:%d/dashboard/api/gateway-groups/%s/dataplane-certificates",
-			f.ProxyPort(),
-			gatewayGroupID,
-		),
-		nil,
-	)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-	client := http.Client{Timeout: 30 * time.Second}
-	resp, err := client.Do(req)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
-	defer func() {
-		if err := resp.Body.Close(); err != nil {
-			f.Logf("failed to close response body: %v", err)
-		}
-	}()
-
-	body, err := io.ReadAll(resp.Body)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-	f.Logger.Logf(f.GinkgoT, "dataplane certificates issuer response: %s", string(body))
-
 	respExp := f.DashboardHTTPClient().
 		POST("/api/gateway_groups/"+gatewayGroupID+"/dp_client_certificates").
 		WithBasicAuth("admin", "admin").
 		WithHeader("Content-Type", "application/json").
-		WithBytes(body).
+		WithBytes([]byte(`{}`)).
 		Expect()
 
+	f.Logger.Logf(f.GinkgoT, "dataplane certificates issuer response: %s", respExp.Body().Raw())
+
 	respExp.Status(200).Body().Contains("certificate").Contains("private_key").Contains("ca_certificate")
+	body := respExp.Body().Raw()
 
 	var dpCertResp struct {
 		Value v1.DataplaneCertificate `json:"value"`
 	}
-	err = json.Unmarshal(body, &dpCertResp)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	err := json.Unmarshal([]byte(body), &dpCertResp)
+	Expect(err).ToNot(HaveOccurred())
 
 	return &dpCertResp.Value
 }
@@ -441,7 +392,7 @@ func (s *Framework) GetAdminKey(gatewayGroupID string) string {
 
 	var response responseCreateGateway
 	err := json.Unmarshal([]byte(body), &response)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "unmarshal response")
+	Expect(err).ToNot(HaveOccurred(), "unmarshal response")
 	return response.Value.Key
 }
 
@@ -457,12 +408,12 @@ func (f *Framework) DeleteGatewayGroup(gatewayGroupID string) {
 	// unmarshal into responseCreateGateway
 	var response responseCreateGateway
 	err := json.Unmarshal([]byte(body), &response)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	Expect(err).ToNot(HaveOccurred())
 }
 
 func (f *Framework) CreateNewGatewayGroupWithIngress() string {
 	gid, err := f.CreateNewGatewayGroupWithIngressE()
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
+	Expect(err).ToNot(HaveOccurred())
 	return gid
 }
 
@@ -498,34 +449,3 @@ func (f *Framework) CreateNewGatewayGroupWithIngressE() (string, error) {
 	}
 	return response.Value.ID, nil
 }
-
-// ExecuteWithRetry executes the given function with retry logic
-func (f *Framework) ExecuteWithRetry(fn func() error, namespace string) error {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	return wait.PollUntilContextTimeout(
-		ctx,
-		1*time.Second,
-		30*time.Second,
-		false,
-		func(ctx context.Context) (bool, error) {
-			err := fn()
-			if err != nil {
-				f.Logf("Error executing function, retrying: %v", err)
-				return false, nil
-			}
-			return true, nil
-		},
-	)
-}
-
-// DeployNamespace returns the namespace used for deployment
-func (f *Framework) DeployNamespace() string {
-	return "api7-ee-e2e"
-}
-
-// ProxyPort returns the proxy port
-func (f *Framework) ProxyPort() int {
-	return 9080
-}

test/e2e/framework/k8s.go

@@ -201,8 +201,6 @@ func (f *Framework) newDashboardTunnel() error {
 		case "https":
 			httpsNodePort = int(port.NodePort)
 			httpsPort = int(port.Port)
-		default:
-			return fmt.Errorf("unknown port name: %s", port.Name)
 		}
 	}
 

test/e2e/scaffold/dp.go

@@ -15,14 +15,13 @@
 package scaffold
 
 import (
-	. "github.com/onsi/gomega" //nolint:staticcheck
-	corev1 "k8s.io/api/core/v1"
+	. "github.com/onsi/gomega"
 
 	"github.com/api7/api7-ingress-controller/test/e2e/framework"
 )
 
 func (s *Scaffold) deployDataplane() {
-	svc := s.deployGateway(framework.DataPlaneDeployOptions{
+	svc := s.DeployGateway(framework.DataPlaneDeployOptions{
 		GatewayGroupID:         s.gatewaygroupid,
 		Namespace:              s.namespace,
 		Name:                   "api7ee3-apisix-gateway-mtls",
@@ -53,11 +52,3 @@ func (s *Scaffold) newAPISIXTunnels() error {
 	s.apisixHttpsTunnel = httpsTunnel
 	return nil
 }
-
-// deployGateway 部署网关
-func (s *Scaffold) deployGateway(opts framework.DataPlaneDeployOptions) *corev1.Service {
-	// 实现部署网关的逻辑
-	// 这里只是个占位符，需要根据实际情况实现
-	// 应该返回一个 *corev1.Service 类型的服务
-	return nil
-}

test/e2e/scaffold/ingress.go

@@ -4,19 +4,12 @@ import (
 	"github.com/api7/api7-ingress-controller/test/e2e/framework"
 )
 
-// deployIngress 部署 ingress 控制器
 func (s *Scaffold) deployIngress() {
-	s.internalDeployIngress(framework.IngressDeployOpts{
+	s.DeployIngress(framework.IngressDeployOpts{
 		ControllerName: s.opts.ControllerName,
 		AdminKey:       s.AdminKey(),
 		AdminTLSVerify: false,
 		Namespace:      s.namespace,
 		AdminEnpoint:   framework.DashboardTLSEndpoint,
 	})
 }
-
-// internalDeployIngress 实际部署 ingress 控制器
-func (s *Scaffold) internalDeployIngress(opts framework.IngressDeployOpts) {
-	// 这里实现部署 ingress 的逻辑
-	// 只是一个占位符，需要根据实际情况实现
-}

test/e2e/scaffold/scaffold.go

@@ -813,49 +813,3 @@ func (s *Scaffold) GetGatewayGroupHTTPSEndpoint(gatewayGroupID string) (string,
 
 	return resources.HttpsTunnel.Endpoint(), nil
 }
-
-// UploadLicense 上传证书
-func (s *Scaffold) UploadLicense() {
-	// 这里实现上传证书的逻辑
-	// 作为占位符，实际逻辑需要根据具体情况实现
-}
-
-// CreateNewGatewayGroupWithIngress 创建新的网关组和Ingress
-func (s *Scaffold) CreateNewGatewayGroupWithIngress() string {
-	// 这里实现创建网关组和Ingress的逻辑
-	// 作为占位符，实际逻辑需要根据具体情况实现
-	return "gateway-group-id-placeholder"
-}
-
-// Logf 日志输出函数
-func (s *Scaffold) Logf(format string, args ...any) {
-	// 这里实现日志输出逻辑
-	s.Framework.Logf(format, args...)
-}
-
-// GetAdminKey 获取管理员密钥
-func (s *Scaffold) GetAdminKey(gatewayGroupID string) string {
-	// 这里实现获取管理员密钥的逻辑
-	// 作为占位符，实际逻辑需要根据具体情况实现
-	return "admin-key-placeholder"
-}
-
-// GetDashboardEndpoint 获取仪表盘端点
-func (s *Scaffold) GetDashboardEndpoint() string {
-	// 这里实现获取仪表盘端点的逻辑
-	// 作为占位符，实际逻辑需要根据具体情况实现
-	return "dashboard-endpoint-placeholder"
-}
-
-// GetDashboardEndpointHTTPS 获取仪表盘HTTPS端点
-func (s *Scaffold) GetDashboardEndpointHTTPS() string {
-	// 这里实现获取仪表盘HTTPS端点的逻辑
-	// 作为占位符，实际逻辑需要根据具体情况实现
-	return "dashboard-endpoint-https-placeholder"
-}
-
-// DeleteGatewayGroup 删除网关组
-func (s *Scaffold) DeleteGatewayGroup(gatewayGroupID string) {
-	// 这里实现删除网关组的逻辑
-	// 作为占位符，实际逻辑需要根据具体情况实现
-}