Skip to content

Commit ab97205

Browse files
rowanseymourrowanseymour
authored
Merge pull request #18 from nyaruka/add-deployment-ID
Add deploymentID, AWS settings, update deps and go to 1.23
2 parents b331831 + 0d40d03 commit ab97205

File tree

6 files changed

+77
-63
lines changed

6 files changed

+77
-63
lines changed

‎go.mod

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
module github.com/nyaruka/chip
22

3-
go 1.22
3+
go 1.23
44

55
require (
6-
github.com/getsentry/sentry-go v0.28.1
7-
github.com/go-chi/chi/v5 v5.0.13
8-
github.com/go-playground/validator/v10 v10.22.0
6+
github.com/getsentry/sentry-go v0.30.0
7+
github.com/go-chi/chi/v5 v5.1.0
8+
github.com/go-playground/validator/v10 v10.23.0
99
github.com/gomodule/redigo v1.9.2
1010
github.com/gorilla/websocket v1.5.3
1111
github.com/lib/pq v1.10.9
1212
github.com/nyaruka/ezconf v0.3.0
13-
github.com/nyaruka/gocommon v1.55.5
13+
github.com/nyaruka/gocommon v1.60.1
1414
github.com/nyaruka/null/v2 v2.0.3
1515
github.com/nyaruka/redisx v0.8.1
16-
github.com/samber/slog-multi v1.1.0
16+
github.com/samber/slog-multi v1.2.4
1717
github.com/samber/slog-sentry v1.2.2
18-
github.com/stretchr/testify v1.9.0
19-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
18+
github.com/stretchr/testify v1.10.0
19+
golang.org/x/exp v0.0.0-20241210194714-1829a127f884
2020
)
2121

2222
require (
2323
github.com/davecgh/go-spew v1.1.1 // indirect
2424
github.com/fatih/structs v1.1.0 // indirect
25-
github.com/gabriel-vasile/mimetype v1.4.4 // indirect
25+
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
2626
github.com/go-playground/locales v0.14.1 // indirect
2727
github.com/go-playground/universal-translator v0.18.1 // indirect
28-
github.com/gofrs/uuid v4.4.0+incompatible // indirect
29-
github.com/jellydator/ttlcache/v3 v3.2.0 // indirect
28+
github.com/google/uuid v1.6.0 // indirect
29+
github.com/jellydator/ttlcache/v3 v3.3.0 // indirect
3030
github.com/jmoiron/sqlx v1.4.0 // indirect
3131
github.com/kylelemons/godebug v1.1.0 // indirect
3232
github.com/leodido/go-urn v1.4.0 // indirect
3333
github.com/naoina/go-stringutil v0.1.0 // indirect
3434
github.com/naoina/toml v0.1.1 // indirect
35-
github.com/nyaruka/phonenumbers v1.3.6 // indirect
35+
github.com/nyaruka/phonenumbers v1.4.3 // indirect
3636
github.com/pmezard/go-difflib v1.0.0 // indirect
37-
github.com/samber/lo v1.39.0 // indirect
37+
github.com/samber/lo v1.47.0 // indirect
3838
github.com/shopspring/decimal v1.4.0 // indirect
39-
golang.org/x/crypto v0.24.0 // indirect
40-
golang.org/x/net v0.26.0 // indirect
41-
golang.org/x/sync v0.7.0 // indirect
42-
golang.org/x/sys v0.21.0 // indirect
43-
golang.org/x/text v0.16.0 // indirect
44-
google.golang.org/protobuf v1.34.2 // indirect
39+
golang.org/x/crypto v0.31.0 // indirect
40+
golang.org/x/net v0.32.0 // indirect
41+
golang.org/x/sync v0.10.0 // indirect
42+
golang.org/x/sys v0.28.0 // indirect
43+
golang.org/x/text v0.21.0 // indirect
44+
google.golang.org/protobuf v1.35.2 // indirect
4545
gopkg.in/yaml.v3 v3.0.1 // indirect
4646
)

‎go.sum

