Skip to content

Commit 9782980

Browse files
marwen-abidmarwen-abid
authored
Merge pull request #978 from stellar/release/6.0.1
Release `6.0.1` to `main`
2 parents 9a44c7b + b007f5f commit 9782980

File tree

10 files changed

+100
-87
lines changed

10 files changed

+100
-87
lines changed

‎.github/workflows/automated_release_process.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
env:
1717
REPO_ORG: stellar
1818
REPO_NAME: stellar-disbursement-platform-backend
19-
REVIEWER: marcelosalloum,marwen-abid
19+
REVIEWER: JiahuiWho,marwen-abid,philipliu
2020

2121
jobs:
2222
create-release:

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/).
66

7+
## [6.0.1](https://github.com/stellar/stellar-disbursement-platform-backend/releases/tag/6.0.1) ([diff](https://github.com/stellar/stellar-disbursement-platform-backend/compare/6.0.0...6.0.1))
8+
9+
### Fixed
10+
11+
- Fix Twilio error 21656 when sending WhatsApp OTP messages by updating template to single variable format as required by Twilio/Meta's updated authentication template requirements [#974](https://github.com/stellar/stellar-disbursement-platform-backend/pull/974)
12+
13+
### Security and Dependencies
14+
15+
- Bump the all-docker group with 2 updates [#976](https://github.com/stellar/stellar-disbursement-platform-backend/pull/976)
16+
- golang from 1.25.4-alpine to 1.25.5-alpine
17+
- alpine from 3.22 to 3.23
18+
- Bump the minor-and-patch group with 7 updates [#977](https://github.com/stellar/stellar-disbursement-platform-backend/pull/977)
19+
720
## [6.0.0](https://github.com/stellar/stellar-disbursement-platform-backend/releases/tag/6.0.0) ([diff](https://github.com/stellar/stellar-disbursement-platform-backend/compare/5.0.0...6.0.0))
821

922
### 🚨Potential Breaking Changes

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To push:
44
# make docker-push
55

6-
FROM golang:1.25.4-alpine AS build
6+
FROM golang:1.25.5-alpine AS build
77
ARG GIT_COMMIT
88

99
ENV CGO_ENABLED=0 GOOS=linux
@@ -14,7 +14,7 @@ COPY . ./
1414
RUN go build -o /bin/stellar-disbursement-platform -ldflags "-X main.GitCommit=$GIT_COMMIT" .
1515

1616

17-
FROM alpine:3.22
17+
FROM alpine:3.23
1818

1919
RUN apk add --no-cache ca-certificates
2020
# ADD migrations/ /app/migrations/

‎Dockerfile.development‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1: Build the Go application
2-
FROM golang:1.25.4-alpine AS build
2+
FROM golang:1.25.5-alpine AS build
33
ARG GIT_COMMIT
44

55
WORKDIR /src/stellar-disbursement-platform
@@ -9,7 +9,7 @@ COPY . ./
99
RUN go build -o /bin/stellar-disbursement-platform -ldflags "-X main.GitCommit=$GIT_COMMIT" .
1010

1111
# Stage 2: Setup the development environment with Delve for debugging
12-
FROM golang:1.25.4-alpine AS development
12+
FROM golang:1.25.5-alpine AS development
1313

1414
# set workdir according to repo structure so remote debug source code is in sync
1515
WORKDIR /app/github.com/stellar/stellar-disbursement-platform

‎go.list‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@ github.com/armon/go-radix v1.0.0
2121
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
2222
github.com/avast/retry-go/v4 v4.7.0
2323
github.com/aws/aws-sdk-go v1.45.27
24-
github.com/aws/aws-sdk-go-v2 v1.40.0
24+
github.com/aws/aws-sdk-go-v2 v1.40.1
2525
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11
26-
github.com/aws/aws-sdk-go-v2/config v1.32.2
27-
github.com/aws/aws-sdk-go-v2/credentials v1.19.2
28-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14
26+
github.com/aws/aws-sdk-go-v2/config v1.32.3
27+
github.com/aws/aws-sdk-go-v2/credentials v1.19.3
28+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.15
2929
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.83
30-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14
31-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14
30+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.15
31+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.15
3232
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4
3333
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36
34-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3
34+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4
3535
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.4
36-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14
36+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.15
3737
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.17
3838
github.com/aws/aws-sdk-go-v2/service/s3 v1.83.0
39-
github.com/aws/aws-sdk-go-v2/service/ses v1.34.14
40-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2
41-
github.com/aws/aws-sdk-go-v2/service/sns v1.39.7
42-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5
43-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10
44-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2
45-
github.com/aws/smithy-go v1.23.2
39+
github.com/aws/aws-sdk-go-v2/service/ses v1.34.15
40+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.3
41+
github.com/aws/aws-sdk-go-v2/service/sns v1.39.8
42+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.6
43+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.11
44+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.3
45+
github.com/aws/smithy-go v1.24.0
4646
github.com/beevik/etree v1.1.0
4747
github.com/beorn7/perks v1.0.1
4848
github.com/bgentry/speakeasy v0.1.0
@@ -184,15 +184,15 @@ github.com/sirupsen/logrus v1.9.3
184184
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8
185185
github.com/spf13/afero v1.15.0
186186
github.com/spf13/cast v1.10.0
187-
github.com/spf13/cobra v1.10.1
187+
github.com/spf13/cobra v1.10.2
188188
github.com/spf13/pflag v1.0.10
189189
github.com/spf13/viper v1.21.0
190190
github.com/stellar/go-stellar-sdk v0.0.0-20251125023429-4c8c6f69a699
191191
github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2
192192
github.com/stretchr/objx v0.5.2
193193
github.com/stretchr/testify v1.11.1
194194
github.com/subosito/gotenv v1.6.0
195-
github.com/twilio/twilio-go v1.28.7
195+
github.com/twilio/twilio-go v1.28.8
196196
github.com/tyler-smith/go-bip39 v0.0.0-20180618194314-52158e4697b8
197197
github.com/valyala/bytebufferpool v1.0.0
198198
github.com/valyala/fasthttp v1.34.0

‎go.mod‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ go 1.24.0
55
require (
66
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
77
github.com/avast/retry-go/v4 v4.7.0
8-
github.com/aws/aws-sdk-go-v2 v1.40.0
9-
github.com/aws/aws-sdk-go-v2/config v1.32.2
10-
github.com/aws/aws-sdk-go-v2/credentials v1.19.2
11-
github.com/aws/aws-sdk-go-v2/service/ses v1.34.14
12-
github.com/aws/aws-sdk-go-v2/service/sns v1.39.7
8+
github.com/aws/aws-sdk-go-v2 v1.40.1
9+
github.com/aws/aws-sdk-go-v2/config v1.32.3
10+
github.com/aws/aws-sdk-go-v2/credentials v1.19.3
11+
github.com/aws/aws-sdk-go-v2/service/ses v1.34.15
12+
github.com/aws/aws-sdk-go-v2/service/sns v1.39.8
1313
github.com/dgraph-io/ristretto v0.2.0
1414
github.com/dimchansky/utfbom v1.1.1
1515
github.com/getsentry/sentry-go v0.40.0
@@ -31,29 +31,29 @@ require (
3131
github.com/sendgrid/sendgrid-go v3.16.1+incompatible
3232
github.com/shopspring/decimal v1.4.0
3333
github.com/sirupsen/logrus v1.9.3
34-
github.com/spf13/cobra v1.10.1
34+
github.com/spf13/cobra v1.10.2
3535
github.com/spf13/viper v1.21.0
3636
github.com/stellar/go-stellar-sdk v0.0.0-20251125023429-4c8c6f69a699
3737
github.com/stretchr/testify v1.11.1
38-
github.com/twilio/twilio-go v1.28.7
38+
github.com/twilio/twilio-go v1.28.8
3939
golang.org/x/crypto v0.45.0
4040
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
4141
golang.org/x/net v0.47.0
4242
)
4343

4444
require (
4545
github.com/BurntSushi/toml v1.3.2 // indirect
46-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect
47-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
48-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
46+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.15 // indirect
47+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.15 // indirect
48+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.15 // indirect
4949
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
50-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect
52-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 // indirect
53-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 // indirect
54-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 // indirect
55-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 // indirect
56-
github.com/aws/smithy-go v1.23.2 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.15 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.3 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.6 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.11 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.3 // indirect
56+
github.com/aws/smithy-go v1.24.0 // indirect
5757
github.com/beorn7/perks v1.0.1 // indirect
5858
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5959
github.com/chzyer/readline v1.5.1 // indirect

‎go.sum‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,38 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
1010
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
1111
github.com/avast/retry-go/v4 v4.7.0 h1:yjDs35SlGvKwRNSykujfjdMxMhMQQM0TnIjJaHB+Zio=
1212
github.com/avast/retry-go/v4 v4.7.0/go.mod h1:ZMPDa3sY2bKgpLtap9JRUgk2yTAba7cgiFhqxY2Sg6Q=
13-
github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc=
14-
github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
15-
github.com/aws/aws-sdk-go-v2/config v1.32.2 h1:4liUsdEpUUPZs5WVapsJLx5NPmQhQdez7nYFcovrytk=
16-
github.com/aws/aws-sdk-go-v2/config v1.32.2/go.mod h1:l0hs06IFz1eCT+jTacU/qZtC33nvcnLADAPL/XyrkZI=
17-
github.com/aws/aws-sdk-go-v2/credentials v1.19.2 h1:qZry8VUyTK4VIo5aEdUcBjPZHL2v4FyQ3QEOaWcFLu4=
18-
github.com/aws/aws-sdk-go-v2/credentials v1.19.2/go.mod h1:YUqm5a1/kBnoK+/NY5WEiMocZihKSo15/tJdmdXnM5g=
19-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 h1:WZVR5DbDgxzA0BJeudId89Kmgy6DIU4ORpxwsVHz0qA=
20-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14/go.mod h1:Dadl9QO0kHgbrH1GRqGiZdYtW5w+IXXaBNCHTIaheM4=
21-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 h1:PZHqQACxYb8mYgms4RZbhZG0a7dPW06xOjmaH0EJC/I=
22-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14/go.mod h1:VymhrMJUWs69D8u0/lZ7jSB6WgaG/NqHi3gX0aYf6U0=
23-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 h1:bOS19y6zlJwagBfHxs0ESzr1XCOU2KXJCWcq3E2vfjY=
24-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14/go.mod h1:1ipeGBMAxZ0xcTm6y6paC2C/J6f6OO7LBODV9afuAyM=
13+
github.com/aws/aws-sdk-go-v2 v1.40.1 h1:difXb4maDZkRH0x//Qkwcfpdg1XQVXEAEs2DdXldFFc=
14+
github.com/aws/aws-sdk-go-v2 v1.40.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
15+
github.com/aws/aws-sdk-go-v2/config v1.32.3 h1:cpz7H2uMNTDa0h/5CYL5dLUEzPSLo2g0NkbxTRJtSSU=
16+
github.com/aws/aws-sdk-go-v2/config v1.32.3/go.mod h1:srtPKaJJe3McW6T/+GMBZyIPc+SeqJsNPJsd4mOYZ6s=
17+
github.com/aws/aws-sdk-go-v2/credentials v1.19.3 h1:01Ym72hK43hjwDeJUfi1l2oYLXBAOR8gNSZNmXmvuas=
18+
github.com/aws/aws-sdk-go-v2/credentials v1.19.3/go.mod h1:55nWF/Sr9Zvls0bGnWkRxUdhzKqj9uRNlPvgV1vgxKc=
19+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.15 h1:utxLraaifrSBkeyII9mIbVwXXWrZdlPO7FIKmyLCEcY=
20+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.15/go.mod h1:hW6zjYUDQwfz3icf4g2O41PHi77u10oAzJ84iSzR/lo=
21+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.15 h1:Y5YXgygXwDI5P4RkteB5yF7v35neH7LfJKBG+hzIons=
22+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.15/go.mod h1:K+/1EpG42dFSY7CBj+Fruzm8PsCGWTXJ3jdeJ659oGQ=
23+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.15 h1:AvltKnW9ewxX2hFmQS0FyJH93aSvJVUEFvXfU+HWtSE=
24+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.15/go.mod h1:3I4oCdZdmgrREhU74qS1dK9yZ62yumob+58AbFR4cQA=
2525
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
2626
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
27-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 h1:x2Ibm/Af8Fi+BH+Hsn9TXGdT+hKbDd5XOTZxTMxDk7o=
28-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3/go.mod h1:IW1jwyrQgMdhisceG8fQLmQIydcT/jWY21rFhzgaKwo=
29-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 h1:FIouAnCE46kyYqyhs0XEBDFFSREtdnr8HQuLPQPLCrY=
30-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14/go.mod h1:UTwDc5COa5+guonQU8qBikJo1ZJ4ln2r1MkF7Dqag1E=
31-
github.com/aws/aws-sdk-go-v2/service/ses v1.34.14 h1:W+zXBgTkWy18nUhFHMCE8hgL6ibRQP1wnlxsjTGlaEY=
32-
github.com/aws/aws-sdk-go-v2/service/ses v1.34.14/go.mod h1:w+iUMP1i8+1u4wO6QjfdfqPFXGQV5Qy5qK+c3/rcYDg=
33-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 h1:MxMBdKTYBjPQChlJhi4qlEueqB1p1KcbTEa7tD5aqPs=
34-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2/go.mod h1:iS6EPmNeqCsGo+xQmXv0jIMjyYtQfnwg36zl2FwEouk=
35-
github.com/aws/aws-sdk-go-v2/service/sns v1.39.7 h1:fovS7qGMT+BBSuifkySdVaMWxXTyaYT6qaBx/1y6Ij4=
36-
github.com/aws/aws-sdk-go-v2/service/sns v1.39.7/go.mod h1:gFahrattA8ulEtiS4XL/fQiQ77l+Urc52Y96/r1e6ks=
37-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 h1:ksUT5KtgpZd3SAiFJNJ0AFEJVva3gjBmN7eXUZjzUwQ=
38-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5/go.mod h1:av+ArJpoYf3pgyrj6tcehSFW+y9/QvAY8kMooR9bZCw=
39-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 h1:GtsxyiF3Nd3JahRBJbxLCCdYW9ltGQYrFWg8XdkGDd8=
40-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10/go.mod h1:/j67Z5XBVDx8nZVp9EuFM9/BS5dvBznbqILGuu73hug=
41-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 h1:a5UTtD4mHBU3t0o6aHQZFJTNKVfxFWfPX7J0Lr7G+uY=
42-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2/go.mod h1:6TxbXoDSgBQ225Qd8Q+MbxUxUh6TtNKwbRt/EPS9xso=
43-
github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
44-
github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
27+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E=
28+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow=
29+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.15 h1:3/u/4yZOffg5jdNk1sDpOQ4Y+R6Xbh+GzpDrSZjuy3U=
30+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.15/go.mod h1:4Zkjq0FKjE78NKjabuM4tRXKFzUJWXgP0ItEZK8l7JU=
31+
github.com/aws/aws-sdk-go-v2/service/ses v1.34.15 h1:kup0JRlXxCOeuTe+TjG0pxy0U2akj3UaV8v3qcmyMLc=
32+
github.com/aws/aws-sdk-go-v2/service/ses v1.34.15/go.mod h1:S+mwHVbb+QiNflLngBwOJIIU/jCPAp81IdEJZK8NbTM=
33+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.3 h1:d/6xOGIllc/XW1lzG9a4AUBMmpLA9PXcQnVPTuHHcik=
34+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.3/go.mod h1:fQ7E7Qj9GiW8y0ClD7cUJk3Bz5Iw8wZkWDHsTe8vDKs=
35+
github.com/aws/aws-sdk-go-v2/service/sns v1.39.8 h1:s2QY81HBbJ+zbafTcWQmMaHj0C18VoJON/gDY1ibrEg=
36+
github.com/aws/aws-sdk-go-v2/service/sns v1.39.8/go.mod h1:3aOzyhwa/mXPZYLwGaALfl88GFRXHQKXdyQSq2L/Y4g=
37+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.6 h1:8sTTiw+9yuNXcfWeqKF2x01GqCF49CpP4Z9nKrrk/ts=
38+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.6/go.mod h1:8WYg+Y40Sn3X2hioaaWAAIngndR8n1XFdRPPX+7QBaM=
39+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.11 h1:E+KqWoVsSrj1tJ6I/fjDIu5xoS2Zacuu1zT+H7KtiIk=
40+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.11/go.mod h1:qyWHz+4lvkXcr3+PoGlGHEI+3DLLiU6/GdrFfMaAhB0=
41+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.3 h1:tzMkjh0yTChUqJDgGkcDdxvZDSrJ/WB6R6ymI5ehqJI=
42+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.3/go.mod h1:T270C0R5sZNLbWUe8ueiAF42XSZxxPocTaGSgs5c/60=
43+
github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=
44+
github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
4545
github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
4646
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
4747
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -201,8 +201,8 @@ github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
201201
github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
202202
github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
203203
github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
204-
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
205-
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
204+
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
205+
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
206206
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
207207
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
208208
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -220,8 +220,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
220220
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
221221
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
222222
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
223-
github.com/twilio/twilio-go v1.28.7 h1:WzzQDR/rqmNkVs1TwtcHFPYGTdSdPnx/eAZf5UIXzr4=
224-
github.com/twilio/twilio-go v1.28.7/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
223+
github.com/twilio/twilio-go v1.28.8 h1:wbFz7Wt4S5mCEaes6FcM/ddcJGIhdjwp/9CHb9e+4fk=
224+
github.com/twilio/twilio-go v1.28.8/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
225225
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
226226
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
227227
github.com/valyala/fasthttp v1.34.0 h1:d3AAQJ2DRcxJYHm7OXNXtXt2as1vMDfxeIcFvhmGGm4=

‎internal/message/twilio_whatsapp_client.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ var messageTemplateConfig = map[MessageType]templateMapping{
8383
MessageTypeReceiverOTP: {
8484
requiredVars: map[TemplateVariable]string{
8585
TemplateVarReceiverOTP: "1",
86-
TemplateVarOrgName: "2",
8786
},
8887
},
8988
}
@@ -95,10 +94,11 @@ func formatContentVariables(messageType MessageType, vars map[TemplateVariable]s
9594
return "", fmt.Errorf("unsupported message type %s for WhatsApp template variables", messageType)
9695
}
9796

98-
// Validate all required variables are present
99-
if len(vars) != len(config.requiredVars) {
100-
return "", fmt.Errorf("expected %d template variables for message type %s, got %d",
101-
len(config.requiredVars), messageType, len(vars))
97+
// Validate all required variables are present (extra variables are allowed and ignored)
98+
for templateVar := range config.requiredVars {
99+
if _, ok := vars[templateVar]; !ok {
100+
return "", fmt.Errorf("missing required template variable %s for message type %s", templateVar, messageType)
101+
}
102102
}
103103

104104
// Build content variables map with position mapping

0 commit comments

Comments
 (0)