From 37e08530592c740d38802ef15a2c805ef55bd137 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:14:04 +0000 Subject: [PATCH 01/18] Bump github.com/aws/aws-sdk-go-v2/service/s3 from 1.58.2 to 1.59.0 Bumps [github.com/aws/aws-sdk-go-v2/service/s3](https://github.com/aws/aws-sdk-go-v2) from 1.58.2 to 1.59.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.58.2...service/s3/v1.59.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index cde6a96b71a..8310b532010 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecr v1.32.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.44.3 github.com/aws/aws-sdk-go-v2/service/rds v1.78.2 - github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 + github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 github.com/aws/aws-sdk-go-v2/service/ses v1.25.3 github.com/aws/aws-sdk-go-v2/service/ssm v1.52.3 github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 @@ -134,16 +134,16 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/Masterminds/sprig/v3 v3.2.3 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect github.com/aymerick/douceur v0.2.0 // indirect diff --git a/go.sum b/go.sum index 7df7aec499d..142086ae6af 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:W github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk= github.com/aws/aws-sdk-go-v2 v1.30.4 h1:frhcagrVNrzmT95RJImMHgabt99vkXGslubDaDagTk8= github.com/aws/aws-sdk-go-v2 v1.30.4/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= github.com/aws/aws-sdk-go-v2/config v1.27.28 h1:OTxWGW/91C61QlneCtnD62NLb4W616/NM1jA8LhJqbg= github.com/aws/aws-sdk-go-v2/config v1.27.28/go.mod h1:uzVRVtJSU5EFv6Fu82AoVFKozJi2ZCY6WRCXj06rbvs= github.com/aws/aws-sdk-go-v2/credentials v1.17.28 h1:m8+AHY/ND8CMHJnPoH7PJIRakWGa4gbfbxuY9TGTUXM= @@ -60,8 +60,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 h1:jYfy8UPmd+6kJW5YhY github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16/go.mod h1:7ZfEPZxkW42Afq4uQB8H2E2e6ebh6mXTueEpYzjCzcs= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 h1:Z5r7SycxmSllHYmaAZPpmN8GviDrSGhMS6bldqtXZPw= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15/go.mod h1:CetW7bDE00QoGEmPUoZuRog07SGVAUVW6LFpNP0YfIg= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 h1:mimdLQkIX1zr8GIPY1ZtALdBQGxcASiBd2MOp8m/dMc= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16/go.mod h1:YHk6owoSwrIsok+cAH9PENCOGoH5PU2EllX4vLtSrsY= github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v1.23.6 h1:s9TaIFJJ1zVLiKoxvclHNXjcZ+9+JnHvVgWfQgN9srQ= github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v1.23.6/go.mod h1:9h+vJwhl865wjyC7AQOBX4LVQxgntBYrf3p5WtzOSi0= github.com/aws/aws-sdk-go-v2/service/ecr v1.32.1 h1:PxM8EHsv1sd9eWGamMQCvqBEjxytK5kAwjrxlfG3tac= @@ -70,16 +70,16 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.44.3 h1:JkVDQ9mfUSwMOGWIEmyB74mIznjK github.com/aws/aws-sdk-go-v2/service/ecs v1.44.3/go.mod h1:MsQWy/90Xwn3cy5u+eiiXqC521xIm21wOODIweLo4hs= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 h1:YPYe6ZmvUfDDDELqEKtAd6bo8zxhkm+XEFEzQisqUIE= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17/go.mod h1:oBtcnYua/CgzCWYN7NZ5j7PotFDaFSUjCYVTtfyn7vw= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 h1:GckUnpm4EJOAio1c8o25a+b3lVfwVzC9gnSBqiiNmZM= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18/go.mod h1:Br6+bxfG33Dk3ynmkhsW2Z/t9D4+lRqdLDNCKi85w0U= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 h1:tJ5RnkHCiSH0jyd6gROjlJtNwov0eGYNz8s8nFcR0jQ= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18/go.mod h1:++NHzT+nAF7ZPrHPsA+ENvsXkOO8wEu+C6RXltAG4/c= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 h1:246A4lSTXWJw/rmlQI+TT2OcqeDMKBdyjEQrafMaQdA= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15/go.mod h1:haVfg3761/WF7YPuJOER2MP0k4UAXyHaLclKXB6usDg= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj8zYIW6bqzeQSuHVEiWnGA0Brz5Xv2I= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16/go.mod h1:Uyk1zE1VVdsHSU7096h/rwnXDzOzYQVl+FNPhPw7ShY= github.com/aws/aws-sdk-go-v2/service/rds v1.78.2 h1:xrRLjWcGzeayJT66aP9qnMrn1iKXYaK/+efukoitIXs= github.com/aws/aws-sdk-go-v2/service/rds v1.78.2/go.mod h1:RJaz7FA+m7alWIPQmS6biVBJWY8j6lZ3wqZOf4BtGlg= -github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 h1:sZXIzO38GZOU+O0C+INqbH7C2yALwfMWpd64tONS/NE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE= +github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 h1:Cso4Ev/XauMVsbwdhYEoxg8rxZWw43CFqqaPB5w3W2c= +github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= github.com/aws/aws-sdk-go-v2/service/ses v1.25.3 h1:wcfUsE2nqsXhEj68gxr7MnGXNPcBPKx0RW2DzBVgVlM= github.com/aws/aws-sdk-go-v2/service/ses v1.25.3/go.mod h1:6Ul/Ir8oOCsI3dFN0prULK9fvpxP+WTYmlHDkFzaAVA= github.com/aws/aws-sdk-go-v2/service/ssm v1.52.3 h1:iu53lwRKbZOGCVUH09g3J0xU8A+bAGVo09VR9K4d0Yg= From d1e0f177116b15212066d1cde0b21d4f2a773256 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:23:44 +0000 Subject: [PATCH 02/18] Bump github.com/go-chi/chi/v5 from 5.0.13 to 5.1.0 Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.0.13 to 5.1.0. - [Release notes](https://github.com/go-chi/chi/releases) - [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md) - [Commits](https://github.com/go-chi/chi/compare/v5.0.13...v5.1.0) --- updated-dependencies: - dependency-name: github.com/go-chi/chi/v5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8310b532010..68e76d88c26 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/felixge/httpsnoop v1.0.4 github.com/gabriel-vasile/mimetype v1.4.3 - github.com/go-chi/chi/v5 v5.0.13 + github.com/go-chi/chi/v5 v5.1.0 github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df github.com/go-logr/zapr v1.3.0 github.com/go-openapi/errors v0.22.0 diff --git a/go.sum b/go.sum index 142086ae6af..34418be0b69 100644 --- a/go.sum +++ b/go.sum @@ -162,8 +162,8 @@ github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyT github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-chi/chi/v5 v5.0.13 h1:JlH2F2M8qnwl0N1+JFFzlX9TlKJYas3aPXdiuTmJL+w= -github.com/go-chi/chi/v5 v5.0.13/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw= +github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df h1:Bao6dhmbTA1KFVxmJ6nBoMuOJit2yjEgLJpIMYpop0E= github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df/go.mod h1:GJr+FCSXshIwgHBtLglIg9M2l2kQSi6QjVAngtzI08Y= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= From 5a35fbe9856b1b7a01ee1be13e2c4ebd9eb61354 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:22:34 +0000 Subject: [PATCH 03/18] Bump github.com/jessevdk/go-flags from 1.5.0 to 1.6.1 Bumps [github.com/jessevdk/go-flags](https://github.com/jessevdk/go-flags) from 1.5.0 to 1.6.1. - [Release notes](https://github.com/jessevdk/go-flags/releases) - [Commits](https://github.com/jessevdk/go-flags/compare/v1.5.0...v1.6.1) --- updated-dependencies: - dependency-name: github.com/jessevdk/go-flags dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 68e76d88c26..a9e92e3d4f1 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/gorilla/csrf v1.7.2 github.com/imdario/mergo v0.3.16 github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa - github.com/jessevdk/go-flags v1.5.0 + github.com/jessevdk/go-flags v1.6.1 github.com/jinzhu/copier v0.4.0 github.com/jmoiron/sqlx v1.3.5 github.com/jung-kurt/gofpdf v1.16.2 diff --git a/go.sum b/go.sum index 34418be0b69..dd71bc442b2 100644 --- a/go.sum +++ b/go.sum @@ -379,8 +379,8 @@ github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww= github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= -github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= -github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4= +github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc= github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -805,7 +805,6 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From eeab8428d69efff7466d9ff3d3b9279d678d29b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:22:36 +0000 Subject: [PATCH 04/18] Bump go.opentelemetry.io/contrib/instrumentation/runtime Bumps [go.opentelemetry.io/contrib/instrumentation/runtime](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.43.0 to 0.53.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.43.0...zpages/v0.53.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/runtime dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 68e76d88c26..ae233f92ba7 100644 --- a/go.mod +++ b/go.mod @@ -78,7 +78,7 @@ require ( go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 go.opentelemetry.io/contrib/detectors/aws/ecs v1.18.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 - go.opentelemetry.io/contrib/instrumentation/runtime v0.43.0 + go.opentelemetry.io/contrib/instrumentation/runtime v0.53.0 go.opentelemetry.io/contrib/propagators/aws v1.18.0 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 diff --git a/go.sum b/go.sum index 34418be0b69..c480df1a6c1 100644 --- a/go.sum +++ b/go.sum @@ -660,8 +660,8 @@ go.opentelemetry.io/contrib/detectors/aws/ecs v1.18.0 h1:orZCNoMPHeYfDo0QFdSK29y go.opentelemetry.io/contrib/detectors/aws/ecs v1.18.0/go.mod h1:9dUe4hRrmnbdfc7sx711L35isi51mJOisRlyghiTLzI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 h1:HKORGpiOY0R0nAPtKx/ub8/7XoHhRooP8yNRkuPfelI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0/go.mod h1:e+y1M74SYXo/FcIx3UATwth2+5dDkM8dBi7eXg1tbw8= -go.opentelemetry.io/contrib/instrumentation/runtime v0.43.0 h1:NunhgxcK14rU7Hw2gKtV6uCSyohkXPisqneRFjnZNKQ= -go.opentelemetry.io/contrib/instrumentation/runtime v0.43.0/go.mod h1:rwb7icgpDjIhhHqv1qPGw6dDjAdAR7IKAe4PQdzBbsg= +go.opentelemetry.io/contrib/instrumentation/runtime v0.53.0 h1:nOlJEAJyrcy8hexK65M+dsCHIx7CVVbybcFDNkcTcAc= +go.opentelemetry.io/contrib/instrumentation/runtime v0.53.0/go.mod h1:u79lGGIlkg3Ryw425RbMjEkGYNxSnXRyR286O840+u4= go.opentelemetry.io/contrib/propagators/aws v1.18.0 h1:8SFScyYfxZK/MaW1iW17h/RhHNogbDtpwNJ6Ce95h0A= go.opentelemetry.io/contrib/propagators/aws v1.18.0/go.mod h1:0ssYM4GfgGWeoJKLcXduZowVIbIlWd8zCY0CdQqYA0w= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= From b43b4cefdd947ed4628a7e7554707d68c21b4bcd Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 21 Aug 2024 16:03:17 +0000 Subject: [PATCH 05/18] local postgres upgrade to 16.4 --- .circleci/config.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04448f118e5..2ee59314fa1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ references: # see milmove_load_testing for the right config load_tester: &load_tester cimg/python:3.11.3 - postgres: &postgres cimg/postgres:12.11 + postgres: &postgres cimg/postgres:16.4 redis: &redis redis:5.0.6 diff --git a/Makefile b/Makefile index b7c7633b4b0..1b3075ea321 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ DB_NAME_TEST = test_db DB_DOCKER_CONTAINER_DEV = milmove-db-dev DB_DOCKER_CONTAINER_DEPLOYED_MIGRATIONS = milmove-db-deployed-migrations DB_DOCKER_CONTAINER_TEST = milmove-db-test -DB_DOCKER_CONTAINER_IMAGE = postgres:12.11 +DB_DOCKER_CONTAINER_IMAGE = postgres:16.4 REDIS_DOCKER_CONTAINER_IMAGE = redis:5.0.6 REDIS_DOCKER_CONTAINER = milmove-redis TASKS_DOCKER_CONTAINER = tasks From c187c3ea141afe319a2683eba44c7b40d1b3b6e0 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 21 Aug 2024 16:23:01 +0000 Subject: [PATCH 06/18] postgres164 --- .circleci/config.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 649f650a27c..ecc5d5f6971 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ references: # see milmove_load_testing for the right config load_tester: &load_tester cimg/python:3.11.3 - postgres: &postgres cimg/postgres:12.11 + postgres: &postgres cimg/postgres:16.4 redis: &redis redis:5.0.6 diff --git a/Makefile b/Makefile index b739a1b9189..b2b60c3142b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ DB_NAME_TEST = test_db DB_DOCKER_CONTAINER_DEV = milmove-db-dev DB_DOCKER_CONTAINER_DEPLOYED_MIGRATIONS = milmove-db-deployed-migrations DB_DOCKER_CONTAINER_TEST = milmove-db-test -DB_DOCKER_CONTAINER_IMAGE = postgres:12.11 +DB_DOCKER_CONTAINER_IMAGE = postgres:16.4 REDIS_DOCKER_CONTAINER_IMAGE = redis:5.0.6 REDIS_DOCKER_CONTAINER = milmove-redis TASKS_DOCKER_CONTAINER = tasks From dbd0b1a8a158d7abd7dc1051c2d6d184f5409192 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 21 Aug 2024 19:43:39 +0000 Subject: [PATCH 07/18] more postgrese --- docker-compose.ecs.yml | 2 +- docker-compose.local.yml | 2 +- docker-compose.mtls.yml | 2 +- docker-compose.mtls_local.yml | 2 +- docker-compose.prime.yml | 2 +- docker-compose.reviewapp.yml | 2 +- docker-compose.yml | 2 +- migrations/app/schema/20210113173236_create_crud_role.up.sql | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.ecs.yml b/docker-compose.ecs.yml index 78e32f93b55..66677616f4e 100644 --- a/docker-compose.ecs.yml +++ b/docker-compose.ecs.yml @@ -2,7 +2,7 @@ version: '3' services: database: - image: public.ecr.aws/docker/library/postgres:12.7 + image: public.ecr.aws/docker/library/postgres:16.4 environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=mysecretpassword diff --git a/docker-compose.local.yml b/docker-compose.local.yml index e43a217bcf0..22ffa99bd5d 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.mtls.yml b/docker-compose.mtls.yml index e9cad7f05b7..4acbdd12d31 100644 --- a/docker-compose.mtls.yml +++ b/docker-compose.mtls.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always environment: - POSTGRES_USER=postgres diff --git a/docker-compose.mtls_local.yml b/docker-compose.mtls_local.yml index d4a723f2f46..72d19771e47 100644 --- a/docker-compose.mtls_local.yml +++ b/docker-compose.mtls_local.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.prime.yml b/docker-compose.prime.yml index 00ddb359c9c..7096dcd4c23 100644 --- a/docker-compose.prime.yml +++ b/docker-compose.prime.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.reviewapp.yml b/docker-compose.reviewapp.yml index b08321d5135..086e46f7a2d 100644 --- a/docker-compose.reviewapp.yml +++ b/docker-compose.reviewapp.yml @@ -2,7 +2,7 @@ version: '3.4' services: database_review: - image: public.ecr.aws/docker/library/postgres:12.7 + image: public.ecr.aws/docker/library/postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.yml b/docker-compose.yml index 815e316a5ab..455816eb4ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/migrations/app/schema/20210113173236_create_crud_role.up.sql b/migrations/app/schema/20210113173236_create_crud_role.up.sql index 8b89cc0139e..189dd6b017b 100644 --- a/migrations/app/schema/20210113173236_create_crud_role.up.sql +++ b/migrations/app/schema/20210113173236_create_crud_role.up.sql @@ -1,6 +1,6 @@ -- Assume the master role, which has the ability to create roles and grant -- group membership to the rds_iam role. -SET ROLE master; +-- SET ROLE master; --commented out because it's not needed for postgres16 -- Create a new role named "crud" (CREATE READ UPDATE DELETE). -- Use NOINHERIT so that this low privileged user cannot assume the privileges From 16796094c520a05e66e78a676475609df4d6e012 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 21 Aug 2024 19:45:49 +0000 Subject: [PATCH 08/18] more postgres changes --- docker-compose.ecs.yml | 2 +- docker-compose.local.yml | 2 +- docker-compose.mtls.yml | 2 +- docker-compose.mtls_local.yml | 2 +- docker-compose.prime.yml | 2 +- docker-compose.reviewapp.yml | 2 +- docker-compose.yml | 2 +- migrations/app/schema/20210113173236_create_crud_role.up.sql | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.ecs.yml b/docker-compose.ecs.yml index 78e32f93b55..66677616f4e 100644 --- a/docker-compose.ecs.yml +++ b/docker-compose.ecs.yml @@ -2,7 +2,7 @@ version: '3' services: database: - image: public.ecr.aws/docker/library/postgres:12.7 + image: public.ecr.aws/docker/library/postgres:16.4 environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=mysecretpassword diff --git a/docker-compose.local.yml b/docker-compose.local.yml index b8b15fa9974..0605a059965 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.mtls.yml b/docker-compose.mtls.yml index 45fbac1652f..bba79d08cc4 100644 --- a/docker-compose.mtls.yml +++ b/docker-compose.mtls.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always environment: - POSTGRES_USER=postgres diff --git a/docker-compose.mtls_local.yml b/docker-compose.mtls_local.yml index f1bed2995c5..f896c7f8a4a 100644 --- a/docker-compose.mtls_local.yml +++ b/docker-compose.mtls_local.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.prime.yml b/docker-compose.prime.yml index 815b9885512..e2b662913b4 100644 --- a/docker-compose.prime.yml +++ b/docker-compose.prime.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.reviewapp.yml b/docker-compose.reviewapp.yml index b08321d5135..086e46f7a2d 100644 --- a/docker-compose.reviewapp.yml +++ b/docker-compose.reviewapp.yml @@ -2,7 +2,7 @@ version: '3.4' services: database_review: - image: public.ecr.aws/docker/library/postgres:12.7 + image: public.ecr.aws/docker/library/postgres:16.4 restart: always ports: - '6432:5432' diff --git a/docker-compose.yml b/docker-compose.yml index e05e6ca9995..753b4bb5a50 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:12.7 + image: postgres:16.4 restart: always ports: - '6432:5432' diff --git a/migrations/app/schema/20210113173236_create_crud_role.up.sql b/migrations/app/schema/20210113173236_create_crud_role.up.sql index 8b89cc0139e..189dd6b017b 100644 --- a/migrations/app/schema/20210113173236_create_crud_role.up.sql +++ b/migrations/app/schema/20210113173236_create_crud_role.up.sql @@ -1,6 +1,6 @@ -- Assume the master role, which has the ability to create roles and grant -- group membership to the rds_iam role. -SET ROLE master; +-- SET ROLE master; --commented out because it's not needed for postgres16 -- Create a new role named "crud" (CREATE READ UPDATE DELETE). -- Use NOINHERIT so that this low privileged user cannot assume the privileges From 3a1f2afb78bcf8798a703876fbb9b0f660742415 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 21 Aug 2024 21:09:54 +0000 Subject: [PATCH 09/18] test port change --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b2b60c3142b..5bcc35400d5 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ REDIS_PORT=6379 REDIS_PORT_DOCKER=6379 ifdef CIRCLECI DB_PORT_DEV=5432 - DB_PORT_TEST=5432 + DB_PORT_TEST=5433 UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) LDFLAGS=-linkmode external -extldflags -static From 64fcd08b70a94e7efe0bfde6577fbd4820fecda5 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 21 Aug 2024 21:14:47 +0000 Subject: [PATCH 10/18] Revert "test port change" This reverts commit 3a1f2afb78bcf8798a703876fbb9b0f660742415. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5bcc35400d5..b2b60c3142b 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ REDIS_PORT=6379 REDIS_PORT_DOCKER=6379 ifdef CIRCLECI DB_PORT_DEV=5432 - DB_PORT_TEST=5433 + DB_PORT_TEST=5432 UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) LDFLAGS=-linkmode external -extldflags -static From 604170389a71fc2cbfb0a97baef9691cd5bcb2cf Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 22 Aug 2024 13:52:15 +0000 Subject: [PATCH 11/18] test params --- Dockerfile.migrations_local | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.migrations_local b/Dockerfile.migrations_local index de2cbbb3481..07f14c00a21 100644 --- a/Dockerfile.migrations_local +++ b/Dockerfile.migrations_local @@ -21,7 +21,7 @@ RUN rm -f bin/milmove && make bin/milmove FROM alpine:3.20.2 # hadolint ignore=DL3017 -RUN apk upgrade --no-cache busybox +RUN apk upgrade --no-cache busybox --force-missing-repositories COPY --from=builder --chown=root:root /home/circleci/project/bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem COPY --from=builder --chown=root:root /home/circleci/project/bin/milmove /bin/milmove diff --git a/Makefile b/Makefile index b2b60c3142b..3040d592018 100644 --- a/Makefile +++ b/Makefile @@ -655,7 +655,7 @@ ifndef CIRCLECI echo "No database container" else @echo "Relying on CircleCI's database setup to destroy the DB." - psql postgres://postgres:$(PGPASSWORD)@localhost:$(DB_PORT_TEST)?sslmode=disable -c 'DROP DATABASE IF EXISTS $(DB_NAME_TEST);' + psql postgres://postgres:$(PGPASSWORD)@localhost:$(DB_PORT_TEST)?sslmode=disable -c 'DROP DATABASE IF EXISTS $(DB_NAME_TEST) FORCE;' endif .PHONY: db_test_start From 8bba093a6232e8013ea30fbe5fb44b9962b5006f Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 22 Aug 2024 13:56:59 +0000 Subject: [PATCH 12/18] force it --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3040d592018..5631131eaa3 100644 --- a/Makefile +++ b/Makefile @@ -655,7 +655,7 @@ ifndef CIRCLECI echo "No database container" else @echo "Relying on CircleCI's database setup to destroy the DB." - psql postgres://postgres:$(PGPASSWORD)@localhost:$(DB_PORT_TEST)?sslmode=disable -c 'DROP DATABASE IF EXISTS $(DB_NAME_TEST) FORCE;' + psql postgres://postgres:$(PGPASSWORD)@localhost:$(DB_PORT_TEST)?sslmode=disable -c 'DROP DATABASE IF EXISTS $(DB_NAME_TEST) WITH (FORCE);' endif .PHONY: db_test_start From 0719c2463b7469b004547af46f9c0ca5fa318214 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 22 Aug 2024 16:09:53 +0000 Subject: [PATCH 13/18] test remove docker-compose changes --- docker-compose.ecs.yml | 2 +- docker-compose.local.yml | 2 +- docker-compose.mtls.yml | 2 +- docker-compose.mtls_local.yml | 2 +- docker-compose.prime.yml | 2 +- docker-compose.reviewapp.yml | 2 +- docker-compose.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.ecs.yml b/docker-compose.ecs.yml index 66677616f4e..78e32f93b55 100644 --- a/docker-compose.ecs.yml +++ b/docker-compose.ecs.yml @@ -2,7 +2,7 @@ version: '3' services: database: - image: public.ecr.aws/docker/library/postgres:16.4 + image: public.ecr.aws/docker/library/postgres:12.7 environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=mysecretpassword diff --git a/docker-compose.local.yml b/docker-compose.local.yml index 0605a059965..b8b15fa9974 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:16.4 + image: postgres:12.7 restart: always ports: - '6432:5432' diff --git a/docker-compose.mtls.yml b/docker-compose.mtls.yml index bba79d08cc4..45fbac1652f 100644 --- a/docker-compose.mtls.yml +++ b/docker-compose.mtls.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:16.4 + image: postgres:12.7 restart: always environment: - POSTGRES_USER=postgres diff --git a/docker-compose.mtls_local.yml b/docker-compose.mtls_local.yml index f896c7f8a4a..f1bed2995c5 100644 --- a/docker-compose.mtls_local.yml +++ b/docker-compose.mtls_local.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:16.4 + image: postgres:12.7 restart: always ports: - '6432:5432' diff --git a/docker-compose.prime.yml b/docker-compose.prime.yml index e2b662913b4..815b9885512 100644 --- a/docker-compose.prime.yml +++ b/docker-compose.prime.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:16.4 + image: postgres:12.7 restart: always ports: - '6432:5432' diff --git a/docker-compose.reviewapp.yml b/docker-compose.reviewapp.yml index 086e46f7a2d..b08321d5135 100644 --- a/docker-compose.reviewapp.yml +++ b/docker-compose.reviewapp.yml @@ -2,7 +2,7 @@ version: '3.4' services: database_review: - image: public.ecr.aws/docker/library/postgres:16.4 + image: public.ecr.aws/docker/library/postgres:12.7 restart: always ports: - '6432:5432' diff --git a/docker-compose.yml b/docker-compose.yml index 753b4bb5a50..e05e6ca9995 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: database: - image: postgres:16.4 + image: postgres:12.7 restart: always ports: - '6432:5432' From 6962c341fe9d07309647ae005598678ce7e72f57 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 22 Aug 2024 16:22:23 +0000 Subject: [PATCH 14/18] dont force it --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5631131eaa3..b2b60c3142b 100644 --- a/Makefile +++ b/Makefile @@ -655,7 +655,7 @@ ifndef CIRCLECI echo "No database container" else @echo "Relying on CircleCI's database setup to destroy the DB." - psql postgres://postgres:$(PGPASSWORD)@localhost:$(DB_PORT_TEST)?sslmode=disable -c 'DROP DATABASE IF EXISTS $(DB_NAME_TEST) WITH (FORCE);' + psql postgres://postgres:$(PGPASSWORD)@localhost:$(DB_PORT_TEST)?sslmode=disable -c 'DROP DATABASE IF EXISTS $(DB_NAME_TEST);' endif .PHONY: db_test_start From 3e4d655f62c729c0f25c32b2361cd659b2a6b7f7 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 22 Aug 2024 18:25:59 +0000 Subject: [PATCH 15/18] cimg --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ecc5d5f6971..fa110e66288 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ references: # see milmove_load_testing for the right config load_tester: &load_tester cimg/python:3.11.3 - postgres: &postgres cimg/postgres:16.4 + postgres: &postgres cimg/postgres:16.4.0 redis: &redis redis:5.0.6 From 4728a8ec75abb362d106f575bfe9a592808188f3 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 22 Aug 2024 18:38:17 +0000 Subject: [PATCH 16/18] 16.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa110e66288..3d205752cb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ references: # see milmove_load_testing for the right config load_tester: &load_tester cimg/python:3.11.3 - postgres: &postgres cimg/postgres:16.4.0 + postgres: &postgres cimg/postgres:16.0 redis: &redis redis:5.0.6 From cba790f88a60bcdc47346e17393fb4e10bfae367 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 22 Aug 2024 18:51:28 +0000 Subject: [PATCH 17/18] keep cimg 12.11 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ee59314fa1..04448f118e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ references: # see milmove_load_testing for the right config load_tester: &load_tester cimg/python:3.11.3 - postgres: &postgres cimg/postgres:16.4 + postgres: &postgres cimg/postgres:12.11 redis: &redis redis:5.0.6 From bdb723bf3e42c9db566c633e0a41d27704a66d79 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 22 Aug 2024 18:51:28 +0000 Subject: [PATCH 18/18] keep cimg 12.11 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d205752cb9..649f650a27c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ references: # see milmove_load_testing for the right config load_tester: &load_tester cimg/python:3.11.3 - postgres: &postgres cimg/postgres:16.0 + postgres: &postgres cimg/postgres:12.11 redis: &redis redis:5.0.6