+38-38
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
66
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
7-
github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I=
8-
github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s=
9-
github.com/getsentry/sentry-go v0.28.1 h1:zzaSm/vHmGllRM6Tpx1492r0YDzauArdBfkJRtY6P5k=
10-
github.com/getsentry/sentry-go v0.28.1/go.mod h1:1fQZ+7l7eeJ3wYi82q5Hg8GqAPgefRq+FP/QhafYVgg=
11-
github.com/go-chi/chi/v5 v5.0.13 h1:JlH2F2M8qnwl0N1+JFFzlX9TlKJYas3aPXdiuTmJL+w=
12-
github.com/go-chi/chi/v5 v5.0.13/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
7+
github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
8+
github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
9+
github.com/getsentry/sentry-go v0.30.0 h1:lWUwDnY7sKHaVIoZ9wYqRHJ5iEmoc0pqcRqFkosKzBo=
10+
github.com/getsentry/sentry-go v0.30.0/go.mod h1:WU9B9/1/sHDqeV8T+3VwwbjeR5MSXs/6aqG3mqZrezA=
11+
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
12+
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
1313
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
1414
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
1515
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
@@ -18,20 +18,20 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
1818
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
1919
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
2020
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
21-
github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
22-
github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
21+
github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o=
22+
github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
2323
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
2424
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
25-
github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
26-
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
2725
github.com/gomodule/redigo v1.9.2 h1:HrutZBLhSIU8abiSfW8pj8mPhOyMYjZT/wcA4/L9L9s=
2826
github.com/gomodule/redigo v1.9.2/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ywhcgtw=
2927
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
3028
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
29+
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
30+
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
3131
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
3232
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
33-
github.com/jellydator/ttlcache/v3 v3.2.0 h1:6lqVJ8X3ZaUwvzENqPAobDsXNExfUJd61u++uW8a3LE=
34-
github.com/jellydator/ttlcache/v3 v3.2.0/go.mod h1:hi7MGFdMAwZna5n2tuvh63DvFLzVKySzCVW6+0gA2n4=
33+
github.com/jellydator/ttlcache/v3 v3.3.0 h1:BdoC9cE81qXfrxeb9eoJi9dWrdhSuwXMAnHTbnBm4Wc=
34+
github.com/jellydator/ttlcache/v3 v3.3.0/go.mod h1:bj2/e0l4jRnQdrnSTaGTsh4GSXvMjQcy41i7th0GVGw=
3535
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
3636
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
3737
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
@@ -48,12 +48,12 @@ github.com/naoina/toml v0.1.1 h1:PT/lllxVVN0gzzSqSlHEmP8MJB4MY2U7STGxiouV4X8=
4848
github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
4949
github.com/nyaruka/ezconf v0.3.0 h1:kGvJqVN8AHowb4HdaHAviJ0Z3yI5Pyekp1WqibFEaGk=
5050
github.com/nyaruka/ezconf v0.3.0/go.mod h1:89GUW6EPRNLIxT7lC4LWnjWTgZeQwRoX7lBmc8ralAU=
51-
github.com/nyaruka/gocommon v1.55.5 h1:1HCDTwoegsmd1FJQH/cFPHIzX3YEtqjRTJ09N+4nlSY=
52-
github.com/nyaruka/gocommon v1.55.5/go.mod h1:hHczEMFfODl6k527y3yxQv48WDX5BnBT0/WpCveSYwg=
51+
github.com/nyaruka/gocommon v1.60.1 h1:m/BXoBQ1KVzbpmTJ5vuQrv084mWyQ6gtuX6cOeva+lM=
52+
github.com/nyaruka/gocommon v1.60.1/go.mod h1:kFJuOq8COneV7ssfK6xgCMJ8gP8fQifLQnNXBnE4YL0=
5353
github.com/nyaruka/null/v2 v2.0.3 h1:rdmMRQyVzrOF3Jff/gpU/7BDR9mQX0lcLl4yImsA3kw=
5454
github.com/nyaruka/null/v2 v2.0.3/go.mod h1:OCVeCkCXwrg5/qE6RU0c1oUVZBy+ZDrT+xYg1XSaIWA=
55-
github.com/nyaruka/phonenumbers v1.3.6 h1:33owXWp4d1U+Tyaj9fpci6PbvaQZcXBUO2FybeKeLwQ=
56-
github.com/nyaruka/phonenumbers v1.3.6/go.mod h1:Ut+eFwikULbmCenH6InMKL9csUNLyxHuBLyfkpum11s=
55+
github.com/nyaruka/phonenumbers v1.4.3 h1:tR71UJ+DZu7TSkxoG8JI8HzHJkPD/m4KNiUX34Fvmlo=
56+
github.com/nyaruka/phonenumbers v1.4.3/go.mod h1:gv+CtldaFz+G3vHHnasBSirAi3O2XLqZzVWz4V1pl2E=
5757
github.com/nyaruka/redisx v0.8.1 h1:d9Hc8nfSKTSEU+bx+YrB13d6bzAgiiHygk4jg/Q4nb4=
5858
github.com/nyaruka/redisx v0.8.1/go.mod h1:2TUmkDvprPInnmInR5AEbCm0zRRewkvSDVLsO+Do6iI=
5959
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
@@ -62,32 +62,32 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
6262
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
6363
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
6464
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
65-
github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
66-
github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
67-
github.com/samber/slog-multi v1.1.0 h1:m5wfpXE8Qu2gCiR/JnhFGsLcWDOmTxnso32EMffVAY0=
68-
github.com/samber/slog-multi v1.1.0/go.mod h1:uLAvHpGqbYgX4FSL0p1ZwoLuveIAJvBECtE07XmYvFo=
65+
github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
66+
github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
67+
github.com/samber/slog-multi v1.2.4 h1:k9x3JAWKJFPKffx+oXZ8TasaNuorIW4tG+TXxkt6Ry4=
68+
github.com/samber/slog-multi v1.2.4/go.mod h1:ACuZ5B6heK57TfMVkVknN2UZHoFfjCwRxR0Q2OXKHlo=
6969
github.com/samber/slog-sentry v1.2.2 h1:S0glIVITlGCCfSvIOte2Sh63HMHJpYN3hDr+97hILIk=
7070
github.com/samber/slog-sentry v1.2.2/go.mod h1:bHm8jm1dks0p+xc/lH2i4TIFwnPcMTvZeHgCBj5+uhA=
7171
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
7272
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
73-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
74-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
75-
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
76-
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
77-
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
78-
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
79-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
80-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
81-
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
82-
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
83-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
84-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
85-
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
86-
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
87-
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
88-
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
89-
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
90-
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
73+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
74+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
75+
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
76+
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
77+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
78+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
79+
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 h1:Y/Mj/94zIQQGHVSv1tTtQBDaQaJe62U9bkDZKKyhPCU=
80+
golang.org/x/exp v0.0.0-20241210194714-1829a127f884/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
81+
golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
82+
golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
83+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
84+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
85+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
86+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
87+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
88+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
89+
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
90+
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
9191
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
9292
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
9393
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎runtime/config.go

