From 6e7b2cdee85d1d0a988b654833c0fb8a73b3a196 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 4 Apr 2026 21:54:30 -0400 Subject: [PATCH] Update go (#17) Reviewed-on: https://git.kundeng.us/phoenix/sender/pulls/17 Co-authored-by: phoenix Co-committed-by: phoenix --- .github/workflows/go.yaml | 2 +- go.mod | 10 +++++----- go.sum | 9 +++++++++ internal/config/config.go | 4 ++-- internal/messaging/messaging.go | 4 ++-- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 9c4aaa1..fd8770a 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: '1.25.4' # You can specify a specific version or 'stable' + go-version: '1.26.1' # You can specify a specific version or 'stable' - name: Build run: | diff --git a/go.mod b/go.mod index 8f7e9d1..5ae150f 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,16 @@ module git.kundeng.us/phoenix/sender -go 1.25.4 +go 1.26.1 require ( - git.kundeng.us/phoenix/swoosh v0.0.12 - git.kundeng.us/phoenix/textsender-models v0.0.12 + git.kundeng.us/phoenix/swoosh v0.2.0 + git.kundeng.us/phoenix/textsender-models v0.2.0 ) require ( - github.com/golang-jwt/jwt/v5 v5.3.0 // indirect + github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/mock v1.6.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/twilio/twilio-go v1.28.8 // indirect + github.com/twilio/twilio-go v1.30.4 // indirect ) diff --git a/go.sum b/go.sum index ff26c71..e5529f0 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,11 @@ git.kundeng.us/phoenix/swoosh v0.0.12 h1:OtGUYJzakpzJ0fF2BP/z+maCtEfG+avQUJiCY9LMix8= git.kundeng.us/phoenix/swoosh v0.0.12/go.mod h1:5J/URwiWcjksaPmczelvBEeLdwB1mACFuhUdtWTheDg= +git.kundeng.us/phoenix/swoosh v0.2.0 h1:aecJdtRhgQofaOfki0fm+YszUuwKyfKqF5YVb20yxHI= +git.kundeng.us/phoenix/swoosh v0.2.0/go.mod h1:NxWD9iUunLIJRgTvlZbZa6jyDHc0JPPRuTmsrxV/hMs= git.kundeng.us/phoenix/textsender-models v0.0.12 h1:ps9H3FS5LyCwQhAiIvg4vYyfLZZ64dex1y9ytb0o9C4= git.kundeng.us/phoenix/textsender-models v0.0.12/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0= +git.kundeng.us/phoenix/textsender-models v0.2.0 h1:smz8Fs8VOs1Ya23txbOM0YPRidZIsM0yE9unHF0D/nQ= +git.kundeng.us/phoenix/textsender-models v0.2.0/go.mod h1:3CkqA/HFKPhpMYxkKn5uVbZEzEbG3sofLZE8pZ1BHO4= 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= @@ -10,6 +14,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= +github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= +github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -29,6 +35,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/twilio/twilio-go v1.28.8 h1:wbFz7Wt4S5mCEaes6FcM/ddcJGIhdjwp/9CHb9e+4fk= github.com/twilio/twilio-go v1.28.8/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw= +github.com/twilio/twilio-go v1.30.4 h1:Whrz37IykDD9KJI2YX4LWaGxYWZoYB7va8fASGDrLng= +github.com/twilio/twilio-go v1.30.4/go.mod h1:QbitvbvtkV77Jn4BABAKVmxabYSjMyQG4tHey9gfPqg= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -56,3 +64,4 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/internal/config/config.go b/internal/config/config.go index 1915afa..5201eea 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -6,7 +6,7 @@ import ( "log" "os" - "git.kundeng.us/phoenix/textsender-models/tx0/config" + axlry "git.kundeng.us/phoenix/textsender-models/tx0/config/auxiliary" ) const ( @@ -24,7 +24,7 @@ func IsVersionFlagPresent() bool { } } -func ParseConfig(filepath string) (config config.TwilioConfig, success bool) { +func ParseConfig(filepath string) (config axlry.TwilioConfig, success bool) { content, err := os.ReadFile(filepath) log.Println("Reading config file...") diff --git a/internal/messaging/messaging.go b/internal/messaging/messaging.go index 89a12b3..1aac02c 100644 --- a/internal/messaging/messaging.go +++ b/internal/messaging/messaging.go @@ -6,7 +6,7 @@ import ( "time" "git.kundeng.us/phoenix/swoosh/swoop/send" - cnfg "git.kundeng.us/phoenix/textsender-models/tx0/config" + cnfg "git.kundeng.us/phoenix/textsender-models/tx0/config/auxiliary" "git.kundeng.us/phoenix/textsender-models/tx0/contact" msg "git.kundeng.us/phoenix/textsender-models/tx0/message" ) @@ -24,7 +24,7 @@ func SendMessages(config cnfg.TwilioConfig, numbers [](contact.Contact), message numberToSend := number log.Println("Sending to: " + numberToSend.PhoneNumber) - if resp, err := snr.Send(message, number, nil); err != nil { + if resp, _, err := snr.Send(message, number, nil); err != nil { log.Println("Error sending:", err) } else { if response, err := json.Marshal(*resp); err != nil {