Skip to content

Commit e0bdc53

Browse files
zhufuyizhufuyi
committed
add grpc+http service test
1 parent 824710c commit e0bdc53

File tree

7 files changed

+160
-16
lines changed

7 files changed

+160
-16
lines changed

‎examples/README.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎test/auto-test/clean_mono_repo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
rm -rf http_mysql http_postgresql http_sqlite http_mongodb grpc_mysql grpc_postgresql grpc_sqlite grpc_mongodb http_pb_mysql http_pb_mongodb grpc_pb_mysql grpc_pb_mongodb grpc_gw_pb go.mod go.sum http_pb_mixed grpc_pb_mixed grpc_gw_pb_mixed
3+
rm -rf go.mod go.sum http_mysql http_postgresql http_sqlite http_mongodb grpc_mysql grpc_postgresql grpc_sqlite grpc_mongodb http_pb_mysql http_pb_mongodb grpc_pb_mysql grpc_pb_mongodb grpc_http_pb_mysql grpc_http_pb_mongodb http_pb_mixed grpc_pb_mixed grpc_gw_pb_mixed grpc_gw_pb

‎test/auto-test/clean_multi_repo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
rm -rf http-mysql http-postgresql http-sqlite http-mongodb grpc-mysql grpc-postgresql grpc-sqlite grpc-mongodb http-pb-mysql http-pb-mongodb grpc-pb-mysql grpc-pb-mongodb grpc-gw-pb http-pb-mixed grpc-pb-mixed grpc-gw-pb-mixed
3+
rm -rf http-mysql http-postgresql http-sqlite http-mongodb grpc-mysql grpc-postgresql grpc-sqlite grpc-mongodb http-pb-mysql http-pb-mongodb grpc-pb-mysql grpc-pb-mongodb grpc-http-pb-mysql grpc-http-pb-mongodb http-pb-mixed grpc-pb-mixed grpc-gw-pb-mixed grpc-gw-pb

‎test/auto-test/files/user.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
2727
type: TYPE_API_KEY;
2828
in: IN_HEADER;
2929
name: "Authorization";
30-
description: "Input a \"Bearer your-jwt-token\" to Value";
30+
description: "Type Bearer your-jwt-token to Value";
3131
}
3232
}
3333
}

‎test/auto-test/files/user_gw.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
2727
type: TYPE_API_KEY;
2828
in: IN_HEADER;
2929
name: "Authorization";
30-
description: "Input a \"Bearer your-jwt-token\" to Value";
30+
description: "Type Bearer your-jwt-token to Value";
3131
}
3232
}
3333
}

