chore: simplify e2e environment (#2694)

Author: bzp2010

.github/workflows/backend-e2e-test.yml

@@ -22,6 +22,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: setup go
         uses: actions/setup-go@v3
@@ -40,10 +42,8 @@ jobs:
 
       - name: Modify conf.yaml Configure for use by the manage-api cluster
         run: |
-          sed -i 's/127.0.0.1:2379/172.16.238.10:2379/' ./api/conf/conf.yaml
+          sed -i 's/127.0.0.1:2379/etcd:2379/' ./api/conf/conf.yaml
           sed -i '[email protected]@0.0.0.0/0@' ./api/conf/conf.yaml
-          sed -i '/172.16.238.10:2379/a\      - 172.16.238.11:2379' ./api/conf/conf.yaml
-          sed -i '/172.16.238.10:2379/a\      - 172.16.238.12:2379' ./api/conf/conf.yaml
           sed -i '[email protected]/0:[email protected]:9000@' ./api/conf/conf.yaml
           sed -i 's/enabled: false/enabled: true/' ./api/conf/conf.yaml
 
@@ -76,11 +76,13 @@ jobs:
           docker logs docker_managerapi_1
 
       - name: install ginkgo cli
-        run: go install github.com/onsi/ginkgo/ginkgo@v1.16.5
+        run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@latest
 
       - name: run test
         working-directory: ./api/test/e2e
-        run: ginkgo -r
+        run: |
+          go mod download
+          ginkgo -r --flake-attempts=3 -v
 
       - name: stop docker compose
         working-directory: ./api/test/docker

api/test/docker/apisix_config.yaml

@@ -19,28 +19,20 @@
 #
 etcd:
   host:
-    - "http://172.16.238.10:2379"
-    - "http://172.16.238.11:2379"
-    - "http://172.16.238.12:2379"
-  resync_delay: 0  # sync data from etcd quickly for e2e test
+    - "http://etcd:2379"
+  resync_delay: 0
 
 apisix:
   id: "apisix-server1"
   admin_key:
-    -
-      name: "admin"                          # yamllint disable rule:comments-indentation
-      key: edd1c9f034335f136f87ad84b625c8f1  # using fixed API token has security risk, please
-                                             # update it when you deploy to production environment
-      role: admin                            # yamllint enable rule:comments-indentation
-
-  allow_admin:               # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
-    - 0.0.0.0/0              # If we don't set any IP list, then any IP access is allowed by default.
-
-  ssl:
-    enable: true
-    ssl_cert: "/usr/local/apisix/certs/apisix.crt"
-    ssl_cert_key: "/usr/local/apisix/certs/apisix.key"
-
+    - name: "admin"
+      key: edd1c9f034335f136f87ad84b625c8f1
+      role: admin
+  allow_admin:
+    - 0.0.0.0/0
+  admin_listen:
+    ip: 0.0.0.0
+    port: 9180
   enable_control: true
   control:
     ip: "0.0.0.0"
@@ -59,53 +51,7 @@ apisix:
 nginx_config:
   error_log_level: "debug"
 
-plugins:                          # plugin list (sorted in alphabetical order)
-  - api-breaker
-  - authz-keycloak
-  - basic-auth
-  - batch-requests
-  - consumer-restriction
-  - cors
-  - echo
-  - fault-injection
-  - grpc-transcode
-  - hmac-auth
-  - http-logger
-  - ip-restriction
-  - jwt-auth
-  - kafka-logger
-  - key-auth
-  - limit-conn
-  - limit-count
-  - limit-req
-  - node-status
-  - openid-connect
-  - prometheus
-  - proxy-cache
-  - proxy-mirror
-  - proxy-rewrite
-  - redirect
-  - referer-restriction
-  - request-id
-  - request-validation
-  - response-rewrite
-  - serverless-post-function
-  - serverless-pre-function
-  - skywalking
-  - sls-logger
-  - syslog
-  - tcp-logger
-  - udp-logger
-  - uri-blocker
-  - wolf-rbac
-  - zipkin
-  - server-info
-
 plugin_attr:
-  skywalking:
-    service_name: APISIX
-    service_instance_name: "APISIX Instance Name"
-    endpoint_addr: http://172.16.238.50:12800
   server-info:
     report_interval: 60
     report_ttl: 3600

api/test/docker/apisix_config2.yaml

@@ -19,80 +19,26 @@
 #
 etcd:
   host:
-    - "http://172.16.238.10:2379"
-    - "http://172.16.238.11:2379"
-    - "http://172.16.238.12:2379"
-  resync_delay: 0  # sync data from etcd quickly for e2e test
+    - "http://etcd:2379"
+  resync_delay: 0
 
 apisix:
   id: "apisix-server2"
   admin_key:
-    -
-      name: "admin"                          # yamllint disable rule:comments-indentation
-      key: edd1c9f034335f136f87ad84b625c8f1  # using fixed API token has security risk, please
-                                             # update it when you deploy to production environment
-      role: admin                            # yamllint enable rule:comments-indentation
-
-  allow_admin:               # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
-    - 0.0.0.0/0              # If we don't set any IP list, then any IP access is allowed by default.
-
-  ssl:
-    enable: true
-    ssl_cert: "/usr/local/apisix/certs/apisix.crt"
-    ssl_cert_key: "/usr/local/apisix/certs/apisix.key"
+    - name: "admin"
+      key: edd1c9f034335f136f87ad84b625c8f1
+      role: admin
+  allow_admin:
+    - 0.0.0.0/0
+  admin_listen:
+    ip: 0.0.0.0
+    port: 9180
 
 nginx_config:
   error_log_level: "debug"
   worker_processes: "1"
 
-plugins:                          # plugin list (sorted in alphabetical order)
-  - api-breaker
-  - authz-keycloak
-  - basic-auth
-  - batch-requests
-  - consumer-restriction
-  - cors
-  - echo
-  - fault-injection
-  - grpc-transcode
-  - hmac-auth
-  - http-logger
-  - ip-restriction
-  - jwt-auth
-  - kafka-logger
-  - key-auth
-  - limit-conn
-  - limit-count
-  - limit-req
-  - node-status
-  - openid-connect
-  - prometheus
-  - proxy-cache
-  - proxy-mirror
-  - proxy-rewrite
-  - redirect
-  - referer-restriction
-  - request-id
-  - request-validation
-  - response-rewrite
-  - serverless-post-function
-  - serverless-pre-function
-  - skywalking
-  - sls-logger
-  - syslog
-  - tcp-logger
-  - udp-logger
-  - uri-blocker
-  - wolf-rbac
-  - zipkin
-  - server-info
-
 plugin_attr:
-  skywalking:
-    service_name: APISIX
-    service_instance_name: "APISIX Instance Name"
-    endpoint_addr: http://172.16.238.50:12800
-
   server-info:
     report_interval: 60
     report_ttl: 3600

api/test/docker/docker-compose.yaml

@@ -17,68 +17,18 @@
 version: "3.6"
 
 services:
-  etcd1:
-    image: bitnami/etcd:3.5.2
+  etcd:
+    image: bitnami/etcd:3.5
     environment:
       - ALLOW_NONE_AUTHENTICATION=yes
-      - ETCD_DATA_DIR=/etcd-data
-      - ETCD_NAME=etcd1
-      - ETCD_INITIAL_ADVERTISE_PEER_URLS=http://172.16.238.10:2380
-      - ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
-      - ETCD_ADVERTISE_CLIENT_URLS=http://172.16.238.10:2379
+      - ETCD_ADVERTISE_CLIENT_URLS=http://etcd:2379
       - ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
-      - ETCD_INITIAL_CLUSTER=etcd1=http://172.16.238.10:2380,etcd2=http://172.16.238.11:2380,etcd3=http://172.16.238.12:2380
-      - ETCD_INITIAL_CLUSTER_STATE=new
-      - ETCD_INITIAL_CLUSTER_TOKEN=docker-etcd
     ports:
       - "2379:2379"
-    expose:
-      - 2379
-      - 2380
     networks:
       apisix_dashboard_e2e:
         ipv4_address: 172.16.238.10
 
-  etcd2:
-    image: bitnami/etcd:3.5.2
-    environment:
-      - ALLOW_NONE_AUTHENTICATION=yes
-      - ETCD_DATA_DIR=/etcd-data
-      - ETCD_NAME=etcd2
-      - ETCD_INITIAL_ADVERTISE_PEER_URLS=http://172.16.238.11:2380
-      - ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
-      - ETCD_ADVERTISE_CLIENT_URLS=http://172.16.238.11:2379
-      - ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
-      - ETCD_INITIAL_CLUSTER=etcd1=http://172.16.238.10:2380,etcd2=http://172.16.238.11:2380,etcd3=http://172.16.238.12:2380
-      - ETCD_INITIAL_CLUSTER_STATE=new
-      - ETCD_INITIAL_CLUSTER_TOKEN=docker-etcd
-    expose:
-      - 2379
-      - 2380
-    networks:
-      apisix_dashboard_e2e:
-        ipv4_address: 172.16.238.11
-
-  etcd3:
-    image: bitnami/etcd:3.5.2
-    environment:
-      - ALLOW_NONE_AUTHENTICATION=yes
-      - ETCD_DATA_DIR=/etcd-data
-      - ETCD_NAME=etcd3
-      - ETCD_INITIAL_ADVERTISE_PEER_URLS=http://172.16.238.12:2380
-      - ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
-      - ETCD_ADVERTISE_CLIENT_URLS=http://172.16.238.12:2379
-      - ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
-      - ETCD_INITIAL_CLUSTER=etcd1=http://172.16.238.10:2380,etcd2=http://172.16.238.11:2380,etcd3=http://172.16.238.12:2380
-      - ETCD_INITIAL_CLUSTER_STATE=new
-      - ETCD_INITIAL_CLUSTER_TOKEN=docker-etcd
-    expose:
-      - 2379
-      - 2380
-    networks:
-      apisix_dashboard_e2e:
-        ipv4_address: 172.16.238.12
-
   upstream:
     image: johz/upstream:v2.0
     restart: always
@@ -109,22 +59,21 @@ services:
 
   apisix:
     hostname: apisix_server1
-    image: apache/apisix:2.10.2-alpine
+    image: apache/apisix:2.15.1-debian
     restart: always
     volumes:
       - ./apisix_config.yaml:/usr/local/apisix/conf/config.yaml:ro
       - ../certs/apisix.crt:/usr/local/apisix/certs/apisix.crt:ro
       - ../certs/apisix.key:/usr/local/apisix/certs/apisix.key:ro
       - ./apisix_logs:/usr/local/apisix/logs
     depends_on:
-      - etcd1
-      - etcd2
-      - etcd3
+      - etcd
     ports:
       - '9080:9080/tcp'
       - '9090:9090/tcp'
       - '9091:9091/tcp'
       - '9443:9443/tcp'
+      - '9180:9180/tcp'
       - '10090:10090/tcp'
       - '10091:10091/tcp'
       - '10092:10092/tcp'
@@ -136,18 +85,17 @@ services:
 
   apisix2:
     hostname: apisix_server2
-    image: apache/apisix:2.10.2-alpine
+    image: apache/apisix:2.15.1-debian
     restart: always
     volumes:
       - ./apisix_config2.yaml:/usr/local/apisix/conf/config.yaml:ro
       - ../certs/apisix.crt:/usr/local/apisix/certs/apisix.crt:ro
       - ../certs/apisix.key:/usr/local/apisix/certs/apisix.key:ro
     depends_on:
-      - etcd1
-      - etcd2
-      - etcd3
+      - etcd
     ports:
       - '9081:9080/tcp'
+      - '9181:9180/tcp'
     networks:
       apisix_dashboard_e2e:
         ipv4_address: 172.16.238.31
@@ -161,26 +109,13 @@ services:
       - ../../conf/conf.yaml:/go/manager-api/conf/conf.yaml:ro
       - ../testdata:/go/manager-api/testdata
     depends_on:
-      - etcd1
-      - etcd2
-      - etcd3
+      - etcd
     ports:
       - '9000:9000/tcp'
     networks:
       apisix_dashboard_e2e:
         ipv4_address: 172.16.238.40
 
-  skywalking:
-    image: apache/skywalking-oap-server:8.3.0-es6
-    restart: always
-    ports:
-      - '1234:1234/tcp'
-      - '11800:11800/tcp'
-      - '12800:12800/tcp'
-    networks:
-      apisix_dashboard_e2e:
-        ipv4_address: 172.16.238.50
-
   keycloak:
     image: jboss/keycloak:9.0.2
     environment:

api/test/e2e/auth/auth_suite_test.go

@@ -18,12 +18,19 @@ package auth_test
 
 import (
 	"testing"
+	"time"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/apisix/manager-api/test/e2e/base"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
 func TestAuth(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Auth Suite")
 }
+
+var _ = BeforeSuite(func() {
+	base.CleanAllResource()
+	time.Sleep(base.SleepTime)
+})