From 9516f1a05205c444ec3dec78cd073b367ac6a98d Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 27 Nov 2025 01:59:25 +0000 Subject: [PATCH] Refactoring (#3) Reviewed-on: https://git.kundeng.us/phoenix/swoosh/pulls/3 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 2 +- .gitea/workflows/workflow.yaml | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- swoop/send/sender.go | 11 +++++++---- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index d0398d8..856b1fd 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -25,7 +25,7 @@ jobs: run: | echo "Creating version" - VERSION="0.0.2" + VERSION="0.0.3" PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) BRANCH_REF="${{ gitea.ref }}" BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 6fd9561..b5c67fa 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -16,8 +16,8 @@ jobs: go-version: '1.25.4' - name: Configure Git for SSH run: | - git config --global url."git@git.kundeng.us:".insteadOf "https://git.kundeng.us/" - go env -w GOPRIVATE=git.kundeng.us/phoenix/* + git config --global url."git@${{ secrets.GIT_HOST_ROOT }}:".insteadOf "https://${{ secrets.GIT_HOST_ROOT }}/" + go env -w GOPRIVATE=${{ secrets.GIT_HOST_ROOT }}/phoenix/* - name: Download dependencies run: | @@ -25,7 +25,7 @@ jobs: mkdir -p ~/.ssh echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/swoosh_deploy_key chmod 600 ~/.ssh/swoosh_deploy_key - ssh-keyscan ${{ vars.MY_HOST }} >> ~/.ssh/known_hosts + ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts eval $(ssh-agent -s) ssh-add -v ~/.ssh/swoosh_deploy_key diff --git a/go.mod b/go.mod index 92035e3..76b7b39 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.kundeng.us/phoenix/swoosh go 1.25.4 require ( - git.kundeng.us/phoenix/textsender-models v0.0.9 + git.kundeng.us/phoenix/textsender-models v0.0.10 github.com/twilio/twilio-go v1.28.6 ) diff --git a/go.sum b/go.sum index 03d7aea..bed12c6 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -git.kundeng.us/phoenix/textsender-models v0.0.9 h1:wHEbDLYzMpXQ8OaIf05xFY1V19iTpQogTJEuKInkjEQ= -git.kundeng.us/phoenix/textsender-models v0.0.9/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0= +git.kundeng.us/phoenix/textsender-models v0.0.10 h1:0AMe/zm4Xte2BcuqqhRP7+42m+4To+rUnHkR2a9eXlI= +git.kundeng.us/phoenix/textsender-models v0.0.10/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/swoop/send/sender.go b/swoop/send/sender.go index f9ca2e1..faaf236 100644 --- a/swoop/send/sender.go +++ b/swoop/send/sender.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "git.kundeng.us/phoenix/textsender-models/pkg/config" - "git.kundeng.us/phoenix/textsender-models/pkg/contact" - "git.kundeng.us/phoenix/textsender-models/pkg/message" + "git.kundeng.us/phoenix/textsender-models/tx0/config" + "git.kundeng.us/phoenix/textsender-models/tx0/contact" + "git.kundeng.us/phoenix/textsender-models/tx0/message" "github.com/twilio/twilio-go" twilioApi "github.com/twilio/twilio-go/rest/api/v2010" @@ -15,10 +15,13 @@ import ( ) type MessageSender struct { - Config config.TwiloConfig + Config *config.TwiloConfig } func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, error) { + if m.Config == nil { + return nil, fmt.Errorf("Config has not been initialized") + } now := time.Now() client := twilio.NewRestClientWithParams(twilio.ClientParams{ Username: m.Config.AccountSID,