+14
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ type Config struct {
2020
StorageURL string `validate:"url" help:"URL base for public storage, e.g. avatars"`
2121
SentryDSN string ` help:"the DSN used for logging errors to Sentry"`
2222

23+
AWSAccessKeyID string `help:"access key ID to use for AWS services"`
24+
AWSSecretAccessKey string `help:"secret access key to use for AWS services"`
25+
AWSRegion string `help:"region to use for AWS services, e.g. us-east-1"`
26+
27+
CloudwatchNamespace string `help:"the namespace to use for cloudwatch metrics"`
28+
DeploymentID string `help:"the deployment identifier to use for metrics"`
29+
2330
InstanceID string `help:"the unique identifier of this instance, defaults to hostname"`
2431
LogLevel slog.Level `help:"the logging level to use"`
2532
Version string `help:"the version of this install"`
@@ -38,6 +45,13 @@ func NewDefaultConfig() *Config {
3845
Redis: "redis://localhost:6379/5",
3946
StorageURL: "http://localhost/media/",
4047

48+
AWSAccessKeyID: "",
49+
AWSSecretAccessKey: "",
50+
AWSRegion: "us-east-1",
51+
52+
CloudwatchNamespace: "Temba",
53+
DeploymentID: "dev",
54+
4155
InstanceID: hostname,
4256
LogLevel: slog.LevelInfo,
4357
Version: "Dev",

‎testsuite/testdata.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func InsertChannel(rt *runtime.Runtime, uuid models.ChannelUUID, orgID models.Or
3131
func InsertContact(rt *runtime.Runtime, orgID models.OrgID, name string) models.ContactID {
3232
row := rt.DB.QueryRow(
3333
`INSERT INTO contacts_contact(uuid, org_id, name, status, ticket_count, is_active, created_on, modified_on)
34-
VALUES($1, $2, $3, 'A', 1, TRUE, NOW(), NOW()) RETURNING id`, uuids.New(), orgID, name,
34+
VALUES($1, $2, $3, 'A', 1, TRUE, NOW(), NOW()) RETURNING id`, uuids.NewV4(), orgID, name,
3535
)
3636
var id models.ContactID
3737
must(row.Scan(&id))
@@ -41,7 +41,7 @@ func InsertContact(rt *runtime.Runtime, orgID models.OrgID, name string) models.
4141
func InsertIncomingMsg(rt *runtime.Runtime, orgID models.OrgID, channelID models.ChannelID, contactID models.ContactID, urnID models.URNID, text string, createdOn time.Time) models.MsgID {
4242
row := rt.DB.QueryRow(
4343
`INSERT INTO msgs_msg(uuid, org_id, channel_id, contact_id, contact_urn_id, direction, msg_type, status, visibility, text, created_on, modified_on, next_attempt, msg_count, error_count)
44-
VALUES($1, $2, $3, $4, $5, 'I', 'T', 'H', 'V', $6, $7, NOW(), NOW(), 1, 1) RETURNING id`, uuids.New(), orgID, channelID, contactID, urnID, text, createdOn,
44+
VALUES($1, $2, $3, $4, $5, 'I', 'T', 'H', 'V', $6, $7, NOW(), NOW(), 1, 1) RETURNING id`, uuids.NewV4(), orgID, channelID, contactID, urnID, text, createdOn,
4545
)
4646
var id models.MsgID
4747
must(row.Scan(&id))
@@ -51,7 +51,7 @@ func InsertIncomingMsg(rt *runtime.Runtime, orgID models.OrgID, channelID models
5151
func InsertOutgoingMsg(rt *runtime.Runtime, orgID models.OrgID, channelID models.ChannelID, contactID models.ContactID, urnID models.URNID, text string, createdOn time.Time) models.MsgID {
5252
row := rt.DB.QueryRow(
5353
`INSERT INTO msgs_msg(uuid, org_id, channel_id, contact_id, contact_urn_id, direction, msg_type, status, visibility, text, created_on, modified_on, next_attempt, msg_count, error_count)
54-
VALUES($1, $2, $3, $4, $5, 'O', 'T', 'Q', 'V', $6, $7, NOW(), NOW(), 1, 1) RETURNING id`, uuids.New(), orgID, channelID, contactID, urnID, text, createdOn,
54+
VALUES($1, $2, $3, $4, $5, 'O', 'T', 'Q', 'V', $6, $7, NOW(), NOW(), 1, 1) RETURNING id`, uuids.NewV4(), orgID, channelID, contactID, urnID, text, createdOn,
5555
)
5656
var id models.MsgID
5757
must(row.Scan(&id))

‎web/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type Client struct {
3030

3131
func NewClient(s *Server, sock httpx.WebSocket, channel *models.Channel) *Client {
3232
c := &Client{
33-
id: string(uuids.New()),
33+
id: string(uuids.NewV4()),
3434
server: s,
3535
socket: sock,
3636
channel: channel,

‎web/server_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ func TestServer(t *testing.T) {
2424
defer random.SetGenerator(random.DefaultGenerator)
2525
random.SetGenerator(random.NewSeededGenerator(1234))
2626

27-
defer dates.SetNowSource(dates.DefaultNowSource)
28-
dates.SetNowSource(dates.NewSequentialNowSource(time.Date(2024, 5, 2, 16, 5, 4, 0, time.UTC)))
27+
dates.SetNowFunc(dates.NewSequentialNow(time.Date(2024, 5, 2, 16, 5, 4, 0, time.UTC), time.Second))
28+
defer dates.SetNowFunc(time.Now)
2929

3030
mockCourier := testsuite.NewMockCourier(rt)
3131

0 commit comments

Comments
 (0)