From 984a69eb79ece4cf903e4c3139148593aa867007 Mon Sep 17 00:00:00 2001 From: junyi <47441677+immanuelhume@users.noreply.github.com> Date: Sun, 5 Jun 2022 02:25:23 +0800 Subject: [PATCH 1/5] feat(service): add lark service --- go.mod | 3 +- go.sum | 95 ++++------------------------ service/lark/README.md | 99 +++++++++++++++++++++++++++++ service/lark/common.go | 58 +++++++++++++++++ service/lark/custom_app.go | 109 ++++++++++++++++++++++++++++++++ service/lark/custom_app_test.go | 82 ++++++++++++++++++++++++ service/lark/doc.go | 54 ++++++++++++++++ service/lark/mocks/sendToer.go | 39 ++++++++++++ service/lark/mocks/sender.go | 39 ++++++++++++ service/lark/webhook.go | 57 +++++++++++++++++ service/lark/webhook_test.go | 43 +++++++++++++ 11 files changed, 595 insertions(+), 83 deletions(-) create mode 100644 service/lark/README.md create mode 100644 service/lark/common.go create mode 100644 service/lark/custom_app.go create mode 100644 service/lark/custom_app_test.go create mode 100644 service/lark/doc.go create mode 100644 service/lark/mocks/sendToer.go create mode 100644 service/lark/mocks/sender.go create mode 100644 service/lark/webhook.go create mode 100644 service/lark/webhook_test.go diff --git a/go.mod b/go.mod index e17f90c..d408b4d 100644 --- a/go.mod +++ b/go.mod @@ -35,6 +35,7 @@ require ( require ( github.com/appleboy/go-fcm v0.1.5 + github.com/go-lark/lark v1.7.1 github.com/google/go-cmp v0.5.8 ) @@ -56,7 +57,6 @@ require ( github.com/fatih/structs v1.1.0 // indirect github.com/go-redis/redis/v8 v8.11.6-0.20220405070650-99c79f7041fc // indirect github.com/golang/protobuf v1.5.2 // indirect - github.com/gomodule/redigo v1.8.8 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/gorilla/mux v1.8.0 // indirect @@ -83,6 +83,5 @@ require ( golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.27.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/go.sum b/go.sum index 0259827..455974f 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,6 @@ github.com/Rhymen/go-whatsapp/examples/echo v0.0.0-20190325075644-cc2581bbf24d/g github.com/Rhymen/go-whatsapp/examples/restoreSession v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:5sCUSpG616ZoSJhlt9iBNI/KXBqrVLcNUJqg7J9+8pU= github.com/Rhymen/go-whatsapp/examples/sendImage v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:RdiyhanVEGXTam+mZ3k6Y3VDCCvXYCwReOoxGozqhHw= github.com/Rhymen/go-whatsapp/examples/sendTextMessages v0.0.0-20190325075644-cc2581bbf24d/go.mod h1:suwzklatySS3Q0+NCxCDh5hYfgXdQUWU1DNcxwAxStM= -github.com/RocketChat/Rocket.Chat.Go.SDK v0.0.0-20210506200512-3b3352a919f0 h1:1j26aiGFmsEd43MNlVpXISIqhdo608SlzuUVSCJcwAM= -github.com/RocketChat/Rocket.Chat.Go.SDK v0.0.0-20210506200512-3b3352a919f0/go.mod h1:rjP7sIipbZcagro/6TCk6X0ZeFT2eyudH5+fve/cbBA= github.com/RocketChat/Rocket.Chat.Go.SDK v0.0.0-20220511045534-400a3e757bb3 h1:QJQBiGAOkog9xdqCw2Zc4avPVOuOxaHYTFj1Fz+S6zo= github.com/RocketChat/Rocket.Chat.Go.SDK v0.0.0-20220511045534-400a3e757bb3/go.mod h1:rjP7sIipbZcagro/6TCk6X0ZeFT2eyudH5+fve/cbBA= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= @@ -54,81 +52,34 @@ github.com/appleboy/go-fcm v0.1.5 h1:fKbcZf/7vwGsvDkcop8a+kCHnK+tt4wXX0X7uEzwI6E github.com/appleboy/go-fcm v0.1.5/go.mod h1:MSxZ4LqGRsnywOjnlXJXMqbjZrG4vf+0oHitfC9HRH0= github.com/atc0005/go-teams-notify/v2 v2.6.1 h1:t22ybzQuaQs4UJe4ceF5VYGsPhs6ir3nZOId/FBy6Go= github.com/atc0005/go-teams-notify/v2 v2.6.1/go.mod h1:xo6GejLDHn3tWBA181F8LrllIL0xC1uRsRxq7YNXaaY= -github.com/aws/aws-sdk-go-v2 v1.16.3 h1:0W1TSJ7O6OzwuEvIXAtJGvOeQ0SGAhcpxPN2/NK5EhM= -github.com/aws/aws-sdk-go-v2 v1.16.3/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= github.com/aws/aws-sdk-go-v2 v1.16.4 h1:swQTEQUyJF/UkEA94/Ga55miiKFoXmm/Zd67XHgmjSg= github.com/aws/aws-sdk-go-v2 v1.16.4/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= -github.com/aws/aws-sdk-go-v2/config v1.15.4 h1:P4mesY1hYUxru4f9SU0XxNKXmzfxsD0FtMIPRBjkH7Q= -github.com/aws/aws-sdk-go-v2/config v1.15.4/go.mod h1:ZijHHh0xd/A+ZY53az0qzC5tT46kt4JVCePf2NX9Lk4= -github.com/aws/aws-sdk-go-v2/config v1.15.5 h1:P+xwhr6kabhxDTXTVH9YoHkqjLJ0wVVpIUHtFNr2hjU= -github.com/aws/aws-sdk-go-v2/config v1.15.5/go.mod h1:ZijHHh0xd/A+ZY53az0qzC5tT46kt4JVCePf2NX9Lk4= -github.com/aws/aws-sdk-go-v2/config v1.15.6 h1:0pItK5GGqDG3Ndu+PiniN4f3X5QABBxI/zHP/z9px6g= -github.com/aws/aws-sdk-go-v2/config v1.15.6/go.mod h1:EvBVTxF6CxlM/U94C4TYh0zuJIHOjkAtMg1LFISNzGY= -github.com/aws/aws-sdk-go-v2/config v1.15.7 h1:PrzhYjDpWnGSpjedmEapldQKPW4x8cCNzUI8XOho1CM= -github.com/aws/aws-sdk-go-v2/config v1.15.7/go.mod h1:exERlvqx1OoUHrxQpMgrmfSW0H6B1+r3xziZD3bBXRg= -github.com/aws/aws-sdk-go-v2/config v1.15.8 h1:Mk9aPT1JiPkhZO9PIP1w2ramuRw95d9w5YNOM3poTKk= -github.com/aws/aws-sdk-go-v2/config v1.15.8/go.mod h1:Z/guryqWzLw1T3pJbFA0/V3aVXw0sX5oH4lXXiD67aY= github.com/aws/aws-sdk-go-v2/config v1.15.9 h1:TK5yNEnFDQ9iaO04gJS/3Y+eW8BioQiCUafW75/Wc3Q= github.com/aws/aws-sdk-go-v2/config v1.15.9/go.mod h1:rv/l/TbZo67kp99v/3Kb0qV6Fm1KEtKyruEV2GvVfgs= -github.com/aws/aws-sdk-go-v2/credentials v1.12.0 h1:4R/NqlcRFSkR0wxOhgHi+agGpbEr5qMCjn7VqUIJY+E= -github.com/aws/aws-sdk-go-v2/credentials v1.12.0/go.mod h1:9YWk7VW+eyKsoIL6/CljkTrNVWBSK9pkqOPUuijid4A= -github.com/aws/aws-sdk-go-v2/credentials v1.12.1 h1:ZrLRNXSHVKfIEtE/Omy4sm3MCttO01/hcAezccZMdFs= -github.com/aws/aws-sdk-go-v2/credentials v1.12.1/go.mod h1:vwCvnQKZoz/lLFkokOpHCWaoftee+ATlpx6XZS0ACn0= -github.com/aws/aws-sdk-go-v2/credentials v1.12.2 h1:tX4EHQFU4+O9at5QjnwIKb/Qgv7MbgbUNtqTRF0Vu2M= -github.com/aws/aws-sdk-go-v2/credentials v1.12.2/go.mod h1:/XWqDVuzclEKvzileqtD7/t+wIhOogv//6JFlKEe0Wc= -github.com/aws/aws-sdk-go-v2/credentials v1.12.3 h1:1kPx2lGjvopx7IMqKFmqmhqcuDZQ7pvq9xNXPP5c6qo= -github.com/aws/aws-sdk-go-v2/credentials v1.12.3/go.mod h1:p6/NGiaGKKM3ihOt/W08Ikz7/F95WhvgjA4x6MWKdS8= github.com/aws/aws-sdk-go-v2/credentials v1.12.4 h1:xggwS+qxCukXRVXJBJWQJGyUsvuxGC8+J1kKzv2cxuw= github.com/aws/aws-sdk-go-v2/credentials v1.12.4/go.mod h1:7g+GGSp7xtR823o1jedxKmqRZGqLdoHQfI4eFasKKxs= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.4 h1:FP8gquGeGHHdfY6G5llaMQDF+HAf20VKc8opRwmjf04= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.4/go.mod h1:u/s5/Z+ohUQOPXl00m2yJVyioWDECsbpXTQlaqSlufc= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 h1:YPxclBeE07HsLQE8vtjC8T2emcTjM9nzqsnDi2fv5UM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5/go.mod h1:WAPnuhG5IQ/i6DETFl5NmX3kKqCzw7aau9NHAGcm4QE= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.10 h1:uFWgo6mGJI1n17nbcvSc6fxVuR3xLNqvXt12JCnEcT8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.10/go.mod h1:F+EZtuIwjlv35kRJPyBGcsA4f7bnSoz15zOQ2lJq1Z4= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 h1:gsqHplNh1DaQunEKZISK56wlpbCg0yKxNVvGWCFuF1k= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11/go.mod h1:tmUB6jakq5DFNcXsXOA/ZQ7/C8VnSKYkx58OI7Fh79g= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.4 h1:cnsvEKSoHN4oAN7spMMr0zhEW2MHnhAVpmqQg8E6UcM= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.4/go.mod h1:8glyUqVIM4AmeenIsPo0oVh3+NUwnsQml2OFupfQW+0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5 h1:PLFj+M2PgIDHG//hw3T0O0KLI4itVtAjtxrZx4AHPLg= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5/go.mod h1:fV1AaS2gFc1tM0RCb015FJ0pvWVUfJZANzjwoO4YakM= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.11 h1:6cZRymlLEIlDTEB0+5+An6Zj1CKt6rSE69tOmFeu1nk= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.11/go.mod h1:0MR+sS1b/yxsfAPvAESrw8NfwUoxMinDyw6EYR9BS2U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.12 h1:j0VqrjtgsY1Bx27tD0ysay36/K4kFMWRp9K3ieO9nLU= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.12/go.mod h1:00c7+ALdPh4YeEUPXJzyU0Yy01nPGOq2+9rUaz05z9g= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.4 h1:b16QW0XWl0jWjLABFc1A+uh145Oqv+xDcObNk0iQgUk= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.4/go.mod h1:uKkN7qmSIsNJVyMtxNQoCEYMvFEXbOg9fwCJPdfp2u8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5 h1:gRW1ZisKc93EWEORNJRvy/ZydF3o6xLSveJHdi1Oa0U= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5/go.mod h1:ZbkttHXaVn3bBo/wpJbQGiiIWR90eTBUVBrEHUEQlho= -github.com/aws/aws-sdk-go-v2/service/ses v1.14.4 h1:ke4Kp6GolWjw9xTtE9PQPw+jN/zcBi9pcunAh9apAW8= -github.com/aws/aws-sdk-go-v2/service/ses v1.14.4/go.mod h1:YPeSVmu3+2iUSCUIspo+vvFe3LKCIW8x8Dxnuadh6AU= -github.com/aws/aws-sdk-go-v2/service/ses v1.14.5 h1:MkCTlHHZacvfv+J8v7TOWKnz5cdqz+SZ+j6XGXGqjyc= -github.com/aws/aws-sdk-go-v2/service/ses v1.14.5/go.mod h1:9pbigrz1Xw/3JrUUAG1DMv7aNZJlC/mZXE+zIoq3fnk= github.com/aws/aws-sdk-go-v2/service/ses v1.14.6 h1:Xna8JVYErbY2XIpYsrB6/W6i8ioEft4pGrWzFstHEGM= github.com/aws/aws-sdk-go-v2/service/ses v1.14.6/go.mod h1:9pbigrz1Xw/3JrUUAG1DMv7aNZJlC/mZXE+zIoq3fnk= -github.com/aws/aws-sdk-go-v2/service/sns v1.17.5 h1:g04C27W8hBB+8T4q7t3TAF4i9ZbTYLr3i9bhFAERIzM= -github.com/aws/aws-sdk-go-v2/service/sns v1.17.5/go.mod h1:U7g4gHRcOB0H1VYv2yNzAOmGZS8dTEUZ/HkSSO6Pggg= github.com/aws/aws-sdk-go-v2/service/sns v1.17.6 h1:ESfYOZpbrkjsRZT1DMfTiYoRdQ9++mTmRAVv+m4zeNs= github.com/aws/aws-sdk-go-v2/service/sns v1.17.6/go.mod h1:5dkTvZXk8wp8o367VdTw6SNkPk6pXwUx2m89LeC/fWw= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.4 h1:Uw5wBybFQ1UeA9ts0Y07gbv0ncZnIAyw858tDW0NP2o= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.4/go.mod h1:cPDwJwsP4Kff9mldCXAmddjJL6JGQqtA3Mzer2zyr88= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.5 h1:TfJ/zuOYvHnxkvohSwAF3Ppn9KT/SrGZuOZHTPy8Guw= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.5/go.mod h1:TFVe6Rr2joVLsYQ1ABACXgOC6lXip/qpX2x5jWg/A9w= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.6 h1:AnTIdD439WgYNyVldYlpccGWY2EIXoUNmVzTDbFqCsg= -github.com/aws/aws-sdk-go-v2/service/sso v1.11.6/go.mod h1:TFVe6Rr2joVLsYQ1ABACXgOC6lXip/qpX2x5jWg/A9w= github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 h1:suAGD+RyiHWPPihZzY+jw4mCZlOFWgmdjb2AeTenz7c= github.com/aws/aws-sdk-go-v2/service/sso v1.11.7/go.mod h1:TFVe6Rr2joVLsYQ1ABACXgOC6lXip/qpX2x5jWg/A9w= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.4 h1:+xtV90n3abQmgzk1pS++FdxZTrPEDgQng6e4/56WR2A= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.4/go.mod h1:lfSYenAXtavyX2A1LsViglqlG9eEFYxNryTZS5rn3QE= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.5 h1:aEMP+STBsvCY1U/yL4pAqUrU4oFli46AdbCXvVbTiHI= -github.com/aws/aws-sdk-go-v2/service/sts v1.16.5/go.mod h1:lfSYenAXtavyX2A1LsViglqlG9eEFYxNryTZS5rn3QE= github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 h1:aYToU0/iazkMY67/BYLt3r6/LT/mUtarLAF5mGof1Kg= github.com/aws/aws-sdk-go-v2/service/sts v1.16.6/go.mod h1:rP1rEOKAGZoXp4iGDxSXFvODAtXpm34Egf0lL0eshaQ= github.com/aws/smithy-go v1.11.2 h1:eG/N+CcUMAvsdffgMvjMKwfyDzIkjM6pfxMJ8Mzc6mE= github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM= github.com/blinkbean/dingtalk v0.0.0-20210905093040-7d935c0f7e19 h1:pamuM2sgLJLoMWfchc6y071z8ifalajU7btZmZNhoH4= github.com/blinkbean/dingtalk v0.0.0-20210905093040-7d935c0f7e19/go.mod h1:9BaLuGSBqY3vT5hstValh48DbsKO7vaHaJnG9pXwbto= -github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw= github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/bwmarrin/discordgo v0.25.0 h1:NXhdfHRNxtwso6FPdzW2i3uBvvU7UIQTghmV2T4nqAs= @@ -143,7 +94,6 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cschomburg/go-pushbullet v0.0.0-20171206132031-67759df45fbb h1:7X9nrm+LNWdxzQOiCjy0G51rNUxbH35IDHCjAMvogyM= github.com/cschomburg/go-pushbullet v0.0.0-20171206132031-67759df45fbb/go.mod h1:RfQ9wji3fjcSEsQ+uFCtIh3+BXgcZum8Kt3JxvzYzlk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -172,10 +122,13 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-lark/lark v1.7.1 h1:7NGHt/dXtvrTkwWg/aOGPfytf9Yp8jIZ1XJl/qgIaYo= +github.com/go-lark/lark v1.7.1/go.mod h1:6ltbSztPZRT6IaO9ZIQyVaY5pVp/KeMizDYtfZkU+vM= github.com/go-redis/redis/v8 v8.11.6-0.20220405070650-99c79f7041fc h1:jZY+lpZB92nvBo2f31oPC/ivGll6NcsnEOORm8Fkr4M= github.com/go-redis/redis/v8 v8.11.6-0.20220405070650-99c79f7041fc/go.mod h1:25mL1NKxbJhB63ihiK8MnNeTRd+xAizd6bOdydrTLUQ= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= @@ -211,9 +164,6 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/gomodule/redigo v1.8.5/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= -github.com/gomodule/redigo v1.8.8 h1:f6cXq6RRfiyrOJEV7p3JhLDlmawGBVBBP1MggY8Mo4E= -github.com/gomodule/redigo v1.8.8/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -266,6 +216,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA= github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -274,21 +226,13 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/line/line-bot-sdk-go v7.8.0+incompatible h1:Uf9/OxV0zCVfqyvwZPH8CrdiHXXmMRa/L91G3btQblQ= github.com/line/line-bot-sdk-go v7.8.0+incompatible/go.mod h1:0RjLjJEAU/3GIcHkC3av6O4jInAbt25nnZVmOFUgDBg= -github.com/mailgun/mailgun-go/v4 v4.6.1 h1:ETvvkcHd6I+FwFgAwZSf02RXKFA0Rg3djOFic//RAu0= -github.com/mailgun/mailgun-go/v4 v4.6.1/go.mod h1:FJlF9rI5cQT+mrwujtJjPMbIVy3Ebor9bKTVsJ0QU40= -github.com/mailgun/mailgun-go/v4 v4.6.2 h1:w65d1Zz/9Ty42itBNvtL5DWyhdFxFlqnaTd7ROhp2jI= -github.com/mailgun/mailgun-go/v4 v4.6.2/go.mod h1:FJlF9rI5cQT+mrwujtJjPMbIVy3Ebor9bKTVsJ0QU40= -github.com/mailgun/mailgun-go/v4 v4.7.0 h1:G55jdfuCaKNVxYDh7VB/3DaF7JFtkGM75qxbUeQrhyw= -github.com/mailgun/mailgun-go/v4 v4.7.0/go.mod h1:FJlF9rI5cQT+mrwujtJjPMbIVy3Ebor9bKTVsJ0QU40= -github.com/mailgun/mailgun-go/v4 v4.8.0 h1:eq6gmm4m8WOqUarlU+Y9FPQcIUcvm32lCjIeiH3sxn4= -github.com/mailgun/mailgun-go/v4 v4.8.0/go.mod h1:FJlF9rI5cQT+mrwujtJjPMbIVy3Ebor9bKTVsJ0QU40= github.com/mailgun/mailgun-go/v4 v4.8.1 h1:1+MdKakJuXnW2JJDbyPdO1ngAANOyHyVPxQvFF8Sq6c= github.com/mailgun/mailgun-go/v4 v4.8.1/go.mod h1:FJlF9rI5cQT+mrwujtJjPMbIVy3Ebor9bKTVsJ0QU40= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= @@ -304,20 +248,21 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/pkg/errors v0.8.1-0.20161029093637-248dadf4e906/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -333,8 +278,6 @@ github.com/sendgrid/rest v2.6.7+incompatible h1:VitKiUoCWxqUSezj7gHtG3tAjQPXElDc github.com/sendgrid/rest v2.6.7+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE= github.com/sendgrid/sendgrid-go v3.10.5+incompatible h1:2f/d7odubrZMkwqSupQDU5ad1GkS8syopBapDazh5bM= github.com/sendgrid/sendgrid-go v3.10.5+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= -github.com/silenceper/wechat/v2 v2.1.2 h1:+QfIMiYfwST2ZloTwmYp0O0p5Y1LYRZxfLWfMuSE30k= -github.com/silenceper/wechat/v2 v2.1.2/go.mod h1:0OprxYCCp2CZAKw06BBlnaczInTk2KxOLsKeiopshGg= github.com/silenceper/wechat/v2 v2.1.3 h1:vMHnU9PG6wROTqkQI+HnBiEzriEEE+sbmGHg9cdb4yc= github.com/silenceper/wechat/v2 v2.1.3/go.mod h1:FoU0YvegD+Z85TBGQhjkXjY8BMb0+cagbe9BqJ0fKhA= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= @@ -346,7 +289,6 @@ github.com/slack-go/slack v0.10.3 h1:kKYwlKY73AfSrtAk9UHWCXXfitudkDztNI9GYBviLxw github.com/slack-go/slack v0.10.3/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= github.com/sony/sonyflake v1.0.0 h1:MpU6Ro7tfXwgn2l5eluf9xQvQJDROTBImNCfRXn/YeM= github.com/sony/sonyflake v1.0.0/go.mod h1:Jv3cfhf/UFtolOTTRd3q4Nl6ENqM+KfyZ5PseKfZGF4= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -387,10 +329,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -457,8 +396,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -478,8 +415,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 h1:w8s32wxx3sY+OjLlv9qltkLU5yvJzxjjgiHWLjdIcw4= golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -517,7 +452,6 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -525,7 +459,6 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a h1:ppl5mZgokTT8uPkmYOyEUmPTr3ypaKkg5eFOGrAmxxE= golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -535,6 +468,7 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -665,14 +599,13 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/h2non/gock.v1 v1.0.15 h1:SzLqcIlb/fDfg7UvukMpNcWsu7sI5tWwL+KCATZqks0= -gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= +gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY= gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/service/lark/README.md b/service/lark/README.md new file mode 100644 index 0000000..7687c58 --- /dev/null +++ b/service/lark/README.md @@ -0,0 +1,99 @@ +# Lark + +## Prerequisites + +Depending on your requirements, you'll need either a custom app or a Lark group +chat webhook. The latter is easier to set up, but can only send messages to the +group it is in. You may refer to the doc +[here](https://open.larksuite.com/document/uAjLw4CM/ukTMukTMuhttps://open.larksuite.com/document/home/develop-a-bot-in-5-minutes/create-an-appkTM/bot-v3/use-custom-bots-in-a-group) +to set up a webhook bot, and the doc +[here](https://open.larksuite.com/document/home/develop-a-bot-in-5-minutes/create-an-app) +to set up a custom app. + +## Usage + +### Webhook + +For webhook bots, we only need the webhook URL, which might look something like +`https://open.feishu.cn/open-apis/bot/v2/hook/xxx`. Note that there is no +method to configure receivers, because the webhook bot can only send messages +to the group in which it was created. + +```go +package main + +import ( + "context" + "log" + + "github.com/nikoksr/notify" + "github.com/nikoksr/notify/service/lark" +) + +// Replace this with your own webhook URL. +const webHookURL = "https://open.feishu.cn/open-apis/bot/v2/hook/xxx" + +func main() { + larkWebhookSvc := lark.NewWebhookService(webHookURL) + + notifier := notify.New() + notifier.UseServices(larkWebhookSvc) + + if err := notifier.Send(context.Background(), "subject", "message"); err != nil { + log.Fatalf("notifier.Send() failed: %s", err.Error()) + } + + log.Println("notification sent") +} +``` + +### Custom App + +For custom apps, we need to pass in the App ID and App Secret when creating a +new notification service. When adding receivers, the type of the receiver ID +must be specified, as shown in the example below. You may refer to the section +entitled "Query parameters" in the doc +[here](https://open.larksuite.com/document/uAjLw4CM/ukTMukTMukTM/reference/im-v1/message/create) +for more information about the different ID types. + +```go +package main + +import ( + "context" + "log" + + "github.com/nikoksr/notify" + "github.com/nikoksr/notify/service/lark" +) + +// Replace these with the credentials from your custom app. +const ( + appId = "xxx" + appSecret = "xxx" +) + +func main() { + larkCustomAppService := lark.NewCustomAppService(appId, appSecret) + + // Lark implements five types of receiver IDs. You'll need to specify the + // type using the respective helper functions when adding them as receivers. + larkCustomAppService.AddReceivers( + lark.OpenID("xxx"), + lark.UserID("xxx"), + lark.UnionID("xxx"), + lark.Email("xyz@example.com"), + lark.ChatID("xxx"), + ) + + notifier := notify.New() + notifier.UseServices(larkCustomAppService) + + if err := notifier.Send(context.Background(), "subject", "message"); err != nil { + log.Fatalf("notifier.Send() failed: %s", err.Error()) + } + + log.Println("notification sent") +} +``` + diff --git a/service/lark/common.go b/service/lark/common.go new file mode 100644 index 0000000..62bdb4b --- /dev/null +++ b/service/lark/common.go @@ -0,0 +1,58 @@ +package lark + +// sender is an interface for sending a message to an already defined receiver. +type sender interface { + Send(subject, message string) error +} + +// sender is an interface for sending a message to a specific receiver ID. +type sendToer interface { + SendTo(subject, message, id, idType string) error +} + +// receiverID encapsulates a receiver ID and its type in Lark. +type receiverID struct { + id string + typ receiverIDType +} + +// OpenID specifies an ID as a Lark Open ID. +func OpenID(s string) *receiverID { + return &receiverID{s, openID} +} + +// UserID specifies an ID as a Lark User ID. +func UserID(s string) *receiverID { + return &receiverID{s, userID} +} + +// UnionID specifies an ID as a Lark Union ID. +func UnionID(s string) *receiverID { + return &receiverID{s, unionID} +} + +// Email specifies a receiver ID as an email. +func Email(s string) *receiverID { + return &receiverID{s, email} +} + +// ChatID specifies an ID as a Lark Chat ID. +func ChatID(s string) *receiverID { + return &receiverID{s, chatID} +} + +// receiverIDType represents the different ID types implemented by Lark. This +// information is required when sending a message. More information about the +// different ID types can be found in the "Query parameters" section of +// the https://open.larksuite.com/document/uAjLw4CM/ukTMukTMukTM/reference/im-v1/message/create, +// or on +// https://open.larksuite.com/document/home/user-identity-introduction/introduction. +type receiverIDType string + +const ( + openID receiverIDType = "open_id" + userID = "user_id" + unionID = "union_id" + email = "email" + chatID = "chat_id" +) diff --git a/service/lark/custom_app.go b/service/lark/custom_app.go new file mode 100644 index 0000000..8e49a33 --- /dev/null +++ b/service/lark/custom_app.go @@ -0,0 +1,109 @@ +package lark + +import ( + "context" + "fmt" + "net/http" + "time" + + "github.com/go-lark/lark" + "github.com/nikoksr/notify" +) + +type customAppService struct { + receiveIDs []*receiverID + cli sendToer +} + +// Compile time check that larkCustomAppService implements notify.Notifer. +var _ notify.Notifier = &customAppService{} + +// NewCustomAppService returns a new instance of a Lark notify service using a +// Lark custom app. +func NewCustomAppService(appID, appSecret string) *customAppService { + bot := lark.NewChatBot(appID, appSecret) + + // We need to set the bot to use Lark's open.larksuite.com domain instead of + // the default open.feishu.cn domain. + bot.SetDomain(lark.DomainLark) + + // Let the bot use a HTTP client with a longer timeout than the default 5 + // seconds. + bot.SetClient(&http.Client{ + Timeout: 8 * time.Second, + }) + bot.StartHeartbeat() + + return &customAppService{ + receiveIDs: make([]*receiverID, 0), + cli: &larkClientGoLarkChatBot{ + bot: bot, + }, + } +} + +// AddReceivers adds recipients to future notifications. There are five different +// types of receiver IDs availabe in Lark and they must be specified here. For +// example: +// +// larkService.AddReceivers( +// lark.OpenID("ou_c99c5f35d542efc7ee492afe11af19ef"), +// lark.UserID("8335aga2"), +// lark.UnionID("on_cad4860e7af114fb4ff6c5d496d1dd76"), +// lark.Email("xyz@example.com"), +// lark.ChatID("oc_a0553eda9014c201e6969b478895c230"), +// ) +func (c *customAppService) AddReceivers(ids ...*receiverID) { + c.receiveIDs = append(c.receiveIDs, ids...) +} + +// Send takes a message subject and a message body and sends them to all +// previously registered recipient IDs. +func (c *customAppService) Send(ctx context.Context, subject, message string) error { + for _, id := range c.receiveIDs { + select { + case <-ctx.Done(): + return ctx.Err() + default: + if err := c.cli.SendTo(subject, message, id.id, string(id.typ)); err != nil { + return err + } + } + } + return nil +} + +// larkClientGoLarkChatBot is a wrapper around go-lark/lark's Bot, to be used +// for sending messages with custom apps. +type larkClientGoLarkChatBot struct { + bot *lark.Bot +} + +// SendTo implements the sendToer interface using a go-lark/lark chat bot. +func (l *larkClientGoLarkChatBot) SendTo(subject, message, receiverID, idType string) error { + content := lark.NewPostBuilder(). + Title(subject). + TextTag(message, 1, false). + Render() + msg := lark.NewMsgBuffer(lark.MsgPost).Post(content) + switch receiverIDType(idType) { + case openID: + msg.BindOpenID(receiverID) + case userID: + msg.BindUserID(receiverID) + case unionID: + msg.BindUnionID(receiverID) + case email: + msg.BindEmail(receiverID) + case chatID: + msg.BindChatID(receiverID) + } + res, err := l.bot.PostMessage(msg.Build()) + if err != nil { + return fmt.Errorf("failed to send message: %w", err) + } + if res.Code != 0 { + return fmt.Errorf("send failed with error code %d, please see https://open.larksuite.com/document/ukTMukTMukTM/ugjM14COyUjL4ITN for details", res.Code) + } + return nil +} diff --git a/service/lark/custom_app_test.go b/service/lark/custom_app_test.go new file mode 100644 index 0000000..b47ddca --- /dev/null +++ b/service/lark/custom_app_test.go @@ -0,0 +1,82 @@ +package lark + +import ( + "context" + "errors" + "testing" + + "github.com/nikoksr/notify/service/lark/mocks" + "github.com/stretchr/testify/assert" +) + +func TestAddReceivers(t *testing.T) { + t.Parallel() + + xs := []*receiverID{ + OpenID("ou_c99c5f35d542efc7ee492afe11af19ef"), + UserID("8335aga2"), + } + svc := NewCustomAppService("", "") + svc.AddReceivers(xs...) + + assert.ElementsMatch(t, svc.receiveIDs, xs) + + // Test if adding more receivers afterwards works. + ys := []*receiverID{ + UnionID("on_cad4860e7af114fb4ff6c5d496d1dd76"), + Email("xyz@example.com"), + ChatID("oc_a0553eda9014c201e6969b478895c230"), + } + svc.AddReceivers(ys...) + + assert.ElementsMatch(t, svc.receiveIDs, append(xs, ys...)) +} + +func TestSendCustomApp(t *testing.T) { + t.Parallel() + ctx := context.Background() + assert := assert.New(t) + + tests := []*receiverID{ + OpenID("ou_c99c5f35d542efc7ee492afe11af19ef"), + UserID("8335aga2"), + UnionID("on_cad4860e7af114fb4ff6c5d496d1dd76"), + Email("xyz@example.com"), + ChatID("oc_a0553eda9014c201e6969b478895c230"), + } + + // First, test for when the sender returns an error. + for _, tt := range tests { + mockSendToer := mocks.NewSendToer(t) + mockSendToer. + On("SendTo", "subject", "message", tt.id, string(tt.typ)). + Return(errors.New("")) + + svc := NewCustomAppService("", "") + svc.cli = mockSendToer + + svc.AddReceivers(tt) + err := svc.Send(ctx, "subject", "message") + assert.NotNil(err) + + mockSendToer.AssertExpectations(t) + } + + // Then test for when the sender does not return an error. + for _, tt := range tests { + mockSendToer := mocks.NewSendToer(t) + mockSendToer. + On("SendTo", "subject", "message", tt.id, string(tt.typ)). + Return(nil) + + svc := NewCustomAppService("", "") + svc.cli = mockSendToer + + svc.AddReceivers(tt) + err := svc.Send(ctx, "subject", "message") + assert.Nil(err) + + mockSendToer.AssertExpectations(t) + + } +} diff --git a/service/lark/doc.go b/service/lark/doc.go new file mode 100644 index 0000000..d752710 --- /dev/null +++ b/service/lark/doc.go @@ -0,0 +1,54 @@ +/* +Package lark provides message notification integration for Lark. Two kinds of +bots on Lark are supported -- webhooks and custom apps. For information on +webhook bots, see +https://open.larksuite.com/document/uAjLw4CM/ukTMukTMukTM/bot-v3/use-custom-bots-in-a-group, +and for info on custom apps, see +https://open.larksuite.com/document/home/develop-a-bot-in-5-minutes/create-an-app. + +Usage: + + package main + + import ( + "context" + "log" + + "github.com/nikoksr/notify" + "github.com/nikoksr/notify/service/lark" + ) + + const ( + webhookURL = "https://open.feishu.cn/open-apis/bot/v2/hook/xxx" + appId = "xxx" + appSecret = "xxx" + ) + + func main() { + // Two types of services are available depending on your requirements. + larkWebhookService := lark.NewWebhookService(webhookURL) + larkCustomAppService := lark.NewCustomAppService(appId, appSecret) + + // Lark implements five types of receiver IDs. You'll need to specify the + // type using the respective helper functions when adding them as receivers + // for the custom app service. + larkCustomAppService.AddReceivers( + lark.OpenID("xxx"), + lark.UserID("xxx"), + lark.UnionID("xxx"), + lark.Email("xyz@example.com"), + lark.ChatID("xxx"), + ) + + notifier := notify.New() + notifier.UseServices(larkWebhookService, larkCustomAppService) + + if err := notifier.Send(context.Background(), "subject", "message"); err != nil { + log.Fatalf("notifier.Send() failed: %s", err.Error()) + } + + log.Println("notification sent") + } +*/ + +package lark diff --git a/service/lark/mocks/sendToer.go b/service/lark/mocks/sendToer.go new file mode 100644 index 0000000..f0ef191 --- /dev/null +++ b/service/lark/mocks/sendToer.go @@ -0,0 +1,39 @@ +// Code generated by mockery v2.12.3. DO NOT EDIT. + +package mocks + +import mock "github.com/stretchr/testify/mock" + +// SendToer is an autogenerated mock type for the sendToer type +type SendToer struct { + mock.Mock +} + +// SendTo provides a mock function with given fields: subject, message, id, idType +func (_m *SendToer) SendTo(subject string, message string, id string, idType string) error { + ret := _m.Called(subject, message, id, idType) + + var r0 error + if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok { + r0 = rf(subject, message, id, idType) + } else { + r0 = ret.Error(0) + } + + return r0 +} + +type NewSendToerT interface { + mock.TestingT + Cleanup(func()) +} + +// NewSendToer creates a new instance of SendToer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSendToer(t NewSendToerT) *SendToer { + mock := &SendToer{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/service/lark/mocks/sender.go b/service/lark/mocks/sender.go new file mode 100644 index 0000000..4156bd1 --- /dev/null +++ b/service/lark/mocks/sender.go @@ -0,0 +1,39 @@ +// Code generated by mockery v2.12.3. DO NOT EDIT. + +package mocks + +import mock "github.com/stretchr/testify/mock" + +// Sender is an autogenerated mock type for the sender type +type Sender struct { + mock.Mock +} + +// Send provides a mock function with given fields: subject, message +func (_m *Sender) Send(subject string, message string) error { + ret := _m.Called(subject, message) + + var r0 error + if rf, ok := ret.Get(0).(func(string, string) error); ok { + r0 = rf(subject, message) + } else { + r0 = ret.Error(0) + } + + return r0 +} + +type NewSenderT interface { + mock.TestingT + Cleanup(func()) +} + +// NewSender creates a new instance of Sender. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSender(t NewSenderT) *Sender { + mock := &Sender{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/service/lark/webhook.go b/service/lark/webhook.go new file mode 100644 index 0000000..9cd38be --- /dev/null +++ b/service/lark/webhook.go @@ -0,0 +1,57 @@ +package lark + +import ( + "context" + "fmt" + + "github.com/go-lark/lark" + "github.com/nikoksr/notify" +) + +type webhookService struct { + cli sender +} + +// Compile time check that larkCustomAppService implements notify.Notifer. +var _ notify.Notifier = &webhookService{} + +// NewWebhookService returns a new instance of a Lark notify service using a +// Lark group chat webhook. Note that this service does not take any +// notification receivers because it can only push messages to the group chat +// it belongs to. +func NewWebhookService(webhookURL string) *webhookService { + bot := lark.NewNotificationBot(webhookURL) + return &webhookService{ + cli: &larkClientGoLarkNotificationBot{ + bot: bot, + }, + } +} + +// Send sends the message subject and body to the group chat. +func (w *webhookService) Send(ctx context.Context, subject, message string) error { + return w.cli.Send(subject, message) +} + +// larkClientGoLarkNotificationBot is a wrapper around go-lark/lark's Bot, to +// be used for notifications via webhooks only. +type larkClientGoLarkNotificationBot struct { + bot *lark.Bot +} + +// Send implements the sender interface using a go-lark/lark notification bot. +func (w *larkClientGoLarkNotificationBot) Send(subject, message string) error { + content := lark.NewPostBuilder(). + Title(subject). + TextTag(message, 1, false). + Render() + msg := lark.NewMsgBuffer(lark.MsgPost).Post(content) + res, err := w.bot.PostNotificationV2(msg.Build()) + if err != nil { + return fmt.Errorf("failed to post webhook message: %w", err) + } + if res.Code != 0 { + return fmt.Errorf("send failed with error code %d, please see https://open.larksuite.com/document/ukTMukTMukTM/ugjM14COyUjL4ITN for details", res.Code) + } + return nil +} diff --git a/service/lark/webhook_test.go b/service/lark/webhook_test.go new file mode 100644 index 0000000..0b494ce --- /dev/null +++ b/service/lark/webhook_test.go @@ -0,0 +1,43 @@ +package lark + +import ( + "context" + "errors" + "testing" + + "github.com/nikoksr/notify/service/lark/mocks" + "github.com/stretchr/testify/assert" +) + +func TestSendWebhook(t *testing.T) { + assert := assert.New(t) + ctx := context.Background() + + // First, test for when the sender returns an error. + { + mockSender := mocks.NewSender(t) + mockSender. + On("Send", "subject", "message"). + Return(errors.New("")) + + svc := NewWebhookService("") + svc.cli = mockSender + err := svc.Send(ctx, "subject", "message") + assert.NotNil(err) + mockSender.AssertExpectations(t) + } + + // Then test for when the sender does not return an error. + { + mockSender := mocks.NewSender(t) + mockSender. + On("Send", "subject", "message"). + Return(nil) + + svc := NewWebhookService("") + svc.cli = mockSender + err := svc.Send(ctx, "subject", "message") + assert.Nil(err) + mockSender.AssertExpectations(t) + } +} From 29c1b8ee81847b3150184cf27d364da5ba542242 Mon Sep 17 00:00:00 2001 From: junyi <47441677+immanuelhume@users.noreply.github.com> Date: Sun, 5 Jun 2022 23:30:00 +0800 Subject: [PATCH 2/5] docs(readme): add lark service support --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7b064e4..c224d25 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ Yes, please! Contributions of all kinds are very welcome! Feel free to check our | [Discord](https://discord.com) | [service/discord](service/discord) | [bwmarrin/discordgo](https://github.com/bwmarrin/discordgo) | | [Email](https://wikipedia.org/wiki/Email) | [service/mail](service/mail) | [jordan-wright/email](https://github.com/jordan-wright/email) | | [Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging) | [service/fcm](service/fcm) | [appleboy/go-fcm](https://github.com/appleboy/go-fcm) | +| [Lark](https://www.larksuite.com/) | [service/lark](service/lark) | [go-lark/lark](https://github.com/go-lark/lark) | | [Line](https://line.me) | [service/line](service/line) | [line/line-bot-sdk-go](https://github.com/line/line-bot-sdk-go) | | [Line Notify](https://notify-bot.line.me) | [service/line](service/line) | [utahta/go-linenotify](https://github.com/utahta/go-linenotify) | | [Mailgun](https://www.mailgun.com) | [service/mailgun](service/mailgun) | [mailgun/mailgun-go](https://github.com/mailgun/mailgun-go) | From ddaeba4b8eaaa367454906da41e16bd96a53b17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niko=20K=C3=B6ser?= Date: Thu, 4 Aug 2022 17:09:36 +0200 Subject: [PATCH 3/5] fix(deps): go get -u and go mod tidy --- go.mod | 2 +- go.sum | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index e8a3ef2..bddb717 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( require ( github.com/appleboy/go-fcm v0.1.5 - github.com/go-lark/lark v1.7.1 + github.com/go-lark/lark v1.7.2 github.com/google/go-cmp v0.5.8 ) diff --git a/go.sum b/go.sum index a855557..de8e395 100644 --- a/go.sum +++ b/go.sum @@ -83,11 +83,8 @@ github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-lark/lark v1.7.1 h1:7NGHt/dXtvrTkwWg/aOGPfytf9Yp8jIZ1XJl/qgIaYo= -github.com/go-lark/lark v1.7.1/go.mod h1:6ltbSztPZRT6IaO9ZIQyVaY5pVp/KeMizDYtfZkU+vM= +github.com/go-lark/lark v1.7.2 h1:F2LlwbRrZVuHPs8lz1D7owDevUndPy88Hbw6ZXaho/A= +github.com/go-lark/lark v1.7.2/go.mod h1:6ltbSztPZRT6IaO9ZIQyVaY5pVp/KeMizDYtfZkU+vM= github.com/go-redis/redis/v8 v8.11.6-0.20220405070650-99c79f7041fc h1:jZY+lpZB92nvBo2f31oPC/ivGll6NcsnEOORm8Fkr4M= github.com/go-redis/redis/v8 v8.11.6-0.20220405070650-99c79f7041fc/go.mod h1:25mL1NKxbJhB63ihiK8MnNeTRd+xAizd6bOdydrTLUQ= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= @@ -329,5 +326,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 82cc699565639185a2f608853c852e960ba32025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niko=20K=C3=B6ser?= Date: Thu, 4 Aug 2022 17:12:33 +0200 Subject: [PATCH 4/5] chore(filestructure): extract mocks folder to follow repo scheme --- service/lark/{mocks/sendToer.go => mock_sendToer.go} | 0 service/lark/{mocks/sender.go => mock_sender.go} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename service/lark/{mocks/sendToer.go => mock_sendToer.go} (100%) rename service/lark/{mocks/sender.go => mock_sender.go} (100%) diff --git a/service/lark/mocks/sendToer.go b/service/lark/mock_sendToer.go similarity index 100% rename from service/lark/mocks/sendToer.go rename to service/lark/mock_sendToer.go diff --git a/service/lark/mocks/sender.go b/service/lark/mock_sender.go similarity index 100% rename from service/lark/mocks/sender.go rename to service/lark/mock_sender.go From a10eeb9247a4e902363265166e5a99a62658d604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niko=20K=C3=B6ser?= Date: Thu, 4 Aug 2022 17:13:17 +0200 Subject: [PATCH 5/5] refactor(lint): apply golangci-lint recommendations --- service/lark/common.go | 8 ++-- service/lark/custom_app.go | 20 +++++----- service/lark/custom_app_test.go | 6 +-- service/lark/doc.go | 67 ++++++++++++++++----------------- service/lark/mock_sendToer.go | 4 +- service/lark/mock_sender.go | 4 +- service/lark/webhook.go | 1 + service/lark/webhook_test.go | 7 ++-- 8 files changed, 59 insertions(+), 58 deletions(-) diff --git a/service/lark/common.go b/service/lark/common.go index 62bdb4b..9d6186e 100644 --- a/service/lark/common.go +++ b/service/lark/common.go @@ -51,8 +51,8 @@ type receiverIDType string const ( openID receiverIDType = "open_id" - userID = "user_id" - unionID = "union_id" - email = "email" - chatID = "chat_id" + userID receiverIDType = "user_id" + unionID receiverIDType = "union_id" + email receiverIDType = "email" + chatID receiverIDType = "chat_id" ) diff --git a/service/lark/custom_app.go b/service/lark/custom_app.go index 8e49a33..2c6d74b 100644 --- a/service/lark/custom_app.go +++ b/service/lark/custom_app.go @@ -7,6 +7,7 @@ import ( "time" "github.com/go-lark/lark" + "github.com/nikoksr/notify" ) @@ -32,7 +33,8 @@ func NewCustomAppService(appID, appSecret string) *customAppService { bot.SetClient(&http.Client{ Timeout: 8 * time.Second, }) - bot.StartHeartbeat() + + _ = bot.StartHeartbeat() return &customAppService{ receiveIDs: make([]*receiverID, 0), @@ -43,16 +45,16 @@ func NewCustomAppService(appID, appSecret string) *customAppService { } // AddReceivers adds recipients to future notifications. There are five different -// types of receiver IDs availabe in Lark and they must be specified here. For +// types of receiver IDs available in Lark and they must be specified here. For // example: // -// larkService.AddReceivers( -// lark.OpenID("ou_c99c5f35d542efc7ee492afe11af19ef"), -// lark.UserID("8335aga2"), -// lark.UnionID("on_cad4860e7af114fb4ff6c5d496d1dd76"), -// lark.Email("xyz@example.com"), -// lark.ChatID("oc_a0553eda9014c201e6969b478895c230"), -// ) +// larkService.AddReceivers( +// lark.OpenID("ou_c99c5f35d542efc7ee492afe11af19ef"), +// lark.UserID("8335aga2"), +// lark.UnionID("on_cad4860e7af114fb4ff6c5d496d1dd76"), +// lark.Email("xyz@example.com"), +// lark.ChatID("oc_a0553eda9014c201e6969b478895c230"), +// ) func (c *customAppService) AddReceivers(ids ...*receiverID) { c.receiveIDs = append(c.receiveIDs, ids...) } diff --git a/service/lark/custom_app_test.go b/service/lark/custom_app_test.go index b47ddca..78f8bb7 100644 --- a/service/lark/custom_app_test.go +++ b/service/lark/custom_app_test.go @@ -5,7 +5,6 @@ import ( "errors" "testing" - "github.com/nikoksr/notify/service/lark/mocks" "github.com/stretchr/testify/assert" ) @@ -47,7 +46,7 @@ func TestSendCustomApp(t *testing.T) { // First, test for when the sender returns an error. for _, tt := range tests { - mockSendToer := mocks.NewSendToer(t) + mockSendToer := NewSendToer(t) mockSendToer. On("SendTo", "subject", "message", tt.id, string(tt.typ)). Return(errors.New("")) @@ -64,7 +63,7 @@ func TestSendCustomApp(t *testing.T) { // Then test for when the sender does not return an error. for _, tt := range tests { - mockSendToer := mocks.NewSendToer(t) + mockSendToer := NewSendToer(t) mockSendToer. On("SendTo", "subject", "message", tt.id, string(tt.typ)). Return(nil) @@ -77,6 +76,5 @@ func TestSendCustomApp(t *testing.T) { assert.Nil(err) mockSendToer.AssertExpectations(t) - } } diff --git a/service/lark/doc.go b/service/lark/doc.go index d752710..13bfaf7 100644 --- a/service/lark/doc.go +++ b/service/lark/doc.go @@ -8,47 +8,46 @@ https://open.larksuite.com/document/home/develop-a-bot-in-5-minutes/create-an-ap Usage: - package main + package main - import ( - "context" - "log" + import ( + "context" + "log" - "github.com/nikoksr/notify" - "github.com/nikoksr/notify/service/lark" - ) + "github.com/nikoksr/notify" + "github.com/nikoksr/notify/service/lark" + ) - const ( - webhookURL = "https://open.feishu.cn/open-apis/bot/v2/hook/xxx" - appId = "xxx" - appSecret = "xxx" - ) + const ( + webhookURL = "https://open.feishu.cn/open-apis/bot/v2/hook/xxx" + appId = "xxx" + appSecret = "xxx" + ) - func main() { - // Two types of services are available depending on your requirements. - larkWebhookService := lark.NewWebhookService(webhookURL) - larkCustomAppService := lark.NewCustomAppService(appId, appSecret) + func main() { + // Two types of services are available depending on your requirements. + larkWebhookService := lark.NewWebhookService(webhookURL) + larkCustomAppService := lark.NewCustomAppService(appId, appSecret) - // Lark implements five types of receiver IDs. You'll need to specify the - // type using the respective helper functions when adding them as receivers - // for the custom app service. - larkCustomAppService.AddReceivers( - lark.OpenID("xxx"), - lark.UserID("xxx"), - lark.UnionID("xxx"), - lark.Email("xyz@example.com"), - lark.ChatID("xxx"), - ) + // Lark implements five types of receiver IDs. You'll need to specify the + // type using the respective helper functions when adding them as receivers + // for the custom app service. + larkCustomAppService.AddReceivers( + lark.OpenID("xxx"), + lark.UserID("xxx"), + lark.UnionID("xxx"), + lark.Email("xyz@example.com"), + lark.ChatID("xxx"), + ) - notifier := notify.New() - notifier.UseServices(larkWebhookService, larkCustomAppService) + notifier := notify.New() + notifier.UseServices(larkWebhookService, larkCustomAppService) - if err := notifier.Send(context.Background(), "subject", "message"); err != nil { - log.Fatalf("notifier.Send() failed: %s", err.Error()) - } + if err := notifier.Send(context.Background(), "subject", "message"); err != nil { + log.Fatalf("notifier.Send() failed: %s", err.Error()) + } - log.Println("notification sent") - } + log.Println("notification sent") + } */ - package lark diff --git a/service/lark/mock_sendToer.go b/service/lark/mock_sendToer.go index f0ef191..7edf606 100644 --- a/service/lark/mock_sendToer.go +++ b/service/lark/mock_sendToer.go @@ -1,8 +1,8 @@ // Code generated by mockery v2.12.3. DO NOT EDIT. -package mocks +package lark -import mock "github.com/stretchr/testify/mock" +import "github.com/stretchr/testify/mock" // SendToer is an autogenerated mock type for the sendToer type type SendToer struct { diff --git a/service/lark/mock_sender.go b/service/lark/mock_sender.go index 4156bd1..b371ab9 100644 --- a/service/lark/mock_sender.go +++ b/service/lark/mock_sender.go @@ -1,8 +1,8 @@ // Code generated by mockery v2.12.3. DO NOT EDIT. -package mocks +package lark -import mock "github.com/stretchr/testify/mock" +import "github.com/stretchr/testify/mock" // Sender is an autogenerated mock type for the sender type type Sender struct { diff --git a/service/lark/webhook.go b/service/lark/webhook.go index 9cd38be..43ceb8f 100644 --- a/service/lark/webhook.go +++ b/service/lark/webhook.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/go-lark/lark" + "github.com/nikoksr/notify" ) diff --git a/service/lark/webhook_test.go b/service/lark/webhook_test.go index 0b494ce..a6534e4 100644 --- a/service/lark/webhook_test.go +++ b/service/lark/webhook_test.go @@ -5,17 +5,18 @@ import ( "errors" "testing" - "github.com/nikoksr/notify/service/lark/mocks" "github.com/stretchr/testify/assert" ) func TestSendWebhook(t *testing.T) { + t.Parallel() + assert := assert.New(t) ctx := context.Background() // First, test for when the sender returns an error. { - mockSender := mocks.NewSender(t) + mockSender := NewSender(t) mockSender. On("Send", "subject", "message"). Return(errors.New("")) @@ -29,7 +30,7 @@ func TestSendWebhook(t *testing.T) { // Then test for when the sender does not return an error. { - mockSender := mocks.NewSender(t) + mockSender := NewSender(t) mockSender. On("Send", "subject", "message"). Return(nil)