diff --git a/.github/workflows/build-push-images.yml b/.github/workflows/build-push-images.yml index 4b49c0b2..8f507d3c 100644 --- a/.github/workflows/build-push-images.yml +++ b/.github/workflows/build-push-images.yml @@ -53,7 +53,7 @@ jobs: docker build -f ./lambda/Dockerfile -t ${{ matrix.ecr_repository }} --build-arg DIR=${{ matrix.dir }} . - name: Trivy Image Vulnerability Scanner for ${{ matrix.ecr_repository }} id: trivy_scan - uses: aquasecurity/trivy-action@0.14.0 + uses: aquasecurity/trivy-action@0.16.0 with: image-ref: ${{ matrix.ecr_repository }}:latest severity: "HIGH,CRITICAL" diff --git a/go.mod b/go.mod index a921cf97..52d6f2f7 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ module github.com/ministryofjustice/opg-data-lpa-store go 1.20 require ( - github.com/aws/aws-lambda-go v1.41.0 - github.com/aws/aws-sdk-go v1.48.11 + github.com/aws/aws-lambda-go v1.42.0 + github.com/aws/aws-sdk-go v1.48.16 github.com/aws/aws-xray-sdk-go v1.8.3 github.com/go-openapi/jsonpointer v0.20.0 github.com/golang-jwt/jwt/v5 v5.2.0 - github.com/google/uuid v1.3.1 + github.com/google/uuid v1.4.0 github.com/ministryofjustice/opg-go-common v0.0.0-20231128145056-24628fba649c github.com/stretchr/testify v1.8.4 ) diff --git a/go.sum b/go.sum index cdb60319..1649c528 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,12 @@ github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sx github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/aws/aws-lambda-go v1.41.0 h1:l/5fyVb6Ud9uYd411xdHZzSf2n86TakxzpvIoz7l+3Y= github.com/aws/aws-lambda-go v1.41.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM= +github.com/aws/aws-lambda-go v1.42.0 h1:U4QKkxLp/il15RJGAANxiT9VumQzimsUER7gokqA0+c= +github.com/aws/aws-lambda-go v1.42.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7RfgJv23DymV8A= github.com/aws/aws-sdk-go v1.48.11 h1:9YbiSbaF/jWi+qLRl+J5dEhr2mcbDYHmKg2V7RBcD5M= github.com/aws/aws-sdk-go v1.48.11/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.48.16 h1:mcj2/9J/MJ55Dov+ocMevhR8Jv6jW/fAxbrn4a1JFc8= +github.com/aws/aws-sdk-go v1.48.16/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-xray-sdk-go v1.8.3 h1:S8GdgVncBRhzbNnNUgTPwhEqhwt2alES/9rLASyhxjU= github.com/aws/aws-xray-sdk-go v1.8.3/go.mod h1:tv8uLMOSCABolrIF8YCcp3ghyswArsan8dfLCA1ZATk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -23,6 +27,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= diff --git a/lambda/Dockerfile b/lambda/Dockerfile index aa06ab53..33a5bffb 100644 --- a/lambda/Dockerfile +++ b/lambda/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.4 AS build-env +FROM golang:1.21.5 AS build-env WORKDIR /app COPY ./go.mod /app/go.mod diff --git a/mock-apigw/Dockerfile b/mock-apigw/Dockerfile index ffc4c6ce..f2495e02 100644 --- a/mock-apigw/Dockerfile +++ b/mock-apigw/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.4 AS build-env +FROM golang:1.21.5 AS build-env WORKDIR /app diff --git a/terraform/account/.terraform.lock.hcl b/terraform/account/.terraform.lock.hcl index 70322472..db5ffba7 100644 --- a/terraform/account/.terraform.lock.hcl +++ b/terraform/account/.terraform.lock.hcl @@ -2,37 +2,37 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.29.0" + version = "5.30.0" constraints = ">= 5.8.0" hashes = [ - "h1:+4qYlyPaktjZTFP9UbpEaz55jfwWapdibViCPoRFf+s=", - "h1:54ChqmTeQ3ECH9OzP25bjOTpaPZOh+us3hSp3YxCLqE=", - "h1:5Sqzq0KJe9zefgLIMXPaY0+iEAcpP1gjm6uSOEyI9vI=", - "h1:6Wb/0B+dNeOBP5KXvlHOmZyX7O6CDEfR+MrbxWI3wfo=", - "h1:AeIVdWtYHsnHwPQUEecZrMBfYsJV6k+6Fs6QSea9RTk=", - "h1:CosX4Q38sd9BkzqD/iZIbtYgzqQ+5/GOrXGWvC4gB9k=", - "h1:GmT1VbZIyWR5BdB4pdwtiJZ1JfaCsOKT7ml37h9ibhw=", - "h1:SyiKAX/D3ZE9My7P03DrRMf65pNnfSDQXPb0g11lCS0=", - "h1:Ywmb8cajJJB9Zpl7jfmMR6Bsu3ympYV51LmHtYuPpXs=", - "h1:cDP+xag9P2+hvlFnf2VrgvUIpuXhLiVWoY/ytQUuk5w=", - "h1:de5/PMb0CyELzKBTy/Wr2H5wBH4/qcC+iC01IKz47FY=", - "h1:f/PuMpuTrqQgKIpTarGx+Rpt1/Pruxq6fh1Cei/QKNk=", - "h1:idHKdU+BJLyiPO/N0cvcGwagoM/pRXT5X5apRnO9mCQ=", - "h1:jysUSkK4JLXQ5G2hn6fdW19StSKQXI+2igdolCkFkno=", - "zh:0453c1c64e51cd7050ce46d9280a0195b9073592508077ebf1a1c45f7026f3f5", - "zh:3ee87d1a2870b61fdcc80f3f96b669dbcc8171aadb821bec0e1fa0e6fb9595b6", - "zh:423c0304eba345167cc37dcd300712f24f03fe4de8eecc15edb0d4f88b29ec79", - "zh:6816ce0ed702263297a8e02467bb712c509a9f6e4f132a152a10f1cc19191a81", - "zh:6feb8a0aedabd778216238e72273f5c2ee86d8841acc3fb3dc9d8014a2bbdc51", - "zh:709ccdc8b37f975d422e7955814671548887613931e234e06249da629b0f2f95", - "zh:76c55744020dbdafea25be634f8ac37c1e371f8c397f73bd89bc270d00ee0834", - "zh:7e48d6fc488b9dbe2fd4bebefa1b485d04da38b11a6799f8cba178173b7f8782", - "zh:951d7ef2adbfb96b1d3e9c4780b2ab4375caf9c6b522a2d023c02ff0698d8e2a", + "h1:6SZLydYMDqhA4A+Fh0oZswJ+McOBf2q+XdSuMFbPzHI=", + "h1:6ZRzAlt5BT1wD7NlRWdKJT5l4DXzMtpHcgEi/xskozM=", + "h1:BORK1eYfvH2VfQYh8WTvrKUeYfnSCHSWNxNW1ftYne8=", + "h1:DFUvG1HTHzCUK3V8oMFqnE9wQxCVIxvU10zLUIOu9Lw=", + "h1:M2Gm+kgFB2y7nwxIsIbHSQwF9L8kZql1j949KTj4fsI=", + "h1:R5d14AWcHqeNBgIcEe9bGAAKtviwYUG5cbJD/XTC6CI=", + "h1:TZjoFKWi4v7ofVf52OvajTejB1Uhe9Gl4ZU9YuIOzbs=", + "h1:UesmpZQoD2aTjFf5m6SJG2WwrmAs559kOihZo8vgFlo=", + "h1:ZsaqSoi0hx+GXUK1AaCwoHx+XYgiZY2JZX2UZ6kVvH4=", + "h1:gSBLKMZLKs9dz5NI8p5hdiQo9aFpYwDrVfAK7tQ7LtE=", + "h1:jTAK4mhRVjLzJse46C2PiNQKFSZoNeLV76mem54WIH8=", + "h1:jnA083f0w14QgjbvJfyqKEmQ9r7savKe3WrEIzey6kc=", + "h1:n9iASXt40TehQn3bN71xpFgMWMaaKwohiHJSkJsQdAI=", + "h1:sqLVPs9SeQR+ZPMJXR+ni5zdPrXjmSbli6AZZXJw/kI=", + "zh:0ac576f2278c6d3fead05fbb136df87e399ec065edeef56c054fa2f3ac465390", + "zh:1ef592d293cac2f35c37c4d23cb5f9e8b34713e24585cedaf5874d024712d9fd", + "zh:21d8412d5cec5e7e9a2199089d95287c5882f4db0e3b820e4f7760242bfa83b2", + "zh:29bcc5616d579cd389b9c43a1922e7eafe68c8ca1b0f13e91b9e0a38d59c8b89", + "zh:3afed6c066524eccabab25ba83af5d2b5b46e6187968284da0cb49a01002e0e8", + "zh:4745d71ca72a6dcf819afe8065fcd8883c8434cdcfcfdc9ab3a4722fd611b437", + "zh:486701b188b4a6a656a3f23b704dc53f4766164c23368542de36622f28b3248d", + "zh:56cd5846b35cd405f63cf33b1fdfe6e99ff19f893aaacedc6e9245c563397173", + "zh:5d1d4806c15c49755c8e73dd590471c43ae84a3ded8c54b0e397ad6336fba6e5", + "zh:7df03941001c14ce255a6f4f5c2edd275fb45a9d7cd316229eef6558f79c0149", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b0bf5974bc1a7d2ce3f3a9a31a8238ad15ad02211f1e84c54832541ec4bd5d10", - "zh:cc56d4ab9bcbee95f73dbe90f11d4ff7299b835dddf2b30cfda526a2cccd0f9f", - "zh:cfe3a4394f2f7044e03bb63f4fb9c691926607c6784417ac9c0724943da60d09", - "zh:d6f82e13f33f70de8df480287b5a961ced5606f041d1c589f706b112f68db890", - "zh:fb7be5bcff62d0ca9edd4a1bee4d2ed16e9428e3f9eff3ea4d898ecb234505a3", + "zh:b0c1732d3a32630bc17d8da29662b16e346b1739ff72273e6169f9f5a968cb82", + "zh:ce9888a63f6a6a8786499fa3e2350b13f6b87410561122799871d50a3cf07604", + "zh:d336271de465e9ed48bce89ce97a874e3d9e2916712e3359d419c811365d75ee", + "zh:e528275339aea59021ec810ee74220ce328181ee38f4ce6c7b1efb2db9dca56f", ] } diff --git a/terraform/environment/.terraform.lock.hcl b/terraform/environment/.terraform.lock.hcl index 70322472..db5ffba7 100644 --- a/terraform/environment/.terraform.lock.hcl +++ b/terraform/environment/.terraform.lock.hcl @@ -2,37 +2,37 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.29.0" + version = "5.30.0" constraints = ">= 5.8.0" hashes = [ - "h1:+4qYlyPaktjZTFP9UbpEaz55jfwWapdibViCPoRFf+s=", - "h1:54ChqmTeQ3ECH9OzP25bjOTpaPZOh+us3hSp3YxCLqE=", - "h1:5Sqzq0KJe9zefgLIMXPaY0+iEAcpP1gjm6uSOEyI9vI=", - "h1:6Wb/0B+dNeOBP5KXvlHOmZyX7O6CDEfR+MrbxWI3wfo=", - "h1:AeIVdWtYHsnHwPQUEecZrMBfYsJV6k+6Fs6QSea9RTk=", - "h1:CosX4Q38sd9BkzqD/iZIbtYgzqQ+5/GOrXGWvC4gB9k=", - "h1:GmT1VbZIyWR5BdB4pdwtiJZ1JfaCsOKT7ml37h9ibhw=", - "h1:SyiKAX/D3ZE9My7P03DrRMf65pNnfSDQXPb0g11lCS0=", - "h1:Ywmb8cajJJB9Zpl7jfmMR6Bsu3ympYV51LmHtYuPpXs=", - "h1:cDP+xag9P2+hvlFnf2VrgvUIpuXhLiVWoY/ytQUuk5w=", - "h1:de5/PMb0CyELzKBTy/Wr2H5wBH4/qcC+iC01IKz47FY=", - "h1:f/PuMpuTrqQgKIpTarGx+Rpt1/Pruxq6fh1Cei/QKNk=", - "h1:idHKdU+BJLyiPO/N0cvcGwagoM/pRXT5X5apRnO9mCQ=", - "h1:jysUSkK4JLXQ5G2hn6fdW19StSKQXI+2igdolCkFkno=", - "zh:0453c1c64e51cd7050ce46d9280a0195b9073592508077ebf1a1c45f7026f3f5", - "zh:3ee87d1a2870b61fdcc80f3f96b669dbcc8171aadb821bec0e1fa0e6fb9595b6", - "zh:423c0304eba345167cc37dcd300712f24f03fe4de8eecc15edb0d4f88b29ec79", - "zh:6816ce0ed702263297a8e02467bb712c509a9f6e4f132a152a10f1cc19191a81", - "zh:6feb8a0aedabd778216238e72273f5c2ee86d8841acc3fb3dc9d8014a2bbdc51", - "zh:709ccdc8b37f975d422e7955814671548887613931e234e06249da629b0f2f95", - "zh:76c55744020dbdafea25be634f8ac37c1e371f8c397f73bd89bc270d00ee0834", - "zh:7e48d6fc488b9dbe2fd4bebefa1b485d04da38b11a6799f8cba178173b7f8782", - "zh:951d7ef2adbfb96b1d3e9c4780b2ab4375caf9c6b522a2d023c02ff0698d8e2a", + "h1:6SZLydYMDqhA4A+Fh0oZswJ+McOBf2q+XdSuMFbPzHI=", + "h1:6ZRzAlt5BT1wD7NlRWdKJT5l4DXzMtpHcgEi/xskozM=", + "h1:BORK1eYfvH2VfQYh8WTvrKUeYfnSCHSWNxNW1ftYne8=", + "h1:DFUvG1HTHzCUK3V8oMFqnE9wQxCVIxvU10zLUIOu9Lw=", + "h1:M2Gm+kgFB2y7nwxIsIbHSQwF9L8kZql1j949KTj4fsI=", + "h1:R5d14AWcHqeNBgIcEe9bGAAKtviwYUG5cbJD/XTC6CI=", + "h1:TZjoFKWi4v7ofVf52OvajTejB1Uhe9Gl4ZU9YuIOzbs=", + "h1:UesmpZQoD2aTjFf5m6SJG2WwrmAs559kOihZo8vgFlo=", + "h1:ZsaqSoi0hx+GXUK1AaCwoHx+XYgiZY2JZX2UZ6kVvH4=", + "h1:gSBLKMZLKs9dz5NI8p5hdiQo9aFpYwDrVfAK7tQ7LtE=", + "h1:jTAK4mhRVjLzJse46C2PiNQKFSZoNeLV76mem54WIH8=", + "h1:jnA083f0w14QgjbvJfyqKEmQ9r7savKe3WrEIzey6kc=", + "h1:n9iASXt40TehQn3bN71xpFgMWMaaKwohiHJSkJsQdAI=", + "h1:sqLVPs9SeQR+ZPMJXR+ni5zdPrXjmSbli6AZZXJw/kI=", + "zh:0ac576f2278c6d3fead05fbb136df87e399ec065edeef56c054fa2f3ac465390", + "zh:1ef592d293cac2f35c37c4d23cb5f9e8b34713e24585cedaf5874d024712d9fd", + "zh:21d8412d5cec5e7e9a2199089d95287c5882f4db0e3b820e4f7760242bfa83b2", + "zh:29bcc5616d579cd389b9c43a1922e7eafe68c8ca1b0f13e91b9e0a38d59c8b89", + "zh:3afed6c066524eccabab25ba83af5d2b5b46e6187968284da0cb49a01002e0e8", + "zh:4745d71ca72a6dcf819afe8065fcd8883c8434cdcfcfdc9ab3a4722fd611b437", + "zh:486701b188b4a6a656a3f23b704dc53f4766164c23368542de36622f28b3248d", + "zh:56cd5846b35cd405f63cf33b1fdfe6e99ff19f893aaacedc6e9245c563397173", + "zh:5d1d4806c15c49755c8e73dd590471c43ae84a3ded8c54b0e397ad6336fba6e5", + "zh:7df03941001c14ce255a6f4f5c2edd275fb45a9d7cd316229eef6558f79c0149", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b0bf5974bc1a7d2ce3f3a9a31a8238ad15ad02211f1e84c54832541ec4bd5d10", - "zh:cc56d4ab9bcbee95f73dbe90f11d4ff7299b835dddf2b30cfda526a2cccd0f9f", - "zh:cfe3a4394f2f7044e03bb63f4fb9c691926607c6784417ac9c0724943da60d09", - "zh:d6f82e13f33f70de8df480287b5a961ced5606f041d1c589f706b112f68db890", - "zh:fb7be5bcff62d0ca9edd4a1bee4d2ed16e9428e3f9eff3ea4d898ecb234505a3", + "zh:b0c1732d3a32630bc17d8da29662b16e346b1739ff72273e6169f9f5a968cb82", + "zh:ce9888a63f6a6a8786499fa3e2350b13f6b87410561122799871d50a3cf07604", + "zh:d336271de465e9ed48bce89ce97a874e3d9e2916712e3359d419c811365d75ee", + "zh:e528275339aea59021ec810ee74220ce328181ee38f4ce6c7b1efb2db9dca56f", ] }