From dd2087b10119d58c459cb4a16e45f72d13d05dd3 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Fri, 16 May 2025 11:55:07 +0800 Subject: [PATCH] refactor: clean code --- internal/notify/providers.go | 12 +++++----- internal/notify/providers_deprecated.go | 6 ++--- .../dingtalkbot.go} | 2 +- .../dingtalkbot_test.go} | 23 ++++++++++--------- .../{lark/lark.go => larkbot/larkbot.go} | 2 +- .../wecom_test.go => larkbot/larkbot_test.go} | 10 ++++---- .../{wecom/wecom.go => wecombot/wecombot.go} | 2 +- .../wecombot_test.go} | 10 ++++---- 8 files changed, 34 insertions(+), 33 deletions(-) rename internal/pkg/core/notifier/providers/{dingtalk/dingtalk.go => dingtalkbot/dingtalkbot.go} (98%) rename internal/pkg/core/notifier/providers/{dingtalk/dingtalk_test.go => dingtalkbot/dingtalkbot_test.go} (62%) rename internal/pkg/core/notifier/providers/{lark/lark.go => larkbot/larkbot.go} (98%) rename internal/pkg/core/notifier/providers/{wecom/wecom_test.go => larkbot/larkbot_test.go} (80%) rename internal/pkg/core/notifier/providers/{wecom/wecom.go => wecombot/wecombot.go} (98%) rename internal/pkg/core/notifier/providers/{lark/lark_test.go => wecombot/wecombot_test.go} (80%) diff --git a/internal/notify/providers.go b/internal/notify/providers.go index c57b9c82..10e28f29 100644 --- a/internal/notify/providers.go +++ b/internal/notify/providers.go @@ -6,13 +6,13 @@ import ( "github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/pkg/core/notifier" - pDingTalk "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalk" + pDingTalkBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalkbot" pEmail "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/email" - pLark "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/lark" + pLarkBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/larkbot" pMattermost "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/mattermost" pTelegram "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/telegram" pWebhook "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/webhook" - pWeCom "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/wecom" + pWeComBot "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/wecombot" httputil "github.com/usual2970/certimate/internal/pkg/utils/http" maputil "github.com/usual2970/certimate/internal/pkg/utils/map" ) @@ -36,7 +36,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - return pDingTalk.NewNotifier(&pDingTalk.NotifierConfig{ + return pDingTalkBot.NewNotifier(&pDingTalkBot.NotifierConfig{ WebhookUrl: access.WebhookUrl, Secret: access.Secret, }) @@ -67,7 +67,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - return pLark.NewNotifier(&pLark.NotifierConfig{ + return pLarkBot.NewNotifier(&pLarkBot.NotifierConfig{ WebhookUrl: access.WebhookUrl, }) } @@ -143,7 +143,7 @@ func createNotifierProvider(options *notifierProviderOptions) (notifier.Notifier return nil, fmt.Errorf("failed to populate provider access config: %w", err) } - return pWeCom.NewNotifier(&pWeCom.NotifierConfig{ + return pWeComBot.NewNotifier(&pWeComBot.NotifierConfig{ WebhookUrl: access.WebhookUrl, }) } diff --git a/internal/notify/providers_deprecated.go b/internal/notify/providers_deprecated.go index 1e862866..759d097d 100644 --- a/internal/notify/providers_deprecated.go +++ b/internal/notify/providers_deprecated.go @@ -6,17 +6,17 @@ import ( "github.com/usual2970/certimate/internal/domain" "github.com/usual2970/certimate/internal/pkg/core/notifier" pBark "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/bark" - pDingTalk "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalk" + pDingTalk "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalkbot" pEmail "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/email" pGotify "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/gotify" - pLark "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/lark" + pLark "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/larkbot" pMattermost "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/mattermost" pPushover "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/pushover" pPushPlus "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/pushplus" pServerChan "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/serverchan" pTelegram "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/telegram" pWebhook "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/webhook" - pWeCom "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/wecom" + pWeCom "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/wecombot" maputil "github.com/usual2970/certimate/internal/pkg/utils/map" ) diff --git a/internal/pkg/core/notifier/providers/dingtalk/dingtalk.go b/internal/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go similarity index 98% rename from internal/pkg/core/notifier/providers/dingtalk/dingtalk.go rename to internal/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go index 9eb94dcf..ea3c51f3 100644 --- a/internal/pkg/core/notifier/providers/dingtalk/dingtalk.go +++ b/internal/pkg/core/notifier/providers/dingtalkbot/dingtalkbot.go @@ -1,4 +1,4 @@ -package dingtalk +package dingtalkbot import ( "context" diff --git a/internal/pkg/core/notifier/providers/dingtalk/dingtalk_test.go b/internal/pkg/core/notifier/providers/dingtalkbot/dingtalkbot_test.go similarity index 62% rename from internal/pkg/core/notifier/providers/dingtalk/dingtalk_test.go rename to internal/pkg/core/notifier/providers/dingtalkbot/dingtalkbot_test.go index 086e3a94..de3b6ba0 100644 --- a/internal/pkg/core/notifier/providers/dingtalk/dingtalk_test.go +++ b/internal/pkg/core/notifier/providers/dingtalkbot/dingtalkbot_test.go @@ -1,4 +1,4 @@ -package dingtalk_test +package dingtalkbot_test import ( "context" @@ -7,7 +7,7 @@ import ( "strings" "testing" - provider "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalk" + provider "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/dingtalkbot" ) const ( @@ -16,22 +16,23 @@ const ( ) var ( - fAccessToken string - fSecret string + fWebhookUrl string + fSecret string ) func init() { - argsPrefix := "CERTIMATE_NOTIFIER_DINGTALK_" + argsPrefix := "CERTIMATE_NOTIFIER_DINGTALKBOT_" - flag.StringVar(&fAccessToken, argsPrefix+"ACCESSTOKEN", "", "") + flag.StringVar(&fWebhookUrl, argsPrefix+"WEBHOOKURL", "", "") flag.StringVar(&fSecret, argsPrefix+"SECRET", "", "") } /* Shell command to run this test: - go test -v ./dingtalk_test.go -args \ - --CERTIMATE_NOTIFIER_DINGTALK_URL="https://example.com/your-webhook-url" + go test -v ./dingtalkbot_test.go -args \ + --CERTIMATE_NOTIFIER_DINGTALKBOT_WEBHOOKURL="https://example.com/your-webhook-url" \ + --CERTIMATE_NOTIFIER_DINGTALKBOT_SECRET="your-secret" */ func TestNotify(t *testing.T) { flag.Parse() @@ -39,13 +40,13 @@ func TestNotify(t *testing.T) { t.Run("Notify", func(t *testing.T) { t.Log(strings.Join([]string{ "args:", - fmt.Sprintf("ACCESSTOKEN: %v", fAccessToken), + fmt.Sprintf("WEBHOOKURL: %v", fWebhookUrl), fmt.Sprintf("SECRET: %v", fSecret), }, "\n")) notifier, err := provider.NewNotifier(&provider.NotifierConfig{ - AccessToken: fAccessToken, - Secret: fSecret, + WebhookUrl: fWebhookUrl, + Secret: fSecret, }) if err != nil { t.Errorf("err: %+v", err) diff --git a/internal/pkg/core/notifier/providers/lark/lark.go b/internal/pkg/core/notifier/providers/larkbot/larkbot.go similarity index 98% rename from internal/pkg/core/notifier/providers/lark/lark.go rename to internal/pkg/core/notifier/providers/larkbot/larkbot.go index e8ad7816..cf6d65ce 100644 --- a/internal/pkg/core/notifier/providers/lark/lark.go +++ b/internal/pkg/core/notifier/providers/larkbot/larkbot.go @@ -1,4 +1,4 @@ -package lark +package larkbot import ( "context" diff --git a/internal/pkg/core/notifier/providers/wecom/wecom_test.go b/internal/pkg/core/notifier/providers/larkbot/larkbot_test.go similarity index 80% rename from internal/pkg/core/notifier/providers/wecom/wecom_test.go rename to internal/pkg/core/notifier/providers/larkbot/larkbot_test.go index 01646121..2deba768 100644 --- a/internal/pkg/core/notifier/providers/wecom/wecom_test.go +++ b/internal/pkg/core/notifier/providers/larkbot/larkbot_test.go @@ -1,4 +1,4 @@ -package serverchan_test +package larkbot_test import ( "context" @@ -7,7 +7,7 @@ import ( "strings" "testing" - provider "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/wecom" + provider "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/larkbot" ) const ( @@ -18,7 +18,7 @@ const ( var fWebhookUrl string func init() { - argsPrefix := "CERTIMATE_NOTIFIER_WECOM_" + argsPrefix := "CERTIMATE_NOTIFIER_LARKBOT_" flag.StringVar(&fWebhookUrl, argsPrefix+"WEBHOOKURL", "", "") } @@ -26,8 +26,8 @@ func init() { /* Shell command to run this test: - go test -v ./wecom_test.go -args \ - --CERTIMATE_NOTIFIER_WECOM_WEBHOOKURL="https://example.com/your-webhook-url" \ + go test -v ./larkbot_test.go -args \ + --CERTIMATE_NOTIFIER_LARKBOT_WEBHOOKURL="https://example.com/your-webhook-url" */ func TestNotify(t *testing.T) { flag.Parse() diff --git a/internal/pkg/core/notifier/providers/wecom/wecom.go b/internal/pkg/core/notifier/providers/wecombot/wecombot.go similarity index 98% rename from internal/pkg/core/notifier/providers/wecom/wecom.go rename to internal/pkg/core/notifier/providers/wecombot/wecombot.go index 413f0d8d..5db0fff4 100644 --- a/internal/pkg/core/notifier/providers/wecom/wecom.go +++ b/internal/pkg/core/notifier/providers/wecombot/wecombot.go @@ -1,4 +1,4 @@ -package serverchan +package wecombot import ( "context" diff --git a/internal/pkg/core/notifier/providers/lark/lark_test.go b/internal/pkg/core/notifier/providers/wecombot/wecombot_test.go similarity index 80% rename from internal/pkg/core/notifier/providers/lark/lark_test.go rename to internal/pkg/core/notifier/providers/wecombot/wecombot_test.go index f72ca443..261f2158 100644 --- a/internal/pkg/core/notifier/providers/lark/lark_test.go +++ b/internal/pkg/core/notifier/providers/wecombot/wecombot_test.go @@ -1,4 +1,4 @@ -package lark_test +package wecombot_test import ( "context" @@ -7,7 +7,7 @@ import ( "strings" "testing" - provider "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/lark" + provider "github.com/usual2970/certimate/internal/pkg/core/notifier/providers/wecombot" ) const ( @@ -18,7 +18,7 @@ const ( var fWebhookUrl string func init() { - argsPrefix := "CERTIMATE_NOTIFIER_LARK_" + argsPrefix := "CERTIMATE_NOTIFIER_WECOMBOT_" flag.StringVar(&fWebhookUrl, argsPrefix+"WEBHOOKURL", "", "") } @@ -26,8 +26,8 @@ func init() { /* Shell command to run this test: - go test -v ./lark_test.go -args \ - --CERTIMATE_NOTIFIER_LARK_WEBHOOKURL="https://example.com/your-webhook-url" + go test -v ./wecombot_test.go -args \ + --CERTIMATE_NOTIFIER_WECOMBOT_WEBHOOKURL="https://example.com/your-webhook-url" \ */ func TestNotify(t *testing.T) { flag.Parse()