☀️ feat: Enhancing OpenIM with Integrated E2E Testing and CI/CD Enhancements (#1359)

* cicd: robot automated Change * feat: add api test Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: add api test make file Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: add openim e2e test Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: add openim e2e test Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * fix: Fixed some unused scripts and some names Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * docs: optimize openim docs Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: add prom address Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: add openim info test * feat: add openim images config path Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * fix: fix tim file rename * fix: fix tim file rename * fix: fix tim file rename * fix: fix tim file rename * fix: add openim test e2e * feat: add openim test .keep Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: add openim test .keep Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: openim test Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: openim test Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> * feat: openim test Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> Co-authored-by: cubxxw <cubxxw@users.noreply.github.com>
2026-05-06 10:05:58 +08:00 · 2023-11-10 19:37:25 +08:00
parent 686fa80800
commit e2004c1e9d
154 changed files with 4020 additions and 928 deletions
@@ -0,0 +1,93 @@
+package discoveryregister
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"github.com/OpenIMSDK/tools/discoveryregistry"
+	openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
+	"github.com/OpenIMSDK/tools/log"
+	"google.golang.org/grpc"
+
+	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
+)
+
+func NewDiscoveryRegister(envType string) (discoveryregistry.SvcDiscoveryRegistry, error) {
+	var client discoveryregistry.SvcDiscoveryRegistry
+	var err error
+	switch envType {
+	case "zookeeper":
+		client, err = openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
+			openkeeper.WithFreq(time.Hour), openkeeper.WithUserNameAndPassword(
+				config.Config.Zookeeper.Username,
+				config.Config.Zookeeper.Password,
+			), openkeeper.WithRoundRobin(), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))
+	case "k8s":
+		client, err = NewK8sDiscoveryRegister()
+	default:
+		client = nil
+		err = errors.New("envType not correct")
+	}
+	return client, err
+}
+
+type K8sDR struct {
+	options         []grpc.DialOption
+	rpcRegisterAddr string
+}
+
+func NewK8sDiscoveryRegister() (discoveryregistry.SvcDiscoveryRegistry, error) {
+	return &K8sDR{}, nil
+}
+
+func (cli *K8sDR) Register(serviceName, host string, port int, opts ...grpc.DialOption) error {
+	cli.rpcRegisterAddr = serviceName
+	return nil
+}
+func (cli *K8sDR) UnRegister() error {
+
+	return nil
+}
+func (cli *K8sDR) CreateRpcRootNodes(serviceNames []string) error {
+
+	return nil
+}
+func (cli *K8sDR) RegisterConf2Registry(key string, conf []byte) error {
+
+	return nil
+}
+
+func (cli *K8sDR) GetConfFromRegistry(key string) ([]byte, error) {
+
+	return nil, nil
+}
+func (cli *K8sDR) GetConns(ctx context.Context, serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error) {
+
+	conn, err := grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
+	return []*grpc.ClientConn{conn}, err
+}
+func (cli *K8sDR) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
+
+	return grpc.DialContext(ctx, serviceName, append(cli.options, opts...)...)
+}
+func (cli *K8sDR) GetSelfConnTarget() string {
+
+	return cli.rpcRegisterAddr
+}
+func (cli *K8sDR) AddOption(opts ...grpc.DialOption) {
+	cli.options = append(cli.options, opts...)
+}
+func (cli *K8sDR) CloseConn(conn *grpc.ClientConn) {
+	conn.Close()
+}
+
+// do not use this method for call rpc
+func (cli *K8sDR) GetClientLocalConns() map[string][]*grpc.ClientConn {
+	fmt.Println("should not call this function!!!!!!!!!!!!!!!!!!!!!!!!!")
+	return nil
+}
+func (cli *K8sDR) Close() {
+	return
+}
@@ -0,0 +1,407 @@
+package discoveryregister
+
+import (
+	"context"
+	"reflect"
+	"testing"
+
+	"github.com/OpenIMSDK/tools/discoveryregistry"
+	"google.golang.org/grpc"
+)
+
+func TestNewDiscoveryRegister(t *testing.T) {
+	type args struct {
+		envType string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    discoveryregistry.SvcDiscoveryRegistry
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := NewDiscoveryRegister(tt.args.envType)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("NewDiscoveryRegister() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewDiscoveryRegister() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestNewK8sDiscoveryRegister(t *testing.T) {
+	tests := []struct {
+		name    string
+		want    discoveryregistry.SvcDiscoveryRegistry
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := NewK8sDiscoveryRegister()
+			if (err != nil) != tt.wantErr {
+				t.Errorf("NewK8sDiscoveryRegister() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewK8sDiscoveryRegister() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestK8sDR_Register(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	type args struct {
+		serviceName string
+		host        string
+		port        int
+		opts        []grpc.DialOption
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			if err := cli.Register(tt.args.serviceName, tt.args.host, tt.args.port, tt.args.opts...); (err != nil) != tt.wantErr {
+				t.Errorf("K8sDR.Register() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestK8sDR_UnRegister(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			if err := cli.UnRegister(); (err != nil) != tt.wantErr {
+				t.Errorf("K8sDR.UnRegister() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestK8sDR_CreateRpcRootNodes(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	type args struct {
+		serviceNames []string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			if err := cli.CreateRpcRootNodes(tt.args.serviceNames); (err != nil) != tt.wantErr {
+				t.Errorf("K8sDR.CreateRpcRootNodes() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestK8sDR_RegisterConf2Registry(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	type args struct {
+		key  string
+		conf []byte
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			if err := cli.RegisterConf2Registry(tt.args.key, tt.args.conf); (err != nil) != tt.wantErr {
+				t.Errorf("K8sDR.RegisterConf2Registry() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestK8sDR_GetConfFromRegistry(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	type args struct {
+		key string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    []byte
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			got, err := cli.GetConfFromRegistry(tt.args.key)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("K8sDR.GetConfFromRegistry() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("K8sDR.GetConfFromRegistry() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestK8sDR_GetConns(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	type args struct {
+		ctx         context.Context
+		serviceName string
+		opts        []grpc.DialOption
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    []*grpc.ClientConn
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			got, err := cli.GetConns(tt.args.ctx, tt.args.serviceName, tt.args.opts...)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("K8sDR.GetConns() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("K8sDR.GetConns() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestK8sDR_GetConn(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	type args struct {
+		ctx         context.Context
+		serviceName string
+		opts        []grpc.DialOption
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    *grpc.ClientConn
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			got, err := cli.GetConn(tt.args.ctx, tt.args.serviceName, tt.args.opts...)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("K8sDR.GetConn() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("K8sDR.GetConn() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestK8sDR_GetSelfConnTarget(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		want   string
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			if got := cli.GetSelfConnTarget(); got != tt.want {
+				t.Errorf("K8sDR.GetSelfConnTarget() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestK8sDR_AddOption(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	type args struct {
+		opts []grpc.DialOption
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			cli.AddOption(tt.args.opts...)
+		})
+	}
+}
+
+func TestK8sDR_CloseConn(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	type args struct {
+		conn *grpc.ClientConn
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			cli.CloseConn(tt.args.conn)
+		})
+	}
+}
+
+func TestK8sDR_GetClientLocalConns(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		want   map[string][]*grpc.ClientConn
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			if got := cli.GetClientLocalConns(); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("K8sDR.GetClientLocalConns() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestK8sDR_Close(t *testing.T) {
+	type fields struct {
+		options         []grpc.DialOption
+		rpcRegisterAddr string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+	}{
+		// TODO: Add test cases.
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cli := &K8sDR{
+				options:         tt.fields.options,
+				rpcRegisterAddr: tt.fields.rpcRegisterAddr,
+			}
+			cli.Close()
+		})
+	}
+}