Skip to content

Commit 5c47726

Browse files
EnovotnyEnovotny
authored
Merge pull request #612 from USACE/cwbi-dev
merge vulnerability update to test
2 parents 9ba0510 + eadf747 commit 5c47726

11 files changed

Lines changed: 112 additions & 83 deletions

File tree

‎api/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24.2-alpine AS builder
1+
FROM golang:1.26.3-alpine AS builder
22
# Install Git
33
RUN apk update && apk add --no-cache ca-certificates
44
# Copy In Source Code

‎api/go.mod‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/USACE/cumulus-api/api
22

3-
go 1.24.2
3+
go 1.26.3
44

55
require (
66
github.com/USACE/go-simple-asyncer v0.0.0-20201015223104-446ae10887a8
77
github.com/aws/aws-sdk-go v1.55.7
8-
github.com/aws/aws-sdk-go-v2 v1.36.3
8+
github.com/aws/aws-sdk-go-v2 v1.41.9
99
github.com/btcsuite/btcutil v1.0.2
1010
github.com/georgysavva/scany v1.2.3
1111
github.com/golang-jwt/jwt/v5 v5.2.2
@@ -17,31 +17,31 @@ require (
1717
github.com/labstack/echo-contrib v0.17.4
1818
github.com/labstack/echo-jwt/v4 v4.3.1
1919
github.com/labstack/echo/v4 v4.13.3
20-
golang.org/x/crypto v0.38.0
21-
golang.org/x/net v0.40.0
20+
golang.org/x/crypto v0.52.0
21+
golang.org/x/net v0.55.0
2222
)
2323

2424
require (
25-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
26-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
27-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
28-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
29-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
30-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
31-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
32-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
33-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 // indirect
34-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
35-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
36-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
39-
github.com/aws/smithy-go v1.22.3 // indirect
25+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11 // indirect
26+
github.com/aws/aws-sdk-go-v2/credentials v1.19.19 // indirect
27+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.25 // indirect
28+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.25 // indirect
29+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.25 // indirect
30+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18 // indirect
33+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.25 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.25 // indirect
35+
github.com/aws/aws-sdk-go-v2/service/signin v1.1.1 // indirect
36+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.19 // indirect
37+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.2 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/sts v1.42.3 // indirect
39+
github.com/aws/smithy-go v1.26.0 // indirect
4040
)
4141

4242
require (
43-
github.com/aws/aws-sdk-go-v2/config v1.29.14
44-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3
43+
github.com/aws/aws-sdk-go-v2/config v1.32.20
44+
github.com/aws/aws-sdk-go-v2/service/s3 v1.102.2
4545
github.com/beorn7/perks v1.0.1 // indirect
4646
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4747
github.com/gosimple/unidecode v1.0.1 // indirect
@@ -65,8 +65,8 @@ require (
6565
github.com/streadway/amqp v1.1.0 // indirect
6666
github.com/valyala/bytebufferpool v1.0.0 // indirect
6767
github.com/valyala/fasttemplate v1.2.2 // indirect
68-
golang.org/x/sys v0.33.0 // indirect
69-
golang.org/x/text v0.25.0 // indirect
68+
golang.org/x/sys v0.45.0 // indirect
69+
golang.org/x/text v0.37.0 // indirect
7070
golang.org/x/time v0.11.0 // indirect
7171
google.golang.org/protobuf v1.36.6 // indirect
7272
)

‎api/go.sum‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBA
88
github.com/aws/aws-sdk-go v1.35.7/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
99
github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE=
1010
github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
11-
github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM=
12-
github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg=
13-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs=
14-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10/go.mod h1:qqvMj6gHLR/EXWZw4ZbqlPbQUyenf4h82UQUlKc+l14=
15-
github.com/aws/aws-sdk-go-v2/config v1.29.14 h1:f+eEi/2cKCg9pqKBoAIwRGzVb70MRKqWX4dg1BDcSJM=
16-
github.com/aws/aws-sdk-go-v2/config v1.29.14/go.mod h1:wVPHWcIFv3WO89w0rE10gzf17ZYy+UVS1Geq8Iei34g=
17-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 h1:9KxtdcIA/5xPNQyZRgUSpYOE6j9Bc4+D7nZua0KGYOM=
18-
github.com/aws/aws-sdk-go-v2/credentials v1.17.67/go.mod h1:p3C44m+cfnbv763s52gCqrjaqyPikj9Sg47kUVaNZQQ=
19-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw=
20-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M=
21-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q=
22-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY=
23-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0=
24-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q=
25-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
26-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
27-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 h1:ZNTqv4nIdE/DiBfUUfXcLZ/Spcuz+RjeziUtNJackkM=
28-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34/go.mod h1:zf7Vcd1ViW7cPqYWEHLHJkS50X0JS2IKz9Cgaj6ugrs=
29-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
30-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA=
31-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 h1:4nm2G6A4pV9rdlWzGMPv4BNtQp22v1hg3yrtkYpeLl8=
32-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1/go.mod h1:iu6FSzgt+M2/x3Dk8zhycdIcHjEFb36IS8HVUVFoMg0=
33-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM=
34-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY=
35-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 h1:moLQUoVq91LiqT1nbvzDukyqAlCv89ZmwaHw/ZFlFZg=
36-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15/go.mod h1:ZH34PJUc8ApjBIfgQCFvkWcUDBtl/WTD+uiYHjd8igA=
37-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3 h1:BRXS0U76Z8wfF+bnkilA2QwpIch6URlm++yPUt9QPmQ=
38-
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3/go.mod h1:bNXKFFyaiVvWuR6O16h/I1724+aXe/tAkA9/QS01t5k=
39-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 h1:1Gw+9ajCV1jogloEv1RRnvfRFia2cL6c9cuKV2Ps+G8=
40-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
41-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 h1:hXmVKytPfTy5axZ+fYbR5d0cFmC3JvwLm5kM83luako=
42-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs=
43-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 h1:1XuUZ8mYJw9B6lzAkXhqHlJd/XvaX32evhproijJEZY=
44-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
45-
github.com/aws/smithy-go v1.22.3 h1:Z//5NuZCSW6R4PhQ93hShNbyBbn8BWCmCVCt+Q8Io5k=
46-
github.com/aws/smithy-go v1.22.3/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
11+
github.com/aws/aws-sdk-go-v2 v1.41.9 h1:/rYeyO2+HrMztAmxAq9++XJtFMqSIpSsNA0yDGALYq4=
12+
github.com/aws/aws-sdk-go-v2 v1.41.9/go.mod h1:+HsoOEX80qAVUitj1A2DhCNTjmb3edVyuDypb6LNEeo=
13+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11 h1:h5+3VT69KUBK24grGuuA5saDJTj2IIjLb9au668Fo5I=
14+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11/go.mod h1:dnakxebH6UwFvcvujL0LVggYQ8nEvBGjU4G/V79Nv94=
15+
github.com/aws/aws-sdk-go-v2/config v1.32.20 h1:8VMDnWc/kEzxsI/1ngGM9mG81a8IGmIHD8KLcYGwagc=
16+
github.com/aws/aws-sdk-go-v2/config v1.32.20/go.mod h1:PuwEpciweIXGULWeOeSTXtSbH4CW9mWdWrhdCKQI1sM=
17+
github.com/aws/aws-sdk-go-v2/credentials v1.19.19 h1:yuFzSV1U0aRNYCQGVaTY2zW2M/L93pYHnXnrJUphYhU=
18+
github.com/aws/aws-sdk-go-v2/credentials v1.19.19/go.mod h1:7y63L1kGzeoDlJaQ3Z578KrnmfBut96JjvJUzGwR+YE=
19+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.25 h1:0w6dCiO8iez+YKwRhRBlL1CH/E3GTfdkuzrwj1by8vo=
20+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.25/go.mod h1:9FDWUothyr5RCRAHc45XOiVCzUR8n/IhCYX+uVqw6vk=
21+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.25 h1:Uii3frf9ztec/ABM2/FSH9/z7PLzxfpG8h4RpkUFflQ=
22+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.25/go.mod h1:G6kntsA2GorAxDPbap6xgB2F+amSLUF8GJTi7PUoX44=
23+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.25 h1:r1+/l6m+WaUJF9HISEsNOLHSNj5EXYQxK8VX6Cz9NlA=
24+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.25/go.mod h1:cKf+D+NMDK1LndD7BowHbBZPgR9V0/5HubH0PFWvA+c=
25+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26 h1:A1PmWU2zfkIm9EyFlJncFXL4W4phML+h8KjltUsCvNQ=
26+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26/go.mod h1:dY4MRzXEizrD4hqtpKvWVGPX7QleSGGVY+EBolo1RmM=
27+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 h1:d5/908OJ4bXg8lyjeMPvXetEKqoDoLi5Owy1zNue3yg=
28+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10/go.mod h1:a57l7Hwh+FWI+we50g5NPJHYUKeJKfXbc4w8SyXu8Ig=
29+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18 h1:W/EyPFl9A5rXrtoilfwHYEvzHER+K4SpBPtMXi24Mos=
30+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18/go.mod h1:UG50K+pvd/uy6xExbobg0rjqFBFZe6I3l75EPDZw4tg=
31+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.25 h1:dD3dhHNglpd98gs72my22Ndqi1hqQGllFFg1F+twfxg=
32+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.25/go.mod h1:0yAbjPfd64gG7mj85RW+fMEYdfBgCRZw8g/oWcL1pjc=
33+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.25 h1:2pQEbwf+/6EDbiit/GcBE2K4IUpMZymaA0kOz3xK978=
34+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.25/go.mod h1:KvT6NCcQ0EZ+ZkVRrlBMt04Po3ok23YELEp7WimhLhM=
35+
github.com/aws/aws-sdk-go-v2/service/s3 v1.102.2 h1:ie4ElCmUKS26pzrZcIk/lmt4yWjAqLLcawstyQCh298=
36+
github.com/aws/aws-sdk-go-v2/service/s3 v1.102.2/go.mod h1:zjsomFeX5duj+4PlMB+o4JoWTIx+G0XMyzjYrUbQkN0=
37+
github.com/aws/aws-sdk-go-v2/service/signin v1.1.1 h1:1VwbP3qMNfxUDEXWki4rCE5iA+44VA1lokTz9HasGzw=
38+
github.com/aws/aws-sdk-go-v2/service/signin v1.1.1/go.mod h1:vUtyoSj0OPji3kjIVSc/GlKuWEiL33f/WFxl6dmpy/A=
39+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.19 h1:N6pIsdFOW1Kd9S4KyFKXdGRBojPPxkP32+uHFWLv4Hc=
40+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.19/go.mod h1:3gt5WJArFooNmyLONS+h/R4J+o86II8du38IgCwj9dE=
41+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.2 h1:hc+lBYiiTr8Zk4MTzIsQ92MeDWCIDvWGmzKUWOaBcOg=
42+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.2/go.mod h1:hU6fqB3OJA6/ePheD47LQnxvjYk6br6PtQxs+Q9ojvk=
43+
github.com/aws/aws-sdk-go-v2/service/sts v1.42.3 h1:ErklX/7uhSbkAAeyQD/Y1OoQ9hO3SJXQNEgksORW3Js=
44+
github.com/aws/aws-sdk-go-v2/service/sts v1.42.3/go.mod h1:ULe4HCzfKPiR6R3HEurE3b1upEkuk8AkMrOKtaOxKO8=
45+
github.com/aws/smithy-go v1.26.0 h1:9ouqbi+NyKP7fV3Te7UElCwdAb6Y8uk7LGwPE5tVe/s=
46+
github.com/aws/smithy-go v1.26.0/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
4747
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
4848
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
4949
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
@@ -301,8 +301,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
301301
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
302302
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
303303
golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
304-
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
305-
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
304+
golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
305+
golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
306306
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
307307
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
308308
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
@@ -319,8 +319,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
319319
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
320320
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
321321
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
322-
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
323-
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
322+
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
323+
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
324324
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
325325
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
326326
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -346,8 +346,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
346346
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
347347
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
348348
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
349-
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
350-
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
349+
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
350+
golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
351351
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
352352
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
353353
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -364,8 +364,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
364364
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
365365
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
366366
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
367-
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
368-
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
367+
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
368+
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
369369
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
370370
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
371371
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎async_geoprocess/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GDAL_TAG=ubuntu-full-3.9.1
1+
ARG GDAL_TAG=ubuntu-full-3.13.0
22
ARG GEOPROC_PACKAGE=main:geoproc
33

44
# *~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~
@@ -29,7 +29,7 @@ EOF
2929

3030
RUN apt-get update \
3131
&& apt-get -y upgrade \
32-
&& apt-get install python3.12-venv -y \
32+
&& apt-get install python3-venv -y \
3333
&& apt-get remove python3-pil -y \
3434
&& apt clean
3535

@@ -45,6 +45,7 @@ ADD --keep-git-dir=false --chown=${USERNAME}:${USERNAME} https://github.com/USAC
4545
# install package in venv
4646
RUN python3 -m venv --system-site-packages ${GEOPROC_VENV} \
4747
&& . activate \
48+
&& pip install --upgrade pip \
4849
&& pip install ${GEOPROC}/pkg/
4950

5051
# Cache buster

‎async_listener/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.24.2
1+
ARG GO_VERSION=1.26.3
22
ARG GO_TAG=${GO_VERSION}-alpine
33

44
# *~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~*~

‎async_listener/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/USACE/cumulus-api/listener
22

3-
go 1.24.2
3+
go 1.26.3
44

55
require (
66
github.com/USACE/go-simple-asyncer v0.0.0-20201015223104-446ae10887a8

‎async_packager/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Packager
2-
ARG GDAL_TAG=ubuntu-full-3.9.1
2+
ARG GDAL_TAG=ubuntu-full-3.13.0
33

44

55
FROM ghcr.io/osgeo/gdal:${GDAL_TAG} AS builder
@@ -31,7 +31,7 @@ EOF
3131
# update and install other dependencies
3232
RUN apt-get update \
3333
&& apt-get -y upgrade \
34-
&& apt-get install -y python3.12-venv \
34+
&& apt-get install -y python3-venv \
3535
&& apt-get remove python3-pil -y \
3636
&& apt clean
3737

@@ -40,6 +40,7 @@ COPY . ${PACKAGER}/pkg
4040

4141
RUN python3 -m venv --system-site-packages ${PACKAGER_VENV} \
4242
&& . activate \
43+
&& pip install --upgrade pip \
4344
&& pip install ${PACKAGER}/pkg/ \
4445
&& pip install hecdss
4546

‎async_packager/packager.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,14 @@
3333
this = os.path.basename(__file__)
3434

3535

36-
def handle_message(message):
36+
def handle_message(message_body):
3737
package_file = None
3838
dst = None
3939
try:
4040
logger.info("%(spacer)s new message %(spacer)s" % {"spacer": "*" * 20})
41-
42-
# parse message to payload as json object and get the download id
43-
message_body = message.body
4441
logger.debug(f"{message_body=}")
4542

46-
download_id = json.loads(message.body)["id"]
43+
download_id = json.loads(message_body)["id"]
4744
logger.debug(f"Download ID: {download_id}")
4845

4946
# get the payload from the download endpoint with the download_id
@@ -147,7 +144,6 @@ def handle_message(message):
147144
if dst is not None and os.path.exists(dst.name):
148145
shutil.rmtree(dst.name, ignore_errors=True)
149146
dst = None
150-
message.delete()
151147

152148
return 0
153149

@@ -176,6 +172,7 @@ def handle_message(message):
176172
MaxNumberOfMessages=MAX_Q_MESSAGES, WaitTimeSeconds=WAIT_TIME_SECONDS
177173
)
178174
for message in messages:
179-
p = multiprocessing.Process(target=handle_message, args=(message,))
175+
p = multiprocessing.Process(target=handle_message, args=(message.body,))
180176
p.start()
181177
p.join()
178+
message.delete()

‎async_packager/setup.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install_requires =
2222
httpx[http2]
2323
boto3
2424
botocore
25-
numpy<=2.0
25+
numpy<3
2626
celery
2727
pyplugs
2828
netCDF4

‎sql/common/V2.66.0__add_PR.sql‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
-- add saa district
2+
INSERT INTO office (id, symbol, name) VALUES
3+
('cae8e3a6-37a1-4fbc-856b-acb68dbf666c','SAA','Caribbean District');
4+
5+
-- add new watershed SAA Puerto Rico
6+
INSERT INTO watershed (id,
7+
slug,
8+
"name",
9+
geometry,
10+
office_id,
11+
output_srid)
12+
VALUES
13+
('26d1728f-3ce1-4a84-b0e6-bbdc7ead1f83',
14+
'puerto-rico',
15+
'Puerto Rico and US Virgin Islands',
16+
ST_GeomFromText('Polygon ((
17+
2637127 588520,
18+
3880772 588520,
19+
3880772 -604377,
20+
2637127 -604377,
21+
2637127 588520))',
22+
5070),
23+
'cae8e3a6-37a1-4fbc-856b-acb68dbf666c',
24+
5070);
25+
26+
27+
-- update Great Lakes watershed name
28+
UPDATE watershed SET name = 'Great Lakes Basin' WHERE slug = 'great-lakes';
29+
30+

0 commit comments

Comments
 (0)