‎test/auto-test/generate_mono_repo_test.sh

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,83 @@ function generate_grpc_pb_mongodb() {
530530

531531
# ---------------------------------------------------------------
532532

533+
function generate_grpc_http_pb_mysql() {
534+
local serverName="grpc_http_pb_mysql"
535+
local outDir="./$serverName"
536+
echo "start generating $serverName service code"
537+
if [ -d "${outDir}" ]; then
538+
echo -e "$outDir already exists\n\n"
539+
else
540+
echo -e "\n${colorCyan}sponge micro grpc-http-pb --server-name=$serverName --module-name=edusys --project-name=edusys --protobuf-file=./files/user.proto --suited-mono-repo=true --out=$outDir ${markEnd}"
541+
sponge micro grpc-http-pb --server-name=$serverName --module-name=edusys --project-name=edusys --protobuf-file=./files/user.proto --suited-mono-repo=true --out=$outDir
542+
checkResult $?
543+
544+
echo -e "\n${colorCyan}sponge micro service-handler --db-driver=mysql --db-dsn=$mysqlDsn --db-table=$mysqlTable1 --embed=false --suited-mono-repo=true --out=$outDir ${markEnd}"
545+
sponge micro service-handler --db-driver=mysql --db-dsn=$mysqlDsn --db-table=$mysqlTable1 --embed=false --suited-mono-repo=true --out=$outDir
546+
checkResult $?
547+
548+
mysqlDsnTmp=$(echo "$mysqlDsn" | sed -E 's/\(/\\\(/g' | sed -E 's/\)/\\\)/g' | sed -E 's/\//\\\//g')
549+
sed -E -i "s/root:123456@\(192.168.3.37:3306\)\/account/${mysqlDsnTmp}/g" ${outDir}/configs/${serverName}.yml
550+
checkGoModule
551+
fi
552+
553+
if [ "$isOnlyGenerateCode" == "true" ]; then
554+
echo -e "\n\n\n\n"
555+
return
556+
fi
557+
558+
cd $outDir
559+
make patch TYPE=types-pb
560+
make patch TYPE=init-mysql
561+
runningProtoService $serverName
562+
checkResult $?
563+
sleep 1
564+
cd -
565+
566+
echo -e "\n\n--------------------- $outDir test passed ---------------------\n\n"
567+
}
568+
569+
570+
function generate_grpc_http_pb_mongodb() {
571+
local serverName="grpc_http_pb_mongodb"
572+
local outDir="./$serverName"
573+
echo "start generating $serverName service code"
574+
if [ -d "${outDir}" ]; then
575+
echo -e "$outDir already exists\n\n"
576+
else
577+
echo -e "\n${colorCyan}sponge micro grpc-http-pb --server-name=$serverName --module-name=edusys --project-name=edusys --protobuf-file=./files/user.proto --suited-mono-repo=true --out=$outDir ${markEnd}"
578+
sponge micro grpc-http-pb --server-name=$serverName --module-name=edusys --project-name=edusys --protobuf-file=./files/user.proto --suited-mono-repo=true --out=$outDir
579+
checkResult $?
580+
581+
echo -e "\n${colorCyan}sponge micro service-handler --db-driver=mongodb --db-dsn=$mongodbDsn --db-table=user_example --embed=false --suited-mono-repo=true --out=$outDir ${markEnd}"
582+
sponge micro service-handler --db-driver=mongodb --db-dsn=$mongodbDsn --db-table=user_example --embed=false --suited-mono-repo=true --out=$outDir
583+
checkResult $?
584+
585+
sed -E -i 's/\"mysql\"/\"mongodb\"/g' ${outDir}/configs/${serverName}.yml
586+
sed -E -i 's/mysql:/mongodb:/g' ${outDir}/configs/${serverName}.yml
587+
mongodbDsnTmp=$(echo "$mongodbDsn" | sed -E 's/\(/\\\(/g' | sed -E 's/\)/\\\)/g' | sed -E 's/\//\\\//g')
588+
sed -E -i "s/root:123456@\(192.168.3.37:3306\)\/account/${mongodbDsnTmp}/g" ${outDir}/configs/${serverName}.yml
589+
checkGoModule
590+
fi
591+
592+
if [ "$isOnlyGenerateCode" == "true" ]; then
593+
echo -e "\n\n\n\n"
594+
return
595+
fi
596+
597+
cd $outDir
598+
make patch TYPE=types-pb
599+
make patch TYPE=init-mongodb
600+
runningProtoService $serverName
601+
checkResult $?
602+
sleep 1
603+
cd -
604+
605+
echo -e "\n\n--------------------- $outDir test passed ---------------------\n\n"
606+
}
607+
608+
# ---------------------------------------------------------------
609+
533610
function generate_http_pb_mixed() {
534611
local serverName="http_pb_mixed"
535612
local outDir="./$serverName"
@@ -666,6 +743,9 @@ function main() {
666743
generate_grpc_pb_mysql
667744
generate_grpc_pb_mongodb
668745

746+
generate_grpc_http_pb_mysql
747+
generate_grpc_http_pb_mongodb
748+
669749
generate_http_pb_mixed
670750
generate_grpc_pb_mixed
671751

‎test/auto-test/generate_multi_repo_test.sh

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,6 @@ function generate_grpc_pb_mysql() {
464464
echo -e "\n\n--------------------- $outDir test passed ---------------------\n\n"
465465
}
466466

467-
468467
function generate_grpc_pb_mongodb() {
469468
local serverName="user"
470469
local outDir="./grpc-pb-mongodb"
@@ -504,6 +503,79 @@ function generate_grpc_pb_mongodb() {
504503

505504
# ---------------------------------------------------------------
506505

506+
function generate_grpc_http_pb_mysql() {
507+
local serverName="user"
508+
local outDir="./grpc-http-pb-mysql"
509+
echo "start generating grpc-http-pb-mysql service code"
510+
if [ -d "${outDir}" ]; then
511+
echo -e "$outDir already exists\n\n"
512+
else
513+
echo -e "\n${colorCyan}sponge micro grpc-http-pb --server-name=$serverName --module-name=user --project-name=edusys --protobuf-file=./files/user.proto --out=$outDir ${markEnd}"
514+
sponge micro grpc-http-pb --server-name=$serverName --module-name=user --project-name=edusys --protobuf-file=./files/user.proto --out=$outDir
515+
checkResult $?
516+
517+
echo -e "\n${colorCyan}sponge micro service-handler --db-driver=mysql --db-dsn=$mysqlDsn --db-table=$mysqlTable1 --out=$outDir ${markEnd}"
518+
sponge micro service-handler --db-driver=mysql --db-dsn=$mysqlDsn --db-table=$mysqlTable1 --out=$outDir
519+
checkResult $?
520+
521+
mysqlDsnTmp=$(echo "$mysqlDsn" | sed -E 's/\(/\\\(/g' | sed -E 's/\)/\\\)/g' | sed -E 's/\//\\\//g')
522+
sed -E -i "s/root:123456@\(192.168.3.37:3306\)\/account/${mysqlDsnTmp}/g" ${outDir}/configs/${serverName}.yml
523+
fi
524+
525+
if [ "$isOnlyGenerateCode" == "true" ]; then
526+
echo -e "\n\n"
527+
return
528+
fi
529+
530+
cd $outDir
531+
make patch TYPE=types-pb
532+
make patch TYPE=init-mysql
533+
runningProtoService $serverName
534+
checkResult $?
535+
sleep 1
536+
cd -
537+
538+
echo -e "\n\n--------------------- $outDir test passed ---------------------\n\n"
539+
}
540+
541+
function generate_grpc_http_pb_mongodb() {
542+
local serverName="user"
543+
local outDir="./grpc-http-pb-mongodb"
544+
echo "start generating grpc-http-pb-mongodb service code"
545+
if [ -d "${outDir}" ]; then
546+
echo -e "$outDir already exists\n\n"
547+
else
548+
echo -e "\n${colorCyan}sponge micro grpc-http-pb --server-name=$serverName --module-name=user --project-name=edusys --protobuf-file=./files/user.proto --out=$outDir ${markEnd}"
549+
sponge micro grpc-http-pb --server-name=$serverName --module-name=user --project-name=edusys --protobuf-file=./files/user.proto --out=$outDir
550+
checkResult $?
551+
552+
echo -e "\n${colorCyan}sponge micro service-handler --db-driver=mongodb --db-dsn=$mongodbDsn --db-table=user_example --out=$outDir ${markEnd}"
553+
sponge micro service-handler --db-driver=mongodb --db-dsn=$mongodbDsn --db-table=user_example --out=$outDir
554+
checkResult $?
555+
556+
sed -E -i 's/\"mysql\"/\"mongodb\"/g' ${outDir}/configs/${serverName}.yml
557+
sed -E -i 's/mysql:/mongodb:/g' ${outDir}/configs/${serverName}.yml
558+
mongodbDsnTmp=$(echo "$mongodbDsn" | sed -E 's/\(/\\\(/g' | sed -E 's/\)/\\\)/g' | sed -E 's/\//\\\//g')
559+
sed -E -i "s/root:123456@\(192.168.3.37:3306\)\/account/${mongodbDsnTmp}/g" ${outDir}/configs/${serverName}.yml
560+
fi
561+
562+
if [ "$isOnlyGenerateCode" == "true" ]; then
563+
echo -e "\n\n"
564+
return
565+
fi
566+
567+
cd $outDir
568+
make patch TYPE=types-pb
569+
make patch TYPE=init-mongodb
570+
runningProtoService $serverName
571+
checkResult $?
572+
sleep 1
573+
cd -
574+
575+
echo -e "\n\n--------------------- $outDir test passed ---------------------\n\n"
576+
}
577+
# ---------------------------------------------------------------
578+
507579
function generate_http_pb_mixed() {
508580
local serverName="user"
509581
local outDir="./http-pb-mixed"
@@ -633,6 +705,9 @@ function main() {
633705
generate_grpc_pb_mysql
634706
generate_grpc_pb_mongodb
635707

708+
generate_grpc_http_pb_mysql
709+
generate_grpc_http_pb_mongodb
710+
636711
generate_http_pb_mixed
637712
generate_grpc_pb_mixed
638713

0 commit comments

Comments
 (0)