From 3b5c7379fc543e73c4e3ed880fe3d4cf81700181 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:30:51 +0000 Subject: [PATCH 01/80] chore: bump github.com/aws/aws-sdk-go-v2 from 1.21.0 to 1.21.1 in /cli (#2536) Bumps [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) from 1.21.0 to 1.21.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.21.0...v1.21.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 4 ++-- cli/go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 494fe6018a..a6d2e6dfa7 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -5,7 +5,7 @@ module github.com/chanzuckerberg/happy/cli require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 - github.com/aws/aws-sdk-go-v2 v1.21.0 + github.com/aws/aws-sdk-go-v2 v1.21.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 github.com/chanzuckerberg/go-misc v1.10.7 github.com/chanzuckerberg/happy/shared v0.0.0 @@ -160,7 +160,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect - github.com/aws/smithy-go v1.14.2 + github.com/aws/smithy-go v1.15.0 github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index 52a55b9f1f..362526cc7c 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -220,8 +220,9 @@ github.com/aws/aws-sdk-go v1.45.12/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8P github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= +github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= +github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= @@ -290,8 +291,9 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 h1:s4bioTgjSFRwOoyEFzAVCmFmoowB github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= +github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= From 8501ac84450ff7dc97313d39d6c2e33e7dbbec77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:35:30 +0000 Subject: [PATCH 02/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ec2 in /cli (#2535) Bumps [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) from 1.122.0 to 1.124.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.122.0...service/ec2/v1.124.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 8 ++++---- cli/go.sum | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index a6d2e6dfa7..f98456221f 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -41,14 +41,14 @@ require ( github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 // indirect @@ -154,7 +154,7 @@ require ( require ( github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect diff --git a/cli/go.sum b/cli/go.sum index 362526cc7c..36e7c85507 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -240,13 +240,15 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99K github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= @@ -258,8 +260,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0/go.mod h1:X3ThW5RPV19hi7bn github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 h1:3VsdIKjFmyXFkKV21tgn49/dxSziWhjnx3YbqrDofXc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0/go.mod h1:f2AJtWtbonV7cSBVdxfs6e68cponNukbBDvzc4WIASo= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 h1:Qw8H7V55d2P1d/a9+cLgAcdez4GtP6l30KQAeYqx9vY= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0/go.mod h1:pGwmNL8hN0jpBfKfTbmu+Rl0bJkDhaGl+9PQLrZ4KLo= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= @@ -274,8 +276,9 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 h1:UKjpIDLVF90RfV88XurdduMoTxPqtGHZMIDYZQM7RO4= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod h1:B3dUg0V6eJesUTi+m27NUkj7n8hdDKYUpxj8f4+TqaQ= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= From bce748de5a5698d6147c468f0837f18c6a8d15b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:37:44 +0000 Subject: [PATCH 03/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ecr in /cli (#2537) Bumps [github.com/aws/aws-sdk-go-v2/service/ecr](https://github.com/aws/aws-sdk-go-v2) from 1.20.0 to 1.20.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.20.0...v1.20.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecr dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index f98456221f..9f1d0b448d 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -155,7 +155,7 @@ require ( require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 - github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 + github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index 36e7c85507..7389646182 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -262,8 +262,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2Dz github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 h1:3VsdIKjFmyXFkKV21tgn49/dxSziWhjnx3YbqrDofXc= github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0/go.mod h1:f2AJtWtbonV7cSBVdxfs6e68cponNukbBDvzc4WIASo= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 h1:Qw8H7V55d2P1d/a9+cLgAcdez4GtP6l30KQAeYqx9vY= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0/go.mod h1:pGwmNL8hN0jpBfKfTbmu+Rl0bJkDhaGl+9PQLrZ4KLo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= From ab16f8642911a4ff015e0b8178432537a6cf7929 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:40:16 +0000 Subject: [PATCH 04/80] chore: bump github.com/aws/aws-sdk-go-v2/config in /api (#2542) Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.18.42 to 1.18.44. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.18.42...config/v1.18.44) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- api/go.mod | 24 ++++++++++++------------ api/go.sum | 43 ++++++++++++++++++++++++------------------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/api/go.mod b/api/go.mod index d2d7a5f83d..83f4aabd15 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,8 +3,8 @@ module github.com/chanzuckerberg/happy/api go 1.20 require ( - github.com/aws/aws-sdk-go-v2 v1.21.0 - github.com/aws/aws-sdk-go-v2/config v1.18.42 + github.com/aws/aws-sdk-go-v2 v1.21.1 + github.com/aws/aws-sdk-go-v2/config v1.18.44 github.com/blang/semver v3.5.1+incompatible github.com/chanzuckerberg/happy/shared v0.0.0 github.com/coreos/go-oidc/v3 v3.6.0 @@ -44,13 +44,13 @@ require ( github.com/agext/levenshtein v1.2.3 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.40 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect @@ -60,13 +60,13 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 // indirect - github.com/aws/smithy-go v1.14.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect + github.com/aws/smithy-go v1.15.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/creasty/defaults v1.7.0 // indirect diff --git a/api/go.sum b/api/go.sum index cec8967f6b..97ab1a28c8 100644 --- a/api/go.sum +++ b/api/go.sum @@ -70,13 +70,14 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= -github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= -github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= +github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= +github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= +github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= +github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40 h1:s8yOkDh+5b1jUDhMBtngF6zKWLDs84chUk2Vk0c38Og= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40/go.mod h1:VtEHVAAqDWASwdOqj/1huyT6uHbs5s8FUHfDQdky/Rs= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -84,20 +85,22 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= @@ -123,25 +126,27 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 h1:UKjpIDLVF90RfV88XurdduMoTxPqtGHZMIDYZQM7RO4= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod h1:B3dUg0V6eJesUTi+m27NUkj7n8hdDKYUpxj8f4+TqaQ= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 h1:YkNzx1RLS0F5qdf9v1Q8Cuv9NXCL2TkosOxhzlUPV64= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 h1:8lKOidPkmSmfUtiTgtdXWgaKItCZ/g75/jEk6Ql6GsA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 h1:s4bioTgjSFRwOoyEFzAVCmFmoowBgjTR8gkrF/sQ4wk= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= +github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= From beca30c2bab5f702082fac2d33fcbe5474f19f49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:40:30 +0000 Subject: [PATCH 05/80] chore: bump github.com/spf13/viper from 1.16.0 to 1.17.0 in /api (#2541) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.16.0 to 1.17.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.16.0...v1.17.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- api/go.mod | 26 +++++++++++++++----------- api/go.sum | 50 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/api/go.mod b/api/go.mod index 83f4aabd15..78b8e99a88 100644 --- a/api/go.mod +++ b/api/go.mod @@ -24,7 +24,7 @@ require ( github.com/prometheus/client_golang v1.17.0 github.com/samber/lo v1.38.1 github.com/sirupsen/logrus v1.9.3 - github.com/spf13/viper v1.16.0 + github.com/spf13/viper v1.17.0 github.com/stretchr/testify v1.8.4 github.com/swaggo/swag v1.16.2 github.com/valyala/fasthttp v1.50.0 @@ -70,7 +70,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/creasty/defaults v1.7.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/docker v24.0.6+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect @@ -120,7 +120,7 @@ require ( github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/kelseyhightower/envconfig v1.4.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/compress v1.17.0 // indirect github.com/lensesio/tableprinter v0.0.0-20201125135848-89e81fc956e7 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/machinebox/graphql v0.2.2 // indirect @@ -141,29 +141,33 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc3 // indirect - github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect github.com/rivo/uniseg v0.4.4 // indirect + github.com/sagikazarmark/locafero v0.3.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sergi/go-diff v1.3.1 // indirect - github.com/spf13/afero v1.9.5 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.10.0 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/cobra v1.7.0 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/src-d/gcfg v1.4.0 // indirect - github.com/subosito/gotenv v1.4.2 // indirect + github.com/subosito/gotenv v1.6.0 // indirect github.com/swaggo/files/v2 v2.0.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/zclconf/go-cty v1.14.0 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.13.0 // indirect - golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect - golang.org/x/mod v0.11.0 // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.15.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect @@ -171,7 +175,7 @@ require ( golang.org/x/term v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.9.3 // indirect + golang.org/x/tools v0.13.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/api/go.sum b/api/go.sum index 97ab1a28c8..ad6945d5a8 100644 --- a/api/go.sum +++ b/api/go.sum @@ -172,8 +172,9 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creasty/defaults v1.7.0 h1:eNdqZvc5B509z18lD8yc212CAqJNvfT1Jq6L8WowdBA= github.com/creasty/defaults v1.7.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v24.0.6+incompatible h1:hceabKCtUgDqPu+qm0NgsaXf28Ljf4/pWFL7xjWWDgE= @@ -401,8 +402,9 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -470,8 +472,8 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3I github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8= github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= -github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= -github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= +github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= +github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= @@ -480,8 +482,9 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -498,6 +501,10 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= +github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= @@ -507,18 +514,18 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= -github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= +github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -535,11 +542,10 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= -github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/swaggo/files/v2 v2.0.0 h1:hmAt8Dkynw7Ssz46F6pn8ok6YmGZqHSVLZ+HQM7i0kw= github.com/swaggo/files/v2 v2.0.0/go.mod h1:24kk2Y9NYEJ5lHuCra6iVwkMjIekMCaFq/0JQj66kyM= github.com/swaggo/swag v1.16.2 h1:28Pp+8DkQoV+HLzLx8RGJZXNGKbFqnuvSbAAtoxiY04= @@ -570,6 +576,10 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -595,8 +605,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw= -golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -625,8 +635,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -829,8 +839,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= -golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= -golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 5afb0e378af5c3f2b28d842af99289244f0b9b1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:40:48 +0000 Subject: [PATCH 06/80] chore: bump github.com/getsentry/sentry-go from 0.24.1 to 0.25.0 in /api (#2540) Bumps [github.com/getsentry/sentry-go](https://github.com/getsentry/sentry-go) from 0.24.1 to 0.25.0. - [Release notes](https://github.com/getsentry/sentry-go/releases) - [Changelog](https://github.com/getsentry/sentry-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-go/compare/v0.24.1...v0.25.0) --- updated-dependencies: - dependency-name: github.com/getsentry/sentry-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- api/go.mod | 2 +- api/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/go.mod b/api/go.mod index 78b8e99a88..04eee15a23 100644 --- a/api/go.mod +++ b/api/go.mod @@ -8,7 +8,7 @@ require ( github.com/blang/semver v3.5.1+incompatible github.com/chanzuckerberg/happy/shared v0.0.0 github.com/coreos/go-oidc/v3 v3.6.0 - github.com/getsentry/sentry-go v0.24.1 + github.com/getsentry/sentry-go v0.25.0 github.com/go-playground/locales v0.14.1 github.com/go-playground/universal-translator v0.18.1 github.com/go-playground/validator/v10 v10.15.5 diff --git a/api/go.sum b/api/go.sum index ad6945d5a8..ec247b47c4 100644 --- a/api/go.sum +++ b/api/go.sum @@ -205,8 +205,8 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= -github.com/getsentry/sentry-go v0.24.1 h1:W6/0GyTy8J6ge6lVCc94WB6Gx2ZuLrgopnn9w8Hiwuk= -github.com/getsentry/sentry-go v0.24.1/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= +github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= From 384d63b76a6a4c52863e4d786624b42545c9514b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:41:08 +0000 Subject: [PATCH 07/80] chore: bump github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs in /cli (#2534) Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs](https://github.com/aws/aws-sdk-go-v2) from 1.24.0 to 1.24.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.24.0...service/s3/v1.24.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 9f1d0b448d..6a3116c0b5 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -6,7 +6,7 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 github.com/aws/aws-sdk-go-v2 v1.21.1 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 github.com/chanzuckerberg/go-misc v1.10.7 github.com/chanzuckerberg/happy/shared v0.0.0 github.com/fatih/color v1.15.0 diff --git a/cli/go.sum b/cli/go.sum index 7389646182..1e3e163cce 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -251,8 +251,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5T github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 h1:kjsywH3KdJnqo6XgHGE8eCoeZ9GsnVIUBILY93YjzKg= From 609658a22eb0099649a696a8e6860cccbc1fcfd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:41:13 +0000 Subject: [PATCH 08/80] chore: bump github.com/aws/aws-sdk-go-v2/service/kms (#2543) Bumps [github.com/aws/aws-sdk-go-v2/service/kms](https://github.com/aws/aws-sdk-go-v2) from 1.24.5 to 1.24.6. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/fms/v1.24.5...service/fsx/v1.24.6) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/kms dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- terraform/provider/go.mod | 10 +++++----- terraform/provider/go.sum | 16 ++++++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index c475573043..e6af4a094d 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -3,10 +3,10 @@ module github.com/chanzuckerberg/happy/terraform/provider go 1.20 require ( - github.com/aws/aws-sdk-go-v2 v1.21.0 + github.com/aws/aws-sdk-go-v2 v1.21.1 github.com/aws/aws-sdk-go-v2/config v1.18.42 github.com/aws/aws-sdk-go-v2/credentials v1.13.40 - github.com/aws/aws-sdk-go-v2/service/kms v1.24.5 + github.com/aws/aws-sdk-go-v2/service/kms v1.24.6 github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 github.com/chanzuckerberg/happy/shared v0.0.0 github.com/golang-jwt/jwt/v4 v4.5.0 @@ -30,8 +30,8 @@ require ( github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 // indirect @@ -47,7 +47,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect - github.com/aws/smithy-go v1.14.2 // indirect + github.com/aws/smithy-go v1.15.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/creasty/defaults v1.7.0 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 03f75f20db..eb72b455ef 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -34,8 +34,9 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= +github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= +github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= @@ -53,13 +54,15 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99K github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= @@ -89,8 +92,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= -github.com/aws/aws-sdk-go-v2/service/kms v1.24.5 h1:VNEw+EdYDUdkICYAVQ6n9WoAq8ZuZr7dXKjyaOw94/Q= -github.com/aws/aws-sdk-go-v2/service/kms v1.24.5/go.mod h1:NZEhPgq+vvmM6L9w+xl78Vf7YxqUcpVULqFdrUhHg8I= +github.com/aws/aws-sdk-go-v2/service/kms v1.24.6 h1:rp9DrFG3na9nuqsBZWb5KwvZrODhjayqFVJe8jmeVY8= +github.com/aws/aws-sdk-go-v2/service/kms v1.24.6/go.mod h1:I/absi3KLfE37J5QWMKyoYT8ZHA9t8JOC+Rb7Cyy+vc= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= @@ -106,8 +109,9 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 h1:s4bioTgjSFRwOoyEFzAVCmFmoowB github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= +github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= From fdb20540e90422b339b59d2b5ae3272097188439 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:41:35 +0000 Subject: [PATCH 09/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ecs in /cli (#2538) Bumps [github.com/aws/aws-sdk-go-v2/service/ecs](https://github.com/aws/aws-sdk-go-v2) from 1.30.1 to 1.30.2. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.30.1...service/s3/v1.30.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 6a3116c0b5..ead47b11f4 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -156,7 +156,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 - github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 + github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index 1e3e163cce..5f3118304f 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -264,8 +264,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 h1:3VsdIKjFmyXFkKV21tgn49/dxSz github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0/go.mod h1:f2AJtWtbonV7cSBVdxfs6e68cponNukbBDvzc4WIASo= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 h1:xCzx8Zo4r9+jb1jrbzRSE5YY0Y2PbXdmjpdXjW2nFOE= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2/go.mod h1:Ju05HZ9/Od0gSH8sozb32bpYdabJbQwyQR9lxonfaAE= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= From ca1852dbfa8fb28bcf38a639e1ac94f956d58abd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:46:57 +0000 Subject: [PATCH 10/80] chore: bump github.com/aws/aws-sdk-go-v2/service/sts (#2545) Bumps [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2) from 1.22.0 to 1.23.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ecs/v1.23.1/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.22.0...service/ecs/v1.23.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- terraform/provider/go.mod | 4 ++-- terraform/provider/go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index e6af4a094d..d3d2cdc872 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.42 github.com/aws/aws-sdk-go-v2/credentials v1.13.40 github.com/aws/aws-sdk-go-v2/service/kms v1.24.6 - github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 + github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 github.com/chanzuckerberg/happy/shared v0.0.0 github.com/golang-jwt/jwt/v4 v4.5.0 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 @@ -42,7 +42,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index eb72b455ef..a5561281c4 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -90,8 +90,9 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 h1:UKjpIDLVF90RfV88XurdduMoTxPqtGHZMIDYZQM7RO4= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod h1:B3dUg0V6eJesUTi+m27NUkj7n8hdDKYUpxj8f4+TqaQ= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/kms v1.24.6 h1:rp9DrFG3na9nuqsBZWb5KwvZrODhjayqFVJe8jmeVY8= github.com/aws/aws-sdk-go-v2/service/kms v1.24.6/go.mod h1:I/absi3KLfE37J5QWMKyoYT8ZHA9t8JOC+Rb7Cyy+vc= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= @@ -105,8 +106,9 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 h1:8lKOidPkmSmfUtiTgtdXWgaKItCZ/g75/jEk6Ql6GsA= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 h1:s4bioTgjSFRwOoyEFzAVCmFmoowBgjTR8gkrF/sQ4wk= github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= From d2e2d2e2d85dc5fbfb991b164f52be8cdfa0be37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:50:56 +0000 Subject: [PATCH 11/80] chore: bump github.com/aws/aws-sdk-go-v2/credentials (#2547) Bumps [github.com/aws/aws-sdk-go-v2/credentials](https://github.com/aws/aws-sdk-go-v2) from 1.13.40 to 1.13.42. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.13.40...credentials/v1.13.42) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- terraform/provider/go.mod | 8 ++++---- terraform/provider/go.sum | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index d3d2cdc872..8b49024b31 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/aws/aws-sdk-go-v2 v1.21.1 github.com/aws/aws-sdk-go-v2/config v1.18.42 - github.com/aws/aws-sdk-go-v2/credentials v1.13.40 + github.com/aws/aws-sdk-go-v2/credentials v1.13.42 github.com/aws/aws-sdk-go-v2/service/kms v1.24.6 github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 github.com/chanzuckerberg/happy/shared v0.0.0 @@ -29,7 +29,7 @@ require ( github.com/armon/go-radix v1.0.0 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect @@ -45,8 +45,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect github.com/aws/smithy-go v1.15.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index a5561281c4..3f1575aab7 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -40,8 +40,9 @@ github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVA github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40 h1:s8yOkDh+5b1jUDhMBtngF6zKWLDs84chUk2Vk0c38Og= github.com/aws/aws-sdk-go-v2/credentials v1.13.40/go.mod h1:VtEHVAAqDWASwdOqj/1huyT6uHbs5s8FUHfDQdky/Rs= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -49,8 +50,9 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= @@ -100,11 +102,13 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvg github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 h1:YkNzx1RLS0F5qdf9v1Q8Cuv9NXCL2TkosOxhzlUPV64= github.com/aws/aws-sdk-go-v2/service/sso v1.14.1/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 h1:8lKOidPkmSmfUtiTgtdXWgaKItCZ/g75/jEk6Ql6GsA= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= From 219a090e6b3568ecc9f866f4951de1054755ccd1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 04:55:02 +0000 Subject: [PATCH 12/80] chore: bump github.com/aws/aws-sdk-go-v2/config in /terraform/provider (#2546) Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.18.42 to 1.18.44. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.18.42...config/v1.18.44) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- terraform/provider/go.mod | 4 ++-- terraform/provider/go.sum | 13 ++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 8b49024b31..af22ed5ae6 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/aws/aws-sdk-go-v2 v1.21.1 - github.com/aws/aws-sdk-go-v2/config v1.18.42 + github.com/aws/aws-sdk-go-v2/config v1.18.44 github.com/aws/aws-sdk-go-v2/credentials v1.13.42 github.com/aws/aws-sdk-go-v2/service/kms v1.24.6 github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 @@ -32,7 +32,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 3f1575aab7..d1d3588c30 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -37,10 +37,9 @@ github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+ github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= -github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= -github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= +github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= +github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40/go.mod h1:VtEHVAAqDWASwdOqj/1huyT6uHbs5s8FUHfDQdky/Rs= github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= @@ -50,7 +49,6 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= @@ -65,8 +63,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4Ft github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= @@ -102,15 +100,12 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvg github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= From 9067b43ded86788cffe1909c3186fd9452ff31d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 05:16:58 +0000 Subject: [PATCH 13/80] chore: bump github.com/aws/aws-sdk-go-v2/service/dynamodb from 1.22.0 to 1.22.1 in /shared (#2548) * chore: bump github.com/aws/aws-sdk-go-v2/service/dynamodb in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/dynamodb](https://github.com/aws/aws-sdk-go-v2) from 1.22.0 to 1.22.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/eks/v1.22.1/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.22.0...service/eks/v1.22.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/dynamodb dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * ci - update go.mod * commit from hvm-ci -- updated coverage --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- api/go.mod | 6 +++--- api/go.sum | 12 ++++++------ cli/go.mod | 6 +++--- cli/go.sum | 12 ++++++------ hvm/go.mod | 14 +++++++------- hvm/go.sum | 24 ++++++++++++++---------- shared/go.mod | 14 +++++++------- shared/go.sum | 24 ++++++++++++++---------- terraform/provider/go.mod | 6 +++--- terraform/provider/go.sum | 12 ++++++------ 10 files changed, 69 insertions(+), 61 deletions(-) diff --git a/api/go.mod b/api/go.mod index 04eee15a23..653104b750 100644 --- a/api/go.mod +++ b/api/go.mod @@ -52,14 +52,14 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect diff --git a/api/go.sum b/api/go.sum index ec247b47c4..47ca8c3df0 100644 --- a/api/go.sum +++ b/api/go.sum @@ -105,8 +105,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wk github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 h1:kjsywH3KdJnqo6XgHGE8eCoeZ9GsnVIUBILY93YjzKg= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0/go.mod h1:X3ThW5RPV19hi7bnQ0RMAiBjZbzxj4rZlj+qdctbMWY= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -119,12 +119,12 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON2 github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 h1:m0QTSI6pZYJTk5WSKx3fm5cNW/DCicVzULBgU/6IyD0= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14/go.mod h1:dDilntgHy9WnHXsh7dDtUPgHKEfTJIBUTHM8OWm0f/0= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 h1:UKjpIDLVF90RfV88XurdduMoTxPqtGHZMIDYZQM7RO4= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod h1:B3dUg0V6eJesUTi+m27NUkj7n8hdDKYUpxj8f4+TqaQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= diff --git a/cli/go.mod b/cli/go.mod index ead47b11f4..45e3614977 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -44,10 +44,10 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect diff --git a/cli/go.sum b/cli/go.sum index 5f3118304f..3dc69d8d78 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -255,8 +255,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 h1:kjsywH3KdJnqo6XgHGE8eCoeZ9GsnVIUBILY93YjzKg= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0/go.mod h1:X3ThW5RPV19hi7bnQ0RMAiBjZbzxj4rZlj+qdctbMWY= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -269,12 +269,12 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2/go.mod h1:Ju05HZ9/Od0gSH8sozb32 github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 h1:m0QTSI6pZYJTk5WSKx3fm5cNW/DCicVzULBgU/6IyD0= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14/go.mod h1:dDilntgHy9WnHXsh7dDtUPgHKEfTJIBUTHM8OWm0f/0= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 h1:UKjpIDLVF90RfV88XurdduMoTxPqtGHZMIDYZQM7RO4= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod h1:B3dUg0V6eJesUTi+m27NUkj7n8hdDKYUpxj8f4+TqaQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= diff --git a/hvm/go.mod b/hvm/go.mod index 47dc60f44c..ad0256b1ee 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -16,31 +16,31 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect - github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect + github.com/aws/aws-sdk-go-v2 v1.21.1 // indirect github.com/aws/aws-sdk-go-v2/config v1.18.42 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.13.40 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 // indirect - github.com/aws/smithy-go v1.14.2 // indirect + github.com/aws/smithy-go v1.15.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/creasty/defaults v1.7.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index bca4d656a2..ca998b356c 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -17,8 +17,9 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= +github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= +github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= @@ -36,21 +37,23 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99K github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 h1:kjsywH3KdJnqo6XgHGE8eCoeZ9GsnVIUBILY93YjzKg= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0/go.mod h1:X3ThW5RPV19hi7bnQ0RMAiBjZbzxj4rZlj+qdctbMWY= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -63,12 +66,12 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON2 github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 h1:m0QTSI6pZYJTk5WSKx3fm5cNW/DCicVzULBgU/6IyD0= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14/go.mod h1:dDilntgHy9WnHXsh7dDtUPgHKEfTJIBUTHM8OWm0f/0= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 h1:UKjpIDLVF90RfV88XurdduMoTxPqtGHZMIDYZQM7RO4= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod h1:B3dUg0V6eJesUTi+m27NUkj7n8hdDKYUpxj8f4+TqaQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= @@ -87,8 +90,9 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 h1:s4bioTgjSFRwOoyEFzAVCmFmoowB github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= +github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/chanzuckerberg/go-misc v1.10.3 h1:uqUEZCJS7dm4nPOQ9vPr0KObpJyn0L1nyxmzswRyohI= github.com/chanzuckerberg/go-misc v1.10.3/go.mod h1:FNU4+AalBFCWSxbhu7ePIKJhurEP+tRGxLZiV2ZGmSg= diff --git a/shared/go.mod b/shared/go.mod index d7337d4900..380bfeca0a 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -6,9 +6,9 @@ require ( cirello.io/dynamolock/v2 v2.0.2 github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Masterminds/semver/v3 v3.2.1 - github.com/aws/aws-sdk-go-v2 v1.21.0 + github.com/aws/aws-sdk-go-v2 v1.21.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 @@ -68,12 +68,12 @@ require ( github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect @@ -149,7 +149,7 @@ require ( require ( github.com/aws/aws-sdk-go-v2/config v1.18.42 - github.com/aws/smithy-go v1.14.2 + github.com/aws/smithy-go v1.15.0 github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.10.2 // indirect github.com/go-logr/logr v1.2.4 // indirect diff --git a/shared/go.sum b/shared/go.sum index 5be1696f42..7873baff33 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -220,8 +220,9 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= +github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= +github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= @@ -239,21 +240,23 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99K github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 h1:kjsywH3KdJnqo6XgHGE8eCoeZ9GsnVIUBILY93YjzKg= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0/go.mod h1:X3ThW5RPV19hi7bnQ0RMAiBjZbzxj4rZlj+qdctbMWY= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -266,12 +269,12 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON2 github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 h1:m0QTSI6pZYJTk5WSKx3fm5cNW/DCicVzULBgU/6IyD0= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14/go.mod h1:dDilntgHy9WnHXsh7dDtUPgHKEfTJIBUTHM8OWm0f/0= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 h1:UKjpIDLVF90RfV88XurdduMoTxPqtGHZMIDYZQM7RO4= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod h1:B3dUg0V6eJesUTi+m27NUkj7n8hdDKYUpxj8f4+TqaQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= @@ -290,8 +293,9 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 h1:s4bioTgjSFRwOoyEFzAVCmFmoowB github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= +github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index af22ed5ae6..411316d8e4 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -34,14 +34,14 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index d1d3588c30..53cf52761e 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -69,8 +69,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wk github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0 h1:kjsywH3KdJnqo6XgHGE8eCoeZ9GsnVIUBILY93YjzKg= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.0/go.mod h1:X3ThW5RPV19hi7bnQ0RMAiBjZbzxj4rZlj+qdctbMWY= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -83,12 +83,12 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON2 github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 h1:m0QTSI6pZYJTk5WSKx3fm5cNW/DCicVzULBgU/6IyD0= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14/go.mod h1:dDilntgHy9WnHXsh7dDtUPgHKEfTJIBUTHM8OWm0f/0= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 h1:UKjpIDLVF90RfV88XurdduMoTxPqtGHZMIDYZQM7RO4= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod h1:B3dUg0V6eJesUTi+m27NUkj7n8hdDKYUpxj8f4+TqaQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= From 37b12c36859420c42a1a50aff2ba975dc893d495 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 05:25:20 +0000 Subject: [PATCH 14/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ecr from 1.20.0 to 1.20.1 in /shared (#2549) * chore: bump github.com/aws/aws-sdk-go-v2/service/ecr in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/ecr](https://github.com/aws/aws-sdk-go-v2) from 1.20.0 to 1.20.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.20.0...v1.20.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecr dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * ci - update go.mod * commit from hvm-ci -- updated coverage --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- api/go.mod | 2 +- api/go.sum | 4 ++-- hvm/go.mod | 2 +- hvm/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/go.mod b/api/go.mod index 653104b750..99debc5285 100644 --- a/api/go.mod +++ b/api/go.mod @@ -55,7 +55,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect diff --git a/api/go.sum b/api/go.sum index 47ca8c3df0..b2a9863832 100644 --- a/api/go.sum +++ b/api/go.sum @@ -112,8 +112,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2Dz github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 h1:Qw8H7V55d2P1d/a9+cLgAcdez4GtP6l30KQAeYqx9vY= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0/go.mod h1:pGwmNL8hN0jpBfKfTbmu+Rl0bJkDhaGl+9PQLrZ4KLo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= diff --git a/hvm/go.mod b/hvm/go.mod index ad0256b1ee..c29820bb4f 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -29,7 +29,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index ca998b356c..ef809eccc5 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -59,8 +59,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2Dz github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 h1:Qw8H7V55d2P1d/a9+cLgAcdez4GtP6l30KQAeYqx9vY= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0/go.mod h1:pGwmNL8hN0jpBfKfTbmu+Rl0bJkDhaGl+9PQLrZ4KLo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= diff --git a/shared/go.mod b/shared/go.mod index 380bfeca0a..e1cd119ca4 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -10,7 +10,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 - github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 + github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 diff --git a/shared/go.sum b/shared/go.sum index 7873baff33..321745d0a2 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -262,8 +262,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2Dz github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 h1:Qw8H7V55d2P1d/a9+cLgAcdez4GtP6l30KQAeYqx9vY= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0/go.mod h1:pGwmNL8hN0jpBfKfTbmu+Rl0bJkDhaGl+9PQLrZ4KLo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 411316d8e4..8ae56bbbb7 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -37,7 +37,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 53cf52761e..8f9b69f245 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -76,8 +76,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2Dz github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0 h1:Qw8H7V55d2P1d/a9+cLgAcdez4GtP6l30KQAeYqx9vY= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.0/go.mod h1:pGwmNL8hN0jpBfKfTbmu+Rl0bJkDhaGl+9PQLrZ4KLo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= From 3037b61d7c580b1a447101579adc34aaef2d5de2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 05:28:44 +0000 Subject: [PATCH 15/80] chore: bump github.com/hashicorp/hcl/v2 from 2.18.0 to 2.18.1 in /shared (#2550) * chore: bump github.com/hashicorp/hcl/v2 from 2.18.0 to 2.18.1 in /shared Bumps [github.com/hashicorp/hcl/v2](https://github.com/hashicorp/hcl) from 2.18.0 to 2.18.1. - [Release notes](https://github.com/hashicorp/hcl/releases) - [Changelog](https://github.com/hashicorp/hcl/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/hcl/compare/v2.18.0...v2.18.1) --- updated-dependencies: - dependency-name: github.com/hashicorp/hcl/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from cli-ci -- updated coverage * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- api/go.mod | 2 +- api/go.sum | 4 ++-- cli/go.mod | 2 +- cli/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/go.mod b/api/go.mod index 99debc5285..d7d220ae55 100644 --- a/api/go.mod +++ b/api/go.mod @@ -101,7 +101,7 @@ require ( github.com/hashicorp/go-tfe v1.34.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hashicorp/hcl/v2 v2.18.0 // indirect + github.com/hashicorp/hcl/v2 v2.18.1 // indirect github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d // indirect github.com/hashicorp/terraform-config-inspect v0.0.0-20230522202058-dbe9bfcbfe7a // indirect github.com/imdario/mergo v0.3.16 // indirect diff --git a/api/go.sum b/api/go.sum index b2a9863832..b49f5abec7 100644 --- a/api/go.sum +++ b/api/go.sum @@ -349,8 +349,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8= -github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= +github.com/hashicorp/hcl/v2 v2.18.1 h1:6nxnOJFku1EuSawSD81fuviYUV8DxFr3fp2dUi3ZYSo= +github.com/hashicorp/hcl/v2 v2.18.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d h1:9ARUJJ1VVynB176G1HCwleORqCaXm/Vx0uUi0dL26I0= github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d/go.mod h1:Yog5+CPEM3c99L1CL2CFCYoSzgWm5vTU58idbRUaLik= github.com/hashicorp/terraform-config-inspect v0.0.0-20230522202058-dbe9bfcbfe7a h1:zKVsrHhIOWiXHYqFrOXfHacOOVDMYv+v/Wx8DUeyySs= diff --git a/cli/go.mod b/cli/go.mod index 45e3614977..2b16138cdc 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -83,7 +83,7 @@ require ( github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/hashicorp/hcl/v2 v2.18.0 // indirect + github.com/hashicorp/hcl/v2 v2.18.1 // indirect github.com/hashicorp/terraform-config-inspect v0.0.0-20230522202058-dbe9bfcbfe7a // indirect github.com/hetiansu5/urlquery v1.2.7 // indirect github.com/imdario/mergo v0.3.16 // indirect diff --git a/cli/go.sum b/cli/go.sum index 3dc69d8d78..4ea99c0819 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -538,8 +538,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8= -github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= +github.com/hashicorp/hcl/v2 v2.18.1 h1:6nxnOJFku1EuSawSD81fuviYUV8DxFr3fp2dUi3ZYSo= +github.com/hashicorp/hcl/v2 v2.18.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d h1:9ARUJJ1VVynB176G1HCwleORqCaXm/Vx0uUi0dL26I0= github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d/go.mod h1:Yog5+CPEM3c99L1CL2CFCYoSzgWm5vTU58idbRUaLik= github.com/hashicorp/terraform-config-inspect v0.0.0-20230522202058-dbe9bfcbfe7a h1:zKVsrHhIOWiXHYqFrOXfHacOOVDMYv+v/Wx8DUeyySs= diff --git a/shared/go.mod b/shared/go.mod index e1cd119ca4..1b6607813c 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -30,7 +30,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-tfe v1.34.0 github.com/hashicorp/go-uuid v1.0.3 - github.com/hashicorp/hcl/v2 v2.18.0 + github.com/hashicorp/hcl/v2 v2.18.1 github.com/hashicorp/terraform-config-inspect v0.0.0-20230522202058-dbe9bfcbfe7a github.com/hetiansu5/urlquery v1.2.7 github.com/jeremywohl/flatten v1.0.1 diff --git a/shared/go.sum b/shared/go.sum index 321745d0a2..87cf3f5cae 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -531,8 +531,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8= -github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= +github.com/hashicorp/hcl/v2 v2.18.1 h1:6nxnOJFku1EuSawSD81fuviYUV8DxFr3fp2dUi3ZYSo= +github.com/hashicorp/hcl/v2 v2.18.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d h1:9ARUJJ1VVynB176G1HCwleORqCaXm/Vx0uUi0dL26I0= github.com/hashicorp/jsonapi v0.0.0-20210826224640-ee7dae0fb22d/go.mod h1:Yog5+CPEM3c99L1CL2CFCYoSzgWm5vTU58idbRUaLik= github.com/hashicorp/terraform-config-inspect v0.0.0-20230522202058-dbe9bfcbfe7a h1:zKVsrHhIOWiXHYqFrOXfHacOOVDMYv+v/Wx8DUeyySs= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 8ae56bbbb7..5a6f85f662 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -84,7 +84,7 @@ require ( github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hc-install v0.6.0 // indirect - github.com/hashicorp/hcl/v2 v2.18.0 // indirect + github.com/hashicorp/hcl/v2 v2.18.1 // indirect github.com/hashicorp/logutils v1.0.0 // indirect github.com/hashicorp/terraform-exec v0.19.0 // indirect github.com/hashicorp/terraform-json v0.17.1 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 8f9b69f245..9264dfd374 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -225,8 +225,8 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/hc-install v0.6.0 h1:fDHnU7JNFNSQebVKYhHZ0va1bC6SrPQ8fpebsvNr2w4= github.com/hashicorp/hc-install v0.6.0/go.mod h1:10I912u3nntx9Umo1VAeYPUUuehk0aRQJYpMwbX5wQA= -github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8= -github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= +github.com/hashicorp/hcl/v2 v2.18.1 h1:6nxnOJFku1EuSawSD81fuviYUV8DxFr3fp2dUi3ZYSo= +github.com/hashicorp/hcl/v2 v2.18.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/terraform-exec v0.19.0 h1:FpqZ6n50Tk95mItTSS9BjeOVUb4eg81SpgVtZNNtFSM= From 4980c85a90dda3672c1fa1c0e051194911eda17b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 05:45:44 +0000 Subject: [PATCH 16/80] chore: bump golang.org/x/sync from 0.3.0 to 0.4.0 in /shared (#2559) * chore: bump golang.org/x/sync from 0.3.0 to 0.4.0 in /shared Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.3.0 to 0.4.0. - [Commits](https://github.com/golang/sync/compare/v0.3.0...v0.4.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- api/go.mod | 2 +- api/go.sum | 4 ++-- cli/go.mod | 2 +- cli/go.sum | 4 ++-- hvm/go.sum | 2 +- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.sum | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/go.mod b/api/go.mod index d7d220ae55..c0b9017b30 100644 --- a/api/go.mod +++ b/api/go.mod @@ -170,7 +170,7 @@ require ( golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.15.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sync v0.3.0 // indirect + golang.org/x/sync v0.4.0 // indirect golang.org/x/sys v0.12.0 // indirect golang.org/x/term v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect diff --git a/api/go.sum b/api/go.sum index b49f5abec7..88e21658a1 100644 --- a/api/go.sum +++ b/api/go.sum @@ -701,8 +701,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/cli/go.mod b/cli/go.mod index 2b16138cdc..5039dd7a74 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -125,7 +125,7 @@ require ( golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect golang.org/x/mod v0.11.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sync v0.3.0 // indirect + golang.org/x/sync v0.4.0 // indirect golang.org/x/tools v0.9.3 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index 4ea99c0819..12574d2286 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -879,8 +879,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/hvm/go.sum b/hvm/go.sum index ef809eccc5..a9399d3061 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -321,7 +321,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/shared/go.mod b/shared/go.mod index 1b6607813c..4facf2e4c0 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -45,7 +45,7 @@ require ( github.com/stretchr/testify v1.8.4 github.com/zclconf/go-cty v1.14.0 golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 - golang.org/x/sync v0.3.0 + golang.org/x/sync v0.4.0 gopkg.in/src-d/go-git.v4 v4.13.1 gorm.io/gorm v1.25.3 k8s.io/kubectl v0.28.2 diff --git a/shared/go.sum b/shared/go.sum index 87cf3f5cae..3f508c0faa 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -866,8 +866,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 9264dfd374..253353d86a 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -465,7 +465,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From a1d4fbed3159bfa880a71838e895ddde419a7fa3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 05:47:46 +0000 Subject: [PATCH 17/80] chore: bump github.com/aws/aws-sdk-go-v2/config from 1.18.42 to 1.18.44 in /shared (#2555) * chore: bump github.com/aws/aws-sdk-go-v2/config in /shared Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.18.42 to 1.18.44. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.18.42...config/v1.18.44) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- cli/go.mod | 14 +++++++------- cli/go.sum | 29 ++++++++++++++--------------- hvm/go.mod | 16 ++++++++-------- hvm/go.sum | 31 ++++++++++++++++--------------- shared/go.mod | 16 ++++++++-------- shared/go.sum | 31 ++++++++++++++++--------------- 6 files changed, 69 insertions(+), 68 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 5039dd7a74..727a09b4f8 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -36,22 +36,22 @@ require ( github.com/agext/levenshtein v1.2.3 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/aws/aws-sdk-go v1.45.12 // indirect - github.com/aws/aws-sdk-go-v2/config v1.18.42 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.40 // indirect + github.com/aws/aws-sdk-go-v2/config v1.18.44 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/compose-spec/compose-go v1.19.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index 12574d2286..fd80ef99e4 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -223,11 +223,11 @@ github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+ github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= -github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= -github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= +github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= +github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40 h1:s8yOkDh+5b1jUDhMBtngF6zKWLDs84chUk2Vk0c38Og= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40/go.mod h1:VtEHVAAqDWASwdOqj/1huyT6uHbs5s8FUHfDQdky/Rs= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -235,8 +235,8 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= @@ -249,8 +249,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4Ft github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= @@ -276,7 +276,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= @@ -284,14 +283,14 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvg github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 h1:YkNzx1RLS0F5qdf9v1Q8Cuv9NXCL2TkosOxhzlUPV64= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 h1:8lKOidPkmSmfUtiTgtdXWgaKItCZ/g75/jEk6Ql6GsA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 h1:s4bioTgjSFRwOoyEFzAVCmFmoowBgjTR8gkrF/sQ4wk= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= diff --git a/hvm/go.mod b/hvm/go.mod index c29820bb4f..fbd6db46df 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -17,14 +17,14 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect github.com/aws/aws-sdk-go-v2 v1.21.1 // indirect - github.com/aws/aws-sdk-go-v2/config v1.18.42 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.40 // indirect + github.com/aws/aws-sdk-go-v2/config v1.18.44 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect @@ -34,12 +34,12 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect github.com/aws/smithy-go v1.15.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/creasty/defaults v1.7.0 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index a9399d3061..68cf4d4c04 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -20,11 +20,11 @@ github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+ github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= -github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= -github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= +github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= +github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40 h1:s8yOkDh+5b1jUDhMBtngF6zKWLDs84chUk2Vk0c38Og= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40/go.mod h1:VtEHVAAqDWASwdOqj/1huyT6uHbs5s8FUHfDQdky/Rs= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -32,8 +32,8 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= @@ -46,8 +46,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4Ft github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= @@ -73,21 +73,22 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 h1:YkNzx1RLS0F5qdf9v1Q8Cuv9NXCL2TkosOxhzlUPV64= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 h1:8lKOidPkmSmfUtiTgtdXWgaKItCZ/g75/jEk6Ql6GsA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 h1:s4bioTgjSFRwOoyEFzAVCmFmoowBgjTR8gkrF/sQ4wk= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= diff --git a/shared/go.mod b/shared/go.mod index 4facf2e4c0..9d5d266660 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 - github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 + github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 github.com/chanzuckerberg/happy/hvm v0.0.0 github.com/compose-spec/compose-go v1.19.0 github.com/creasty/defaults v1.7.0 @@ -64,19 +64,19 @@ require ( github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/aws/aws-sdk-go v1.44.122 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.40 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/distribution/reference v0.5.0 // indirect @@ -148,7 +148,7 @@ require ( ) require ( - github.com/aws/aws-sdk-go-v2/config v1.18.42 + github.com/aws/aws-sdk-go-v2/config v1.18.44 github.com/aws/smithy-go v1.15.0 github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.10.2 // indirect diff --git a/shared/go.sum b/shared/go.sum index 3f508c0faa..41f50476b1 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -223,11 +223,11 @@ github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+ github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= -github.com/aws/aws-sdk-go-v2/config v1.18.42 h1:28jHROB27xZwU0CB88giDSjz7M1Sba3olb5JBGwina8= -github.com/aws/aws-sdk-go-v2/config v1.18.42/go.mod h1:4AZM3nMMxwlG+eZlxvBKqwVbkDLlnN2a4UGTL6HjaZI= +github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= +github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40 h1:s8yOkDh+5b1jUDhMBtngF6zKWLDs84chUk2Vk0c38Og= -github.com/aws/aws-sdk-go-v2/credentials v1.13.40/go.mod h1:VtEHVAAqDWASwdOqj/1huyT6uHbs5s8FUHfDQdky/Rs= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -235,8 +235,8 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= @@ -249,8 +249,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4Ft github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43 h1:g+qlObJH4Kn4n21g69DjspU0hKTjWtq7naZ9OLCv0ew= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.43/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= @@ -276,21 +276,22 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1 h1:YkNzx1RLS0F5qdf9v1Q8Cuv9NXCL2TkosOxhzlUPV64= -github.com/aws/aws-sdk-go-v2/service/sso v1.14.1/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 h1:8lKOidPkmSmfUtiTgtdXWgaKItCZ/g75/jEk6Ql6GsA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 h1:s4bioTgjSFRwOoyEFzAVCmFmoowBgjTR8gkrF/sQ4wk= -github.com/aws/aws-sdk-go-v2/service/sts v1.22.0/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= From e32774affd6f8dcdb668de40c7a11a37881ffe29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 05:51:07 +0000 Subject: [PATCH 18/80] chore: bump github.com/aws/aws-sdk-go-v2/service/eks from 1.29.5 to 1.29.6 in /shared (#2552) * chore: bump github.com/aws/aws-sdk-go-v2/service/eks in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/eks](https://github.com/aws/aws-sdk-go-v2) from 1.29.5 to 1.29.6. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.29.5...service/s3/v1.29.6) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/eks dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- api/go.mod | 2 +- api/go.sum | 4 ++-- cli/go.mod | 2 +- cli/go.sum | 4 ++-- hvm/go.mod | 2 +- hvm/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/api/go.mod b/api/go.mod index c0b9017b30..d7b05e16c4 100644 --- a/api/go.mod +++ b/api/go.mod @@ -57,7 +57,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect diff --git a/api/go.sum b/api/go.sum index 88e21658a1..364bb31252 100644 --- a/api/go.sum +++ b/api/go.sum @@ -116,8 +116,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTB github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= diff --git a/cli/go.mod b/cli/go.mod index 727a09b4f8..87eed4e985 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -157,7 +157,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 - github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect github.com/aws/smithy-go v1.15.0 diff --git a/cli/go.sum b/cli/go.sum index fd80ef99e4..83063f02b1 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -266,8 +266,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTB github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 h1:xCzx8Zo4r9+jb1jrbzRSE5YY0Y2PbXdmjpdXjW2nFOE= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2/go.mod h1:Ju05HZ9/Od0gSH8sozb32bpYdabJbQwyQR9lxonfaAE= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= diff --git a/hvm/go.mod b/hvm/go.mod index fbd6db46df..824b6cfde7 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -31,7 +31,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index 68cf4d4c04..a9e247507e 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -63,8 +63,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTB github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= diff --git a/shared/go.mod b/shared/go.mod index 9d5d266660..1a819ed0bf 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -12,7 +12,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 - github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 + github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 diff --git a/shared/go.sum b/shared/go.sum index 41f50476b1..ea5b121901 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -266,8 +266,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTB github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 5a6f85f662..269b9f6254 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -39,7 +39,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 253353d86a..f9a5482f3a 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -80,8 +80,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTB github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5 h1:6eSpTHOsDixcFIvPdiAAVdyCru3k2jIVRPdIQfGzfc8= -github.com/aws/aws-sdk-go-v2/service/eks v1.29.5/go.mod h1:TwqefcyPlF31NTF+fH34tJ2VwMMR6c74IbiiUgA6kVY= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= +github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYyXzdD71KWVCL78lJZltah6VVznXBazvKjfH58= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= From af4ac23bfabf9ee52e234a17a1c5ea4237bf9125 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:17:14 +0000 Subject: [PATCH 19/80] chore: bump golang.org/x/net from 0.15.0 to 0.17.0 in /hvm (#2561) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.15.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.15.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- hvm/go.mod | 8 ++++---- hvm/go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hvm/go.mod b/hvm/go.mod index 824b6cfde7..04e2e864fa 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -100,12 +100,12 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/src-d/gcfg v1.4.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - golang.org/x/crypto v0.13.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/mod v0.11.0 // indirect - golang.org/x/net v0.15.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/term v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.9.3 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index a9e247507e..1c03015175 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -298,8 +298,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -314,8 +314,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -339,11 +339,11 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= From d64593223412158b9aed2dca407716605686a4a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:21:39 +0000 Subject: [PATCH 20/80] chore: bump golang.org/x/net in /terraform/provider (#2562) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.15.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.15.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- terraform/provider/go.mod | 8 ++++---- terraform/provider/go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 269b9f6254..32f8a9bda8 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -143,13 +143,13 @@ require ( github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/zclconf/go-cty v1.14.0 // indirect - golang.org/x/crypto v0.13.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.15.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/term v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.9.3 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index f9a5482f3a..206d6e49fb 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -430,8 +430,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw= golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -454,8 +454,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -492,15 +492,15 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= From fbfa9e35d5f096313c0abcd296d13361e9d83187 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:26:57 +0000 Subject: [PATCH 21/80] chore: bump golang.org/x/net from 0.15.0 to 0.17.0 in /api (#2563) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.15.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.15.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- api/go.mod | 8 ++++---- api/go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/go.mod b/api/go.mod index d7b05e16c4..000170c5bc 100644 --- a/api/go.mod +++ b/api/go.mod @@ -165,14 +165,14 @@ require ( github.com/zclconf/go-cty v1.14.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect - golang.org/x/crypto v0.13.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.15.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sync v0.4.0 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/term v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.13.0 // indirect diff --git a/api/go.sum b/api/go.sum index 364bb31252..4ac7a3c677 100644 --- a/api/go.sum +++ b/api/go.sum @@ -593,8 +593,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -675,8 +675,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -756,15 +756,15 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From cb535ae76ff19c3c7840c7a46d9dc62bdf9c173c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:28:28 +0000 Subject: [PATCH 22/80] chore: bump golang.org/x/net from 0.15.0 to 0.17.0 in /cli (#2565) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.15.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.15.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 8 ++++---- cli/go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 87eed4e985..7d5489559e 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -191,10 +191,10 @@ require ( github.com/rivo/uniseg v0.4.4 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect - golang.org/x/crypto v0.13.0 // indirect - golang.org/x/net v0.15.0 // indirect - golang.org/x/sys v0.12.0 // indirect - golang.org/x/term v0.12.0 // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index 83063f02b1..b3d703cb39 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -745,8 +745,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -835,8 +835,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -951,13 +951,13 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From b13ea252b574f133f509af714dc996d590509932 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:33:06 +0000 Subject: [PATCH 23/80] chore: bump golang.org/x/net from 0.15.0 to 0.17.0 in /shared (#2564) * chore: bump golang.org/x/net from 0.15.0 to 0.17.0 in /shared Bumps [golang.org/x/net](https://github.com/golang/net) from 0.15.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.15.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] * commit from cli-ci -- updated coverage --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] --- shared/go.mod | 8 ++++---- shared/go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/shared/go.mod b/shared/go.mod index 1a819ed0bf..aa2668f89b 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -134,7 +134,7 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.13.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/mod v0.11.0 // indirect golang.org/x/tools v0.9.3 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect @@ -171,10 +171,10 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.9.3 - golang.org/x/net v0.15.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.12.0 - golang.org/x/sys v0.12.0 // indirect - golang.org/x/term v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/shared/go.sum b/shared/go.sum index ea5b121901..7b12e88d97 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -734,8 +734,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -824,8 +824,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -943,13 +943,13 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From ccbccebb0b1bf3b9f042b8f4751cf623e5320624 Mon Sep 17 00:00:00 2001 From: Jake Heath <76011913+jakeyheath@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:51:47 -0700 Subject: [PATCH 24/80] fix: duplicate target group names (#2566) We need to use the random pet ID to get an actual random ID attached to the target group name. Otherwise, stacks of the same name will conflict. --- terraform/modules/happy-service-eks/target_group_only.tf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/terraform/modules/happy-service-eks/target_group_only.tf b/terraform/modules/happy-service-eks/target_group_only.tf index ad17150bbc..874f43b790 100644 --- a/terraform/modules/happy-service-eks/target_group_only.tf +++ b/terraform/modules/happy-service-eks/target_group_only.tf @@ -4,6 +4,10 @@ resource "random_pet" "this" { } } +locals { + target_group_name = "${random_pet.this.keepers.target_group_name}_${random_pet.this.id}" +} + data "aws_lb" "this" { count = var.routing.service_type == "TARGET_GROUP_ONLY" ? 1 : 0 @@ -20,7 +24,7 @@ data "aws_lb_listener" "this" { resource "aws_lb_target_group" "this" { count = var.routing.service_type == "TARGET_GROUP_ONLY" ? 1 : 0 - name = random_pet.this.keepers.target_group_name + name = local.target_group_name port = var.routing.service_port protocol = "HTTP" vpc_id = var.cloud_env.vpc_id @@ -55,7 +59,7 @@ resource "kubernetes_manifest" "this" { kind = "TargetGroupBinding" metadata = { - name = random_pet.this.keepers.target_group_name + name = local.target_group_name namespace = var.k8s_namespace } From 9c42bce9b561cb13b5e8409bb372db611e1b1421 Mon Sep 17 00:00:00 2001 From: "czi-github-helper[bot]" <95879977+czi-github-helper[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 11:42:49 -0700 Subject: [PATCH 25/80] chore: release main (#2567) Co-authored-by: czi-github-helper[bot] <95879977+czi-github-helper[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- terraform/modules/happy-service-eks/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index c69907285d..3a7bcc57a9 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -9,7 +9,7 @@ "terraform/modules/happy-github-ci-role": "1.4.2", "terraform/modules/happy-route53": "1.3.0", "terraform/modules/happy-service-ecs": "2.1.0", - "terraform/modules/happy-service-eks": "3.17.0", + "terraform/modules/happy-service-eks": "3.17.1", "terraform/modules/happy-stack-ecs": "2.1.0", "terraform/modules/happy-stack-eks": "4.19.0", "terraform/modules/happy-tfe-okta-app": "3.0.0", diff --git a/terraform/modules/happy-service-eks/CHANGELOG.md b/terraform/modules/happy-service-eks/CHANGELOG.md index 34006c9a3f..dce4a572f6 100644 --- a/terraform/modules/happy-service-eks/CHANGELOG.md +++ b/terraform/modules/happy-service-eks/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.17.1](https://github.com/chanzuckerberg/happy/compare/happy-service-eks-v3.17.0...happy-service-eks-v3.17.1) (2023-10-12) + + +### Bug Fixes + +* duplicate target group names ([#2566](https://github.com/chanzuckerberg/happy/issues/2566)) ([ccbcceb](https://github.com/chanzuckerberg/happy/commit/ccbccebb0b1bf3b9f042b8f4751cf623e5320624)) + ## [3.17.0](https://github.com/chanzuckerberg/happy/compare/happy-service-eks-v3.16.0...happy-service-eks-v3.17.0) (2023-10-03) From fa87b1a0bbd2c6b41ac4e9f013c8c60ff5409913 Mon Sep 17 00:00:00 2001 From: Hayden Spitzley <105455169+hspitzley-czi@users.noreply.github.com> Date: Fri, 13 Oct 2023 10:45:47 -0400 Subject: [PATCH 26/80] feat: replace Gorm with Ent ORM (#2530) --- .github/workflows/api-update-ent-schema.yml | 49 ++ Dockerfile.api | 2 +- api/.gitignore | 4 +- api/Makefile | 11 +- api/app-config.development.yaml | 4 +- api/app-config.docker-dev.yaml | 2 + api/app-config.test.yaml | 2 +- api/docker-compose.yml | 8 +- api/go.mod | 22 +- api/go.sum | 24 +- api/pkg/api/app.go | 4 + api/pkg/api/app_test.go | 23 +- api/pkg/api/config_group_test.go | 21 +- api/pkg/cmd/cmd_test.go | 21 +- api/pkg/cmd/config.go | 284 ++++--- api/pkg/cmd/config_test.go | 41 +- api/pkg/dbutil/db.go | 87 +- api/pkg/ent/appconfig.go | 186 ++++ api/pkg/ent/appconfig/appconfig.go | 116 +++ api/pkg/ent/appconfig/where.go | 565 +++++++++++++ api/pkg/ent/appconfig_create.go | 889 ++++++++++++++++++++ api/pkg/ent/appconfig_delete.go | 88 ++ api/pkg/ent/appconfig_query.go | 526 ++++++++++++ api/pkg/ent/appconfig_update.go | 370 ++++++++ api/pkg/ent/client.go | 335 ++++++++ api/pkg/ent/ent.go | 608 +++++++++++++ api/pkg/ent/enttest/enttest.go | 84 ++ api/pkg/ent/generate.go | 3 + api/pkg/ent/hook/hook.go | 199 +++++ api/pkg/ent/migrate/migrate.go | 64 ++ api/pkg/ent/migrate/schema.go | 48 ++ api/pkg/ent/mutation.go | 760 +++++++++++++++++ api/pkg/ent/predicate/predicate.go | 10 + api/pkg/ent/runtime.go | 32 + api/pkg/ent/runtime/runtime.go | 10 + api/pkg/ent/schema/appconfig.go | 80 ++ api/pkg/ent/tx.go | 210 +++++ api/pkg/setup/setup.go | 6 +- api/pkg/utils/utils.go | 15 - api/tools/db-shell.sh | 2 +- cli/go.mod | 2 +- cli/go.sum | 4 +- shared/go.mod | 6 +- shared/go.sum | 4 +- shared/model/app_metadata.go | 6 +- shared/model/common.go | 4 +- shared/model/config.go | 29 +- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 +- 49 files changed, 5569 insertions(+), 307 deletions(-) create mode 100644 .github/workflows/api-update-ent-schema.yml create mode 100644 api/pkg/ent/appconfig.go create mode 100644 api/pkg/ent/appconfig/appconfig.go create mode 100644 api/pkg/ent/appconfig/where.go create mode 100644 api/pkg/ent/appconfig_create.go create mode 100644 api/pkg/ent/appconfig_delete.go create mode 100644 api/pkg/ent/appconfig_query.go create mode 100644 api/pkg/ent/appconfig_update.go create mode 100644 api/pkg/ent/client.go create mode 100644 api/pkg/ent/ent.go create mode 100644 api/pkg/ent/enttest/enttest.go create mode 100644 api/pkg/ent/generate.go create mode 100644 api/pkg/ent/hook/hook.go create mode 100644 api/pkg/ent/migrate/migrate.go create mode 100644 api/pkg/ent/migrate/schema.go create mode 100644 api/pkg/ent/mutation.go create mode 100644 api/pkg/ent/predicate/predicate.go create mode 100644 api/pkg/ent/runtime.go create mode 100644 api/pkg/ent/runtime/runtime.go create mode 100644 api/pkg/ent/schema/appconfig.go create mode 100644 api/pkg/ent/tx.go delete mode 100644 api/pkg/utils/utils.go diff --git a/.github/workflows/api-update-ent-schema.yml b/.github/workflows/api-update-ent-schema.yml new file mode 100644 index 0000000000..93a43f9913 --- /dev/null +++ b/.github/workflows/api-update-ent-schema.yml @@ -0,0 +1,49 @@ +on: + - pull_request + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +name: api-ent-schema +jobs: + api_changes: + runs-on: [ARM64, self-hosted, Linux] + permissions: + pull-requests: read + outputs: + run_api_ci: ${{ steps.filter.outputs.dependencies }} + steps: + - name: Check for changed files + uses: dorny/paths-filter@v2 + id: filter + with: + filters: | + dependencies: + - '.github/**' + - 'api/**' + - 'shared/**' + update-api-ent-schema: + needs: api_changes + if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} + runs-on: [ARM64, self-hosted, Linux] + steps: + - name: Generate token + id: generate_token + uses: chanzuckerberg/github-app-token@v1.1.4 + with: + app_id: ${{ secrets.CZI_GITHUB_HELPER_APP_ID }} + private_key: ${{ secrets.CZI_GITHUB_HELPER_PK }} + - uses: actions/checkout@v3 + with: + token: ${{ steps.generate_token.outputs.token }} + ref: ${{ github.event.pull_request.head.ref }} + - uses: actions/setup-go@v4 + with: + go-version-file: api/go.mod + cache: true + - run: make update-ent-schema + working-directory: api + - uses: EndBug/add-and-commit@v9 + with: + add: -A + message: ci - update ent schema diff --git a/Dockerfile.api b/Dockerfile.api index 36354778f7..8dc4d0972b 100644 --- a/Dockerfile.api +++ b/Dockerfile.api @@ -16,7 +16,7 @@ WORKDIR /code/api ARG RELEASE_VERSION ARG GITHUB_SHA -RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${PLATFORM} go build -o /code/api/dist/happy-api -ldflags "-w -s -X github.com/chanzuckerberg/happy/shared/util.ReleaseGitSha=${GITHUB_SHA} -X github.com/chanzuckerberg/happy/shared/util.ReleaseVersion=${RELEASE_VERSION}" +RUN --mount=type=cache,mode=0755,target=/go/pkg/mod GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=${PLATFORM} go build -o /code/api/dist/happy-api -ldflags "-w -s -X github.com/chanzuckerberg/happy/shared/util.ReleaseGitSha=${GITHUB_SHA} -X github.com/chanzuckerberg/happy/shared/util.ReleaseVersion=${RELEASE_VERSION}" # -------------------------------------------------------------------------------------------------- diff --git a/api/.gitignore b/api/.gitignore index f80cc9f4ab..374e254c7e 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -1,5 +1,7 @@ gorm.db +hapi.db happy-api -api +/api .vscode/ +node_modules/ diff --git a/api/Makefile b/api/Makefile index a598ee5733..23aeb97d1b 100644 --- a/api/Makefile +++ b/api/Makefile @@ -23,6 +23,12 @@ clean-dist: ## Removing dist directory dev: ## Run app in development mode with current working directory as config @CONFIG_YAML_DIRECTORY=./ TZ=utc APP_ENV=development aws-oidc exec --profile czi-si-readonly -- chamber exec happy-ldev-hapi -- go run main.go +dev-docker: + aws-oidc exec --profile czi-si-readonly -- chamber exec happy-ldev-hapi -- docker-compose --profile hapi up --build + +dev-db-shell: + docker exec -it api-hapi-1 /tools/db-shell.sh + test: ## Run tests for API @CONFIG_YAML_DIRECTORY=../.. TZ=utc APP_ENV=test go test ./... -run ^$(name) @@ -36,5 +42,6 @@ update-docs: ## Update swagger docs docker: ## Build docker image using scratch and Dockerfile.api in root project directory pushd ../ && docker build -t happy-api:dev -f Dockerfile.api . -docker-dev: - aws-oidc exec --profile czi-si-readonly -- chamber exec happy-ldev-hapi -- docker-compose --profile hapi up --build +update-ent-schema: + ## This will update the ent schema and regenerate the ent code. We need to run `go mod tidy` after the fact to update the go.mod file + go generate ./pkg/ent && go mod tidy diff --git a/api/app-config.development.yaml b/api/app-config.development.yaml index 5d239998d5..8efe513979 100644 --- a/api/app-config.development.yaml +++ b/api/app-config.development.yaml @@ -7,6 +7,6 @@ auth: # - client_id: "k8s-test-app-rdev-happy-service-account" # issuer_url: "https://czi-prod.okta.com/oauth2/aus8a6q70ndVGTrhp5d7" database: - driver: sqlite - data_source_name: gorm.db + driver: sqlite3 + data_source_name: hapi.db?_fk=1 log_level: info diff --git a/api/app-config.docker-dev.yaml b/api/app-config.docker-dev.yaml index a364929501..2e1be747e9 100644 --- a/api/app-config.docker-dev.yaml +++ b/api/app-config.docker-dev.yaml @@ -2,3 +2,5 @@ auth: enable: false database: log_level: info + driver: postgres + data_source_name: host={{.HAPPY_DATABASE_HOST}} user={{.HAPPY_DATABASE_USER}} password={{.HAPPY_DATABASE_PASSWORD}} port={{.HAPPY_DATABASE_PORT}} dbname={{.HAPPY_DATABASE_NAME}} sslmode=disable diff --git a/api/app-config.test.yaml b/api/app-config.test.yaml index d3beb7dbb2..6452187cc3 100644 --- a/api/app-config.test.yaml +++ b/api/app-config.test.yaml @@ -3,6 +3,6 @@ auth: api: log_level: silent database: - driver: sqlite + driver: sqlite3 data_source_name: ":memory:" log_level: silent diff --git a/api/docker-compose.yml b/api/docker-compose.yml index b38af3be38..de1a27d3e8 100644 --- a/api/docker-compose.yml +++ b/api/docker-compose.yml @@ -29,14 +29,16 @@ services: profiles: - hapi restart: always + command: postgres -c 'max_connections=500' ports: - 5432:5432 environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=REPLACEME - POSTGRES_DB=postgres + - PGPASSWORD=REPLACEME healthcheck: test: [ "CMD-SHELL", "pg_isready -d postgres" ] - interval: 10s - timeout: 5s - retries: 5 + interval: 3s + timeout: 3s + retries: 10 diff --git a/api/go.mod b/api/go.mod index 000170c5bc..866f419542 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,6 +3,7 @@ module github.com/chanzuckerberg/happy/api go 1.20 require ( + entgo.io/ent v0.12.4 github.com/aws/aws-sdk-go-v2 v1.21.1 github.com/aws/aws-sdk-go-v2/config v1.18.44 github.com/blang/semver v3.5.1+incompatible @@ -19,6 +20,8 @@ require ( github.com/google/uuid v1.3.1 github.com/hashicorp/go-multierror v1.1.1 github.com/hetiansu5/urlquery v1.2.7 + github.com/lib/pq v1.10.9 + github.com/mattn/go-sqlite3 v1.14.17 github.com/mitchellh/mapstructure v1.5.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.17.0 @@ -29,12 +32,11 @@ require ( github.com/swaggo/swag v1.16.2 github.com/valyala/fasthttp v1.50.0 gopkg.in/yaml.v3 v3.0.1 - gorm.io/driver/postgres v1.5.2 - gorm.io/driver/sqlite v1.5.2 - gorm.io/gorm v1.25.3 + gorm.io/gorm v1.25.4 ) require ( + ariga.io/atlas v0.14.1-0.20230918065911-83ad451a4935 // indirect cirello.io/dynamolock/v2 v2.0.2 // indirect github.com/AlecAivazis/survey/v2 v2.3.7 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect @@ -83,6 +85,7 @@ require ( github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/go-jose/go-jose/v3 v3.0.0 // indirect github.com/go-logr/logr v1.2.4 // indirect + github.com/go-openapi/inflect v0.19.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/spec v0.20.9 // indirect @@ -106,9 +109,6 @@ require ( github.com/hashicorp/terraform-config-inspect v0.0.0-20230522202058-dbe9bfcbfe7a // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect - github.com/jackc/pgx/v5 v5.3.1 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jeremywohl/flatten v1.0.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect @@ -129,7 +129,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect - github.com/mattn/go-sqlite3 v1.14.17 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -197,13 +196,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -// this version was causing errors in the sqlite driver (eg: "cannot convert 0 (untyped int constant) to *int") -exclude gorm.io/gorm v1.24.0 - -exclude gorm.io/gorm v1.25.0 - replace github.com/chanzuckerberg/happy/shared v0.0.0 => ../shared - -replace gorm.io/gorm => gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11 - -replace gorm.io/driver/sqlite => gorm.io/driver/sqlite v1.4.4 diff --git a/api/go.sum b/api/go.sum index 4ac7a3c677..1b6551cde6 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,3 +1,5 @@ +ariga.io/atlas v0.14.1-0.20230918065911-83ad451a4935 h1:JnYs/y8RJ3+MiIUp+3RgyyeO48VHLAZimqiaZYnMKk8= +ariga.io/atlas v0.14.1-0.20230918065911-83ad451a4935/go.mod h1:isZrlzJ5cpoCoKFoY9knZug7Lq4pP1cm8g3XciLZ0Pw= cirello.io/dynamolock/v2 v2.0.2 h1:4AEs4218aQLB9NfMMc/B9nmPrZZkrDNZXOgMUC0l/As= cirello.io/dynamolock/v2 v2.0.2/go.mod h1:kC31fXt8CEX0colxFT/4r9RRKfhZLG0PFrJJXM5A24w= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -38,12 +40,15 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +entgo.io/ent v0.12.4 h1:LddPnAyxls/O7DTXZvUGDj0NZIdGSu317+aoNLJWbD8= +entgo.io/ent v0.12.4/go.mod h1:Y3JVAjtlIk8xVZYSn3t3mf8xlZIn5SAOXZQxD6kKI+Q= github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= @@ -218,6 +223,8 @@ github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxF github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4= +github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= @@ -365,12 +372,6 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= -github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= -github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU= -github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jeremywohl/flatten v1.0.1 h1:LrsxmB3hfwJuE+ptGOijix1PIfOoKLJ3Uee/mzbgtrs= @@ -419,6 +420,8 @@ github.com/lensesio/tableprinter v0.0.0-20201125135848-89e81fc956e7 h1:k/1ku0yeh github.com/lensesio/tableprinter v0.0.0-20201125135848-89e81fc956e7/go.mod h1:YR/zYthNdWfO8+0IOyHDcIDBBBS2JMnYUIwSsnwmRqU= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/machinebox/graphql v0.2.2 h1:dWKpJligYKhYKO5A2gvNhkJdQMNZeChZYyBbrZkBZfo= github.com/machinebox/graphql v0.2.2/go.mod h1:F+kbVMHuwrQ5tYgU9JXlnskM8nOaFxCAEolaQybkjWA= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= @@ -438,7 +441,6 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= @@ -967,12 +969,8 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/postgres v1.5.2 h1:ytTDxxEv+MplXOfFe3Lzm7SjG09fcdb3Z/c056DTBx0= -gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBpCgl8= -gorm.io/driver/sqlite v1.4.4 h1:gIufGoR0dQzjkyqDyYSCvsYR6fba1Gw5YKDqKeChxFc= -gorm.io/driver/sqlite v1.4.4/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI= -gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11 h1:9qNbmu21nNThCNnF5i2R3kw2aL27U8ZwbzccNjOmW0g= -gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw= +gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/api/pkg/api/app.go b/api/pkg/api/app.go index eed8a5fb86..ebcddda108 100644 --- a/api/pkg/api/app.go +++ b/api/pkg/api/app.go @@ -38,6 +38,10 @@ func MakeAPIApplication(cfg *setup.Configuration) *APIApplication { func MakeApp(ctx context.Context, cfg *setup.Configuration) *APIApplication { db := dbutil.MakeDB(cfg.Database) + return MakeAppWithDB(ctx, cfg, db) +} + +func MakeAppWithDB(ctx context.Context, cfg *setup.Configuration, db *dbutil.DB) *APIApplication { apiApp := MakeAPIApplication(cfg).WithDatabase(db) apiApp.FiberApp.Use(requestid.New()) apiApp.FiberApp.Use(cors.New(cors.Config{ diff --git a/api/pkg/api/app_test.go b/api/pkg/api/app_test.go index 59c7f058bd..cb00a47b5a 100644 --- a/api/pkg/api/app_test.go +++ b/api/pkg/api/app_test.go @@ -6,18 +6,33 @@ import ( "fmt" "io" "net/http/httptest" + "sync" "testing" "github.com/blang/semver" + "github.com/chanzuckerberg/happy/api/pkg/dbutil" + "github.com/chanzuckerberg/happy/api/pkg/ent/enttest" "github.com/chanzuckerberg/happy/api/pkg/request" "github.com/chanzuckerberg/happy/api/pkg/setup" "github.com/gofiber/fiber/v2" + "github.com/google/uuid" "github.com/stretchr/testify/require" ) -func MakeTestApp(r *require.Assertions) *APIApplication { +var ( + mu sync.Mutex +) + +func MakeTestApp(t *testing.T) *APIApplication { cfg := setup.GetConfiguration() - app := MakeApp(context.Background(), cfg) + + // Even with a UUID in the data source name this is not thread safe so we need to use a mutex to prevent concurrent access + mu.Lock() + client := enttest.Open(t, "sqlite3", fmt.Sprintf("file:memdb%s?mode=memory&cache=shared&_fk=1", uuid.NewString())) + mu.Unlock() + + testDB := dbutil.MakeDB(cfg.Database).WithClient(client) + app := MakeAppWithDB(context.Background(), cfg, testDB) return app } @@ -55,7 +70,7 @@ func TestVersionCheckSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) req := httptest.NewRequest("GET", "/versionCheck", nil) req.Header.Set(fiber.HeaderUserAgent, tc.userAgent) @@ -102,7 +117,7 @@ func TestVersionCheckFail(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) req := httptest.NewRequest("GET", "/versionCheck", nil) req.Header.Set(fiber.HeaderUserAgent, tc.userAgent) diff --git a/api/pkg/api/config_group_test.go b/api/pkg/api/config_group_test.go index 672eec6f4b..b8cec7fb5c 100644 --- a/api/pkg/api/config_group_test.go +++ b/api/pkg/api/config_group_test.go @@ -144,7 +144,7 @@ func TestSetConfigRouteSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) respBody := makeSuccessfulRequest(app.FiberApp, "POST", "/v1/configs", tc.reqBody, r) @@ -223,7 +223,7 @@ func TestSetConfigRouteFailure(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) respBody := makeInvalidRequest(app.FiberApp, "POST", "/v1/configs", tc.reqBody, r) @@ -294,7 +294,7 @@ func TestSetConfigRouteFailsWithMalformedValue(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) respBody := makeInvalidRequest(app.FiberApp, "POST", "/v1/configs", tc.reqBody, r) @@ -374,7 +374,7 @@ func TestGetConfigRouteSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) for _, input := range tc.seeds { _, err := cmd.MakeConfig(app.DB).SetConfigValue(input) @@ -441,7 +441,7 @@ func TestDeleteConfigRouteSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) for _, input := range tc.seeds { _, err := cmd.MakeConfig(app.DB).SetConfigValue(input) @@ -460,7 +460,8 @@ func TestDeleteConfigRouteSucceed(t *testing.T) { _, updatedAtPresent := record["updated_at"] r.Equal(true, updatedAtPresent) - for _, key := range []string{"id", "created_at", "updated_at", "deleted_at"} { + delete(record, "deleted_at") // ignore this, might implement soft deletes later + for _, key := range []string{"id", "created_at", "updated_at"} { r.NotNil(record[key]) delete(record, key) } @@ -524,7 +525,7 @@ func TestGetAllConfigsRouteSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) for _, input := range tc.seeds { _, err := cmd.MakeConfig(app.DB).SetConfigValue(input) @@ -604,7 +605,7 @@ func TestCopyConfigRouteSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) for _, input := range tc.seeds { _, err := cmd.MakeConfig(app.DB).SetConfigValue(input) @@ -707,7 +708,7 @@ func TestCopyConfigRouteFail(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) respBody := makeInvalidRequest(app.FiberApp, "POST", "/v1/config/copy", tc.reqBody, r) @@ -824,7 +825,7 @@ func TestCopyDiffRouteSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - app := MakeTestApp(r) + app := MakeTestApp(t) for _, input := range tc.seeds { _, err := cmd.MakeConfig(app.DB).SetConfigValue(input) diff --git a/api/pkg/cmd/cmd_test.go b/api/pkg/cmd/cmd_test.go index 83059a0e63..2cab382842 100644 --- a/api/pkg/cmd/cmd_test.go +++ b/api/pkg/cmd/cmd_test.go @@ -1,12 +1,27 @@ package cmd import ( + "fmt" + "sync" + "testing" + "github.com/chanzuckerberg/happy/api/pkg/dbutil" + "github.com/chanzuckerberg/happy/api/pkg/ent/enttest" "github.com/chanzuckerberg/happy/api/pkg/setup" - "github.com/stretchr/testify/require" + "github.com/google/uuid" +) + +var ( + mu sync.Mutex ) -func MakeTestDB(r *require.Assertions) *dbutil.DB { +func MakeTestDB(t *testing.T) *dbutil.DB { config := setup.GetConfiguration() - return dbutil.MakeDB(config.Database) + + // Even with a UUID in the data source name this is not thread safe so we need to use a mutex to prevent concurrent access + mu.Lock() + client := enttest.Open(t, "sqlite3", fmt.Sprintf("file:memdb%s?mode=memory&cache=shared&_fk=1", uuid.NewString())) + mu.Unlock() + + return dbutil.MakeDB(config.Database).WithClient(client) } diff --git a/api/pkg/cmd/config.go b/api/pkg/cmd/config.go index 5af1a9ae22..3ce616f99e 100644 --- a/api/pkg/cmd/config.go +++ b/api/pkg/cmd/config.go @@ -1,13 +1,15 @@ package cmd import ( + "context" + "github.com/chanzuckerberg/happy/api/pkg/dbutil" - "github.com/chanzuckerberg/happy/api/pkg/utils" + "github.com/chanzuckerberg/happy/api/pkg/ent" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" "github.com/chanzuckerberg/happy/shared/model" "github.com/pkg/errors" "github.com/samber/lo" "gorm.io/gorm" - "gorm.io/gorm/clause" ) type Config interface { @@ -32,203 +34,219 @@ func MakeConfig(db *dbutil.DB) Config { } } +func MakeAppConfigFromEnt(in *ent.AppConfig) *model.AppConfig { + deletedAt := gorm.DeletedAt{ + Valid: false, + } + if in.DeletedAt != nil { + deletedAt.Valid = true + deletedAt.Time = *in.DeletedAt + } + return &model.AppConfig{ + CommonDBFields: model.CommonDBFields{ + ID: in.ID, + CreatedAt: in.CreatedAt, + UpdatedAt: in.UpdatedAt, + DeletedAt: deletedAt, + }, + AppConfigPayload: *model.NewAppConfigPayload(in.AppName, in.Environment, in.Stack, in.Key, in.Value), + } +} + func (c *dbConfig) SetConfigValue(payload *model.AppConfigPayload) (*model.AppConfig, error) { db := c.DB.GetDB() - record := model.AppConfig{AppConfigPayload: *payload} - res := db.Clauses(clause.OnConflict{ - // in order to make this ON CONFLICT work we must not allow nulls for - // stack values when dealing with an environment-level config, - // thus the stack column defaults to empty string and enforces NOT NULL - Columns: []clause.Column{ - {Name: "app_name"}, - {Name: "environment"}, - {Name: "stack"}, - {Name: "key"}, - }, - UpdateAll: true, - }).Create(&record) + ctx := context.Background() + tx, err := db.Tx(ctx) + if err != nil { + return nil, errors.Wrap(err, "[SetConfigValue] starting transaction failed") + } - return &record, res.Error -} + err = tx.AppConfig.Create(). + SetAppName(payload.AppName). + SetEnvironment(payload.Environment). + SetStack(payload.Stack). + SetKey(payload.Key). + SetValue(payload.Value). + OnConflictColumns(appconfig.FieldAppName, appconfig.FieldEnvironment, appconfig.FieldStack, appconfig.FieldKey). + UpdateNewValues(). + Exec(ctx) + if err != nil { + return nil, rollback(tx, errors.Wrap(err, "[SetConfigValue] unable to create app config")) + } -// Returns env-level and stack-level configs for the given app and env -func (c *dbConfig) GetAllAppConfigs(payload *model.AppMetadata) ([]*model.AppConfig, error) { - var records []*model.AppConfig - criteria, err := utils.StructToMap(payload) + record, err := appEnvScopedQuery(tx.AppConfig, &payload.AppMetadata). + Where( + appconfig.Stack(payload.Stack), + appconfig.Key(payload.Key), + ).Only(ctx) if err != nil { - return nil, err + return nil, rollback(tx, errors.Wrap(err, "[SetConfigValue] unable to query app config")) } - delete(criteria, "stack") + err = tx.Commit() + return MakeAppConfigFromEnt(record), err +} + +// Returns all env-level and stack-level configs for the given app and env (no overrides applied) +func (c *dbConfig) GetAllAppConfigs(payload *model.AppMetadata) ([]*model.AppConfig, error) { db := c.DB.GetDB() - res := db.Where(criteria).Find(&records) + records, err := appEnvScopedQuery(db.AppConfig, payload).All(context.Background()) + if err != nil { + return nil, errors.Wrap(err, "[GetAllAppConfigs] unable to query app configs") + } - return records, res.Error + return entArrayToSharedModelArray(records), nil } // Returns only env-level configs for the given app and env func (c *dbConfig) GetAppConfigsForEnv(payload *model.AppMetadata) ([]*model.ResolvedAppConfig, error) { - var records []*model.AppConfig - criteria, err := utils.StructToMap(payload) + db := c.DB.GetDB() + records, err := appEnvScopedQuery(db.AppConfig, payload). + Where(appconfig.Stack("")). + All(context.Background()) if err != nil { - return nil, err + return nil, errors.Wrap(err, "[GetAppConfigsForEnv] unable to query app configs") } - criteria["stack"] = "" - db := c.DB.GetDB() - res := db.Where(criteria).Find(&records) - if res.Error != nil { - return nil, res.Error + results := entArrayToSharedModelArray(records) + resolvedResults := []*model.ResolvedAppConfig{} + for _, result := range results { + resolvedResults = append(resolvedResults, model.NewResolvedAppConfig(result)) } - return createResolvedAppConfigs(&records, "environment"), nil + return resolvedResults, nil } -// Returns only stack-level configs for the given app, env, and stack +// Returns resolved stack-level configs for the given app, env, and stack (with overrides applied) func (c *dbConfig) GetAppConfigsForStack(payload *model.AppMetadata) ([]*model.ResolvedAppConfig, error) { - envConfigs, err := c.GetAppConfigsForEnv(payload) + // get all appconfigs for the app/env and order by key, then by stack DESC. Take the first item for each key + db := c.DB.GetDB() + records, err := appEnvScopedQuery(db.AppConfig, payload). + Where(appconfig.StackIn(payload.Stack, "")). + Order(ent.Asc(appconfig.FieldKey), ent.Desc(appconfig.FieldStack)). + All(context.Background()) if err != nil { return nil, err } - criteria, err := utils.StructToMap(payload) - if err != nil { - return nil, err - } - stackConfigs := []*model.ResolvedAppConfig{} - if _, ok := criteria["stack"]; ok { - var records []*model.AppConfig - db := c.DB.GetDB() - res := db.Where(criteria).Find(&records) - if res.Error != nil { - return nil, res.Error + // we'll get at most 2 config records for each key (one for env and one for stack), so we'll use a map to dedupe + // and select the stack record if it exists (since we order by stack DESC) and the env record otherwise + resolvedMap := map[string]*ent.AppConfig{} + for _, record := range records { + if _, ok := resolvedMap[record.Key]; !ok { + resolvedMap[record.Key] = record } - stackConfigs = createResolvedAppConfigs(&records, "stack") } - resolvedConfigs := []*model.ResolvedAppConfig{} - for _, cfg := range envConfigs { - stackOverrideIdx := findInStackConfigs(&stackConfigs, cfg.Key) - - if stackOverrideIdx >= 0 { - cfg = stackConfigs[stackOverrideIdx] - // reomve the item from the slice - stackConfigs = append(stackConfigs[:stackOverrideIdx], stackConfigs[stackOverrideIdx+1:]...) - } - resolvedConfigs = append(resolvedConfigs, cfg) + results := []*model.ResolvedAppConfig{} + for _, record := range resolvedMap { + results = append(results, model.NewResolvedAppConfig(MakeAppConfigFromEnt(record))) } - resolvedConfigs = append(resolvedConfigs, stackConfigs...) - return resolvedConfigs, nil + return results, nil } -func createResolvedAppConfigs(records *[]*model.AppConfig, source string) []*model.ResolvedAppConfig { - cfgs := []*model.ResolvedAppConfig{} - for _, record := range *records { - cfgs = append( - cfgs, - &model.ResolvedAppConfig{AppConfig: *record, Source: source}, - ) - } - return cfgs +func appEnvScopedQuery(client *ent.AppConfigClient, payload *model.AppMetadata) *ent.AppConfigQuery { + return client.Query().Where( + appconfig.AppName(payload.AppName), + appconfig.Environment(payload.Environment), + ) } -func findInStackConfigs(stackConfigs *[]*model.ResolvedAppConfig, key string) int { - stackOverrideIdx := -1 - for idx := range *stackConfigs { - if (*stackConfigs)[idx].Key == key { - stackOverrideIdx = idx - break - } +// rollback calls to tx.Rollback and wraps the given error +// with the rollback error if occurred. +func rollback(tx *ent.Tx, err error) error { + if rerr := tx.Rollback(); rerr != nil { + err = errors.Wrap(err, "[rollback] unable to rollback transaction") + err = errors.Wrap(err, rerr.Error()) } - return stackOverrideIdx + return err } -func (c *dbConfig) GetResolvedAppConfig(payload *model.AppConfigLookupPayload) (*model.ResolvedAppConfig, error) { - criteria, err := utils.StructToMap(payload) - if err != nil { - return nil, err - } - - if _, ok := criteria["stack"]; ok { - record, err := c.getAppConfig(&criteria) - if err != nil { - return nil, err - } - if record != nil { - return &model.ResolvedAppConfig{AppConfig: *record, Source: "stack"}, nil - } - } - - criteria["stack"] = "" - record, err := c.getAppConfig(&criteria) - if err != nil { - return nil, err - } - if record != nil { - return &model.ResolvedAppConfig{AppConfig: *record, Source: "environment"}, nil +func entArrayToSharedModelArray(records []*ent.AppConfig) []*model.AppConfig { + results := make([]*model.AppConfig, len(records)) + for idx, record := range records { + results[idx] = MakeAppConfigFromEnt(record) } - - return nil, nil + return results } -func (c *dbConfig) getAppConfig(criteria *map[string]interface{}) (*model.AppConfig, error) { - record := &model.AppConfig{} +func (c *dbConfig) GetResolvedAppConfig(payload *model.AppConfigLookupPayload) (*model.ResolvedAppConfig, error) { db := c.DB.GetDB() - res := db.Where(*criteria).First(record) - if res.Error != nil && !errors.Is(res.Error, gorm.ErrRecordNotFound) { - return nil, res.Error + records, err := appEnvScopedQuery(db.AppConfig, &payload.AppMetadata). + Where( + appconfig.Key(payload.Key), + appconfig.StackIn(payload.Stack, ""), + ). + Order(ent.Desc(appconfig.FieldStack)). + All(context.Background()) + if err != nil { + return nil, errors.Wrap(err, "[GetResolvedAppConfig] unable to query app configs") } - if res.RowsAffected == 0 { + + if len(records) == 0 { return nil, nil } - return record, nil + // at most 2 records are defined and since we order by stack DESC, the first record is the stack-specific one if it exists + result := MakeAppConfigFromEnt(records[0]) + return model.NewResolvedAppConfig(result), nil } func (c *dbConfig) DeleteAppConfig(payload *model.AppConfigLookupPayload) (*model.AppConfig, error) { - criteria, err := utils.StructToMap(payload) + db := c.DB.GetDB() + ctx := context.Background() + tx, err := db.Tx(ctx) if err != nil { - return nil, err + return nil, errors.Wrap(err, "[DeleteAppConfig] starting transaction failed") } - if _, ok := criteria["stack"]; !ok { - criteria["stack"] = "" - } - db := c.DB.GetDB() - record := &model.AppConfig{} - res := db.Clauses(clause.Returning{}).Where(criteria).Delete(record) - if res.Error != nil { - return nil, res.Error + records, err := appEnvScopedQuery(tx.AppConfig, &payload.AppMetadata).Where( + appconfig.AppName(payload.AppName), + appconfig.Environment(payload.Environment), + appconfig.Stack(payload.Stack), + appconfig.Key(payload.Key), + ).All(ctx) + if err != nil { + return nil, errors.Wrap(err, "[DeleteAppConfig] unable to query app configs") } - if res.RowsAffected == 0 { + + if len(records) == 0 { return nil, nil } - return record, nil -} -func (c *dbConfig) CopyAppConfig(payload *model.CopyAppConfigPayload) (*model.AppConfig, error) { - srcAppConfigPayload := model.NewAppConfigLookupPayload(payload.AppName, payload.SrcEnvironment, payload.SrcStack, payload.Key) - // GORM won't include "stack" in the generated WHERE clause if it's unset, so we need to convert to a map then manually set the stack - criteria, err := utils.StructToMap(srcAppConfigPayload) + record := records[0] + err = tx.AppConfig.DeleteOne(record).Exec(ctx) if err != nil { - return nil, err + return nil, rollback(tx, errors.Wrap(err, "[DeleteAppConfig] unable to delete app config")) } - criteria["stack"] = payload.SrcStack + err = tx.Commit() + return MakeAppConfigFromEnt(record), err +} - record, err := c.getAppConfig(&criteria) - if err != nil || record == nil { +func (c *dbConfig) CopyAppConfig(payload *model.CopyAppConfigPayload) (*model.AppConfig, error) { + db := c.DB.GetDB() + srcRecords, err := db.AppConfig.Query(). + Where( + appconfig.AppName(payload.AppName), + appconfig.Environment(payload.SrcEnvironment), + appconfig.Stack(payload.SrcStack), + appconfig.Key(payload.Key), + ). + All(context.Background()) + if err != nil || len(srcRecords) == 0 { return nil, err } - record, err = c.SetConfigValue( - model.NewAppConfigPayload(payload.AppName, payload.DstEnvironment, payload.DstStack, payload.Key, record.Value), + srcRecord := srcRecords[0] + resultRecord, err := c.SetConfigValue( + model.NewAppConfigPayload(payload.AppName, payload.DstEnvironment, payload.DstStack, payload.Key, srcRecord.Value), ) if err != nil { return nil, err } - return record, nil + return resultRecord, nil } // returns array of keys that are present in Src and not in Dst diff --git a/api/pkg/cmd/config_test.go b/api/pkg/cmd/config_test.go index b1cb423ab6..b7868a1589 100644 --- a/api/pkg/cmd/config_test.go +++ b/api/pkg/cmd/config_test.go @@ -1,6 +1,7 @@ package cmd import ( + "context" "fmt" "testing" @@ -107,7 +108,7 @@ func TestSetConfigValueSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - db := MakeTestDB(r) + db := MakeTestDB(t) err := db.AutoMigrate() r.NoError(err) @@ -116,12 +117,11 @@ func TestSetConfigValueSucceed(t *testing.T) { r.NoError(err) } - configs := []*model.AppConfig{} - db.GetDB().Find(&configs) + configs := db.GetDB().AppConfig.Query().AllX(context.Background()) results := []*model.AppConfigPayload{} for _, config := range configs { - results = append(results, &config.AppConfigPayload) + results = append(results, model.NewAppConfigPayload(config.AppName, config.Environment, config.Stack, config.Key, config.Value)) } r.EqualValues(results, tc.expected) @@ -218,7 +218,7 @@ func TestGetAppConfigSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - db := MakeTestDB(r) + db := MakeTestDB(t) err := db.AutoMigrate() r.NoError(err) @@ -296,7 +296,7 @@ func TestDeleteAppConfigSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - db := MakeTestDB(r) + db := MakeTestDB(t) err := db.AutoMigrate() r.NoError(err) @@ -314,12 +314,11 @@ func TestDeleteAppConfigSucceed(t *testing.T) { r.EqualValues(result.AppConfigPayload, *tc.expectedResult) } - configs := []*model.AppConfig{} - db.GetDB().Find(&configs) + configs := db.GetDB().AppConfig.Query().AllX(context.Background()) results := []*model.AppConfigPayload{} for _, config := range configs { - results = append(results, &config.AppConfigPayload) + results = append(results, model.NewAppConfigPayload(config.AppName, config.Environment, config.Stack, config.Key, config.Value)) } r.EqualValues(results, tc.remainingConfigs) @@ -375,7 +374,7 @@ func TestGetAllAppConfigsSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - db := MakeTestDB(r) + db := MakeTestDB(t) err := db.AutoMigrate() r.NoError(err) @@ -443,7 +442,7 @@ func TestGetAppConfigsForEnvSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - db := MakeTestDB(r) + db := MakeTestDB(t) err := db.AutoMigrate() r.NoError(err) @@ -539,7 +538,7 @@ func TestGetAppConfigsForStackSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - db := MakeTestDB(r) + db := MakeTestDB(t) err := db.AutoMigrate() r.NoError(err) @@ -647,7 +646,7 @@ func TestCopyAppConfigSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - db := MakeTestDB(r) + db := MakeTestDB(t) err := db.AutoMigrate() r.NoError(err) @@ -659,12 +658,11 @@ func TestCopyAppConfigSucceed(t *testing.T) { _, err = MakeConfig(db).CopyAppConfig(tc.copyPayload) r.NoError(err) - configs := []*model.AppConfig{} - db.GetDB().Find(&configs) + configs := db.GetDB().AppConfig.Query().AllX(context.Background()) results := []*model.AppConfigPayload{} for _, config := range configs { - results = append(results, &config.AppConfigPayload) + results = append(results, model.NewAppConfigPayload(config.AppName, config.Environment, config.Stack, config.Key, config.Value)) } r.EqualValues(tc.expected, results) @@ -726,7 +724,7 @@ func TestAppConfigDiffSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - db := MakeTestDB(r) + db := MakeTestDB(t) err := db.AutoMigrate() r.NoError(err) @@ -813,7 +811,7 @@ func TestCopyAppConfigDiffSucceed(t *testing.T) { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { t.Parallel() r := require.New(t) - db := MakeTestDB(r) + db := MakeTestDB(t) err := db.AutoMigrate() r.NoError(err) @@ -825,15 +823,14 @@ func TestCopyAppConfigDiffSucceed(t *testing.T) { _, err = MakeConfig(db).CopyAppConfigDiff(tc.diffPayload) r.NoError(err) - configs := []*model.AppConfig{} - db.GetDB().Find(&configs) + configs := db.GetDB().AppConfig.Query().AllX(context.Background()) results := []*model.AppConfigPayload{} for _, config := range configs { - results = append(results, &config.AppConfigPayload) + results = append(results, model.NewAppConfigPayload(config.AppName, config.Environment, config.Stack, config.Key, config.Value)) } - r.EqualValues(tc.expected, results) + r.ElementsMatch(tc.expected, results) }) } } diff --git a/api/pkg/dbutil/db.go b/api/pkg/dbutil/db.go index f28b6044fa..37af50490a 100644 --- a/api/pkg/dbutil/db.go +++ b/api/pkg/dbutil/db.go @@ -1,51 +1,21 @@ package dbutil import ( - "fmt" + "context" + "log" "sync" + "github.com/chanzuckerberg/happy/api/pkg/ent" + _ "github.com/chanzuckerberg/happy/api/pkg/ent/runtime" "github.com/chanzuckerberg/happy/api/pkg/setup" - "github.com/chanzuckerberg/happy/shared/model" - "github.com/google/uuid" - "github.com/sirupsen/logrus" - "gorm.io/driver/postgres" - "gorm.io/driver/sqlite" - "gorm.io/gorm" - "gorm.io/gorm/logger" + _ "github.com/lib/pq" + _ "github.com/mattn/go-sqlite3" ) type DB struct { - once sync.Once - dbConnection *gorm.DB - Config setup.DatabaseConfiguration -} - -func resolveDriver(dbCfg setup.DatabaseConfiguration) gorm.Dialector { - switch dbCfg.Driver { - case setup.Sqlite: - if dbCfg.DataSourceName == ":memory:" { - return sqlite.Open(fmt.Sprintf("file:memdb%s?mode=memory&cache=shared", uuid.NewString())) - } - return sqlite.Open(dbCfg.DataSourceName) - case setup.Postgres: - return postgres.Open(dbCfg.DataSourceName) - default: - logrus.Fatal("Configuration did not provide valid database driver and data_source_name") - } - return nil -} - -func resolveLogLevel(dbCfg setup.DatabaseConfiguration) logger.LogLevel { - switch dbCfg.LogLevel { - case "error": - return logger.Error - case "warn": - return logger.Warn - case "silent": - return logger.Silent - default: - return logger.Info - } + once sync.Once + dbClient *ent.Client + Config setup.DatabaseConfiguration } // MakeDB returns a pointer because we store sync.Once inside it @@ -57,28 +27,37 @@ func MakeDB(cfg setup.DatabaseConfiguration) *DB { return db } -func (d *DB) GetDB() *gorm.DB { +func (d *DB) WithClient(client *ent.Client) *DB { + d.dbClient = client + return d +} + +func (d *DB) GetDB() *ent.Client { d.once.Do(func() { + // if this was set with WithClient we do not want to override it + if d.dbClient != nil { + return + } + + opts := []ent.Option{} + if d.Config.LogLevel == "debug" { + opts = append(opts, ent.Debug()) + } + var err error - d.dbConnection, err = gorm.Open(resolveDriver(d.Config), &gorm.Config{ - Logger: logger.Default.LogMode(logger.LogLevel(resolveLogLevel(d.Config))), - }) + d.dbClient, err = ent.Open(d.Config.Driver.String(), d.Config.DataSourceName, opts...) if err != nil { - logrus.Fatal("Failed to connect to the DB") + log.Fatalf("ENT failed to connect to the DB: %v", err) } }) - return d.dbConnection -} - -// To get a new table added to the DB, add the model to this list -func allModels() []interface{} { - return []interface{}{ - model.AppConfig{}, - } + return d.dbClient } func (d *DB) AutoMigrate() error { - db := d.GetDB() - return db.AutoMigrate(allModels()...) + client := d.GetDB() + ctx := context.Background() + + // Run the auto migration tool. + return client.Schema.Create(ctx) } diff --git a/api/pkg/ent/appconfig.go b/api/pkg/ent/appconfig.go new file mode 100644 index 0000000000..53999088dd --- /dev/null +++ b/api/pkg/ent/appconfig.go @@ -0,0 +1,186 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "fmt" + "strings" + "time" + + "entgo.io/ent" + "entgo.io/ent/dialect/sql" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" +) + +// AppConfig is the model entity for the AppConfig schema. +type AppConfig struct { + config `json:"-"` + // ID of the ent. + ID uint `json:"id,omitempty"` + // CreatedAt holds the value of the "created_at" field. + CreatedAt time.Time `json:"created_at,omitempty"` + // UpdatedAt holds the value of the "updated_at" field. + UpdatedAt time.Time `json:"updated_at,omitempty"` + // DeletedAt holds the value of the "deleted_at" field. + DeletedAt *time.Time `json:"deleted_at,omitempty"` + // AppName holds the value of the "app_name" field. + AppName string `json:"app_name,omitempty"` + // Environment holds the value of the "environment" field. + Environment string `json:"environment,omitempty"` + // Stack holds the value of the "stack" field. + Stack string `json:"stack,omitempty"` + // Key holds the value of the "key" field. + Key string `json:"key,omitempty"` + // Value holds the value of the "value" field. + Value string `json:"value,omitempty"` + selectValues sql.SelectValues +} + +// scanValues returns the types for scanning values from sql.Rows. +func (*AppConfig) scanValues(columns []string) ([]any, error) { + values := make([]any, len(columns)) + for i := range columns { + switch columns[i] { + case appconfig.FieldID: + values[i] = new(sql.NullInt64) + case appconfig.FieldAppName, appconfig.FieldEnvironment, appconfig.FieldStack, appconfig.FieldKey, appconfig.FieldValue: + values[i] = new(sql.NullString) + case appconfig.FieldCreatedAt, appconfig.FieldUpdatedAt, appconfig.FieldDeletedAt: + values[i] = new(sql.NullTime) + default: + values[i] = new(sql.UnknownType) + } + } + return values, nil +} + +// assignValues assigns the values that were returned from sql.Rows (after scanning) +// to the AppConfig fields. +func (ac *AppConfig) assignValues(columns []string, values []any) error { + if m, n := len(values), len(columns); m < n { + return fmt.Errorf("mismatch number of scan values: %d != %d", m, n) + } + for i := range columns { + switch columns[i] { + case appconfig.FieldID: + value, ok := values[i].(*sql.NullInt64) + if !ok { + return fmt.Errorf("unexpected type %T for field id", value) + } + ac.ID = uint(value.Int64) + case appconfig.FieldCreatedAt: + if value, ok := values[i].(*sql.NullTime); !ok { + return fmt.Errorf("unexpected type %T for field created_at", values[i]) + } else if value.Valid { + ac.CreatedAt = value.Time + } + case appconfig.FieldUpdatedAt: + if value, ok := values[i].(*sql.NullTime); !ok { + return fmt.Errorf("unexpected type %T for field updated_at", values[i]) + } else if value.Valid { + ac.UpdatedAt = value.Time + } + case appconfig.FieldDeletedAt: + if value, ok := values[i].(*sql.NullTime); !ok { + return fmt.Errorf("unexpected type %T for field deleted_at", values[i]) + } else if value.Valid { + ac.DeletedAt = new(time.Time) + *ac.DeletedAt = value.Time + } + case appconfig.FieldAppName: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field app_name", values[i]) + } else if value.Valid { + ac.AppName = value.String + } + case appconfig.FieldEnvironment: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field environment", values[i]) + } else if value.Valid { + ac.Environment = value.String + } + case appconfig.FieldStack: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field stack", values[i]) + } else if value.Valid { + ac.Stack = value.String + } + case appconfig.FieldKey: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field key", values[i]) + } else if value.Valid { + ac.Key = value.String + } + case appconfig.FieldValue: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field value", values[i]) + } else if value.Valid { + ac.Value = value.String + } + default: + ac.selectValues.Set(columns[i], values[i]) + } + } + return nil +} + +// GetValue returns the ent.Value that was dynamically selected and assigned to the AppConfig. +// This includes values selected through modifiers, order, etc. +func (ac *AppConfig) GetValue(name string) (ent.Value, error) { + return ac.selectValues.Get(name) +} + +// Update returns a builder for updating this AppConfig. +// Note that you need to call AppConfig.Unwrap() before calling this method if this AppConfig +// was returned from a transaction, and the transaction was committed or rolled back. +func (ac *AppConfig) Update() *AppConfigUpdateOne { + return NewAppConfigClient(ac.config).UpdateOne(ac) +} + +// Unwrap unwraps the AppConfig entity that was returned from a transaction after it was closed, +// so that all future queries will be executed through the driver which created the transaction. +func (ac *AppConfig) Unwrap() *AppConfig { + _tx, ok := ac.config.driver.(*txDriver) + if !ok { + panic("ent: AppConfig is not a transactional entity") + } + ac.config.driver = _tx.drv + return ac +} + +// String implements the fmt.Stringer. +func (ac *AppConfig) String() string { + var builder strings.Builder + builder.WriteString("AppConfig(") + builder.WriteString(fmt.Sprintf("id=%v, ", ac.ID)) + builder.WriteString("created_at=") + builder.WriteString(ac.CreatedAt.Format(time.ANSIC)) + builder.WriteString(", ") + builder.WriteString("updated_at=") + builder.WriteString(ac.UpdatedAt.Format(time.ANSIC)) + builder.WriteString(", ") + if v := ac.DeletedAt; v != nil { + builder.WriteString("deleted_at=") + builder.WriteString(v.Format(time.ANSIC)) + } + builder.WriteString(", ") + builder.WriteString("app_name=") + builder.WriteString(ac.AppName) + builder.WriteString(", ") + builder.WriteString("environment=") + builder.WriteString(ac.Environment) + builder.WriteString(", ") + builder.WriteString("stack=") + builder.WriteString(ac.Stack) + builder.WriteString(", ") + builder.WriteString("key=") + builder.WriteString(ac.Key) + builder.WriteString(", ") + builder.WriteString("value=") + builder.WriteString(ac.Value) + builder.WriteByte(')') + return builder.String() +} + +// AppConfigs is a parsable slice of AppConfig. +type AppConfigs []*AppConfig diff --git a/api/pkg/ent/appconfig/appconfig.go b/api/pkg/ent/appconfig/appconfig.go new file mode 100644 index 0000000000..170c720ad0 --- /dev/null +++ b/api/pkg/ent/appconfig/appconfig.go @@ -0,0 +1,116 @@ +// Code generated by ent, DO NOT EDIT. + +package appconfig + +import ( + "time" + + "entgo.io/ent/dialect/sql" +) + +const ( + // Label holds the string label denoting the appconfig type in the database. + Label = "app_config" + // FieldID holds the string denoting the id field in the database. + FieldID = "id" + // FieldCreatedAt holds the string denoting the created_at field in the database. + FieldCreatedAt = "created_at" + // FieldUpdatedAt holds the string denoting the updated_at field in the database. + FieldUpdatedAt = "updated_at" + // FieldDeletedAt holds the string denoting the deleted_at field in the database. + FieldDeletedAt = "deleted_at" + // FieldAppName holds the string denoting the app_name field in the database. + FieldAppName = "app_name" + // FieldEnvironment holds the string denoting the environment field in the database. + FieldEnvironment = "environment" + // FieldStack holds the string denoting the stack field in the database. + FieldStack = "stack" + // FieldKey holds the string denoting the key field in the database. + FieldKey = "key" + // FieldValue holds the string denoting the value field in the database. + FieldValue = "value" + // Table holds the table name of the appconfig in the database. + Table = "app_configs" +) + +// Columns holds all SQL columns for appconfig fields. +var Columns = []string{ + FieldID, + FieldCreatedAt, + FieldUpdatedAt, + FieldDeletedAt, + FieldAppName, + FieldEnvironment, + FieldStack, + FieldKey, + FieldValue, +} + +// ValidColumn reports if the column name is valid (part of the table columns). +func ValidColumn(column string) bool { + for i := range Columns { + if column == Columns[i] { + return true + } + } + return false +} + +var ( + // DefaultCreatedAt holds the default value on creation for the "created_at" field. + DefaultCreatedAt func() time.Time + // DefaultUpdatedAt holds the default value on creation for the "updated_at" field. + DefaultUpdatedAt func() time.Time + // UpdateDefaultUpdatedAt holds the default value on update for the "updated_at" field. + UpdateDefaultUpdatedAt func() time.Time + // DefaultStack holds the default value on creation for the "stack" field. + DefaultStack string +) + +// OrderOption defines the ordering options for the AppConfig queries. +type OrderOption func(*sql.Selector) + +// ByID orders the results by the id field. +func ByID(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldID, opts...).ToFunc() +} + +// ByCreatedAt orders the results by the created_at field. +func ByCreatedAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldCreatedAt, opts...).ToFunc() +} + +// ByUpdatedAt orders the results by the updated_at field. +func ByUpdatedAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldUpdatedAt, opts...).ToFunc() +} + +// ByDeletedAt orders the results by the deleted_at field. +func ByDeletedAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldDeletedAt, opts...).ToFunc() +} + +// ByAppName orders the results by the app_name field. +func ByAppName(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldAppName, opts...).ToFunc() +} + +// ByEnvironment orders the results by the environment field. +func ByEnvironment(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldEnvironment, opts...).ToFunc() +} + +// ByStack orders the results by the stack field. +func ByStack(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldStack, opts...).ToFunc() +} + +// ByKey orders the results by the key field. +func ByKey(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldKey, opts...).ToFunc() +} + +// ByValue orders the results by the value field. +func ByValue(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldValue, opts...).ToFunc() +} diff --git a/api/pkg/ent/appconfig/where.go b/api/pkg/ent/appconfig/where.go new file mode 100644 index 0000000000..f48d8e5f18 --- /dev/null +++ b/api/pkg/ent/appconfig/where.go @@ -0,0 +1,565 @@ +// Code generated by ent, DO NOT EDIT. + +package appconfig + +import ( + "time" + + "entgo.io/ent/dialect/sql" + "github.com/chanzuckerberg/happy/api/pkg/ent/predicate" +) + +// ID filters vertices based on their ID field. +func ID(id uint) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldID, id)) +} + +// IDEQ applies the EQ predicate on the ID field. +func IDEQ(id uint) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldID, id)) +} + +// IDNEQ applies the NEQ predicate on the ID field. +func IDNEQ(id uint) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldID, id)) +} + +// IDIn applies the In predicate on the ID field. +func IDIn(ids ...uint) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldID, ids...)) +} + +// IDNotIn applies the NotIn predicate on the ID field. +func IDNotIn(ids ...uint) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldID, ids...)) +} + +// IDGT applies the GT predicate on the ID field. +func IDGT(id uint) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGT(FieldID, id)) +} + +// IDGTE applies the GTE predicate on the ID field. +func IDGTE(id uint) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGTE(FieldID, id)) +} + +// IDLT applies the LT predicate on the ID field. +func IDLT(id uint) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLT(FieldID, id)) +} + +// IDLTE applies the LTE predicate on the ID field. +func IDLTE(id uint) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLTE(FieldID, id)) +} + +// CreatedAt applies equality check predicate on the "created_at" field. It's identical to CreatedAtEQ. +func CreatedAt(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldCreatedAt, v)) +} + +// UpdatedAt applies equality check predicate on the "updated_at" field. It's identical to UpdatedAtEQ. +func UpdatedAt(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldUpdatedAt, v)) +} + +// DeletedAt applies equality check predicate on the "deleted_at" field. It's identical to DeletedAtEQ. +func DeletedAt(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldDeletedAt, v)) +} + +// AppName applies equality check predicate on the "app_name" field. It's identical to AppNameEQ. +func AppName(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldAppName, v)) +} + +// Environment applies equality check predicate on the "environment" field. It's identical to EnvironmentEQ. +func Environment(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldEnvironment, v)) +} + +// Stack applies equality check predicate on the "stack" field. It's identical to StackEQ. +func Stack(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldStack, v)) +} + +// Key applies equality check predicate on the "key" field. It's identical to KeyEQ. +func Key(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldKey, v)) +} + +// Value applies equality check predicate on the "value" field. It's identical to ValueEQ. +func Value(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldValue, v)) +} + +// CreatedAtEQ applies the EQ predicate on the "created_at" field. +func CreatedAtEQ(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldCreatedAt, v)) +} + +// CreatedAtNEQ applies the NEQ predicate on the "created_at" field. +func CreatedAtNEQ(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldCreatedAt, v)) +} + +// CreatedAtIn applies the In predicate on the "created_at" field. +func CreatedAtIn(vs ...time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldCreatedAt, vs...)) +} + +// CreatedAtNotIn applies the NotIn predicate on the "created_at" field. +func CreatedAtNotIn(vs ...time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldCreatedAt, vs...)) +} + +// CreatedAtGT applies the GT predicate on the "created_at" field. +func CreatedAtGT(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGT(FieldCreatedAt, v)) +} + +// CreatedAtGTE applies the GTE predicate on the "created_at" field. +func CreatedAtGTE(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGTE(FieldCreatedAt, v)) +} + +// CreatedAtLT applies the LT predicate on the "created_at" field. +func CreatedAtLT(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLT(FieldCreatedAt, v)) +} + +// CreatedAtLTE applies the LTE predicate on the "created_at" field. +func CreatedAtLTE(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLTE(FieldCreatedAt, v)) +} + +// UpdatedAtEQ applies the EQ predicate on the "updated_at" field. +func UpdatedAtEQ(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldUpdatedAt, v)) +} + +// UpdatedAtNEQ applies the NEQ predicate on the "updated_at" field. +func UpdatedAtNEQ(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldUpdatedAt, v)) +} + +// UpdatedAtIn applies the In predicate on the "updated_at" field. +func UpdatedAtIn(vs ...time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldUpdatedAt, vs...)) +} + +// UpdatedAtNotIn applies the NotIn predicate on the "updated_at" field. +func UpdatedAtNotIn(vs ...time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldUpdatedAt, vs...)) +} + +// UpdatedAtGT applies the GT predicate on the "updated_at" field. +func UpdatedAtGT(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGT(FieldUpdatedAt, v)) +} + +// UpdatedAtGTE applies the GTE predicate on the "updated_at" field. +func UpdatedAtGTE(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGTE(FieldUpdatedAt, v)) +} + +// UpdatedAtLT applies the LT predicate on the "updated_at" field. +func UpdatedAtLT(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLT(FieldUpdatedAt, v)) +} + +// UpdatedAtLTE applies the LTE predicate on the "updated_at" field. +func UpdatedAtLTE(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLTE(FieldUpdatedAt, v)) +} + +// DeletedAtEQ applies the EQ predicate on the "deleted_at" field. +func DeletedAtEQ(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldDeletedAt, v)) +} + +// DeletedAtNEQ applies the NEQ predicate on the "deleted_at" field. +func DeletedAtNEQ(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldDeletedAt, v)) +} + +// DeletedAtIn applies the In predicate on the "deleted_at" field. +func DeletedAtIn(vs ...time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldDeletedAt, vs...)) +} + +// DeletedAtNotIn applies the NotIn predicate on the "deleted_at" field. +func DeletedAtNotIn(vs ...time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldDeletedAt, vs...)) +} + +// DeletedAtGT applies the GT predicate on the "deleted_at" field. +func DeletedAtGT(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGT(FieldDeletedAt, v)) +} + +// DeletedAtGTE applies the GTE predicate on the "deleted_at" field. +func DeletedAtGTE(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGTE(FieldDeletedAt, v)) +} + +// DeletedAtLT applies the LT predicate on the "deleted_at" field. +func DeletedAtLT(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLT(FieldDeletedAt, v)) +} + +// DeletedAtLTE applies the LTE predicate on the "deleted_at" field. +func DeletedAtLTE(v time.Time) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLTE(FieldDeletedAt, v)) +} + +// DeletedAtIsNil applies the IsNil predicate on the "deleted_at" field. +func DeletedAtIsNil() predicate.AppConfig { + return predicate.AppConfig(sql.FieldIsNull(FieldDeletedAt)) +} + +// DeletedAtNotNil applies the NotNil predicate on the "deleted_at" field. +func DeletedAtNotNil() predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotNull(FieldDeletedAt)) +} + +// AppNameEQ applies the EQ predicate on the "app_name" field. +func AppNameEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldAppName, v)) +} + +// AppNameNEQ applies the NEQ predicate on the "app_name" field. +func AppNameNEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldAppName, v)) +} + +// AppNameIn applies the In predicate on the "app_name" field. +func AppNameIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldAppName, vs...)) +} + +// AppNameNotIn applies the NotIn predicate on the "app_name" field. +func AppNameNotIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldAppName, vs...)) +} + +// AppNameGT applies the GT predicate on the "app_name" field. +func AppNameGT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGT(FieldAppName, v)) +} + +// AppNameGTE applies the GTE predicate on the "app_name" field. +func AppNameGTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGTE(FieldAppName, v)) +} + +// AppNameLT applies the LT predicate on the "app_name" field. +func AppNameLT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLT(FieldAppName, v)) +} + +// AppNameLTE applies the LTE predicate on the "app_name" field. +func AppNameLTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLTE(FieldAppName, v)) +} + +// AppNameContains applies the Contains predicate on the "app_name" field. +func AppNameContains(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContains(FieldAppName, v)) +} + +// AppNameHasPrefix applies the HasPrefix predicate on the "app_name" field. +func AppNameHasPrefix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasPrefix(FieldAppName, v)) +} + +// AppNameHasSuffix applies the HasSuffix predicate on the "app_name" field. +func AppNameHasSuffix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasSuffix(FieldAppName, v)) +} + +// AppNameEqualFold applies the EqualFold predicate on the "app_name" field. +func AppNameEqualFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEqualFold(FieldAppName, v)) +} + +// AppNameContainsFold applies the ContainsFold predicate on the "app_name" field. +func AppNameContainsFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContainsFold(FieldAppName, v)) +} + +// EnvironmentEQ applies the EQ predicate on the "environment" field. +func EnvironmentEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldEnvironment, v)) +} + +// EnvironmentNEQ applies the NEQ predicate on the "environment" field. +func EnvironmentNEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldEnvironment, v)) +} + +// EnvironmentIn applies the In predicate on the "environment" field. +func EnvironmentIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldEnvironment, vs...)) +} + +// EnvironmentNotIn applies the NotIn predicate on the "environment" field. +func EnvironmentNotIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldEnvironment, vs...)) +} + +// EnvironmentGT applies the GT predicate on the "environment" field. +func EnvironmentGT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGT(FieldEnvironment, v)) +} + +// EnvironmentGTE applies the GTE predicate on the "environment" field. +func EnvironmentGTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGTE(FieldEnvironment, v)) +} + +// EnvironmentLT applies the LT predicate on the "environment" field. +func EnvironmentLT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLT(FieldEnvironment, v)) +} + +// EnvironmentLTE applies the LTE predicate on the "environment" field. +func EnvironmentLTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLTE(FieldEnvironment, v)) +} + +// EnvironmentContains applies the Contains predicate on the "environment" field. +func EnvironmentContains(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContains(FieldEnvironment, v)) +} + +// EnvironmentHasPrefix applies the HasPrefix predicate on the "environment" field. +func EnvironmentHasPrefix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasPrefix(FieldEnvironment, v)) +} + +// EnvironmentHasSuffix applies the HasSuffix predicate on the "environment" field. +func EnvironmentHasSuffix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasSuffix(FieldEnvironment, v)) +} + +// EnvironmentEqualFold applies the EqualFold predicate on the "environment" field. +func EnvironmentEqualFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEqualFold(FieldEnvironment, v)) +} + +// EnvironmentContainsFold applies the ContainsFold predicate on the "environment" field. +func EnvironmentContainsFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContainsFold(FieldEnvironment, v)) +} + +// StackEQ applies the EQ predicate on the "stack" field. +func StackEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldStack, v)) +} + +// StackNEQ applies the NEQ predicate on the "stack" field. +func StackNEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldStack, v)) +} + +// StackIn applies the In predicate on the "stack" field. +func StackIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldStack, vs...)) +} + +// StackNotIn applies the NotIn predicate on the "stack" field. +func StackNotIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldStack, vs...)) +} + +// StackGT applies the GT predicate on the "stack" field. +func StackGT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGT(FieldStack, v)) +} + +// StackGTE applies the GTE predicate on the "stack" field. +func StackGTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGTE(FieldStack, v)) +} + +// StackLT applies the LT predicate on the "stack" field. +func StackLT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLT(FieldStack, v)) +} + +// StackLTE applies the LTE predicate on the "stack" field. +func StackLTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLTE(FieldStack, v)) +} + +// StackContains applies the Contains predicate on the "stack" field. +func StackContains(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContains(FieldStack, v)) +} + +// StackHasPrefix applies the HasPrefix predicate on the "stack" field. +func StackHasPrefix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasPrefix(FieldStack, v)) +} + +// StackHasSuffix applies the HasSuffix predicate on the "stack" field. +func StackHasSuffix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasSuffix(FieldStack, v)) +} + +// StackEqualFold applies the EqualFold predicate on the "stack" field. +func StackEqualFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEqualFold(FieldStack, v)) +} + +// StackContainsFold applies the ContainsFold predicate on the "stack" field. +func StackContainsFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContainsFold(FieldStack, v)) +} + +// KeyEQ applies the EQ predicate on the "key" field. +func KeyEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldKey, v)) +} + +// KeyNEQ applies the NEQ predicate on the "key" field. +func KeyNEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldKey, v)) +} + +// KeyIn applies the In predicate on the "key" field. +func KeyIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldKey, vs...)) +} + +// KeyNotIn applies the NotIn predicate on the "key" field. +func KeyNotIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldKey, vs...)) +} + +// KeyGT applies the GT predicate on the "key" field. +func KeyGT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGT(FieldKey, v)) +} + +// KeyGTE applies the GTE predicate on the "key" field. +func KeyGTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGTE(FieldKey, v)) +} + +// KeyLT applies the LT predicate on the "key" field. +func KeyLT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLT(FieldKey, v)) +} + +// KeyLTE applies the LTE predicate on the "key" field. +func KeyLTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLTE(FieldKey, v)) +} + +// KeyContains applies the Contains predicate on the "key" field. +func KeyContains(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContains(FieldKey, v)) +} + +// KeyHasPrefix applies the HasPrefix predicate on the "key" field. +func KeyHasPrefix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasPrefix(FieldKey, v)) +} + +// KeyHasSuffix applies the HasSuffix predicate on the "key" field. +func KeyHasSuffix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasSuffix(FieldKey, v)) +} + +// KeyEqualFold applies the EqualFold predicate on the "key" field. +func KeyEqualFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEqualFold(FieldKey, v)) +} + +// KeyContainsFold applies the ContainsFold predicate on the "key" field. +func KeyContainsFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContainsFold(FieldKey, v)) +} + +// ValueEQ applies the EQ predicate on the "value" field. +func ValueEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldValue, v)) +} + +// ValueNEQ applies the NEQ predicate on the "value" field. +func ValueNEQ(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldValue, v)) +} + +// ValueIn applies the In predicate on the "value" field. +func ValueIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldValue, vs...)) +} + +// ValueNotIn applies the NotIn predicate on the "value" field. +func ValueNotIn(vs ...string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldValue, vs...)) +} + +// ValueGT applies the GT predicate on the "value" field. +func ValueGT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGT(FieldValue, v)) +} + +// ValueGTE applies the GTE predicate on the "value" field. +func ValueGTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldGTE(FieldValue, v)) +} + +// ValueLT applies the LT predicate on the "value" field. +func ValueLT(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLT(FieldValue, v)) +} + +// ValueLTE applies the LTE predicate on the "value" field. +func ValueLTE(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldLTE(FieldValue, v)) +} + +// ValueContains applies the Contains predicate on the "value" field. +func ValueContains(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContains(FieldValue, v)) +} + +// ValueHasPrefix applies the HasPrefix predicate on the "value" field. +func ValueHasPrefix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasPrefix(FieldValue, v)) +} + +// ValueHasSuffix applies the HasSuffix predicate on the "value" field. +func ValueHasSuffix(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldHasSuffix(FieldValue, v)) +} + +// ValueEqualFold applies the EqualFold predicate on the "value" field. +func ValueEqualFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEqualFold(FieldValue, v)) +} + +// ValueContainsFold applies the ContainsFold predicate on the "value" field. +func ValueContainsFold(v string) predicate.AppConfig { + return predicate.AppConfig(sql.FieldContainsFold(FieldValue, v)) +} + +// And groups predicates with the AND operator between them. +func And(predicates ...predicate.AppConfig) predicate.AppConfig { + return predicate.AppConfig(sql.AndPredicates(predicates...)) +} + +// Or groups predicates with the OR operator between them. +func Or(predicates ...predicate.AppConfig) predicate.AppConfig { + return predicate.AppConfig(sql.OrPredicates(predicates...)) +} + +// Not applies the not operator on the given predicate. +func Not(p predicate.AppConfig) predicate.AppConfig { + return predicate.AppConfig(sql.NotPredicates(p)) +} diff --git a/api/pkg/ent/appconfig_create.go b/api/pkg/ent/appconfig_create.go new file mode 100644 index 0000000000..9cbf06057c --- /dev/null +++ b/api/pkg/ent/appconfig_create.go @@ -0,0 +1,889 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "context" + "errors" + "fmt" + "time" + + "entgo.io/ent/dialect/sql" + "entgo.io/ent/dialect/sql/sqlgraph" + "entgo.io/ent/schema/field" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" +) + +// AppConfigCreate is the builder for creating a AppConfig entity. +type AppConfigCreate struct { + config + mutation *AppConfigMutation + hooks []Hook + conflict []sql.ConflictOption +} + +// SetCreatedAt sets the "created_at" field. +func (acc *AppConfigCreate) SetCreatedAt(t time.Time) *AppConfigCreate { + acc.mutation.SetCreatedAt(t) + return acc +} + +// SetNillableCreatedAt sets the "created_at" field if the given value is not nil. +func (acc *AppConfigCreate) SetNillableCreatedAt(t *time.Time) *AppConfigCreate { + if t != nil { + acc.SetCreatedAt(*t) + } + return acc +} + +// SetUpdatedAt sets the "updated_at" field. +func (acc *AppConfigCreate) SetUpdatedAt(t time.Time) *AppConfigCreate { + acc.mutation.SetUpdatedAt(t) + return acc +} + +// SetNillableUpdatedAt sets the "updated_at" field if the given value is not nil. +func (acc *AppConfigCreate) SetNillableUpdatedAt(t *time.Time) *AppConfigCreate { + if t != nil { + acc.SetUpdatedAt(*t) + } + return acc +} + +// SetDeletedAt sets the "deleted_at" field. +func (acc *AppConfigCreate) SetDeletedAt(t time.Time) *AppConfigCreate { + acc.mutation.SetDeletedAt(t) + return acc +} + +// SetNillableDeletedAt sets the "deleted_at" field if the given value is not nil. +func (acc *AppConfigCreate) SetNillableDeletedAt(t *time.Time) *AppConfigCreate { + if t != nil { + acc.SetDeletedAt(*t) + } + return acc +} + +// SetAppName sets the "app_name" field. +func (acc *AppConfigCreate) SetAppName(s string) *AppConfigCreate { + acc.mutation.SetAppName(s) + return acc +} + +// SetEnvironment sets the "environment" field. +func (acc *AppConfigCreate) SetEnvironment(s string) *AppConfigCreate { + acc.mutation.SetEnvironment(s) + return acc +} + +// SetStack sets the "stack" field. +func (acc *AppConfigCreate) SetStack(s string) *AppConfigCreate { + acc.mutation.SetStack(s) + return acc +} + +// SetNillableStack sets the "stack" field if the given value is not nil. +func (acc *AppConfigCreate) SetNillableStack(s *string) *AppConfigCreate { + if s != nil { + acc.SetStack(*s) + } + return acc +} + +// SetKey sets the "key" field. +func (acc *AppConfigCreate) SetKey(s string) *AppConfigCreate { + acc.mutation.SetKey(s) + return acc +} + +// SetValue sets the "value" field. +func (acc *AppConfigCreate) SetValue(s string) *AppConfigCreate { + acc.mutation.SetValue(s) + return acc +} + +// SetID sets the "id" field. +func (acc *AppConfigCreate) SetID(u uint) *AppConfigCreate { + acc.mutation.SetID(u) + return acc +} + +// Mutation returns the AppConfigMutation object of the builder. +func (acc *AppConfigCreate) Mutation() *AppConfigMutation { + return acc.mutation +} + +// Save creates the AppConfig in the database. +func (acc *AppConfigCreate) Save(ctx context.Context) (*AppConfig, error) { + acc.defaults() + return withHooks(ctx, acc.sqlSave, acc.mutation, acc.hooks) +} + +// SaveX calls Save and panics if Save returns an error. +func (acc *AppConfigCreate) SaveX(ctx context.Context) *AppConfig { + v, err := acc.Save(ctx) + if err != nil { + panic(err) + } + return v +} + +// Exec executes the query. +func (acc *AppConfigCreate) Exec(ctx context.Context) error { + _, err := acc.Save(ctx) + return err +} + +// ExecX is like Exec, but panics if an error occurs. +func (acc *AppConfigCreate) ExecX(ctx context.Context) { + if err := acc.Exec(ctx); err != nil { + panic(err) + } +} + +// defaults sets the default values of the builder before save. +func (acc *AppConfigCreate) defaults() { + if _, ok := acc.mutation.CreatedAt(); !ok { + v := appconfig.DefaultCreatedAt() + acc.mutation.SetCreatedAt(v) + } + if _, ok := acc.mutation.UpdatedAt(); !ok { + v := appconfig.DefaultUpdatedAt() + acc.mutation.SetUpdatedAt(v) + } + if _, ok := acc.mutation.Stack(); !ok { + v := appconfig.DefaultStack + acc.mutation.SetStack(v) + } +} + +// check runs all checks and user-defined validators on the builder. +func (acc *AppConfigCreate) check() error { + if _, ok := acc.mutation.CreatedAt(); !ok { + return &ValidationError{Name: "created_at", err: errors.New(`ent: missing required field "AppConfig.created_at"`)} + } + if _, ok := acc.mutation.UpdatedAt(); !ok { + return &ValidationError{Name: "updated_at", err: errors.New(`ent: missing required field "AppConfig.updated_at"`)} + } + if _, ok := acc.mutation.AppName(); !ok { + return &ValidationError{Name: "app_name", err: errors.New(`ent: missing required field "AppConfig.app_name"`)} + } + if _, ok := acc.mutation.Environment(); !ok { + return &ValidationError{Name: "environment", err: errors.New(`ent: missing required field "AppConfig.environment"`)} + } + if _, ok := acc.mutation.Stack(); !ok { + return &ValidationError{Name: "stack", err: errors.New(`ent: missing required field "AppConfig.stack"`)} + } + if _, ok := acc.mutation.Key(); !ok { + return &ValidationError{Name: "key", err: errors.New(`ent: missing required field "AppConfig.key"`)} + } + if _, ok := acc.mutation.Value(); !ok { + return &ValidationError{Name: "value", err: errors.New(`ent: missing required field "AppConfig.value"`)} + } + return nil +} + +func (acc *AppConfigCreate) sqlSave(ctx context.Context) (*AppConfig, error) { + if err := acc.check(); err != nil { + return nil, err + } + _node, _spec := acc.createSpec() + if err := sqlgraph.CreateNode(ctx, acc.driver, _spec); err != nil { + if sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + return nil, err + } + if _spec.ID.Value != _node.ID { + id := _spec.ID.Value.(int64) + _node.ID = uint(id) + } + acc.mutation.id = &_node.ID + acc.mutation.done = true + return _node, nil +} + +func (acc *AppConfigCreate) createSpec() (*AppConfig, *sqlgraph.CreateSpec) { + var ( + _node = &AppConfig{config: acc.config} + _spec = sqlgraph.NewCreateSpec(appconfig.Table, sqlgraph.NewFieldSpec(appconfig.FieldID, field.TypeUint)) + ) + _spec.OnConflict = acc.conflict + if id, ok := acc.mutation.ID(); ok { + _node.ID = id + _spec.ID.Value = id + } + if value, ok := acc.mutation.CreatedAt(); ok { + _spec.SetField(appconfig.FieldCreatedAt, field.TypeTime, value) + _node.CreatedAt = value + } + if value, ok := acc.mutation.UpdatedAt(); ok { + _spec.SetField(appconfig.FieldUpdatedAt, field.TypeTime, value) + _node.UpdatedAt = value + } + if value, ok := acc.mutation.DeletedAt(); ok { + _spec.SetField(appconfig.FieldDeletedAt, field.TypeTime, value) + _node.DeletedAt = &value + } + if value, ok := acc.mutation.AppName(); ok { + _spec.SetField(appconfig.FieldAppName, field.TypeString, value) + _node.AppName = value + } + if value, ok := acc.mutation.Environment(); ok { + _spec.SetField(appconfig.FieldEnvironment, field.TypeString, value) + _node.Environment = value + } + if value, ok := acc.mutation.Stack(); ok { + _spec.SetField(appconfig.FieldStack, field.TypeString, value) + _node.Stack = value + } + if value, ok := acc.mutation.Key(); ok { + _spec.SetField(appconfig.FieldKey, field.TypeString, value) + _node.Key = value + } + if value, ok := acc.mutation.Value(); ok { + _spec.SetField(appconfig.FieldValue, field.TypeString, value) + _node.Value = value + } + return _node, _spec +} + +// OnConflict allows configuring the `ON CONFLICT` / `ON DUPLICATE KEY` clause +// of the `INSERT` statement. For example: +// +// client.AppConfig.Create(). +// SetCreatedAt(v). +// OnConflict( +// // Update the row with the new values +// // the was proposed for insertion. +// sql.ResolveWithNewValues(), +// ). +// // Override some of the fields with custom +// // update values. +// Update(func(u *ent.AppConfigUpsert) { +// SetCreatedAt(v+v). +// }). +// Exec(ctx) +func (acc *AppConfigCreate) OnConflict(opts ...sql.ConflictOption) *AppConfigUpsertOne { + acc.conflict = opts + return &AppConfigUpsertOne{ + create: acc, + } +} + +// OnConflictColumns calls `OnConflict` and configures the columns +// as conflict target. Using this option is equivalent to using: +// +// client.AppConfig.Create(). +// OnConflict(sql.ConflictColumns(columns...)). +// Exec(ctx) +func (acc *AppConfigCreate) OnConflictColumns(columns ...string) *AppConfigUpsertOne { + acc.conflict = append(acc.conflict, sql.ConflictColumns(columns...)) + return &AppConfigUpsertOne{ + create: acc, + } +} + +type ( + // AppConfigUpsertOne is the builder for "upsert"-ing + // one AppConfig node. + AppConfigUpsertOne struct { + create *AppConfigCreate + } + + // AppConfigUpsert is the "OnConflict" setter. + AppConfigUpsert struct { + *sql.UpdateSet + } +) + +// SetUpdatedAt sets the "updated_at" field. +func (u *AppConfigUpsert) SetUpdatedAt(v time.Time) *AppConfigUpsert { + u.Set(appconfig.FieldUpdatedAt, v) + return u +} + +// UpdateUpdatedAt sets the "updated_at" field to the value that was provided on create. +func (u *AppConfigUpsert) UpdateUpdatedAt() *AppConfigUpsert { + u.SetExcluded(appconfig.FieldUpdatedAt) + return u +} + +// SetDeletedAt sets the "deleted_at" field. +func (u *AppConfigUpsert) SetDeletedAt(v time.Time) *AppConfigUpsert { + u.Set(appconfig.FieldDeletedAt, v) + return u +} + +// UpdateDeletedAt sets the "deleted_at" field to the value that was provided on create. +func (u *AppConfigUpsert) UpdateDeletedAt() *AppConfigUpsert { + u.SetExcluded(appconfig.FieldDeletedAt) + return u +} + +// ClearDeletedAt clears the value of the "deleted_at" field. +func (u *AppConfigUpsert) ClearDeletedAt() *AppConfigUpsert { + u.SetNull(appconfig.FieldDeletedAt) + return u +} + +// SetAppName sets the "app_name" field. +func (u *AppConfigUpsert) SetAppName(v string) *AppConfigUpsert { + u.Set(appconfig.FieldAppName, v) + return u +} + +// UpdateAppName sets the "app_name" field to the value that was provided on create. +func (u *AppConfigUpsert) UpdateAppName() *AppConfigUpsert { + u.SetExcluded(appconfig.FieldAppName) + return u +} + +// SetEnvironment sets the "environment" field. +func (u *AppConfigUpsert) SetEnvironment(v string) *AppConfigUpsert { + u.Set(appconfig.FieldEnvironment, v) + return u +} + +// UpdateEnvironment sets the "environment" field to the value that was provided on create. +func (u *AppConfigUpsert) UpdateEnvironment() *AppConfigUpsert { + u.SetExcluded(appconfig.FieldEnvironment) + return u +} + +// SetStack sets the "stack" field. +func (u *AppConfigUpsert) SetStack(v string) *AppConfigUpsert { + u.Set(appconfig.FieldStack, v) + return u +} + +// UpdateStack sets the "stack" field to the value that was provided on create. +func (u *AppConfigUpsert) UpdateStack() *AppConfigUpsert { + u.SetExcluded(appconfig.FieldStack) + return u +} + +// SetKey sets the "key" field. +func (u *AppConfigUpsert) SetKey(v string) *AppConfigUpsert { + u.Set(appconfig.FieldKey, v) + return u +} + +// UpdateKey sets the "key" field to the value that was provided on create. +func (u *AppConfigUpsert) UpdateKey() *AppConfigUpsert { + u.SetExcluded(appconfig.FieldKey) + return u +} + +// SetValue sets the "value" field. +func (u *AppConfigUpsert) SetValue(v string) *AppConfigUpsert { + u.Set(appconfig.FieldValue, v) + return u +} + +// UpdateValue sets the "value" field to the value that was provided on create. +func (u *AppConfigUpsert) UpdateValue() *AppConfigUpsert { + u.SetExcluded(appconfig.FieldValue) + return u +} + +// UpdateNewValues updates the mutable fields using the new values that were set on create except the ID field. +// Using this option is equivalent to using: +// +// client.AppConfig.Create(). +// OnConflict( +// sql.ResolveWithNewValues(), +// sql.ResolveWith(func(u *sql.UpdateSet) { +// u.SetIgnore(appconfig.FieldID) +// }), +// ). +// Exec(ctx) +func (u *AppConfigUpsertOne) UpdateNewValues() *AppConfigUpsertOne { + u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) + u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { + if _, exists := u.create.mutation.ID(); exists { + s.SetIgnore(appconfig.FieldID) + } + if _, exists := u.create.mutation.CreatedAt(); exists { + s.SetIgnore(appconfig.FieldCreatedAt) + } + })) + return u +} + +// Ignore sets each column to itself in case of conflict. +// Using this option is equivalent to using: +// +// client.AppConfig.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) +func (u *AppConfigUpsertOne) Ignore() *AppConfigUpsertOne { + u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) + return u +} + +// DoNothing configures the conflict_action to `DO NOTHING`. +// Supported only by SQLite and PostgreSQL. +func (u *AppConfigUpsertOne) DoNothing() *AppConfigUpsertOne { + u.create.conflict = append(u.create.conflict, sql.DoNothing()) + return u +} + +// Update allows overriding fields `UPDATE` values. See the AppConfigCreate.OnConflict +// documentation for more info. +func (u *AppConfigUpsertOne) Update(set func(*AppConfigUpsert)) *AppConfigUpsertOne { + u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(update *sql.UpdateSet) { + set(&AppConfigUpsert{UpdateSet: update}) + })) + return u +} + +// SetUpdatedAt sets the "updated_at" field. +func (u *AppConfigUpsertOne) SetUpdatedAt(v time.Time) *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.SetUpdatedAt(v) + }) +} + +// UpdateUpdatedAt sets the "updated_at" field to the value that was provided on create. +func (u *AppConfigUpsertOne) UpdateUpdatedAt() *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateUpdatedAt() + }) +} + +// SetDeletedAt sets the "deleted_at" field. +func (u *AppConfigUpsertOne) SetDeletedAt(v time.Time) *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.SetDeletedAt(v) + }) +} + +// UpdateDeletedAt sets the "deleted_at" field to the value that was provided on create. +func (u *AppConfigUpsertOne) UpdateDeletedAt() *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateDeletedAt() + }) +} + +// ClearDeletedAt clears the value of the "deleted_at" field. +func (u *AppConfigUpsertOne) ClearDeletedAt() *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.ClearDeletedAt() + }) +} + +// SetAppName sets the "app_name" field. +func (u *AppConfigUpsertOne) SetAppName(v string) *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.SetAppName(v) + }) +} + +// UpdateAppName sets the "app_name" field to the value that was provided on create. +func (u *AppConfigUpsertOne) UpdateAppName() *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateAppName() + }) +} + +// SetEnvironment sets the "environment" field. +func (u *AppConfigUpsertOne) SetEnvironment(v string) *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.SetEnvironment(v) + }) +} + +// UpdateEnvironment sets the "environment" field to the value that was provided on create. +func (u *AppConfigUpsertOne) UpdateEnvironment() *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateEnvironment() + }) +} + +// SetStack sets the "stack" field. +func (u *AppConfigUpsertOne) SetStack(v string) *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.SetStack(v) + }) +} + +// UpdateStack sets the "stack" field to the value that was provided on create. +func (u *AppConfigUpsertOne) UpdateStack() *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateStack() + }) +} + +// SetKey sets the "key" field. +func (u *AppConfigUpsertOne) SetKey(v string) *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.SetKey(v) + }) +} + +// UpdateKey sets the "key" field to the value that was provided on create. +func (u *AppConfigUpsertOne) UpdateKey() *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateKey() + }) +} + +// SetValue sets the "value" field. +func (u *AppConfigUpsertOne) SetValue(v string) *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.SetValue(v) + }) +} + +// UpdateValue sets the "value" field to the value that was provided on create. +func (u *AppConfigUpsertOne) UpdateValue() *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateValue() + }) +} + +// Exec executes the query. +func (u *AppConfigUpsertOne) Exec(ctx context.Context) error { + if len(u.create.conflict) == 0 { + return errors.New("ent: missing options for AppConfigCreate.OnConflict") + } + return u.create.Exec(ctx) +} + +// ExecX is like Exec, but panics if an error occurs. +func (u *AppConfigUpsertOne) ExecX(ctx context.Context) { + if err := u.create.Exec(ctx); err != nil { + panic(err) + } +} + +// Exec executes the UPSERT query and returns the inserted/updated ID. +func (u *AppConfigUpsertOne) ID(ctx context.Context) (id uint, err error) { + node, err := u.create.Save(ctx) + if err != nil { + return id, err + } + return node.ID, nil +} + +// IDX is like ID, but panics if an error occurs. +func (u *AppConfigUpsertOne) IDX(ctx context.Context) uint { + id, err := u.ID(ctx) + if err != nil { + panic(err) + } + return id +} + +// AppConfigCreateBulk is the builder for creating many AppConfig entities in bulk. +type AppConfigCreateBulk struct { + config + err error + builders []*AppConfigCreate + conflict []sql.ConflictOption +} + +// Save creates the AppConfig entities in the database. +func (accb *AppConfigCreateBulk) Save(ctx context.Context) ([]*AppConfig, error) { + if accb.err != nil { + return nil, accb.err + } + specs := make([]*sqlgraph.CreateSpec, len(accb.builders)) + nodes := make([]*AppConfig, len(accb.builders)) + mutators := make([]Mutator, len(accb.builders)) + for i := range accb.builders { + func(i int, root context.Context) { + builder := accb.builders[i] + builder.defaults() + var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) { + mutation, ok := m.(*AppConfigMutation) + if !ok { + return nil, fmt.Errorf("unexpected mutation type %T", m) + } + if err := builder.check(); err != nil { + return nil, err + } + builder.mutation = mutation + var err error + nodes[i], specs[i] = builder.createSpec() + if i < len(mutators)-1 { + _, err = mutators[i+1].Mutate(root, accb.builders[i+1].mutation) + } else { + spec := &sqlgraph.BatchCreateSpec{Nodes: specs} + spec.OnConflict = accb.conflict + // Invoke the actual operation on the latest mutation in the chain. + if err = sqlgraph.BatchCreate(ctx, accb.driver, spec); err != nil { + if sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + } + } + if err != nil { + return nil, err + } + mutation.id = &nodes[i].ID + if specs[i].ID.Value != nil && nodes[i].ID == 0 { + id := specs[i].ID.Value.(int64) + nodes[i].ID = uint(id) + } + mutation.done = true + return nodes[i], nil + }) + for i := len(builder.hooks) - 1; i >= 0; i-- { + mut = builder.hooks[i](mut) + } + mutators[i] = mut + }(i, ctx) + } + if len(mutators) > 0 { + if _, err := mutators[0].Mutate(ctx, accb.builders[0].mutation); err != nil { + return nil, err + } + } + return nodes, nil +} + +// SaveX is like Save, but panics if an error occurs. +func (accb *AppConfigCreateBulk) SaveX(ctx context.Context) []*AppConfig { + v, err := accb.Save(ctx) + if err != nil { + panic(err) + } + return v +} + +// Exec executes the query. +func (accb *AppConfigCreateBulk) Exec(ctx context.Context) error { + _, err := accb.Save(ctx) + return err +} + +// ExecX is like Exec, but panics if an error occurs. +func (accb *AppConfigCreateBulk) ExecX(ctx context.Context) { + if err := accb.Exec(ctx); err != nil { + panic(err) + } +} + +// OnConflict allows configuring the `ON CONFLICT` / `ON DUPLICATE KEY` clause +// of the `INSERT` statement. For example: +// +// client.AppConfig.CreateBulk(builders...). +// OnConflict( +// // Update the row with the new values +// // the was proposed for insertion. +// sql.ResolveWithNewValues(), +// ). +// // Override some of the fields with custom +// // update values. +// Update(func(u *ent.AppConfigUpsert) { +// SetCreatedAt(v+v). +// }). +// Exec(ctx) +func (accb *AppConfigCreateBulk) OnConflict(opts ...sql.ConflictOption) *AppConfigUpsertBulk { + accb.conflict = opts + return &AppConfigUpsertBulk{ + create: accb, + } +} + +// OnConflictColumns calls `OnConflict` and configures the columns +// as conflict target. Using this option is equivalent to using: +// +// client.AppConfig.Create(). +// OnConflict(sql.ConflictColumns(columns...)). +// Exec(ctx) +func (accb *AppConfigCreateBulk) OnConflictColumns(columns ...string) *AppConfigUpsertBulk { + accb.conflict = append(accb.conflict, sql.ConflictColumns(columns...)) + return &AppConfigUpsertBulk{ + create: accb, + } +} + +// AppConfigUpsertBulk is the builder for "upsert"-ing +// a bulk of AppConfig nodes. +type AppConfigUpsertBulk struct { + create *AppConfigCreateBulk +} + +// UpdateNewValues updates the mutable fields using the new values that +// were set on create. Using this option is equivalent to using: +// +// client.AppConfig.Create(). +// OnConflict( +// sql.ResolveWithNewValues(), +// sql.ResolveWith(func(u *sql.UpdateSet) { +// u.SetIgnore(appconfig.FieldID) +// }), +// ). +// Exec(ctx) +func (u *AppConfigUpsertBulk) UpdateNewValues() *AppConfigUpsertBulk { + u.create.conflict = append(u.create.conflict, sql.ResolveWithNewValues()) + u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(s *sql.UpdateSet) { + for _, b := range u.create.builders { + if _, exists := b.mutation.ID(); exists { + s.SetIgnore(appconfig.FieldID) + } + if _, exists := b.mutation.CreatedAt(); exists { + s.SetIgnore(appconfig.FieldCreatedAt) + } + } + })) + return u +} + +// Ignore sets each column to itself in case of conflict. +// Using this option is equivalent to using: +// +// client.AppConfig.Create(). +// OnConflict(sql.ResolveWithIgnore()). +// Exec(ctx) +func (u *AppConfigUpsertBulk) Ignore() *AppConfigUpsertBulk { + u.create.conflict = append(u.create.conflict, sql.ResolveWithIgnore()) + return u +} + +// DoNothing configures the conflict_action to `DO NOTHING`. +// Supported only by SQLite and PostgreSQL. +func (u *AppConfigUpsertBulk) DoNothing() *AppConfigUpsertBulk { + u.create.conflict = append(u.create.conflict, sql.DoNothing()) + return u +} + +// Update allows overriding fields `UPDATE` values. See the AppConfigCreateBulk.OnConflict +// documentation for more info. +func (u *AppConfigUpsertBulk) Update(set func(*AppConfigUpsert)) *AppConfigUpsertBulk { + u.create.conflict = append(u.create.conflict, sql.ResolveWith(func(update *sql.UpdateSet) { + set(&AppConfigUpsert{UpdateSet: update}) + })) + return u +} + +// SetUpdatedAt sets the "updated_at" field. +func (u *AppConfigUpsertBulk) SetUpdatedAt(v time.Time) *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.SetUpdatedAt(v) + }) +} + +// UpdateUpdatedAt sets the "updated_at" field to the value that was provided on create. +func (u *AppConfigUpsertBulk) UpdateUpdatedAt() *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateUpdatedAt() + }) +} + +// SetDeletedAt sets the "deleted_at" field. +func (u *AppConfigUpsertBulk) SetDeletedAt(v time.Time) *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.SetDeletedAt(v) + }) +} + +// UpdateDeletedAt sets the "deleted_at" field to the value that was provided on create. +func (u *AppConfigUpsertBulk) UpdateDeletedAt() *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateDeletedAt() + }) +} + +// ClearDeletedAt clears the value of the "deleted_at" field. +func (u *AppConfigUpsertBulk) ClearDeletedAt() *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.ClearDeletedAt() + }) +} + +// SetAppName sets the "app_name" field. +func (u *AppConfigUpsertBulk) SetAppName(v string) *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.SetAppName(v) + }) +} + +// UpdateAppName sets the "app_name" field to the value that was provided on create. +func (u *AppConfigUpsertBulk) UpdateAppName() *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateAppName() + }) +} + +// SetEnvironment sets the "environment" field. +func (u *AppConfigUpsertBulk) SetEnvironment(v string) *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.SetEnvironment(v) + }) +} + +// UpdateEnvironment sets the "environment" field to the value that was provided on create. +func (u *AppConfigUpsertBulk) UpdateEnvironment() *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateEnvironment() + }) +} + +// SetStack sets the "stack" field. +func (u *AppConfigUpsertBulk) SetStack(v string) *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.SetStack(v) + }) +} + +// UpdateStack sets the "stack" field to the value that was provided on create. +func (u *AppConfigUpsertBulk) UpdateStack() *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateStack() + }) +} + +// SetKey sets the "key" field. +func (u *AppConfigUpsertBulk) SetKey(v string) *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.SetKey(v) + }) +} + +// UpdateKey sets the "key" field to the value that was provided on create. +func (u *AppConfigUpsertBulk) UpdateKey() *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateKey() + }) +} + +// SetValue sets the "value" field. +func (u *AppConfigUpsertBulk) SetValue(v string) *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.SetValue(v) + }) +} + +// UpdateValue sets the "value" field to the value that was provided on create. +func (u *AppConfigUpsertBulk) UpdateValue() *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateValue() + }) +} + +// Exec executes the query. +func (u *AppConfigUpsertBulk) Exec(ctx context.Context) error { + if u.create.err != nil { + return u.create.err + } + for i, b := range u.create.builders { + if len(b.conflict) != 0 { + return fmt.Errorf("ent: OnConflict was set for builder %d. Set it on the AppConfigCreateBulk instead", i) + } + } + if len(u.create.conflict) == 0 { + return errors.New("ent: missing options for AppConfigCreateBulk.OnConflict") + } + return u.create.Exec(ctx) +} + +// ExecX is like Exec, but panics if an error occurs. +func (u *AppConfigUpsertBulk) ExecX(ctx context.Context) { + if err := u.create.Exec(ctx); err != nil { + panic(err) + } +} diff --git a/api/pkg/ent/appconfig_delete.go b/api/pkg/ent/appconfig_delete.go new file mode 100644 index 0000000000..5d4e1c2bba --- /dev/null +++ b/api/pkg/ent/appconfig_delete.go @@ -0,0 +1,88 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "context" + + "entgo.io/ent/dialect/sql" + "entgo.io/ent/dialect/sql/sqlgraph" + "entgo.io/ent/schema/field" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" + "github.com/chanzuckerberg/happy/api/pkg/ent/predicate" +) + +// AppConfigDelete is the builder for deleting a AppConfig entity. +type AppConfigDelete struct { + config + hooks []Hook + mutation *AppConfigMutation +} + +// Where appends a list predicates to the AppConfigDelete builder. +func (acd *AppConfigDelete) Where(ps ...predicate.AppConfig) *AppConfigDelete { + acd.mutation.Where(ps...) + return acd +} + +// Exec executes the deletion query and returns how many vertices were deleted. +func (acd *AppConfigDelete) Exec(ctx context.Context) (int, error) { + return withHooks(ctx, acd.sqlExec, acd.mutation, acd.hooks) +} + +// ExecX is like Exec, but panics if an error occurs. +func (acd *AppConfigDelete) ExecX(ctx context.Context) int { + n, err := acd.Exec(ctx) + if err != nil { + panic(err) + } + return n +} + +func (acd *AppConfigDelete) sqlExec(ctx context.Context) (int, error) { + _spec := sqlgraph.NewDeleteSpec(appconfig.Table, sqlgraph.NewFieldSpec(appconfig.FieldID, field.TypeUint)) + if ps := acd.mutation.predicates; len(ps) > 0 { + _spec.Predicate = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + affected, err := sqlgraph.DeleteNodes(ctx, acd.driver, _spec) + if err != nil && sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + acd.mutation.done = true + return affected, err +} + +// AppConfigDeleteOne is the builder for deleting a single AppConfig entity. +type AppConfigDeleteOne struct { + acd *AppConfigDelete +} + +// Where appends a list predicates to the AppConfigDelete builder. +func (acdo *AppConfigDeleteOne) Where(ps ...predicate.AppConfig) *AppConfigDeleteOne { + acdo.acd.mutation.Where(ps...) + return acdo +} + +// Exec executes the deletion query. +func (acdo *AppConfigDeleteOne) Exec(ctx context.Context) error { + n, err := acdo.acd.Exec(ctx) + switch { + case err != nil: + return err + case n == 0: + return &NotFoundError{appconfig.Label} + default: + return nil + } +} + +// ExecX is like Exec, but panics if an error occurs. +func (acdo *AppConfigDeleteOne) ExecX(ctx context.Context) { + if err := acdo.Exec(ctx); err != nil { + panic(err) + } +} diff --git a/api/pkg/ent/appconfig_query.go b/api/pkg/ent/appconfig_query.go new file mode 100644 index 0000000000..9dd97e9845 --- /dev/null +++ b/api/pkg/ent/appconfig_query.go @@ -0,0 +1,526 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "context" + "fmt" + "math" + + "entgo.io/ent/dialect/sql" + "entgo.io/ent/dialect/sql/sqlgraph" + "entgo.io/ent/schema/field" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" + "github.com/chanzuckerberg/happy/api/pkg/ent/predicate" +) + +// AppConfigQuery is the builder for querying AppConfig entities. +type AppConfigQuery struct { + config + ctx *QueryContext + order []appconfig.OrderOption + inters []Interceptor + predicates []predicate.AppConfig + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) +} + +// Where adds a new predicate for the AppConfigQuery builder. +func (acq *AppConfigQuery) Where(ps ...predicate.AppConfig) *AppConfigQuery { + acq.predicates = append(acq.predicates, ps...) + return acq +} + +// Limit the number of records to be returned by this query. +func (acq *AppConfigQuery) Limit(limit int) *AppConfigQuery { + acq.ctx.Limit = &limit + return acq +} + +// Offset to start from. +func (acq *AppConfigQuery) Offset(offset int) *AppConfigQuery { + acq.ctx.Offset = &offset + return acq +} + +// Unique configures the query builder to filter duplicate records on query. +// By default, unique is set to true, and can be disabled using this method. +func (acq *AppConfigQuery) Unique(unique bool) *AppConfigQuery { + acq.ctx.Unique = &unique + return acq +} + +// Order specifies how the records should be ordered. +func (acq *AppConfigQuery) Order(o ...appconfig.OrderOption) *AppConfigQuery { + acq.order = append(acq.order, o...) + return acq +} + +// First returns the first AppConfig entity from the query. +// Returns a *NotFoundError when no AppConfig was found. +func (acq *AppConfigQuery) First(ctx context.Context) (*AppConfig, error) { + nodes, err := acq.Limit(1).All(setContextOp(ctx, acq.ctx, "First")) + if err != nil { + return nil, err + } + if len(nodes) == 0 { + return nil, &NotFoundError{appconfig.Label} + } + return nodes[0], nil +} + +// FirstX is like First, but panics if an error occurs. +func (acq *AppConfigQuery) FirstX(ctx context.Context) *AppConfig { + node, err := acq.First(ctx) + if err != nil && !IsNotFound(err) { + panic(err) + } + return node +} + +// FirstID returns the first AppConfig ID from the query. +// Returns a *NotFoundError when no AppConfig ID was found. +func (acq *AppConfigQuery) FirstID(ctx context.Context) (id uint, err error) { + var ids []uint + if ids, err = acq.Limit(1).IDs(setContextOp(ctx, acq.ctx, "FirstID")); err != nil { + return + } + if len(ids) == 0 { + err = &NotFoundError{appconfig.Label} + return + } + return ids[0], nil +} + +// FirstIDX is like FirstID, but panics if an error occurs. +func (acq *AppConfigQuery) FirstIDX(ctx context.Context) uint { + id, err := acq.FirstID(ctx) + if err != nil && !IsNotFound(err) { + panic(err) + } + return id +} + +// Only returns a single AppConfig entity found by the query, ensuring it only returns one. +// Returns a *NotSingularError when more than one AppConfig entity is found. +// Returns a *NotFoundError when no AppConfig entities are found. +func (acq *AppConfigQuery) Only(ctx context.Context) (*AppConfig, error) { + nodes, err := acq.Limit(2).All(setContextOp(ctx, acq.ctx, "Only")) + if err != nil { + return nil, err + } + switch len(nodes) { + case 1: + return nodes[0], nil + case 0: + return nil, &NotFoundError{appconfig.Label} + default: + return nil, &NotSingularError{appconfig.Label} + } +} + +// OnlyX is like Only, but panics if an error occurs. +func (acq *AppConfigQuery) OnlyX(ctx context.Context) *AppConfig { + node, err := acq.Only(ctx) + if err != nil { + panic(err) + } + return node +} + +// OnlyID is like Only, but returns the only AppConfig ID in the query. +// Returns a *NotSingularError when more than one AppConfig ID is found. +// Returns a *NotFoundError when no entities are found. +func (acq *AppConfigQuery) OnlyID(ctx context.Context) (id uint, err error) { + var ids []uint + if ids, err = acq.Limit(2).IDs(setContextOp(ctx, acq.ctx, "OnlyID")); err != nil { + return + } + switch len(ids) { + case 1: + id = ids[0] + case 0: + err = &NotFoundError{appconfig.Label} + default: + err = &NotSingularError{appconfig.Label} + } + return +} + +// OnlyIDX is like OnlyID, but panics if an error occurs. +func (acq *AppConfigQuery) OnlyIDX(ctx context.Context) uint { + id, err := acq.OnlyID(ctx) + if err != nil { + panic(err) + } + return id +} + +// All executes the query and returns a list of AppConfigs. +func (acq *AppConfigQuery) All(ctx context.Context) ([]*AppConfig, error) { + ctx = setContextOp(ctx, acq.ctx, "All") + if err := acq.prepareQuery(ctx); err != nil { + return nil, err + } + qr := querierAll[[]*AppConfig, *AppConfigQuery]() + return withInterceptors[[]*AppConfig](ctx, acq, qr, acq.inters) +} + +// AllX is like All, but panics if an error occurs. +func (acq *AppConfigQuery) AllX(ctx context.Context) []*AppConfig { + nodes, err := acq.All(ctx) + if err != nil { + panic(err) + } + return nodes +} + +// IDs executes the query and returns a list of AppConfig IDs. +func (acq *AppConfigQuery) IDs(ctx context.Context) (ids []uint, err error) { + if acq.ctx.Unique == nil && acq.path != nil { + acq.Unique(true) + } + ctx = setContextOp(ctx, acq.ctx, "IDs") + if err = acq.Select(appconfig.FieldID).Scan(ctx, &ids); err != nil { + return nil, err + } + return ids, nil +} + +// IDsX is like IDs, but panics if an error occurs. +func (acq *AppConfigQuery) IDsX(ctx context.Context) []uint { + ids, err := acq.IDs(ctx) + if err != nil { + panic(err) + } + return ids +} + +// Count returns the count of the given query. +func (acq *AppConfigQuery) Count(ctx context.Context) (int, error) { + ctx = setContextOp(ctx, acq.ctx, "Count") + if err := acq.prepareQuery(ctx); err != nil { + return 0, err + } + return withInterceptors[int](ctx, acq, querierCount[*AppConfigQuery](), acq.inters) +} + +// CountX is like Count, but panics if an error occurs. +func (acq *AppConfigQuery) CountX(ctx context.Context) int { + count, err := acq.Count(ctx) + if err != nil { + panic(err) + } + return count +} + +// Exist returns true if the query has elements in the graph. +func (acq *AppConfigQuery) Exist(ctx context.Context) (bool, error) { + ctx = setContextOp(ctx, acq.ctx, "Exist") + switch _, err := acq.FirstID(ctx); { + case IsNotFound(err): + return false, nil + case err != nil: + return false, fmt.Errorf("ent: check existence: %w", err) + default: + return true, nil + } +} + +// ExistX is like Exist, but panics if an error occurs. +func (acq *AppConfigQuery) ExistX(ctx context.Context) bool { + exist, err := acq.Exist(ctx) + if err != nil { + panic(err) + } + return exist +} + +// Clone returns a duplicate of the AppConfigQuery builder, including all associated steps. It can be +// used to prepare common query builders and use them differently after the clone is made. +func (acq *AppConfigQuery) Clone() *AppConfigQuery { + if acq == nil { + return nil + } + return &AppConfigQuery{ + config: acq.config, + ctx: acq.ctx.Clone(), + order: append([]appconfig.OrderOption{}, acq.order...), + inters: append([]Interceptor{}, acq.inters...), + predicates: append([]predicate.AppConfig{}, acq.predicates...), + // clone intermediate query. + sql: acq.sql.Clone(), + path: acq.path, + } +} + +// GroupBy is used to group vertices by one or more fields/columns. +// It is often used with aggregate functions, like: count, max, mean, min, sum. +// +// Example: +// +// var v []struct { +// CreatedAt time.Time `json:"created_at,omitempty"` +// Count int `json:"count,omitempty"` +// } +// +// client.AppConfig.Query(). +// GroupBy(appconfig.FieldCreatedAt). +// Aggregate(ent.Count()). +// Scan(ctx, &v) +func (acq *AppConfigQuery) GroupBy(field string, fields ...string) *AppConfigGroupBy { + acq.ctx.Fields = append([]string{field}, fields...) + grbuild := &AppConfigGroupBy{build: acq} + grbuild.flds = &acq.ctx.Fields + grbuild.label = appconfig.Label + grbuild.scan = grbuild.Scan + return grbuild +} + +// Select allows the selection one or more fields/columns for the given query, +// instead of selecting all fields in the entity. +// +// Example: +// +// var v []struct { +// CreatedAt time.Time `json:"created_at,omitempty"` +// } +// +// client.AppConfig.Query(). +// Select(appconfig.FieldCreatedAt). +// Scan(ctx, &v) +func (acq *AppConfigQuery) Select(fields ...string) *AppConfigSelect { + acq.ctx.Fields = append(acq.ctx.Fields, fields...) + sbuild := &AppConfigSelect{AppConfigQuery: acq} + sbuild.label = appconfig.Label + sbuild.flds, sbuild.scan = &acq.ctx.Fields, sbuild.Scan + return sbuild +} + +// Aggregate returns a AppConfigSelect configured with the given aggregations. +func (acq *AppConfigQuery) Aggregate(fns ...AggregateFunc) *AppConfigSelect { + return acq.Select().Aggregate(fns...) +} + +func (acq *AppConfigQuery) prepareQuery(ctx context.Context) error { + for _, inter := range acq.inters { + if inter == nil { + return fmt.Errorf("ent: uninitialized interceptor (forgotten import ent/runtime?)") + } + if trv, ok := inter.(Traverser); ok { + if err := trv.Traverse(ctx, acq); err != nil { + return err + } + } + } + for _, f := range acq.ctx.Fields { + if !appconfig.ValidColumn(f) { + return &ValidationError{Name: f, err: fmt.Errorf("ent: invalid field %q for query", f)} + } + } + if acq.path != nil { + prev, err := acq.path(ctx) + if err != nil { + return err + } + acq.sql = prev + } + return nil +} + +func (acq *AppConfigQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*AppConfig, error) { + var ( + nodes = []*AppConfig{} + _spec = acq.querySpec() + ) + _spec.ScanValues = func(columns []string) ([]any, error) { + return (*AppConfig).scanValues(nil, columns) + } + _spec.Assign = func(columns []string, values []any) error { + node := &AppConfig{config: acq.config} + nodes = append(nodes, node) + return node.assignValues(columns, values) + } + for i := range hooks { + hooks[i](ctx, _spec) + } + if err := sqlgraph.QueryNodes(ctx, acq.driver, _spec); err != nil { + return nil, err + } + if len(nodes) == 0 { + return nodes, nil + } + return nodes, nil +} + +func (acq *AppConfigQuery) sqlCount(ctx context.Context) (int, error) { + _spec := acq.querySpec() + _spec.Node.Columns = acq.ctx.Fields + if len(acq.ctx.Fields) > 0 { + _spec.Unique = acq.ctx.Unique != nil && *acq.ctx.Unique + } + return sqlgraph.CountNodes(ctx, acq.driver, _spec) +} + +func (acq *AppConfigQuery) querySpec() *sqlgraph.QuerySpec { + _spec := sqlgraph.NewQuerySpec(appconfig.Table, appconfig.Columns, sqlgraph.NewFieldSpec(appconfig.FieldID, field.TypeUint)) + _spec.From = acq.sql + if unique := acq.ctx.Unique; unique != nil { + _spec.Unique = *unique + } else if acq.path != nil { + _spec.Unique = true + } + if fields := acq.ctx.Fields; len(fields) > 0 { + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, appconfig.FieldID) + for i := range fields { + if fields[i] != appconfig.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } + } + if ps := acq.predicates; len(ps) > 0 { + _spec.Predicate = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + if limit := acq.ctx.Limit; limit != nil { + _spec.Limit = *limit + } + if offset := acq.ctx.Offset; offset != nil { + _spec.Offset = *offset + } + if ps := acq.order; len(ps) > 0 { + _spec.Order = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + return _spec +} + +func (acq *AppConfigQuery) sqlQuery(ctx context.Context) *sql.Selector { + builder := sql.Dialect(acq.driver.Dialect()) + t1 := builder.Table(appconfig.Table) + columns := acq.ctx.Fields + if len(columns) == 0 { + columns = appconfig.Columns + } + selector := builder.Select(t1.Columns(columns...)...).From(t1) + if acq.sql != nil { + selector = acq.sql + selector.Select(selector.Columns(columns...)...) + } + if acq.ctx.Unique != nil && *acq.ctx.Unique { + selector.Distinct() + } + for _, p := range acq.predicates { + p(selector) + } + for _, p := range acq.order { + p(selector) + } + if offset := acq.ctx.Offset; offset != nil { + // limit is mandatory for offset clause. We start + // with default value, and override it below if needed. + selector.Offset(*offset).Limit(math.MaxInt32) + } + if limit := acq.ctx.Limit; limit != nil { + selector.Limit(*limit) + } + return selector +} + +// AppConfigGroupBy is the group-by builder for AppConfig entities. +type AppConfigGroupBy struct { + selector + build *AppConfigQuery +} + +// Aggregate adds the given aggregation functions to the group-by query. +func (acgb *AppConfigGroupBy) Aggregate(fns ...AggregateFunc) *AppConfigGroupBy { + acgb.fns = append(acgb.fns, fns...) + return acgb +} + +// Scan applies the selector query and scans the result into the given value. +func (acgb *AppConfigGroupBy) Scan(ctx context.Context, v any) error { + ctx = setContextOp(ctx, acgb.build.ctx, "GroupBy") + if err := acgb.build.prepareQuery(ctx); err != nil { + return err + } + return scanWithInterceptors[*AppConfigQuery, *AppConfigGroupBy](ctx, acgb.build, acgb, acgb.build.inters, v) +} + +func (acgb *AppConfigGroupBy) sqlScan(ctx context.Context, root *AppConfigQuery, v any) error { + selector := root.sqlQuery(ctx).Select() + aggregation := make([]string, 0, len(acgb.fns)) + for _, fn := range acgb.fns { + aggregation = append(aggregation, fn(selector)) + } + if len(selector.SelectedColumns()) == 0 { + columns := make([]string, 0, len(*acgb.flds)+len(acgb.fns)) + for _, f := range *acgb.flds { + columns = append(columns, selector.C(f)) + } + columns = append(columns, aggregation...) + selector.Select(columns...) + } + selector.GroupBy(selector.Columns(*acgb.flds...)...) + if err := selector.Err(); err != nil { + return err + } + rows := &sql.Rows{} + query, args := selector.Query() + if err := acgb.build.driver.Query(ctx, query, args, rows); err != nil { + return err + } + defer rows.Close() + return sql.ScanSlice(rows, v) +} + +// AppConfigSelect is the builder for selecting fields of AppConfig entities. +type AppConfigSelect struct { + *AppConfigQuery + selector +} + +// Aggregate adds the given aggregation functions to the selector query. +func (acs *AppConfigSelect) Aggregate(fns ...AggregateFunc) *AppConfigSelect { + acs.fns = append(acs.fns, fns...) + return acs +} + +// Scan applies the selector query and scans the result into the given value. +func (acs *AppConfigSelect) Scan(ctx context.Context, v any) error { + ctx = setContextOp(ctx, acs.ctx, "Select") + if err := acs.prepareQuery(ctx); err != nil { + return err + } + return scanWithInterceptors[*AppConfigQuery, *AppConfigSelect](ctx, acs.AppConfigQuery, acs, acs.inters, v) +} + +func (acs *AppConfigSelect) sqlScan(ctx context.Context, root *AppConfigQuery, v any) error { + selector := root.sqlQuery(ctx) + aggregation := make([]string, 0, len(acs.fns)) + for _, fn := range acs.fns { + aggregation = append(aggregation, fn(selector)) + } + switch n := len(*acs.selector.flds); { + case n == 0 && len(aggregation) > 0: + selector.Select(aggregation...) + case n != 0 && len(aggregation) > 0: + selector.AppendSelect(aggregation...) + } + rows := &sql.Rows{} + query, args := selector.Query() + if err := acs.driver.Query(ctx, query, args, rows); err != nil { + return err + } + defer rows.Close() + return sql.ScanSlice(rows, v) +} diff --git a/api/pkg/ent/appconfig_update.go b/api/pkg/ent/appconfig_update.go new file mode 100644 index 0000000000..f11aca4903 --- /dev/null +++ b/api/pkg/ent/appconfig_update.go @@ -0,0 +1,370 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "context" + "errors" + "fmt" + "time" + + "entgo.io/ent/dialect/sql" + "entgo.io/ent/dialect/sql/sqlgraph" + "entgo.io/ent/schema/field" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" + "github.com/chanzuckerberg/happy/api/pkg/ent/predicate" +) + +// AppConfigUpdate is the builder for updating AppConfig entities. +type AppConfigUpdate struct { + config + hooks []Hook + mutation *AppConfigMutation +} + +// Where appends a list predicates to the AppConfigUpdate builder. +func (acu *AppConfigUpdate) Where(ps ...predicate.AppConfig) *AppConfigUpdate { + acu.mutation.Where(ps...) + return acu +} + +// SetUpdatedAt sets the "updated_at" field. +func (acu *AppConfigUpdate) SetUpdatedAt(t time.Time) *AppConfigUpdate { + acu.mutation.SetUpdatedAt(t) + return acu +} + +// SetDeletedAt sets the "deleted_at" field. +func (acu *AppConfigUpdate) SetDeletedAt(t time.Time) *AppConfigUpdate { + acu.mutation.SetDeletedAt(t) + return acu +} + +// SetNillableDeletedAt sets the "deleted_at" field if the given value is not nil. +func (acu *AppConfigUpdate) SetNillableDeletedAt(t *time.Time) *AppConfigUpdate { + if t != nil { + acu.SetDeletedAt(*t) + } + return acu +} + +// ClearDeletedAt clears the value of the "deleted_at" field. +func (acu *AppConfigUpdate) ClearDeletedAt() *AppConfigUpdate { + acu.mutation.ClearDeletedAt() + return acu +} + +// SetAppName sets the "app_name" field. +func (acu *AppConfigUpdate) SetAppName(s string) *AppConfigUpdate { + acu.mutation.SetAppName(s) + return acu +} + +// SetEnvironment sets the "environment" field. +func (acu *AppConfigUpdate) SetEnvironment(s string) *AppConfigUpdate { + acu.mutation.SetEnvironment(s) + return acu +} + +// SetStack sets the "stack" field. +func (acu *AppConfigUpdate) SetStack(s string) *AppConfigUpdate { + acu.mutation.SetStack(s) + return acu +} + +// SetNillableStack sets the "stack" field if the given value is not nil. +func (acu *AppConfigUpdate) SetNillableStack(s *string) *AppConfigUpdate { + if s != nil { + acu.SetStack(*s) + } + return acu +} + +// SetKey sets the "key" field. +func (acu *AppConfigUpdate) SetKey(s string) *AppConfigUpdate { + acu.mutation.SetKey(s) + return acu +} + +// SetValue sets the "value" field. +func (acu *AppConfigUpdate) SetValue(s string) *AppConfigUpdate { + acu.mutation.SetValue(s) + return acu +} + +// Mutation returns the AppConfigMutation object of the builder. +func (acu *AppConfigUpdate) Mutation() *AppConfigMutation { + return acu.mutation +} + +// Save executes the query and returns the number of nodes affected by the update operation. +func (acu *AppConfigUpdate) Save(ctx context.Context) (int, error) { + acu.defaults() + return withHooks(ctx, acu.sqlSave, acu.mutation, acu.hooks) +} + +// SaveX is like Save, but panics if an error occurs. +func (acu *AppConfigUpdate) SaveX(ctx context.Context) int { + affected, err := acu.Save(ctx) + if err != nil { + panic(err) + } + return affected +} + +// Exec executes the query. +func (acu *AppConfigUpdate) Exec(ctx context.Context) error { + _, err := acu.Save(ctx) + return err +} + +// ExecX is like Exec, but panics if an error occurs. +func (acu *AppConfigUpdate) ExecX(ctx context.Context) { + if err := acu.Exec(ctx); err != nil { + panic(err) + } +} + +// defaults sets the default values of the builder before save. +func (acu *AppConfigUpdate) defaults() { + if _, ok := acu.mutation.UpdatedAt(); !ok { + v := appconfig.UpdateDefaultUpdatedAt() + acu.mutation.SetUpdatedAt(v) + } +} + +func (acu *AppConfigUpdate) sqlSave(ctx context.Context) (n int, err error) { + _spec := sqlgraph.NewUpdateSpec(appconfig.Table, appconfig.Columns, sqlgraph.NewFieldSpec(appconfig.FieldID, field.TypeUint)) + if ps := acu.mutation.predicates; len(ps) > 0 { + _spec.Predicate = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + if value, ok := acu.mutation.UpdatedAt(); ok { + _spec.SetField(appconfig.FieldUpdatedAt, field.TypeTime, value) + } + if value, ok := acu.mutation.DeletedAt(); ok { + _spec.SetField(appconfig.FieldDeletedAt, field.TypeTime, value) + } + if acu.mutation.DeletedAtCleared() { + _spec.ClearField(appconfig.FieldDeletedAt, field.TypeTime) + } + if value, ok := acu.mutation.AppName(); ok { + _spec.SetField(appconfig.FieldAppName, field.TypeString, value) + } + if value, ok := acu.mutation.Environment(); ok { + _spec.SetField(appconfig.FieldEnvironment, field.TypeString, value) + } + if value, ok := acu.mutation.Stack(); ok { + _spec.SetField(appconfig.FieldStack, field.TypeString, value) + } + if value, ok := acu.mutation.Key(); ok { + _spec.SetField(appconfig.FieldKey, field.TypeString, value) + } + if value, ok := acu.mutation.Value(); ok { + _spec.SetField(appconfig.FieldValue, field.TypeString, value) + } + if n, err = sqlgraph.UpdateNodes(ctx, acu.driver, _spec); err != nil { + if _, ok := err.(*sqlgraph.NotFoundError); ok { + err = &NotFoundError{appconfig.Label} + } else if sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + return 0, err + } + acu.mutation.done = true + return n, nil +} + +// AppConfigUpdateOne is the builder for updating a single AppConfig entity. +type AppConfigUpdateOne struct { + config + fields []string + hooks []Hook + mutation *AppConfigMutation +} + +// SetUpdatedAt sets the "updated_at" field. +func (acuo *AppConfigUpdateOne) SetUpdatedAt(t time.Time) *AppConfigUpdateOne { + acuo.mutation.SetUpdatedAt(t) + return acuo +} + +// SetDeletedAt sets the "deleted_at" field. +func (acuo *AppConfigUpdateOne) SetDeletedAt(t time.Time) *AppConfigUpdateOne { + acuo.mutation.SetDeletedAt(t) + return acuo +} + +// SetNillableDeletedAt sets the "deleted_at" field if the given value is not nil. +func (acuo *AppConfigUpdateOne) SetNillableDeletedAt(t *time.Time) *AppConfigUpdateOne { + if t != nil { + acuo.SetDeletedAt(*t) + } + return acuo +} + +// ClearDeletedAt clears the value of the "deleted_at" field. +func (acuo *AppConfigUpdateOne) ClearDeletedAt() *AppConfigUpdateOne { + acuo.mutation.ClearDeletedAt() + return acuo +} + +// SetAppName sets the "app_name" field. +func (acuo *AppConfigUpdateOne) SetAppName(s string) *AppConfigUpdateOne { + acuo.mutation.SetAppName(s) + return acuo +} + +// SetEnvironment sets the "environment" field. +func (acuo *AppConfigUpdateOne) SetEnvironment(s string) *AppConfigUpdateOne { + acuo.mutation.SetEnvironment(s) + return acuo +} + +// SetStack sets the "stack" field. +func (acuo *AppConfigUpdateOne) SetStack(s string) *AppConfigUpdateOne { + acuo.mutation.SetStack(s) + return acuo +} + +// SetNillableStack sets the "stack" field if the given value is not nil. +func (acuo *AppConfigUpdateOne) SetNillableStack(s *string) *AppConfigUpdateOne { + if s != nil { + acuo.SetStack(*s) + } + return acuo +} + +// SetKey sets the "key" field. +func (acuo *AppConfigUpdateOne) SetKey(s string) *AppConfigUpdateOne { + acuo.mutation.SetKey(s) + return acuo +} + +// SetValue sets the "value" field. +func (acuo *AppConfigUpdateOne) SetValue(s string) *AppConfigUpdateOne { + acuo.mutation.SetValue(s) + return acuo +} + +// Mutation returns the AppConfigMutation object of the builder. +func (acuo *AppConfigUpdateOne) Mutation() *AppConfigMutation { + return acuo.mutation +} + +// Where appends a list predicates to the AppConfigUpdate builder. +func (acuo *AppConfigUpdateOne) Where(ps ...predicate.AppConfig) *AppConfigUpdateOne { + acuo.mutation.Where(ps...) + return acuo +} + +// Select allows selecting one or more fields (columns) of the returned entity. +// The default is selecting all fields defined in the entity schema. +func (acuo *AppConfigUpdateOne) Select(field string, fields ...string) *AppConfigUpdateOne { + acuo.fields = append([]string{field}, fields...) + return acuo +} + +// Save executes the query and returns the updated AppConfig entity. +func (acuo *AppConfigUpdateOne) Save(ctx context.Context) (*AppConfig, error) { + acuo.defaults() + return withHooks(ctx, acuo.sqlSave, acuo.mutation, acuo.hooks) +} + +// SaveX is like Save, but panics if an error occurs. +func (acuo *AppConfigUpdateOne) SaveX(ctx context.Context) *AppConfig { + node, err := acuo.Save(ctx) + if err != nil { + panic(err) + } + return node +} + +// Exec executes the query on the entity. +func (acuo *AppConfigUpdateOne) Exec(ctx context.Context) error { + _, err := acuo.Save(ctx) + return err +} + +// ExecX is like Exec, but panics if an error occurs. +func (acuo *AppConfigUpdateOne) ExecX(ctx context.Context) { + if err := acuo.Exec(ctx); err != nil { + panic(err) + } +} + +// defaults sets the default values of the builder before save. +func (acuo *AppConfigUpdateOne) defaults() { + if _, ok := acuo.mutation.UpdatedAt(); !ok { + v := appconfig.UpdateDefaultUpdatedAt() + acuo.mutation.SetUpdatedAt(v) + } +} + +func (acuo *AppConfigUpdateOne) sqlSave(ctx context.Context) (_node *AppConfig, err error) { + _spec := sqlgraph.NewUpdateSpec(appconfig.Table, appconfig.Columns, sqlgraph.NewFieldSpec(appconfig.FieldID, field.TypeUint)) + id, ok := acuo.mutation.ID() + if !ok { + return nil, &ValidationError{Name: "id", err: errors.New(`ent: missing "AppConfig.id" for update`)} + } + _spec.Node.ID.Value = id + if fields := acuo.fields; len(fields) > 0 { + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, appconfig.FieldID) + for _, f := range fields { + if !appconfig.ValidColumn(f) { + return nil, &ValidationError{Name: f, err: fmt.Errorf("ent: invalid field %q for query", f)} + } + if f != appconfig.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, f) + } + } + } + if ps := acuo.mutation.predicates; len(ps) > 0 { + _spec.Predicate = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + if value, ok := acuo.mutation.UpdatedAt(); ok { + _spec.SetField(appconfig.FieldUpdatedAt, field.TypeTime, value) + } + if value, ok := acuo.mutation.DeletedAt(); ok { + _spec.SetField(appconfig.FieldDeletedAt, field.TypeTime, value) + } + if acuo.mutation.DeletedAtCleared() { + _spec.ClearField(appconfig.FieldDeletedAt, field.TypeTime) + } + if value, ok := acuo.mutation.AppName(); ok { + _spec.SetField(appconfig.FieldAppName, field.TypeString, value) + } + if value, ok := acuo.mutation.Environment(); ok { + _spec.SetField(appconfig.FieldEnvironment, field.TypeString, value) + } + if value, ok := acuo.mutation.Stack(); ok { + _spec.SetField(appconfig.FieldStack, field.TypeString, value) + } + if value, ok := acuo.mutation.Key(); ok { + _spec.SetField(appconfig.FieldKey, field.TypeString, value) + } + if value, ok := acuo.mutation.Value(); ok { + _spec.SetField(appconfig.FieldValue, field.TypeString, value) + } + _node = &AppConfig{config: acuo.config} + _spec.Assign = _node.assignValues + _spec.ScanValues = _node.scanValues + if err = sqlgraph.UpdateNode(ctx, acuo.driver, _spec); err != nil { + if _, ok := err.(*sqlgraph.NotFoundError); ok { + err = &NotFoundError{appconfig.Label} + } else if sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + return nil, err + } + acuo.mutation.done = true + return _node, nil +} diff --git a/api/pkg/ent/client.go b/api/pkg/ent/client.go new file mode 100644 index 0000000000..8277f1947c --- /dev/null +++ b/api/pkg/ent/client.go @@ -0,0 +1,335 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "context" + "errors" + "fmt" + "log" + "reflect" + + "github.com/chanzuckerberg/happy/api/pkg/ent/migrate" + + "entgo.io/ent" + "entgo.io/ent/dialect" + "entgo.io/ent/dialect/sql" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" +) + +// Client is the client that holds all ent builders. +type Client struct { + config + // Schema is the client for creating, migrating and dropping schema. + Schema *migrate.Schema + // AppConfig is the client for interacting with the AppConfig builders. + AppConfig *AppConfigClient +} + +// NewClient creates a new client configured with the given options. +func NewClient(opts ...Option) *Client { + cfg := config{log: log.Println, hooks: &hooks{}, inters: &inters{}} + cfg.options(opts...) + client := &Client{config: cfg} + client.init() + return client +} + +func (c *Client) init() { + c.Schema = migrate.NewSchema(c.driver) + c.AppConfig = NewAppConfigClient(c.config) +} + +type ( + // config is the configuration for the client and its builder. + config struct { + // driver used for executing database requests. + driver dialect.Driver + // debug enable a debug logging. + debug bool + // log used for logging on debug mode. + log func(...any) + // hooks to execute on mutations. + hooks *hooks + // interceptors to execute on queries. + inters *inters + } + // Option function to configure the client. + Option func(*config) +) + +// options applies the options on the config object. +func (c *config) options(opts ...Option) { + for _, opt := range opts { + opt(c) + } + if c.debug { + c.driver = dialect.Debug(c.driver, c.log) + } +} + +// Debug enables debug logging on the ent.Driver. +func Debug() Option { + return func(c *config) { + c.debug = true + } +} + +// Log sets the logging function for debug mode. +func Log(fn func(...any)) Option { + return func(c *config) { + c.log = fn + } +} + +// Driver configures the client driver. +func Driver(driver dialect.Driver) Option { + return func(c *config) { + c.driver = driver + } +} + +// Open opens a database/sql.DB specified by the driver name and +// the data source name, and returns a new client attached to it. +// Optional parameters can be added for configuring the client. +func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { + switch driverName { + case dialect.MySQL, dialect.Postgres, dialect.SQLite: + drv, err := sql.Open(driverName, dataSourceName) + if err != nil { + return nil, err + } + return NewClient(append(options, Driver(drv))...), nil + default: + return nil, fmt.Errorf("unsupported driver: %q", driverName) + } +} + +// ErrTxStarted is returned when trying to start a new transaction from a transactional client. +var ErrTxStarted = errors.New("ent: cannot start a transaction within a transaction") + +// Tx returns a new transactional client. The provided context +// is used until the transaction is committed or rolled back. +func (c *Client) Tx(ctx context.Context) (*Tx, error) { + if _, ok := c.driver.(*txDriver); ok { + return nil, ErrTxStarted + } + tx, err := newTx(ctx, c.driver) + if err != nil { + return nil, fmt.Errorf("ent: starting a transaction: %w", err) + } + cfg := c.config + cfg.driver = tx + return &Tx{ + ctx: ctx, + config: cfg, + AppConfig: NewAppConfigClient(cfg), + }, nil +} + +// BeginTx returns a transactional client with specified options. +func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) { + if _, ok := c.driver.(*txDriver); ok { + return nil, errors.New("ent: cannot start a transaction within a transaction") + } + tx, err := c.driver.(interface { + BeginTx(context.Context, *sql.TxOptions) (dialect.Tx, error) + }).BeginTx(ctx, opts) + if err != nil { + return nil, fmt.Errorf("ent: starting a transaction: %w", err) + } + cfg := c.config + cfg.driver = &txDriver{tx: tx, drv: c.driver} + return &Tx{ + ctx: ctx, + config: cfg, + AppConfig: NewAppConfigClient(cfg), + }, nil +} + +// Debug returns a new debug-client. It's used to get verbose logging on specific operations. +// +// client.Debug(). +// AppConfig. +// Query(). +// Count(ctx) +func (c *Client) Debug() *Client { + if c.debug { + return c + } + cfg := c.config + cfg.driver = dialect.Debug(c.driver, c.log) + client := &Client{config: cfg} + client.init() + return client +} + +// Close closes the database connection and prevents new queries from starting. +func (c *Client) Close() error { + return c.driver.Close() +} + +// Use adds the mutation hooks to all the entity clients. +// In order to add hooks to a specific client, call: `client.Node.Use(...)`. +func (c *Client) Use(hooks ...Hook) { + c.AppConfig.Use(hooks...) +} + +// Intercept adds the query interceptors to all the entity clients. +// In order to add interceptors to a specific client, call: `client.Node.Intercept(...)`. +func (c *Client) Intercept(interceptors ...Interceptor) { + c.AppConfig.Intercept(interceptors...) +} + +// Mutate implements the ent.Mutator interface. +func (c *Client) Mutate(ctx context.Context, m Mutation) (Value, error) { + switch m := m.(type) { + case *AppConfigMutation: + return c.AppConfig.mutate(ctx, m) + default: + return nil, fmt.Errorf("ent: unknown mutation type %T", m) + } +} + +// AppConfigClient is a client for the AppConfig schema. +type AppConfigClient struct { + config +} + +// NewAppConfigClient returns a client for the AppConfig from the given config. +func NewAppConfigClient(c config) *AppConfigClient { + return &AppConfigClient{config: c} +} + +// Use adds a list of mutation hooks to the hooks stack. +// A call to `Use(f, g, h)` equals to `appconfig.Hooks(f(g(h())))`. +func (c *AppConfigClient) Use(hooks ...Hook) { + c.hooks.AppConfig = append(c.hooks.AppConfig, hooks...) +} + +// Intercept adds a list of query interceptors to the interceptors stack. +// A call to `Intercept(f, g, h)` equals to `appconfig.Intercept(f(g(h())))`. +func (c *AppConfigClient) Intercept(interceptors ...Interceptor) { + c.inters.AppConfig = append(c.inters.AppConfig, interceptors...) +} + +// Create returns a builder for creating a AppConfig entity. +func (c *AppConfigClient) Create() *AppConfigCreate { + mutation := newAppConfigMutation(c.config, OpCreate) + return &AppConfigCreate{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// CreateBulk returns a builder for creating a bulk of AppConfig entities. +func (c *AppConfigClient) CreateBulk(builders ...*AppConfigCreate) *AppConfigCreateBulk { + return &AppConfigCreateBulk{config: c.config, builders: builders} +} + +// MapCreateBulk creates a bulk creation builder from the given slice. For each item in the slice, the function creates +// a builder and applies setFunc on it. +func (c *AppConfigClient) MapCreateBulk(slice any, setFunc func(*AppConfigCreate, int)) *AppConfigCreateBulk { + rv := reflect.ValueOf(slice) + if rv.Kind() != reflect.Slice { + return &AppConfigCreateBulk{err: fmt.Errorf("calling to AppConfigClient.MapCreateBulk with wrong type %T, need slice", slice)} + } + builders := make([]*AppConfigCreate, rv.Len()) + for i := 0; i < rv.Len(); i++ { + builders[i] = c.Create() + setFunc(builders[i], i) + } + return &AppConfigCreateBulk{config: c.config, builders: builders} +} + +// Update returns an update builder for AppConfig. +func (c *AppConfigClient) Update() *AppConfigUpdate { + mutation := newAppConfigMutation(c.config, OpUpdate) + return &AppConfigUpdate{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// UpdateOne returns an update builder for the given entity. +func (c *AppConfigClient) UpdateOne(ac *AppConfig) *AppConfigUpdateOne { + mutation := newAppConfigMutation(c.config, OpUpdateOne, withAppConfig(ac)) + return &AppConfigUpdateOne{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// UpdateOneID returns an update builder for the given id. +func (c *AppConfigClient) UpdateOneID(id uint) *AppConfigUpdateOne { + mutation := newAppConfigMutation(c.config, OpUpdateOne, withAppConfigID(id)) + return &AppConfigUpdateOne{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// Delete returns a delete builder for AppConfig. +func (c *AppConfigClient) Delete() *AppConfigDelete { + mutation := newAppConfigMutation(c.config, OpDelete) + return &AppConfigDelete{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// DeleteOne returns a builder for deleting the given entity. +func (c *AppConfigClient) DeleteOne(ac *AppConfig) *AppConfigDeleteOne { + return c.DeleteOneID(ac.ID) +} + +// DeleteOneID returns a builder for deleting the given entity by its id. +func (c *AppConfigClient) DeleteOneID(id uint) *AppConfigDeleteOne { + builder := c.Delete().Where(appconfig.ID(id)) + builder.mutation.id = &id + builder.mutation.op = OpDeleteOne + return &AppConfigDeleteOne{builder} +} + +// Query returns a query builder for AppConfig. +func (c *AppConfigClient) Query() *AppConfigQuery { + return &AppConfigQuery{ + config: c.config, + ctx: &QueryContext{Type: TypeAppConfig}, + inters: c.Interceptors(), + } +} + +// Get returns a AppConfig entity by its id. +func (c *AppConfigClient) Get(ctx context.Context, id uint) (*AppConfig, error) { + return c.Query().Where(appconfig.ID(id)).Only(ctx) +} + +// GetX is like Get, but panics if an error occurs. +func (c *AppConfigClient) GetX(ctx context.Context, id uint) *AppConfig { + obj, err := c.Get(ctx, id) + if err != nil { + panic(err) + } + return obj +} + +// Hooks returns the client hooks. +func (c *AppConfigClient) Hooks() []Hook { + return c.hooks.AppConfig +} + +// Interceptors returns the client interceptors. +func (c *AppConfigClient) Interceptors() []Interceptor { + return c.inters.AppConfig +} + +func (c *AppConfigClient) mutate(ctx context.Context, m *AppConfigMutation) (Value, error) { + switch m.Op() { + case OpCreate: + return (&AppConfigCreate{config: c.config, hooks: c.Hooks(), mutation: m}).Save(ctx) + case OpUpdate: + return (&AppConfigUpdate{config: c.config, hooks: c.Hooks(), mutation: m}).Save(ctx) + case OpUpdateOne: + return (&AppConfigUpdateOne{config: c.config, hooks: c.Hooks(), mutation: m}).Save(ctx) + case OpDelete, OpDeleteOne: + return (&AppConfigDelete{config: c.config, hooks: c.Hooks(), mutation: m}).Exec(ctx) + default: + return nil, fmt.Errorf("ent: unknown AppConfig mutation op: %q", m.Op()) + } +} + +// hooks and interceptors per client, for fast access. +type ( + hooks struct { + AppConfig []ent.Hook + } + inters struct { + AppConfig []ent.Interceptor + } +) diff --git a/api/pkg/ent/ent.go b/api/pkg/ent/ent.go new file mode 100644 index 0000000000..2b059e01e8 --- /dev/null +++ b/api/pkg/ent/ent.go @@ -0,0 +1,608 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "context" + "errors" + "fmt" + "reflect" + "sync" + + "entgo.io/ent" + "entgo.io/ent/dialect/sql" + "entgo.io/ent/dialect/sql/sqlgraph" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" +) + +// ent aliases to avoid import conflicts in user's code. +type ( + Op = ent.Op + Hook = ent.Hook + Value = ent.Value + Query = ent.Query + QueryContext = ent.QueryContext + Querier = ent.Querier + QuerierFunc = ent.QuerierFunc + Interceptor = ent.Interceptor + InterceptFunc = ent.InterceptFunc + Traverser = ent.Traverser + TraverseFunc = ent.TraverseFunc + Policy = ent.Policy + Mutator = ent.Mutator + Mutation = ent.Mutation + MutateFunc = ent.MutateFunc +) + +type clientCtxKey struct{} + +// FromContext returns a Client stored inside a context, or nil if there isn't one. +func FromContext(ctx context.Context) *Client { + c, _ := ctx.Value(clientCtxKey{}).(*Client) + return c +} + +// NewContext returns a new context with the given Client attached. +func NewContext(parent context.Context, c *Client) context.Context { + return context.WithValue(parent, clientCtxKey{}, c) +} + +type txCtxKey struct{} + +// TxFromContext returns a Tx stored inside a context, or nil if there isn't one. +func TxFromContext(ctx context.Context) *Tx { + tx, _ := ctx.Value(txCtxKey{}).(*Tx) + return tx +} + +// NewTxContext returns a new context with the given Tx attached. +func NewTxContext(parent context.Context, tx *Tx) context.Context { + return context.WithValue(parent, txCtxKey{}, tx) +} + +// OrderFunc applies an ordering on the sql selector. +// Deprecated: Use Asc/Desc functions or the package builders instead. +type OrderFunc func(*sql.Selector) + +var ( + initCheck sync.Once + columnCheck sql.ColumnCheck +) + +// columnChecker checks if the column exists in the given table. +func checkColumn(table, column string) error { + initCheck.Do(func() { + columnCheck = sql.NewColumnCheck(map[string]func(string) bool{ + appconfig.Table: appconfig.ValidColumn, + }) + }) + return columnCheck(table, column) +} + +// Asc applies the given fields in ASC order. +func Asc(fields ...string) func(*sql.Selector) { + return func(s *sql.Selector) { + for _, f := range fields { + if err := checkColumn(s.TableName(), f); err != nil { + s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ent: %w", err)}) + } + s.OrderBy(sql.Asc(s.C(f))) + } + } +} + +// Desc applies the given fields in DESC order. +func Desc(fields ...string) func(*sql.Selector) { + return func(s *sql.Selector) { + for _, f := range fields { + if err := checkColumn(s.TableName(), f); err != nil { + s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ent: %w", err)}) + } + s.OrderBy(sql.Desc(s.C(f))) + } + } +} + +// AggregateFunc applies an aggregation step on the group-by traversal/selector. +type AggregateFunc func(*sql.Selector) string + +// As is a pseudo aggregation function for renaming another other functions with custom names. For example: +// +// GroupBy(field1, field2). +// Aggregate(ent.As(ent.Sum(field1), "sum_field1"), (ent.As(ent.Sum(field2), "sum_field2")). +// Scan(ctx, &v) +func As(fn AggregateFunc, end string) AggregateFunc { + return func(s *sql.Selector) string { + return sql.As(fn(s), end) + } +} + +// Count applies the "count" aggregation function on each group. +func Count() AggregateFunc { + return func(s *sql.Selector) string { + return sql.Count("*") + } +} + +// Max applies the "max" aggregation function on the given field of each group. +func Max(field string) AggregateFunc { + return func(s *sql.Selector) string { + if err := checkColumn(s.TableName(), field); err != nil { + s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)}) + return "" + } + return sql.Max(s.C(field)) + } +} + +// Mean applies the "mean" aggregation function on the given field of each group. +func Mean(field string) AggregateFunc { + return func(s *sql.Selector) string { + if err := checkColumn(s.TableName(), field); err != nil { + s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)}) + return "" + } + return sql.Avg(s.C(field)) + } +} + +// Min applies the "min" aggregation function on the given field of each group. +func Min(field string) AggregateFunc { + return func(s *sql.Selector) string { + if err := checkColumn(s.TableName(), field); err != nil { + s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)}) + return "" + } + return sql.Min(s.C(field)) + } +} + +// Sum applies the "sum" aggregation function on the given field of each group. +func Sum(field string) AggregateFunc { + return func(s *sql.Selector) string { + if err := checkColumn(s.TableName(), field); err != nil { + s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)}) + return "" + } + return sql.Sum(s.C(field)) + } +} + +// ValidationError returns when validating a field or edge fails. +type ValidationError struct { + Name string // Field or edge name. + err error +} + +// Error implements the error interface. +func (e *ValidationError) Error() string { + return e.err.Error() +} + +// Unwrap implements the errors.Wrapper interface. +func (e *ValidationError) Unwrap() error { + return e.err +} + +// IsValidationError returns a boolean indicating whether the error is a validation error. +func IsValidationError(err error) bool { + if err == nil { + return false + } + var e *ValidationError + return errors.As(err, &e) +} + +// NotFoundError returns when trying to fetch a specific entity and it was not found in the database. +type NotFoundError struct { + label string +} + +// Error implements the error interface. +func (e *NotFoundError) Error() string { + return "ent: " + e.label + " not found" +} + +// IsNotFound returns a boolean indicating whether the error is a not found error. +func IsNotFound(err error) bool { + if err == nil { + return false + } + var e *NotFoundError + return errors.As(err, &e) +} + +// MaskNotFound masks not found error. +func MaskNotFound(err error) error { + if IsNotFound(err) { + return nil + } + return err +} + +// NotSingularError returns when trying to fetch a singular entity and more then one was found in the database. +type NotSingularError struct { + label string +} + +// Error implements the error interface. +func (e *NotSingularError) Error() string { + return "ent: " + e.label + " not singular" +} + +// IsNotSingular returns a boolean indicating whether the error is a not singular error. +func IsNotSingular(err error) bool { + if err == nil { + return false + } + var e *NotSingularError + return errors.As(err, &e) +} + +// NotLoadedError returns when trying to get a node that was not loaded by the query. +type NotLoadedError struct { + edge string +} + +// Error implements the error interface. +func (e *NotLoadedError) Error() string { + return "ent: " + e.edge + " edge was not loaded" +} + +// IsNotLoaded returns a boolean indicating whether the error is a not loaded error. +func IsNotLoaded(err error) bool { + if err == nil { + return false + } + var e *NotLoadedError + return errors.As(err, &e) +} + +// ConstraintError returns when trying to create/update one or more entities and +// one or more of their constraints failed. For example, violation of edge or +// field uniqueness. +type ConstraintError struct { + msg string + wrap error +} + +// Error implements the error interface. +func (e ConstraintError) Error() string { + return "ent: constraint failed: " + e.msg +} + +// Unwrap implements the errors.Wrapper interface. +func (e *ConstraintError) Unwrap() error { + return e.wrap +} + +// IsConstraintError returns a boolean indicating whether the error is a constraint failure. +func IsConstraintError(err error) bool { + if err == nil { + return false + } + var e *ConstraintError + return errors.As(err, &e) +} + +// selector embedded by the different Select/GroupBy builders. +type selector struct { + label string + flds *[]string + fns []AggregateFunc + scan func(context.Context, any) error +} + +// ScanX is like Scan, but panics if an error occurs. +func (s *selector) ScanX(ctx context.Context, v any) { + if err := s.scan(ctx, v); err != nil { + panic(err) + } +} + +// Strings returns list of strings from a selector. It is only allowed when selecting one field. +func (s *selector) Strings(ctx context.Context) ([]string, error) { + if len(*s.flds) > 1 { + return nil, errors.New("ent: Strings is not achievable when selecting more than 1 field") + } + var v []string + if err := s.scan(ctx, &v); err != nil { + return nil, err + } + return v, nil +} + +// StringsX is like Strings, but panics if an error occurs. +func (s *selector) StringsX(ctx context.Context) []string { + v, err := s.Strings(ctx) + if err != nil { + panic(err) + } + return v +} + +// String returns a single string from a selector. It is only allowed when selecting one field. +func (s *selector) String(ctx context.Context) (_ string, err error) { + var v []string + if v, err = s.Strings(ctx); err != nil { + return + } + switch len(v) { + case 1: + return v[0], nil + case 0: + err = &NotFoundError{s.label} + default: + err = fmt.Errorf("ent: Strings returned %d results when one was expected", len(v)) + } + return +} + +// StringX is like String, but panics if an error occurs. +func (s *selector) StringX(ctx context.Context) string { + v, err := s.String(ctx) + if err != nil { + panic(err) + } + return v +} + +// Ints returns list of ints from a selector. It is only allowed when selecting one field. +func (s *selector) Ints(ctx context.Context) ([]int, error) { + if len(*s.flds) > 1 { + return nil, errors.New("ent: Ints is not achievable when selecting more than 1 field") + } + var v []int + if err := s.scan(ctx, &v); err != nil { + return nil, err + } + return v, nil +} + +// IntsX is like Ints, but panics if an error occurs. +func (s *selector) IntsX(ctx context.Context) []int { + v, err := s.Ints(ctx) + if err != nil { + panic(err) + } + return v +} + +// Int returns a single int from a selector. It is only allowed when selecting one field. +func (s *selector) Int(ctx context.Context) (_ int, err error) { + var v []int + if v, err = s.Ints(ctx); err != nil { + return + } + switch len(v) { + case 1: + return v[0], nil + case 0: + err = &NotFoundError{s.label} + default: + err = fmt.Errorf("ent: Ints returned %d results when one was expected", len(v)) + } + return +} + +// IntX is like Int, but panics if an error occurs. +func (s *selector) IntX(ctx context.Context) int { + v, err := s.Int(ctx) + if err != nil { + panic(err) + } + return v +} + +// Float64s returns list of float64s from a selector. It is only allowed when selecting one field. +func (s *selector) Float64s(ctx context.Context) ([]float64, error) { + if len(*s.flds) > 1 { + return nil, errors.New("ent: Float64s is not achievable when selecting more than 1 field") + } + var v []float64 + if err := s.scan(ctx, &v); err != nil { + return nil, err + } + return v, nil +} + +// Float64sX is like Float64s, but panics if an error occurs. +func (s *selector) Float64sX(ctx context.Context) []float64 { + v, err := s.Float64s(ctx) + if err != nil { + panic(err) + } + return v +} + +// Float64 returns a single float64 from a selector. It is only allowed when selecting one field. +func (s *selector) Float64(ctx context.Context) (_ float64, err error) { + var v []float64 + if v, err = s.Float64s(ctx); err != nil { + return + } + switch len(v) { + case 1: + return v[0], nil + case 0: + err = &NotFoundError{s.label} + default: + err = fmt.Errorf("ent: Float64s returned %d results when one was expected", len(v)) + } + return +} + +// Float64X is like Float64, but panics if an error occurs. +func (s *selector) Float64X(ctx context.Context) float64 { + v, err := s.Float64(ctx) + if err != nil { + panic(err) + } + return v +} + +// Bools returns list of bools from a selector. It is only allowed when selecting one field. +func (s *selector) Bools(ctx context.Context) ([]bool, error) { + if len(*s.flds) > 1 { + return nil, errors.New("ent: Bools is not achievable when selecting more than 1 field") + } + var v []bool + if err := s.scan(ctx, &v); err != nil { + return nil, err + } + return v, nil +} + +// BoolsX is like Bools, but panics if an error occurs. +func (s *selector) BoolsX(ctx context.Context) []bool { + v, err := s.Bools(ctx) + if err != nil { + panic(err) + } + return v +} + +// Bool returns a single bool from a selector. It is only allowed when selecting one field. +func (s *selector) Bool(ctx context.Context) (_ bool, err error) { + var v []bool + if v, err = s.Bools(ctx); err != nil { + return + } + switch len(v) { + case 1: + return v[0], nil + case 0: + err = &NotFoundError{s.label} + default: + err = fmt.Errorf("ent: Bools returned %d results when one was expected", len(v)) + } + return +} + +// BoolX is like Bool, but panics if an error occurs. +func (s *selector) BoolX(ctx context.Context) bool { + v, err := s.Bool(ctx) + if err != nil { + panic(err) + } + return v +} + +// withHooks invokes the builder operation with the given hooks, if any. +func withHooks[V Value, M any, PM interface { + *M + Mutation +}](ctx context.Context, exec func(context.Context) (V, error), mutation PM, hooks []Hook) (value V, err error) { + if len(hooks) == 0 { + return exec(ctx) + } + var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) { + mutationT, ok := any(m).(PM) + if !ok { + return nil, fmt.Errorf("unexpected mutation type %T", m) + } + // Set the mutation to the builder. + *mutation = *mutationT + return exec(ctx) + }) + for i := len(hooks) - 1; i >= 0; i-- { + if hooks[i] == nil { + return value, fmt.Errorf("ent: uninitialized hook (forgotten import ent/runtime?)") + } + mut = hooks[i](mut) + } + v, err := mut.Mutate(ctx, mutation) + if err != nil { + return value, err + } + nv, ok := v.(V) + if !ok { + return value, fmt.Errorf("unexpected node type %T returned from %T", v, mutation) + } + return nv, nil +} + +// setContextOp returns a new context with the given QueryContext attached (including its op) in case it does not exist. +func setContextOp(ctx context.Context, qc *QueryContext, op string) context.Context { + if ent.QueryFromContext(ctx) == nil { + qc.Op = op + ctx = ent.NewQueryContext(ctx, qc) + } + return ctx +} + +func querierAll[V Value, Q interface { + sqlAll(context.Context, ...queryHook) (V, error) +}]() Querier { + return QuerierFunc(func(ctx context.Context, q Query) (Value, error) { + query, ok := q.(Q) + if !ok { + return nil, fmt.Errorf("unexpected query type %T", q) + } + return query.sqlAll(ctx) + }) +} + +func querierCount[Q interface { + sqlCount(context.Context) (int, error) +}]() Querier { + return QuerierFunc(func(ctx context.Context, q Query) (Value, error) { + query, ok := q.(Q) + if !ok { + return nil, fmt.Errorf("unexpected query type %T", q) + } + return query.sqlCount(ctx) + }) +} + +func withInterceptors[V Value](ctx context.Context, q Query, qr Querier, inters []Interceptor) (v V, err error) { + for i := len(inters) - 1; i >= 0; i-- { + qr = inters[i].Intercept(qr) + } + rv, err := qr.Query(ctx, q) + if err != nil { + return v, err + } + vt, ok := rv.(V) + if !ok { + return v, fmt.Errorf("unexpected type %T returned from %T. expected type: %T", vt, q, v) + } + return vt, nil +} + +func scanWithInterceptors[Q1 ent.Query, Q2 interface { + sqlScan(context.Context, Q1, any) error +}](ctx context.Context, rootQuery Q1, selectOrGroup Q2, inters []Interceptor, v any) error { + rv := reflect.ValueOf(v) + var qr Querier = QuerierFunc(func(ctx context.Context, q Query) (Value, error) { + query, ok := q.(Q1) + if !ok { + return nil, fmt.Errorf("unexpected query type %T", q) + } + if err := selectOrGroup.sqlScan(ctx, query, v); err != nil { + return nil, err + } + if k := rv.Kind(); k == reflect.Pointer && rv.Elem().CanInterface() { + return rv.Elem().Interface(), nil + } + return v, nil + }) + for i := len(inters) - 1; i >= 0; i-- { + qr = inters[i].Intercept(qr) + } + vv, err := qr.Query(ctx, rootQuery) + if err != nil { + return err + } + switch rv2 := reflect.ValueOf(vv); { + case rv.IsNil(), rv2.IsNil(), rv.Kind() != reflect.Pointer: + case rv.Type() == rv2.Type(): + rv.Elem().Set(rv2.Elem()) + case rv.Elem().Type() == rv2.Type(): + rv.Elem().Set(rv2) + } + return nil +} + +// queryHook describes an internal hook for the different sqlAll methods. +type queryHook func(context.Context, *sqlgraph.QuerySpec) diff --git a/api/pkg/ent/enttest/enttest.go b/api/pkg/ent/enttest/enttest.go new file mode 100644 index 0000000000..11861da77c --- /dev/null +++ b/api/pkg/ent/enttest/enttest.go @@ -0,0 +1,84 @@ +// Code generated by ent, DO NOT EDIT. + +package enttest + +import ( + "context" + + "github.com/chanzuckerberg/happy/api/pkg/ent" + // required by schema hooks. + _ "github.com/chanzuckerberg/happy/api/pkg/ent/runtime" + + "entgo.io/ent/dialect/sql/schema" + "github.com/chanzuckerberg/happy/api/pkg/ent/migrate" +) + +type ( + // TestingT is the interface that is shared between + // testing.T and testing.B and used by enttest. + TestingT interface { + FailNow() + Error(...any) + } + + // Option configures client creation. + Option func(*options) + + options struct { + opts []ent.Option + migrateOpts []schema.MigrateOption + } +) + +// WithOptions forwards options to client creation. +func WithOptions(opts ...ent.Option) Option { + return func(o *options) { + o.opts = append(o.opts, opts...) + } +} + +// WithMigrateOptions forwards options to auto migration. +func WithMigrateOptions(opts ...schema.MigrateOption) Option { + return func(o *options) { + o.migrateOpts = append(o.migrateOpts, opts...) + } +} + +func newOptions(opts []Option) *options { + o := &options{} + for _, opt := range opts { + opt(o) + } + return o +} + +// Open calls ent.Open and auto-run migration. +func Open(t TestingT, driverName, dataSourceName string, opts ...Option) *ent.Client { + o := newOptions(opts) + c, err := ent.Open(driverName, dataSourceName, o.opts...) + if err != nil { + t.Error(err) + t.FailNow() + } + migrateSchema(t, c, o) + return c +} + +// NewClient calls ent.NewClient and auto-run migration. +func NewClient(t TestingT, opts ...Option) *ent.Client { + o := newOptions(opts) + c := ent.NewClient(o.opts...) + migrateSchema(t, c, o) + return c +} +func migrateSchema(t TestingT, c *ent.Client, o *options) { + tables, err := schema.CopyTables(migrate.Tables) + if err != nil { + t.Error(err) + t.FailNow() + } + if err := migrate.Create(context.Background(), c.Schema, tables, o.migrateOpts...); err != nil { + t.Error(err) + t.FailNow() + } +} diff --git a/api/pkg/ent/generate.go b/api/pkg/ent/generate.go new file mode 100644 index 0000000000..f15ee8225b --- /dev/null +++ b/api/pkg/ent/generate.go @@ -0,0 +1,3 @@ +package ent + +//go:generate go run -mod=mod entgo.io/ent/cmd/ent generate --feature sql/upsert ./schema diff --git a/api/pkg/ent/hook/hook.go b/api/pkg/ent/hook/hook.go new file mode 100644 index 0000000000..b6bbd8d7c4 --- /dev/null +++ b/api/pkg/ent/hook/hook.go @@ -0,0 +1,199 @@ +// Code generated by ent, DO NOT EDIT. + +package hook + +import ( + "context" + "fmt" + + "github.com/chanzuckerberg/happy/api/pkg/ent" +) + +// The AppConfigFunc type is an adapter to allow the use of ordinary +// function as AppConfig mutator. +type AppConfigFunc func(context.Context, *ent.AppConfigMutation) (ent.Value, error) + +// Mutate calls f(ctx, m). +func (f AppConfigFunc) Mutate(ctx context.Context, m ent.Mutation) (ent.Value, error) { + if mv, ok := m.(*ent.AppConfigMutation); ok { + return f(ctx, mv) + } + return nil, fmt.Errorf("unexpected mutation type %T. expect *ent.AppConfigMutation", m) +} + +// Condition is a hook condition function. +type Condition func(context.Context, ent.Mutation) bool + +// And groups conditions with the AND operator. +func And(first, second Condition, rest ...Condition) Condition { + return func(ctx context.Context, m ent.Mutation) bool { + if !first(ctx, m) || !second(ctx, m) { + return false + } + for _, cond := range rest { + if !cond(ctx, m) { + return false + } + } + return true + } +} + +// Or groups conditions with the OR operator. +func Or(first, second Condition, rest ...Condition) Condition { + return func(ctx context.Context, m ent.Mutation) bool { + if first(ctx, m) || second(ctx, m) { + return true + } + for _, cond := range rest { + if cond(ctx, m) { + return true + } + } + return false + } +} + +// Not negates a given condition. +func Not(cond Condition) Condition { + return func(ctx context.Context, m ent.Mutation) bool { + return !cond(ctx, m) + } +} + +// HasOp is a condition testing mutation operation. +func HasOp(op ent.Op) Condition { + return func(_ context.Context, m ent.Mutation) bool { + return m.Op().Is(op) + } +} + +// HasAddedFields is a condition validating `.AddedField` on fields. +func HasAddedFields(field string, fields ...string) Condition { + return func(_ context.Context, m ent.Mutation) bool { + if _, exists := m.AddedField(field); !exists { + return false + } + for _, field := range fields { + if _, exists := m.AddedField(field); !exists { + return false + } + } + return true + } +} + +// HasClearedFields is a condition validating `.FieldCleared` on fields. +func HasClearedFields(field string, fields ...string) Condition { + return func(_ context.Context, m ent.Mutation) bool { + if exists := m.FieldCleared(field); !exists { + return false + } + for _, field := range fields { + if exists := m.FieldCleared(field); !exists { + return false + } + } + return true + } +} + +// HasFields is a condition validating `.Field` on fields. +func HasFields(field string, fields ...string) Condition { + return func(_ context.Context, m ent.Mutation) bool { + if _, exists := m.Field(field); !exists { + return false + } + for _, field := range fields { + if _, exists := m.Field(field); !exists { + return false + } + } + return true + } +} + +// If executes the given hook under condition. +// +// hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) +func If(hk ent.Hook, cond Condition) ent.Hook { + return func(next ent.Mutator) ent.Mutator { + return ent.MutateFunc(func(ctx context.Context, m ent.Mutation) (ent.Value, error) { + if cond(ctx, m) { + return hk(next).Mutate(ctx, m) + } + return next.Mutate(ctx, m) + }) + } +} + +// On executes the given hook only for the given operation. +// +// hook.On(Log, ent.Delete|ent.Create) +func On(hk ent.Hook, op ent.Op) ent.Hook { + return If(hk, HasOp(op)) +} + +// Unless skips the given hook only for the given operation. +// +// hook.Unless(Log, ent.Update|ent.UpdateOne) +func Unless(hk ent.Hook, op ent.Op) ent.Hook { + return If(hk, Not(HasOp(op))) +} + +// FixedError is a hook returning a fixed error. +func FixedError(err error) ent.Hook { + return func(ent.Mutator) ent.Mutator { + return ent.MutateFunc(func(context.Context, ent.Mutation) (ent.Value, error) { + return nil, err + }) + } +} + +// Reject returns a hook that rejects all operations that match op. +// +// func (T) Hooks() []ent.Hook { +// return []ent.Hook{ +// Reject(ent.Delete|ent.Update), +// } +// } +func Reject(op ent.Op) ent.Hook { + hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) + return On(hk, op) +} + +// Chain acts as a list of hooks and is effectively immutable. +// Once created, it will always hold the same set of hooks in the same order. +type Chain struct { + hooks []ent.Hook +} + +// NewChain creates a new chain of hooks. +func NewChain(hooks ...ent.Hook) Chain { + return Chain{append([]ent.Hook(nil), hooks...)} +} + +// Hook chains the list of hooks and returns the final hook. +func (c Chain) Hook() ent.Hook { + return func(mutator ent.Mutator) ent.Mutator { + for i := len(c.hooks) - 1; i >= 0; i-- { + mutator = c.hooks[i](mutator) + } + return mutator + } +} + +// Append extends a chain, adding the specified hook +// as the last ones in the mutation flow. +func (c Chain) Append(hooks ...ent.Hook) Chain { + newHooks := make([]ent.Hook, 0, len(c.hooks)+len(hooks)) + newHooks = append(newHooks, c.hooks...) + newHooks = append(newHooks, hooks...) + return Chain{newHooks} +} + +// Extend extends a chain, adding the specified chain +// as the last ones in the mutation flow. +func (c Chain) Extend(chain Chain) Chain { + return c.Append(chain.hooks...) +} diff --git a/api/pkg/ent/migrate/migrate.go b/api/pkg/ent/migrate/migrate.go new file mode 100644 index 0000000000..1956a6bf64 --- /dev/null +++ b/api/pkg/ent/migrate/migrate.go @@ -0,0 +1,64 @@ +// Code generated by ent, DO NOT EDIT. + +package migrate + +import ( + "context" + "fmt" + "io" + + "entgo.io/ent/dialect" + "entgo.io/ent/dialect/sql/schema" +) + +var ( + // WithGlobalUniqueID sets the universal ids options to the migration. + // If this option is enabled, ent migration will allocate a 1<<32 range + // for the ids of each entity (table). + // Note that this option cannot be applied on tables that already exist. + WithGlobalUniqueID = schema.WithGlobalUniqueID + // WithDropColumn sets the drop column option to the migration. + // If this option is enabled, ent migration will drop old columns + // that were used for both fields and edges. This defaults to false. + WithDropColumn = schema.WithDropColumn + // WithDropIndex sets the drop index option to the migration. + // If this option is enabled, ent migration will drop old indexes + // that were defined in the schema. This defaults to false. + // Note that unique constraints are defined using `UNIQUE INDEX`, + // and therefore, it's recommended to enable this option to get more + // flexibility in the schema changes. + WithDropIndex = schema.WithDropIndex + // WithForeignKeys enables creating foreign-key in schema DDL. This defaults to true. + WithForeignKeys = schema.WithForeignKeys +) + +// Schema is the API for creating, migrating and dropping a schema. +type Schema struct { + drv dialect.Driver +} + +// NewSchema creates a new schema client. +func NewSchema(drv dialect.Driver) *Schema { return &Schema{drv: drv} } + +// Create creates all schema resources. +func (s *Schema) Create(ctx context.Context, opts ...schema.MigrateOption) error { + return Create(ctx, s, Tables, opts...) +} + +// Create creates all table resources using the given schema driver. +func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...schema.MigrateOption) error { + migrate, err := schema.NewMigrate(s.drv, opts...) + if err != nil { + return fmt.Errorf("ent/migrate: %w", err) + } + return migrate.Create(ctx, tables...) +} + +// WriteTo writes the schema changes to w instead of running them against the database. +// +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// log.Fatal(err) +// } +func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { + return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) +} diff --git a/api/pkg/ent/migrate/schema.go b/api/pkg/ent/migrate/schema.go new file mode 100644 index 0000000000..7ac7afa0f4 --- /dev/null +++ b/api/pkg/ent/migrate/schema.go @@ -0,0 +1,48 @@ +// Code generated by ent, DO NOT EDIT. + +package migrate + +import ( + "entgo.io/ent/dialect/sql/schema" + "entgo.io/ent/schema/field" +) + +var ( + // AppConfigsColumns holds the columns for the "app_configs" table. + AppConfigsColumns = []*schema.Column{ + {Name: "id", Type: field.TypeUint, Increment: true, SchemaType: map[string]string{"postgres": "bigserial"}}, + {Name: "created_at", Type: field.TypeTime}, + {Name: "updated_at", Type: field.TypeTime}, + {Name: "deleted_at", Type: field.TypeTime, Nullable: true}, + {Name: "app_name", Type: field.TypeString}, + {Name: "environment", Type: field.TypeString}, + {Name: "stack", Type: field.TypeString, Default: ""}, + {Name: "key", Type: field.TypeString}, + {Name: "value", Type: field.TypeString, Size: 2147483647}, + } + // AppConfigsTable holds the schema information for the "app_configs" table. + AppConfigsTable = &schema.Table{ + Name: "app_configs", + Columns: AppConfigsColumns, + PrimaryKey: []*schema.Column{AppConfigsColumns[0]}, + Indexes: []*schema.Index{ + { + Name: "appconfig_deleted_at", + Unique: false, + Columns: []*schema.Column{AppConfigsColumns[3]}, + }, + { + Name: "appconfig_app_name_environment_stack_key", + Unique: true, + Columns: []*schema.Column{AppConfigsColumns[4], AppConfigsColumns[5], AppConfigsColumns[6], AppConfigsColumns[7]}, + }, + }, + } + // Tables holds all the tables in the schema. + Tables = []*schema.Table{ + AppConfigsTable, + } +) + +func init() { +} diff --git a/api/pkg/ent/mutation.go b/api/pkg/ent/mutation.go new file mode 100644 index 0000000000..27d777abfc --- /dev/null +++ b/api/pkg/ent/mutation.go @@ -0,0 +1,760 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "context" + "errors" + "fmt" + "sync" + "time" + + "entgo.io/ent" + "entgo.io/ent/dialect/sql" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" + "github.com/chanzuckerberg/happy/api/pkg/ent/predicate" +) + +const ( + // Operation types. + OpCreate = ent.OpCreate + OpDelete = ent.OpDelete + OpDeleteOne = ent.OpDeleteOne + OpUpdate = ent.OpUpdate + OpUpdateOne = ent.OpUpdateOne + + // Node types. + TypeAppConfig = "AppConfig" +) + +// AppConfigMutation represents an operation that mutates the AppConfig nodes in the graph. +type AppConfigMutation struct { + config + op Op + typ string + id *uint + created_at *time.Time + updated_at *time.Time + deleted_at *time.Time + app_name *string + environment *string + stack *string + key *string + value *string + clearedFields map[string]struct{} + done bool + oldValue func(context.Context) (*AppConfig, error) + predicates []predicate.AppConfig +} + +var _ ent.Mutation = (*AppConfigMutation)(nil) + +// appconfigOption allows management of the mutation configuration using functional options. +type appconfigOption func(*AppConfigMutation) + +// newAppConfigMutation creates new mutation for the AppConfig entity. +func newAppConfigMutation(c config, op Op, opts ...appconfigOption) *AppConfigMutation { + m := &AppConfigMutation{ + config: c, + op: op, + typ: TypeAppConfig, + clearedFields: make(map[string]struct{}), + } + for _, opt := range opts { + opt(m) + } + return m +} + +// withAppConfigID sets the ID field of the mutation. +func withAppConfigID(id uint) appconfigOption { + return func(m *AppConfigMutation) { + var ( + err error + once sync.Once + value *AppConfig + ) + m.oldValue = func(ctx context.Context) (*AppConfig, error) { + once.Do(func() { + if m.done { + err = errors.New("querying old values post mutation is not allowed") + } else { + value, err = m.Client().AppConfig.Get(ctx, id) + } + }) + return value, err + } + m.id = &id + } +} + +// withAppConfig sets the old AppConfig of the mutation. +func withAppConfig(node *AppConfig) appconfigOption { + return func(m *AppConfigMutation) { + m.oldValue = func(context.Context) (*AppConfig, error) { + return node, nil + } + m.id = &node.ID + } +} + +// Client returns a new `ent.Client` from the mutation. If the mutation was +// executed in a transaction (ent.Tx), a transactional client is returned. +func (m AppConfigMutation) Client() *Client { + client := &Client{config: m.config} + client.init() + return client +} + +// Tx returns an `ent.Tx` for mutations that were executed in transactions; +// it returns an error otherwise. +func (m AppConfigMutation) Tx() (*Tx, error) { + if _, ok := m.driver.(*txDriver); !ok { + return nil, errors.New("ent: mutation is not running in a transaction") + } + tx := &Tx{config: m.config} + tx.init() + return tx, nil +} + +// SetID sets the value of the id field. Note that this +// operation is only accepted on creation of AppConfig entities. +func (m *AppConfigMutation) SetID(id uint) { + m.id = &id +} + +// ID returns the ID value in the mutation. Note that the ID is only available +// if it was provided to the builder or after it was returned from the database. +func (m *AppConfigMutation) ID() (id uint, exists bool) { + if m.id == nil { + return + } + return *m.id, true +} + +// IDs queries the database and returns the entity ids that match the mutation's predicate. +// That means, if the mutation is applied within a transaction with an isolation level such +// as sql.LevelSerializable, the returned ids match the ids of the rows that will be updated +// or updated by the mutation. +func (m *AppConfigMutation) IDs(ctx context.Context) ([]uint, error) { + switch { + case m.op.Is(OpUpdateOne | OpDeleteOne): + id, exists := m.ID() + if exists { + return []uint{id}, nil + } + fallthrough + case m.op.Is(OpUpdate | OpDelete): + return m.Client().AppConfig.Query().Where(m.predicates...).IDs(ctx) + default: + return nil, fmt.Errorf("IDs is not allowed on %s operations", m.op) + } +} + +// SetCreatedAt sets the "created_at" field. +func (m *AppConfigMutation) SetCreatedAt(t time.Time) { + m.created_at = &t +} + +// CreatedAt returns the value of the "created_at" field in the mutation. +func (m *AppConfigMutation) CreatedAt() (r time.Time, exists bool) { + v := m.created_at + if v == nil { + return + } + return *v, true +} + +// OldCreatedAt returns the old "created_at" field's value of the AppConfig entity. +// If the AppConfig object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AppConfigMutation) OldCreatedAt(ctx context.Context) (v time.Time, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldCreatedAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldCreatedAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldCreatedAt: %w", err) + } + return oldValue.CreatedAt, nil +} + +// ResetCreatedAt resets all changes to the "created_at" field. +func (m *AppConfigMutation) ResetCreatedAt() { + m.created_at = nil +} + +// SetUpdatedAt sets the "updated_at" field. +func (m *AppConfigMutation) SetUpdatedAt(t time.Time) { + m.updated_at = &t +} + +// UpdatedAt returns the value of the "updated_at" field in the mutation. +func (m *AppConfigMutation) UpdatedAt() (r time.Time, exists bool) { + v := m.updated_at + if v == nil { + return + } + return *v, true +} + +// OldUpdatedAt returns the old "updated_at" field's value of the AppConfig entity. +// If the AppConfig object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AppConfigMutation) OldUpdatedAt(ctx context.Context) (v time.Time, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldUpdatedAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldUpdatedAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldUpdatedAt: %w", err) + } + return oldValue.UpdatedAt, nil +} + +// ResetUpdatedAt resets all changes to the "updated_at" field. +func (m *AppConfigMutation) ResetUpdatedAt() { + m.updated_at = nil +} + +// SetDeletedAt sets the "deleted_at" field. +func (m *AppConfigMutation) SetDeletedAt(t time.Time) { + m.deleted_at = &t +} + +// DeletedAt returns the value of the "deleted_at" field in the mutation. +func (m *AppConfigMutation) DeletedAt() (r time.Time, exists bool) { + v := m.deleted_at + if v == nil { + return + } + return *v, true +} + +// OldDeletedAt returns the old "deleted_at" field's value of the AppConfig entity. +// If the AppConfig object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AppConfigMutation) OldDeletedAt(ctx context.Context) (v *time.Time, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldDeletedAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldDeletedAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldDeletedAt: %w", err) + } + return oldValue.DeletedAt, nil +} + +// ClearDeletedAt clears the value of the "deleted_at" field. +func (m *AppConfigMutation) ClearDeletedAt() { + m.deleted_at = nil + m.clearedFields[appconfig.FieldDeletedAt] = struct{}{} +} + +// DeletedAtCleared returns if the "deleted_at" field was cleared in this mutation. +func (m *AppConfigMutation) DeletedAtCleared() bool { + _, ok := m.clearedFields[appconfig.FieldDeletedAt] + return ok +} + +// ResetDeletedAt resets all changes to the "deleted_at" field. +func (m *AppConfigMutation) ResetDeletedAt() { + m.deleted_at = nil + delete(m.clearedFields, appconfig.FieldDeletedAt) +} + +// SetAppName sets the "app_name" field. +func (m *AppConfigMutation) SetAppName(s string) { + m.app_name = &s +} + +// AppName returns the value of the "app_name" field in the mutation. +func (m *AppConfigMutation) AppName() (r string, exists bool) { + v := m.app_name + if v == nil { + return + } + return *v, true +} + +// OldAppName returns the old "app_name" field's value of the AppConfig entity. +// If the AppConfig object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AppConfigMutation) OldAppName(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldAppName is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldAppName requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldAppName: %w", err) + } + return oldValue.AppName, nil +} + +// ResetAppName resets all changes to the "app_name" field. +func (m *AppConfigMutation) ResetAppName() { + m.app_name = nil +} + +// SetEnvironment sets the "environment" field. +func (m *AppConfigMutation) SetEnvironment(s string) { + m.environment = &s +} + +// Environment returns the value of the "environment" field in the mutation. +func (m *AppConfigMutation) Environment() (r string, exists bool) { + v := m.environment + if v == nil { + return + } + return *v, true +} + +// OldEnvironment returns the old "environment" field's value of the AppConfig entity. +// If the AppConfig object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AppConfigMutation) OldEnvironment(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldEnvironment is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldEnvironment requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldEnvironment: %w", err) + } + return oldValue.Environment, nil +} + +// ResetEnvironment resets all changes to the "environment" field. +func (m *AppConfigMutation) ResetEnvironment() { + m.environment = nil +} + +// SetStack sets the "stack" field. +func (m *AppConfigMutation) SetStack(s string) { + m.stack = &s +} + +// Stack returns the value of the "stack" field in the mutation. +func (m *AppConfigMutation) Stack() (r string, exists bool) { + v := m.stack + if v == nil { + return + } + return *v, true +} + +// OldStack returns the old "stack" field's value of the AppConfig entity. +// If the AppConfig object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AppConfigMutation) OldStack(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldStack is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldStack requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldStack: %w", err) + } + return oldValue.Stack, nil +} + +// ResetStack resets all changes to the "stack" field. +func (m *AppConfigMutation) ResetStack() { + m.stack = nil +} + +// SetKey sets the "key" field. +func (m *AppConfigMutation) SetKey(s string) { + m.key = &s +} + +// Key returns the value of the "key" field in the mutation. +func (m *AppConfigMutation) Key() (r string, exists bool) { + v := m.key + if v == nil { + return + } + return *v, true +} + +// OldKey returns the old "key" field's value of the AppConfig entity. +// If the AppConfig object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AppConfigMutation) OldKey(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldKey is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldKey requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldKey: %w", err) + } + return oldValue.Key, nil +} + +// ResetKey resets all changes to the "key" field. +func (m *AppConfigMutation) ResetKey() { + m.key = nil +} + +// SetValue sets the "value" field. +func (m *AppConfigMutation) SetValue(s string) { + m.value = &s +} + +// Value returns the value of the "value" field in the mutation. +func (m *AppConfigMutation) Value() (r string, exists bool) { + v := m.value + if v == nil { + return + } + return *v, true +} + +// OldValue returns the old "value" field's value of the AppConfig entity. +// If the AppConfig object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AppConfigMutation) OldValue(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldValue is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldValue requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldValue: %w", err) + } + return oldValue.Value, nil +} + +// ResetValue resets all changes to the "value" field. +func (m *AppConfigMutation) ResetValue() { + m.value = nil +} + +// Where appends a list predicates to the AppConfigMutation builder. +func (m *AppConfigMutation) Where(ps ...predicate.AppConfig) { + m.predicates = append(m.predicates, ps...) +} + +// WhereP appends storage-level predicates to the AppConfigMutation builder. Using this method, +// users can use type-assertion to append predicates that do not depend on any generated package. +func (m *AppConfigMutation) WhereP(ps ...func(*sql.Selector)) { + p := make([]predicate.AppConfig, len(ps)) + for i := range ps { + p[i] = ps[i] + } + m.Where(p...) +} + +// Op returns the operation name. +func (m *AppConfigMutation) Op() Op { + return m.op +} + +// SetOp allows setting the mutation operation. +func (m *AppConfigMutation) SetOp(op Op) { + m.op = op +} + +// Type returns the node type of this mutation (AppConfig). +func (m *AppConfigMutation) Type() string { + return m.typ +} + +// Fields returns all fields that were changed during this mutation. Note that in +// order to get all numeric fields that were incremented/decremented, call +// AddedFields(). +func (m *AppConfigMutation) Fields() []string { + fields := make([]string, 0, 8) + if m.created_at != nil { + fields = append(fields, appconfig.FieldCreatedAt) + } + if m.updated_at != nil { + fields = append(fields, appconfig.FieldUpdatedAt) + } + if m.deleted_at != nil { + fields = append(fields, appconfig.FieldDeletedAt) + } + if m.app_name != nil { + fields = append(fields, appconfig.FieldAppName) + } + if m.environment != nil { + fields = append(fields, appconfig.FieldEnvironment) + } + if m.stack != nil { + fields = append(fields, appconfig.FieldStack) + } + if m.key != nil { + fields = append(fields, appconfig.FieldKey) + } + if m.value != nil { + fields = append(fields, appconfig.FieldValue) + } + return fields +} + +// Field returns the value of a field with the given name. The second boolean +// return value indicates that this field was not set, or was not defined in the +// schema. +func (m *AppConfigMutation) Field(name string) (ent.Value, bool) { + switch name { + case appconfig.FieldCreatedAt: + return m.CreatedAt() + case appconfig.FieldUpdatedAt: + return m.UpdatedAt() + case appconfig.FieldDeletedAt: + return m.DeletedAt() + case appconfig.FieldAppName: + return m.AppName() + case appconfig.FieldEnvironment: + return m.Environment() + case appconfig.FieldStack: + return m.Stack() + case appconfig.FieldKey: + return m.Key() + case appconfig.FieldValue: + return m.Value() + } + return nil, false +} + +// OldField returns the old value of the field from the database. An error is +// returned if the mutation operation is not UpdateOne, or the query to the +// database failed. +func (m *AppConfigMutation) OldField(ctx context.Context, name string) (ent.Value, error) { + switch name { + case appconfig.FieldCreatedAt: + return m.OldCreatedAt(ctx) + case appconfig.FieldUpdatedAt: + return m.OldUpdatedAt(ctx) + case appconfig.FieldDeletedAt: + return m.OldDeletedAt(ctx) + case appconfig.FieldAppName: + return m.OldAppName(ctx) + case appconfig.FieldEnvironment: + return m.OldEnvironment(ctx) + case appconfig.FieldStack: + return m.OldStack(ctx) + case appconfig.FieldKey: + return m.OldKey(ctx) + case appconfig.FieldValue: + return m.OldValue(ctx) + } + return nil, fmt.Errorf("unknown AppConfig field %s", name) +} + +// SetField sets the value of a field with the given name. It returns an error if +// the field is not defined in the schema, or if the type mismatched the field +// type. +func (m *AppConfigMutation) SetField(name string, value ent.Value) error { + switch name { + case appconfig.FieldCreatedAt: + v, ok := value.(time.Time) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetCreatedAt(v) + return nil + case appconfig.FieldUpdatedAt: + v, ok := value.(time.Time) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetUpdatedAt(v) + return nil + case appconfig.FieldDeletedAt: + v, ok := value.(time.Time) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetDeletedAt(v) + return nil + case appconfig.FieldAppName: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetAppName(v) + return nil + case appconfig.FieldEnvironment: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetEnvironment(v) + return nil + case appconfig.FieldStack: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetStack(v) + return nil + case appconfig.FieldKey: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetKey(v) + return nil + case appconfig.FieldValue: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetValue(v) + return nil + } + return fmt.Errorf("unknown AppConfig field %s", name) +} + +// AddedFields returns all numeric fields that were incremented/decremented during +// this mutation. +func (m *AppConfigMutation) AddedFields() []string { + return nil +} + +// AddedField returns the numeric value that was incremented/decremented on a field +// with the given name. The second boolean return value indicates that this field +// was not set, or was not defined in the schema. +func (m *AppConfigMutation) AddedField(name string) (ent.Value, bool) { + return nil, false +} + +// AddField adds the value to the field with the given name. It returns an error if +// the field is not defined in the schema, or if the type mismatched the field +// type. +func (m *AppConfigMutation) AddField(name string, value ent.Value) error { + switch name { + } + return fmt.Errorf("unknown AppConfig numeric field %s", name) +} + +// ClearedFields returns all nullable fields that were cleared during this +// mutation. +func (m *AppConfigMutation) ClearedFields() []string { + var fields []string + if m.FieldCleared(appconfig.FieldDeletedAt) { + fields = append(fields, appconfig.FieldDeletedAt) + } + return fields +} + +// FieldCleared returns a boolean indicating if a field with the given name was +// cleared in this mutation. +func (m *AppConfigMutation) FieldCleared(name string) bool { + _, ok := m.clearedFields[name] + return ok +} + +// ClearField clears the value of the field with the given name. It returns an +// error if the field is not defined in the schema. +func (m *AppConfigMutation) ClearField(name string) error { + switch name { + case appconfig.FieldDeletedAt: + m.ClearDeletedAt() + return nil + } + return fmt.Errorf("unknown AppConfig nullable field %s", name) +} + +// ResetField resets all changes in the mutation for the field with the given name. +// It returns an error if the field is not defined in the schema. +func (m *AppConfigMutation) ResetField(name string) error { + switch name { + case appconfig.FieldCreatedAt: + m.ResetCreatedAt() + return nil + case appconfig.FieldUpdatedAt: + m.ResetUpdatedAt() + return nil + case appconfig.FieldDeletedAt: + m.ResetDeletedAt() + return nil + case appconfig.FieldAppName: + m.ResetAppName() + return nil + case appconfig.FieldEnvironment: + m.ResetEnvironment() + return nil + case appconfig.FieldStack: + m.ResetStack() + return nil + case appconfig.FieldKey: + m.ResetKey() + return nil + case appconfig.FieldValue: + m.ResetValue() + return nil + } + return fmt.Errorf("unknown AppConfig field %s", name) +} + +// AddedEdges returns all edge names that were set/added in this mutation. +func (m *AppConfigMutation) AddedEdges() []string { + edges := make([]string, 0, 0) + return edges +} + +// AddedIDs returns all IDs (to other nodes) that were added for the given edge +// name in this mutation. +func (m *AppConfigMutation) AddedIDs(name string) []ent.Value { + return nil +} + +// RemovedEdges returns all edge names that were removed in this mutation. +func (m *AppConfigMutation) RemovedEdges() []string { + edges := make([]string, 0, 0) + return edges +} + +// RemovedIDs returns all IDs (to other nodes) that were removed for the edge with +// the given name in this mutation. +func (m *AppConfigMutation) RemovedIDs(name string) []ent.Value { + return nil +} + +// ClearedEdges returns all edge names that were cleared in this mutation. +func (m *AppConfigMutation) ClearedEdges() []string { + edges := make([]string, 0, 0) + return edges +} + +// EdgeCleared returns a boolean which indicates if the edge with the given name +// was cleared in this mutation. +func (m *AppConfigMutation) EdgeCleared(name string) bool { + return false +} + +// ClearEdge clears the value of the edge with the given name. It returns an error +// if that edge is not defined in the schema. +func (m *AppConfigMutation) ClearEdge(name string) error { + return fmt.Errorf("unknown AppConfig unique edge %s", name) +} + +// ResetEdge resets all changes to the edge with the given name in this mutation. +// It returns an error if the edge is not defined in the schema. +func (m *AppConfigMutation) ResetEdge(name string) error { + return fmt.Errorf("unknown AppConfig edge %s", name) +} diff --git a/api/pkg/ent/predicate/predicate.go b/api/pkg/ent/predicate/predicate.go new file mode 100644 index 0000000000..7049b2e771 --- /dev/null +++ b/api/pkg/ent/predicate/predicate.go @@ -0,0 +1,10 @@ +// Code generated by ent, DO NOT EDIT. + +package predicate + +import ( + "entgo.io/ent/dialect/sql" +) + +// AppConfig is the predicate function for appconfig builders. +type AppConfig func(*sql.Selector) diff --git a/api/pkg/ent/runtime.go b/api/pkg/ent/runtime.go new file mode 100644 index 0000000000..8aa9ec17cc --- /dev/null +++ b/api/pkg/ent/runtime.go @@ -0,0 +1,32 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "time" + + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" + "github.com/chanzuckerberg/happy/api/pkg/ent/schema" +) + +// The init function reads all schema descriptors with runtime code +// (default values, validators, hooks and policies) and stitches it +// to their package variables. +func init() { + appconfigFields := schema.AppConfig{}.Fields() + _ = appconfigFields + // appconfigDescCreatedAt is the schema descriptor for created_at field. + appconfigDescCreatedAt := appconfigFields[1].Descriptor() + // appconfig.DefaultCreatedAt holds the default value on creation for the created_at field. + appconfig.DefaultCreatedAt = appconfigDescCreatedAt.Default.(func() time.Time) + // appconfigDescUpdatedAt is the schema descriptor for updated_at field. + appconfigDescUpdatedAt := appconfigFields[2].Descriptor() + // appconfig.DefaultUpdatedAt holds the default value on creation for the updated_at field. + appconfig.DefaultUpdatedAt = appconfigDescUpdatedAt.Default.(func() time.Time) + // appconfig.UpdateDefaultUpdatedAt holds the default value on update for the updated_at field. + appconfig.UpdateDefaultUpdatedAt = appconfigDescUpdatedAt.UpdateDefault.(func() time.Time) + // appconfigDescStack is the schema descriptor for stack field. + appconfigDescStack := appconfigFields[6].Descriptor() + // appconfig.DefaultStack holds the default value on creation for the stack field. + appconfig.DefaultStack = appconfigDescStack.Default.(string) +} diff --git a/api/pkg/ent/runtime/runtime.go b/api/pkg/ent/runtime/runtime.go new file mode 100644 index 0000000000..e902b9175a --- /dev/null +++ b/api/pkg/ent/runtime/runtime.go @@ -0,0 +1,10 @@ +// Code generated by ent, DO NOT EDIT. + +package runtime + +// The schema-stitching logic is generated in github.com/chanzuckerberg/happy/api/pkg/ent/runtime.go + +const ( + Version = "v0.12.4" // Version of ent codegen. + Sum = "h1:LddPnAyxls/O7DTXZvUGDj0NZIdGSu317+aoNLJWbD8=" // Sum of ent codegen. +) diff --git a/api/pkg/ent/schema/appconfig.go b/api/pkg/ent/schema/appconfig.go new file mode 100644 index 0000000000..5ebaf1e2a5 --- /dev/null +++ b/api/pkg/ent/schema/appconfig.go @@ -0,0 +1,80 @@ +package schema + +import ( + "time" + + "entgo.io/ent" + "entgo.io/ent/schema/field" + "entgo.io/ent/schema/index" +) + +type AppConfig struct { + ent.Schema +} + +func (AppConfig) Fields() []ent.Field { + return []ent.Field{ + field. + Uint("id"). + SchemaType(map[string]string{"postgres": "bigserial"}), + field. + Time("created_at"). + Default(time.Now). + Immutable(), + field. + Time("updated_at"). + Default(time.Now). + UpdateDefault(time.Now), + field. + Time("deleted_at"). + Optional(). + Nillable(). + Default(nil), + field. + String("app_name"), + field. + String("environment"), + field. + String("stack"). + Default(""), + field. + String("key"), + field. + Text("value"), + // field. + // Enum("source"). + // Values("stack", "environment"). + // Default("environment"). + // Comment("'stack' if the config is for a specific stack or 'environment' if available to all stacks in the environment"), + } +} + +func (AppConfig) Indexes() []ent.Index { + return []ent.Index{ + index. + Fields("deleted_at"), + index. + Fields("app_name", "environment", "stack", "key"). + Unique(), + } +} + +func (AppConfig) Edges() []ent.Edge { + return nil +} + +func (AppConfig) Hooks() []ent.Hook { + return []ent.Hook{ + // hook to populate the source field + // func(next ent.Mutator) ent.Mutator { + // return hook.AppConfigFunc(func(ctx context.Context, m *gen.AppConfigMutation) (ent.Value, error) { + // source := appconfig.SourceEnvironment + // if stack, ok := m.Stack(); ok && stack != "" { + // source = appconfig.SourceStack + // } + // m.SetSource(source) + // return next.Mutate(ctx, m) + // }) + // }, + } +} diff --git a/api/pkg/ent/tx.go b/api/pkg/ent/tx.go new file mode 100644 index 0000000000..1546fff3c3 --- /dev/null +++ b/api/pkg/ent/tx.go @@ -0,0 +1,210 @@ +// Code generated by ent, DO NOT EDIT. + +package ent + +import ( + "context" + "sync" + + "entgo.io/ent/dialect" +) + +// Tx is a transactional client that is created by calling Client.Tx(). +type Tx struct { + config + // AppConfig is the client for interacting with the AppConfig builders. + AppConfig *AppConfigClient + + // lazily loaded. + client *Client + clientOnce sync.Once + // ctx lives for the life of the transaction. It is + // the same context used by the underlying connection. + ctx context.Context +} + +type ( + // Committer is the interface that wraps the Commit method. + Committer interface { + Commit(context.Context, *Tx) error + } + + // The CommitFunc type is an adapter to allow the use of ordinary + // function as a Committer. If f is a function with the appropriate + // signature, CommitFunc(f) is a Committer that calls f. + CommitFunc func(context.Context, *Tx) error + + // CommitHook defines the "commit middleware". A function that gets a Committer + // and returns a Committer. For example: + // + // hook := func(next ent.Committer) ent.Committer { + // return ent.CommitFunc(func(ctx context.Context, tx *ent.Tx) error { + // // Do some stuff before. + // if err := next.Commit(ctx, tx); err != nil { + // return err + // } + // // Do some stuff after. + // return nil + // }) + // } + // + CommitHook func(Committer) Committer +) + +// Commit calls f(ctx, m). +func (f CommitFunc) Commit(ctx context.Context, tx *Tx) error { + return f(ctx, tx) +} + +// Commit commits the transaction. +func (tx *Tx) Commit() error { + txDriver := tx.config.driver.(*txDriver) + var fn Committer = CommitFunc(func(context.Context, *Tx) error { + return txDriver.tx.Commit() + }) + txDriver.mu.Lock() + hooks := append([]CommitHook(nil), txDriver.onCommit...) + txDriver.mu.Unlock() + for i := len(hooks) - 1; i >= 0; i-- { + fn = hooks[i](fn) + } + return fn.Commit(tx.ctx, tx) +} + +// OnCommit adds a hook to call on commit. +func (tx *Tx) OnCommit(f CommitHook) { + txDriver := tx.config.driver.(*txDriver) + txDriver.mu.Lock() + txDriver.onCommit = append(txDriver.onCommit, f) + txDriver.mu.Unlock() +} + +type ( + // Rollbacker is the interface that wraps the Rollback method. + Rollbacker interface { + Rollback(context.Context, *Tx) error + } + + // The RollbackFunc type is an adapter to allow the use of ordinary + // function as a Rollbacker. If f is a function with the appropriate + // signature, RollbackFunc(f) is a Rollbacker that calls f. + RollbackFunc func(context.Context, *Tx) error + + // RollbackHook defines the "rollback middleware". A function that gets a Rollbacker + // and returns a Rollbacker. For example: + // + // hook := func(next ent.Rollbacker) ent.Rollbacker { + // return ent.RollbackFunc(func(ctx context.Context, tx *ent.Tx) error { + // // Do some stuff before. + // if err := next.Rollback(ctx, tx); err != nil { + // return err + // } + // // Do some stuff after. + // return nil + // }) + // } + // + RollbackHook func(Rollbacker) Rollbacker +) + +// Rollback calls f(ctx, m). +func (f RollbackFunc) Rollback(ctx context.Context, tx *Tx) error { + return f(ctx, tx) +} + +// Rollback rollbacks the transaction. +func (tx *Tx) Rollback() error { + txDriver := tx.config.driver.(*txDriver) + var fn Rollbacker = RollbackFunc(func(context.Context, *Tx) error { + return txDriver.tx.Rollback() + }) + txDriver.mu.Lock() + hooks := append([]RollbackHook(nil), txDriver.onRollback...) + txDriver.mu.Unlock() + for i := len(hooks) - 1; i >= 0; i-- { + fn = hooks[i](fn) + } + return fn.Rollback(tx.ctx, tx) +} + +// OnRollback adds a hook to call on rollback. +func (tx *Tx) OnRollback(f RollbackHook) { + txDriver := tx.config.driver.(*txDriver) + txDriver.mu.Lock() + txDriver.onRollback = append(txDriver.onRollback, f) + txDriver.mu.Unlock() +} + +// Client returns a Client that binds to current transaction. +func (tx *Tx) Client() *Client { + tx.clientOnce.Do(func() { + tx.client = &Client{config: tx.config} + tx.client.init() + }) + return tx.client +} + +func (tx *Tx) init() { + tx.AppConfig = NewAppConfigClient(tx.config) +} + +// txDriver wraps the given dialect.Tx with a nop dialect.Driver implementation. +// The idea is to support transactions without adding any extra code to the builders. +// When a builder calls to driver.Tx(), it gets the same dialect.Tx instance. +// Commit and Rollback are nop for the internal builders and the user must call one +// of them in order to commit or rollback the transaction. +// +// If a closed transaction is embedded in one of the generated entities, and the entity +// applies a query, for example: AppConfig.QueryXXX(), the query will be executed +// through the driver which created this transaction. +// +// Note that txDriver is not goroutine safe. +type txDriver struct { + // the driver we started the transaction from. + drv dialect.Driver + // tx is the underlying transaction. + tx dialect.Tx + // completion hooks. + mu sync.Mutex + onCommit []CommitHook + onRollback []RollbackHook +} + +// newTx creates a new transactional driver. +func newTx(ctx context.Context, drv dialect.Driver) (*txDriver, error) { + tx, err := drv.Tx(ctx) + if err != nil { + return nil, err + } + return &txDriver{tx: tx, drv: drv}, nil +} + +// Tx returns the transaction wrapper (txDriver) to avoid Commit or Rollback calls +// from the internal builders. Should be called only by the internal builders. +func (tx *txDriver) Tx(context.Context) (dialect.Tx, error) { return tx, nil } + +// Dialect returns the dialect of the driver we started the transaction from. +func (tx *txDriver) Dialect() string { return tx.drv.Dialect() } + +// Close is a nop close. +func (*txDriver) Close() error { return nil } + +// Commit is a nop commit for the internal builders. +// User must call `Tx.Commit` in order to commit the transaction. +func (*txDriver) Commit() error { return nil } + +// Rollback is a nop rollback for the internal builders. +// User must call `Tx.Rollback` in order to rollback the transaction. +func (*txDriver) Rollback() error { return nil } + +// Exec calls tx.Exec. +func (tx *txDriver) Exec(ctx context.Context, query string, args, v any) error { + return tx.tx.Exec(ctx, query, args, v) +} + +// Query calls tx.Query. +func (tx *txDriver) Query(ctx context.Context, query string, args, v any) error { + return tx.tx.Query(ctx, query, args, v) +} + +var _ dialect.Driver = (*txDriver)(nil) diff --git a/api/pkg/setup/setup.go b/api/pkg/setup/setup.go index 053ca093f5..9bed619ed5 100644 --- a/api/pkg/setup/setup.go +++ b/api/pkg/setup/setup.go @@ -62,7 +62,7 @@ type ApiConfiguration struct { type DBDriver string const ( - Sqlite DBDriver = "sqlite" + Sqlite DBDriver = "sqlite3" Postgres DBDriver = "postgres" ) @@ -72,6 +72,10 @@ type DatabaseConfiguration struct { LogLevel string `mapstructure:"log_level"` } +func (d *DBDriver) String() string { + return string(*d) +} + type TFEConfiguration struct { Token string `mapstructure:"token"` } diff --git a/api/pkg/utils/utils.go b/api/pkg/utils/utils.go deleted file mode 100644 index 38ba42f49b..0000000000 --- a/api/pkg/utils/utils.go +++ /dev/null @@ -1,15 +0,0 @@ -package utils - -import ( - "encoding/json" -) - -func StructToMap(payload interface{}) (map[string]interface{}, error) { - var inInterface map[string]interface{} - inrec, _ := json.Marshal(payload) - err := json.Unmarshal(inrec, &inInterface) - if err != nil { - return nil, err - } - return inInterface, nil -} diff --git a/api/tools/db-shell.sh b/api/tools/db-shell.sh index 7ced44a284..da8c35d85b 100755 --- a/api/tools/db-shell.sh +++ b/api/tools/db-shell.sh @@ -1,4 +1,4 @@ #!/bin/sh set -euox pipefail -PGPASSWORD=${HAPPY_DATABASE_PASSWORD} psql -U ${HAPPY_DATABASE_USER} -h ${HAPPY_DATABASE_HOST} +PGPASSWORD=${HAPPY_DATABASE_PASSWORD} psql -U ${HAPPY_DATABASE_USER} -h ${HAPPY_DATABASE_HOST} -d ${HAPPY_DATABASE_NAME} diff --git a/cli/go.mod b/cli/go.mod index 7d5489559e..052e0286a4 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -141,7 +141,7 @@ require ( gopkg.in/src-d/go-git.v4 v4.13.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gorm.io/gorm v1.25.3 // indirect + gorm.io/gorm v1.25.4 // indirect k8s.io/client-go v0.28.2 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect diff --git a/cli/go.sum b/cli/go.sum index b3d703cb39..7927da268c 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1291,8 +1291,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.25.3 h1:zi4rHZj1anhZS2EuEODMhDisGy+Daq9jtPrNGgbQYD8= -gorm.io/gorm v1.25.3/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw= +gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/shared/go.mod b/shared/go.mod index aa2668f89b..4190f6e77f 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -47,7 +47,7 @@ require ( golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 golang.org/x/sync v0.4.0 gopkg.in/src-d/go-git.v4 v4.13.1 - gorm.io/gorm v1.25.3 + gorm.io/gorm v1.25.4 k8s.io/kubectl v0.28.2 ) @@ -105,6 +105,8 @@ require ( github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kataras/tablewriter v0.0.0-20180708051242-e063d29b7c23 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect @@ -161,8 +163,6 @@ require ( github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jinzhu/now v1.1.5 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect diff --git a/shared/go.sum b/shared/go.sum index 7b12e88d97..0cd3c6720a 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -1281,8 +1281,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.25.3 h1:zi4rHZj1anhZS2EuEODMhDisGy+Daq9jtPrNGgbQYD8= -gorm.io/gorm v1.25.3/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw= +gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/shared/model/app_metadata.go b/shared/model/app_metadata.go index 739a268105..e908c49274 100644 --- a/shared/model/app_metadata.go +++ b/shared/model/app_metadata.go @@ -3,7 +3,7 @@ package model import "fmt" type App struct { - AppName string `json:"app_name" query:"app_name" validate:"required" gorm:"index:,unique,composite:metadata" example:"testapp"` + AppName string `json:"app_name" query:"app_name" validate:"required" example:"testapp"` } var ( @@ -20,11 +20,11 @@ var ( type AppMetadata struct { App - Environment string `json:"environment" query:"environment" validate:"required,valid_env" gorm:"index:,unique,composite:metadata" example:"rdev"` + Environment string `json:"environment" query:"environment" validate:"required,valid_env" example:"rdev"` // in order to make this ON CONFLICT work we must not allow nulls for stack values // thus the stack column defaults to empty string and enforces NOT NULL - Stack string `json:"stack,omitempty" query:"stack" gorm:"default:'';not null;index:,unique,composite:metadata" example:"my-stack"` + Stack string `json:"stack,omitempty" query:"stack" example:"my-stack"` } // @Name payload.AppMetadata func (a AppMetadata) String() string { diff --git a/shared/model/common.go b/shared/model/common.go index 378066a15b..4f3a0652f3 100644 --- a/shared/model/common.go +++ b/shared/model/common.go @@ -7,8 +7,8 @@ import ( ) type CommonDBFields struct { - ID uint `json:"id" gorm:"primarykey" swaggerignore:"true"` + ID uint `json:"id" swaggerignore:"true"` CreatedAt time.Time `json:"created_at" example:"2023-02-22T22:55:02.20034Z"` UpdatedAt time.Time `json:"updated_at" example:"2023-02-22T22:55:02.20034Z"` - DeletedAt gorm.DeletedAt `json:"deleted_at" gorm:"index" swaggerignore:"true"` + DeletedAt gorm.DeletedAt `json:"deleted_at" swaggerignore:"true"` } diff --git a/shared/model/config.go b/shared/model/config.go index ef6beaa900..9e820a793e 100644 --- a/shared/model/config.go +++ b/shared/model/config.go @@ -1,7 +1,7 @@ package model type ConfigKey struct { - Key string `json:"key" validate:"required" gorm:"index:,unique,composite:metadata" example:"SOME_KEY"` + Key string `json:"key" validate:"required" example:"SOME_KEY"` } type ConfigValue struct { @@ -21,19 +21,19 @@ type AppConfigLookupPayload struct { type CopyAppConfigPayload struct { App - SrcEnvironment string `json:"source_environment" validate:"required,valid_env" gorm:"index:,unique,composite:metadata"` - SrcStack string `json:"source_stack,omitempty" gorm:"default:'';not null;index:,unique,composite:metadata"` - DstEnvironment string `json:"destination_environment" validate:"required,valid_env_dest" gorm:"index:,unique,composite:metadata"` - DstStack string `json:"destination_stack,omitempty" gorm:"default:'';not null;index:,unique,composite:metadata"` + SrcEnvironment string `json:"source_environment" validate:"required,valid_env"` + SrcStack string `json:"source_stack,omitempty"` + DstEnvironment string `json:"destination_environment" validate:"required,valid_env_dest"` + DstStack string `json:"destination_stack,omitempty"` ConfigKey } // @name payload.CopyAppConfig type AppConfigDiffPayload struct { App - SrcEnvironment string `json:"source_environment" query:"source_environment" validate:"required,valid_env" gorm:"index:,unique,composite:metadata"` - SrcStack string `json:"source_stack,omitempty" query:"source_stack" gorm:"default:'';not null;index:,unique,composite:metadata"` - DstEnvironment string `json:"destination_environment" query:"destination_environment" validate:"required,valid_env_dest" gorm:"index:,unique,composite:metadata"` - DstStack string `json:"destination_stack,omitempty" query:"destination_stack" gorm:"default:'';not null;index:,unique,composite:metadata"` + SrcEnvironment string `json:"source_environment" query:"source_environment" validate:"required,valid_env"` + SrcStack string `json:"source_stack,omitempty" query:"source_stack"` + DstEnvironment string `json:"destination_environment" query:"destination_environment" validate:"required,valid_env_dest"` + DstStack string `json:"destination_stack,omitempty" query:"destination_stack"` } // @name payload.AppConfigDiff // @Description Object denoting which app config keys are missing from the destination env/stack @@ -97,6 +97,17 @@ func NewAppConfigDiffPayload(appName, srcEnv, srcStack, destEnv, destStack strin } } +func NewResolvedAppConfig(appConfig *AppConfig) *ResolvedAppConfig { + source := "stack" + if appConfig.Stack == "" { + source = "environment" + } + return &ResolvedAppConfig{ + AppConfig: *appConfig, + Source: source, + } +} + // @Description App config key/value pair wrapped in "record" key type WrappedResolvedAppConfig struct { Record *ResolvedAppConfig `json:"record"` diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 32f8a9bda8..e8f952a297 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -164,7 +164,7 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/gorm v1.25.3 // indirect + gorm.io/gorm v1.25.4 // indirect gotest.tools/v3 v3.4.0 // indirect k8s.io/api v0.28.2 // indirect k8s.io/apimachinery v0.28.2 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 206d6e49fb..0bbca4cae0 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -564,8 +564,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.25.3 h1:zi4rHZj1anhZS2EuEODMhDisGy+Daq9jtPrNGgbQYD8= -gorm.io/gorm v1.25.3/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw= +gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= From 4d5cd7b9a8f66c89fa3df030f11e5733c262f573 Mon Sep 17 00:00:00 2001 From: "czi-github-helper[bot]" <95879977+czi-github-helper[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:05:31 -0400 Subject: [PATCH 27/80] chore: release main (#2568) --- .release-please-manifest.json | 10 +++++----- api/CHANGELOG.md | 7 +++++++ cli/CHANGELOG.md | 7 +++++++ hvm/CHANGELOG.md | 7 +++++++ shared/CHANGELOG.md | 7 +++++++ terraform/provider/CHANGELOG.md | 7 +++++++ 6 files changed, 40 insertions(+), 5 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 3a7bcc57a9..0885a3fd8b 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,8 +1,8 @@ { - "cli": "0.110.1", - "api": "0.110.1", - "shared": "0.110.1", - "terraform/provider": "0.110.1", + "cli": "0.111.0", + "api": "0.111.0", + "shared": "0.111.0", + "terraform/provider": "0.111.0", "terraform/modules/happy-dns-ecs": "1.5.0", "terraform/modules/happy-env-ecs": "3.3.0", "terraform/modules/happy-env-eks": "4.12.2", @@ -15,7 +15,7 @@ "terraform/modules/happy-tfe-okta-app": "3.0.0", "terraform/modules/happy-tfe-user": "1.3.0", "terraform/modules/happy-ingress-eks": "2.9.0", - "hvm": "0.110.1", + "hvm": "0.111.0", "hapi-proto": "0.1.0", "terraform/modules/happy-cloudfront": "1.0.0" } diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md index 617122c143..1f01e00406 100644 --- a/api/CHANGELOG.md +++ b/api/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.111.0](https://github.com/chanzuckerberg/happy/compare/api-v0.110.1...api-v0.111.0) (2023-10-13) + + +### Features + +* replace Gorm with Ent ORM ([#2530](https://github.com/chanzuckerberg/happy/issues/2530)) ([fa87b1a](https://github.com/chanzuckerberg/happy/commit/fa87b1a0bbd2c6b41ac4e9f013c8c60ff5409913)) + ## [0.110.1](https://github.com/chanzuckerberg/happy/compare/api-v0.110.0...api-v0.110.1) (2023-10-05) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index b6c19c7951..1e59b0c2ca 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.111.0](https://github.com/chanzuckerberg/happy/compare/cli-v0.110.1...cli-v0.111.0) (2023-10-13) + + +### Features + +* replace Gorm with Ent ORM ([#2530](https://github.com/chanzuckerberg/happy/issues/2530)) ([fa87b1a](https://github.com/chanzuckerberg/happy/commit/fa87b1a0bbd2c6b41ac4e9f013c8c60ff5409913)) + ## [0.110.1](https://github.com/chanzuckerberg/happy/compare/cli-v0.110.0...cli-v0.110.1) (2023-10-05) diff --git a/hvm/CHANGELOG.md b/hvm/CHANGELOG.md index 3d9120a6d5..87ff8b399b 100644 --- a/hvm/CHANGELOG.md +++ b/hvm/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.111.0](https://github.com/chanzuckerberg/happy/compare/hvm-v0.110.1...hvm-v0.111.0) (2023-10-13) + + +### Miscellaneous Chores + +* **hvm:** Synchronize happy platform versions + ## [0.110.1](https://github.com/chanzuckerberg/happy/compare/hvm-v0.110.0...hvm-v0.110.1) (2023-10-05) diff --git a/shared/CHANGELOG.md b/shared/CHANGELOG.md index 3e863250d3..cc36028d80 100644 --- a/shared/CHANGELOG.md +++ b/shared/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.111.0](https://github.com/chanzuckerberg/happy/compare/shared-v0.110.1...shared-v0.111.0) (2023-10-13) + + +### Features + +* replace Gorm with Ent ORM ([#2530](https://github.com/chanzuckerberg/happy/issues/2530)) ([fa87b1a](https://github.com/chanzuckerberg/happy/commit/fa87b1a0bbd2c6b41ac4e9f013c8c60ff5409913)) + ## [0.110.1](https://github.com/chanzuckerberg/happy/compare/shared-v0.110.0...shared-v0.110.1) (2023-10-05) diff --git a/terraform/provider/CHANGELOG.md b/terraform/provider/CHANGELOG.md index 11d69d0271..5efb6f34a9 100644 --- a/terraform/provider/CHANGELOG.md +++ b/terraform/provider/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.111.0](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.110.1...terraform-provider-v0.111.0) (2023-10-13) + + +### Features + +* replace Gorm with Ent ORM ([#2530](https://github.com/chanzuckerberg/happy/issues/2530)) ([fa87b1a](https://github.com/chanzuckerberg/happy/commit/fa87b1a0bbd2c6b41ac4e9f013c8c60ff5409913)) + ## [0.110.1](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.110.0...terraform-provider-v0.110.1) (2023-10-05) From 2527f8761c3a4d913f76563be22291ba00af3421 Mon Sep 17 00:00:00 2001 From: Jake Heath <76011913+jakeyheath@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:34:20 -0700 Subject: [PATCH 28/80] fix: trim the target group name to only 32 chars (#2572) and also change it to hyphens --- terraform/modules/happy-service-eks/target_group_only.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/terraform/modules/happy-service-eks/target_group_only.tf b/terraform/modules/happy-service-eks/target_group_only.tf index 874f43b790..b8d3f88450 100644 --- a/terraform/modules/happy-service-eks/target_group_only.tf +++ b/terraform/modules/happy-service-eks/target_group_only.tf @@ -5,7 +5,8 @@ resource "random_pet" "this" { } locals { - target_group_name = "${random_pet.this.keepers.target_group_name}_${random_pet.this.id}" + # only hyphens and a max of 32 characters + target_group_name = replace(substr("${random_pet.this.id}", 0, 32), "_", "-") } data "aws_lb" "this" { From eeebd3833a7978df874775ee995021d4ef4e62da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 22:59:23 +0000 Subject: [PATCH 29/80] chore: bump github.com/aws/aws-sdk-go-v2/service/sts from 1.22.0 to 1.23.1 in /shared (#2554) * chore: bump github.com/aws/aws-sdk-go-v2/service/sts in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2) from 1.22.0 to 1.23.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ecs/v1.23.1/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.22.0...service/ecs/v1.23.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] Co-authored-by: Alex Lokshin From 0414fc78126bf8ac4c400788ace77ee8cf4b1dc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 23:04:55 +0000 Subject: [PATCH 30/80] chore: bump github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs from 1.24.0 to 1.24.1 in /shared (#2558) * chore: bump github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs](https://github.com/aws/aws-sdk-go-v2) from 1.24.0 to 1.24.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.24.0...service/s3/v1.24.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * ci - update go.mod * commit from hvm-ci -- updated coverage --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] Co-authored-by: Alex Lokshin --- api/go.mod | 2 +- api/go.sum | 4 ++-- hvm/go.mod | 2 +- hvm/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/go.mod b/api/go.mod index 866f419542..027dc52aab 100644 --- a/api/go.mod +++ b/api/go.mod @@ -53,7 +53,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect diff --git a/api/go.sum b/api/go.sum index 1b6551cde6..7c6feb16c9 100644 --- a/api/go.sum +++ b/api/go.sum @@ -106,8 +106,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5T github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= diff --git a/hvm/go.mod b/hvm/go.mod index 04e2e864fa..22f5ff26e0 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index 1c03015175..6dca84612e 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -48,8 +48,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5T github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= diff --git a/shared/go.mod b/shared/go.mod index 4190f6e77f..3d72ef8259 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -7,7 +7,7 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Masterminds/semver/v3 v3.2.1 github.com/aws/aws-sdk-go-v2 v1.21.1 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 diff --git a/shared/go.sum b/shared/go.sum index 0cd3c6720a..a0888906d3 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -251,8 +251,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5T github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index e8f952a297..7ff0f9cfbc 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -33,7 +33,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 0bbca4cae0..7b6bee607d 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -65,8 +65,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5T github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0 h1:6LRil7J+uh2SZ58Wkm/5aVRpBOZbTtwi8p8gdsix94c= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.0/go.mod h1:5v2ZNXCSwG73rx0k3sCuB1Ju8sbEbG0iUlxCA7D8sV8= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= From 014095c7adea28fbf672e998c87d62d02c49f708 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 23:06:16 +0000 Subject: [PATCH 31/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ssm from 1.38.0 to 1.38.1 in /shared (#2556) * chore: bump github.com/aws/aws-sdk-go-v2/service/ssm in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/ssm](https://github.com/aws/aws-sdk-go-v2) from 1.38.0 to 1.38.1. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.38.1/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.38.0...service/s3/v1.38.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from cli-ci -- updated coverage * commit from hvm-ci -- updated coverage * ci - update go.mod * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] Co-authored-by: Alex Lokshin Co-authored-by: alexlokshin-czi --- api/go.mod | 2 +- api/go.sum | 4 ++-- cli/go.mod | 2 +- cli/go.sum | 8 ++------ hvm/go.mod | 2 +- hvm/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 19 deletions(-) diff --git a/api/go.mod b/api/go.mod index 027dc52aab..8e70f93b0d 100644 --- a/api/go.mod +++ b/api/go.mod @@ -64,7 +64,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect diff --git a/api/go.sum b/api/go.sum index 7c6feb16c9..b82fff1a42 100644 --- a/api/go.sum +++ b/api/go.sum @@ -136,8 +136,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwN github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= diff --git a/cli/go.mod b/cli/go.mod index 052e0286a4..00cf5f5b2a 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -159,7 +159,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect github.com/aws/smithy-go v1.15.0 github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect diff --git a/cli/go.sum b/cli/go.sum index 7927da268c..d3c3ef95b1 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -220,7 +220,6 @@ github.com/aws/aws-sdk-go v1.45.12/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8P github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= @@ -240,13 +239,11 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zp github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= @@ -280,8 +277,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwN github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= @@ -293,7 +290,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7H github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= diff --git a/hvm/go.mod b/hvm/go.mod index 22f5ff26e0..9281f1db31 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index 6dca84612e..e153ca7eec 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -78,8 +78,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwN github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= diff --git a/shared/go.mod b/shared/go.mod index 3d72ef8259..031c98beb6 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -14,7 +14,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 github.com/chanzuckerberg/happy/hvm v0.0.0 github.com/compose-spec/compose-go v1.19.0 diff --git a/shared/go.sum b/shared/go.sum index a0888906d3..130edb04e8 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -281,8 +281,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwN github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 7ff0f9cfbc..a880cfcd59 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -44,7 +44,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect github.com/aws/smithy-go v1.15.0 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 7b6bee607d..6d1fde7d0c 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -97,8 +97,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.24.6 h1:rp9DrFG3na9nuqsBZWb5KwvZrODh github.com/aws/aws-sdk-go-v2/service/kms v1.24.6/go.mod h1:I/absi3KLfE37J5QWMKyoYT8ZHA9t8JOC+Rb7Cyy+vc= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0 h1:JON9MBvwUlM8HXylfB2caZuH3VXz9RxO4SMp2+TNc3Q= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.0/go.mod h1:JjBzoceyKkpQY3v1GPIdg6kHqUFHRJ7SDlwtwoH0Qh8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= From 07b4a63698881ef64fcc772417a37856378b33b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:20:30 +0000 Subject: [PATCH 32/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ecr in /cli (#2574) Bumps [github.com/aws/aws-sdk-go-v2/service/ecr](https://github.com/aws/aws-sdk-go-v2) from 1.20.1 to 1.20.2. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.20.1...v1.20.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecr dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 8 ++++---- cli/go.sum | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 00cf5f5b2a..1f991474a2 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -5,7 +5,7 @@ module github.com/chanzuckerberg/happy/cli require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 - github.com/aws/aws-sdk-go-v2 v1.21.1 + github.com/aws/aws-sdk-go-v2 v1.21.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 github.com/chanzuckerberg/go-misc v1.10.7 github.com/chanzuckerberg/happy/shared v0.0.0 @@ -41,8 +41,8 @@ require ( github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect @@ -155,7 +155,7 @@ require ( require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 - github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 + github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index d3c3ef95b1..e4b2a7cbb0 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -220,8 +220,9 @@ github.com/aws/aws-sdk-go v1.45.12/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8P github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= +github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= +github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= @@ -239,13 +240,15 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zp github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= @@ -259,8 +262,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2Dz github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 h1:3VsdIKjFmyXFkKV21tgn49/dxSziWhjnx3YbqrDofXc= github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0/go.mod h1:f2AJtWtbonV7cSBVdxfs6e68cponNukbBDvzc4WIASo= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= -github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 h1:y6LX9GUoEA3mO0qpFl1ZQHj1rFyPWVphlzebiSt2tKE= +github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2/go.mod h1:Q0LcmaN/Qr8+4aSBrdrXXePqoX0eOuYpJLbYpilmWnA= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 h1:xCzx8Zo4r9+jb1jrbzRSE5YY0Y2PbXdmjpdXjW2nFOE= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2/go.mod h1:Ju05HZ9/Od0gSH8sozb32bpYdabJbQwyQR9lxonfaAE= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= From f1603d223d8305fbb28c418eca9b4a5c5a0bacb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:24:53 +0000 Subject: [PATCH 33/80] chore: bump github.com/hashicorp/go-tfe from 1.34.0 to 1.36.0 in /cli (#2578) Bumps [github.com/hashicorp/go-tfe](https://github.com/hashicorp/go-tfe) from 1.34.0 to 1.36.0. - [Release notes](https://github.com/hashicorp/go-tfe/releases) - [Changelog](https://github.com/hashicorp/go-tfe/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/go-tfe/compare/v1.34.0...v1.36.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-tfe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 1f991474a2..aad0f8c72f 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -13,7 +13,7 @@ require ( github.com/gen2brain/beeep v0.0.0-20230307103607-6e717729cb4f github.com/golang/mock v1.6.0 github.com/hashicorp/go-multierror v1.1.1 - github.com/hashicorp/go-tfe v1.34.0 + github.com/hashicorp/go-tfe v1.36.0 github.com/joho/godotenv v1.5.1 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 diff --git a/cli/go.sum b/cli/go.sum index e4b2a7cbb0..d65595b575 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -527,8 +527,8 @@ github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhE github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= github.com/hashicorp/go-slug v0.9.1 h1:gYNVJ3t0jAWx8AT2eYZci3Xd7NBHyjayW9AR1DU4ki0= github.com/hashicorp/go-slug v0.9.1/go.mod h1:Ib+IWBYfEfJGI1ZyXMGNbu2BU+aa3Dzu41RKLH301v4= -github.com/hashicorp/go-tfe v1.34.0 h1:33xcVQ8sbkdPVhubpVH208+S72l6l5bFEi14363yOIE= -github.com/hashicorp/go-tfe v1.34.0/go.mod h1:xA+N8r81ldvS7PC/DVbL+FqGsgfrcu1Ak4+6His+51s= +github.com/hashicorp/go-tfe v1.36.0 h1:Wq73gjjDo/f9gkKQ5MVSb+4NNJ6T7c5MVTivA0s/bZ0= +github.com/hashicorp/go-tfe v1.36.0/go.mod h1:awOuTZ4K9F1EJsKBIoxonJlb7Axn3PIb8YeBLtm/G/0= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= From 02e35bb52a2bfaf4cd1cd93d192a3aa550470637 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:33:58 +0000 Subject: [PATCH 34/80] chore: bump github.com/aws/aws-sdk-go-v2/service/kms (#2580) Bumps [github.com/aws/aws-sdk-go-v2/service/kms](https://github.com/aws/aws-sdk-go-v2) from 1.24.6 to 1.24.7. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/fsx/v1.24.6...service/fsx/v1.24.7) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/kms dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- terraform/provider/go.mod | 8 ++++---- terraform/provider/go.sum | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index a880cfcd59..11b651a0b2 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -3,10 +3,10 @@ module github.com/chanzuckerberg/happy/terraform/provider go 1.20 require ( - github.com/aws/aws-sdk-go-v2 v1.21.1 + github.com/aws/aws-sdk-go-v2 v1.21.2 github.com/aws/aws-sdk-go-v2/config v1.18.44 github.com/aws/aws-sdk-go-v2/credentials v1.13.42 - github.com/aws/aws-sdk-go-v2/service/kms v1.24.6 + github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 github.com/chanzuckerberg/happy/shared v0.0.0 github.com/golang-jwt/jwt/v4 v4.5.0 @@ -30,8 +30,8 @@ require ( github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 6d1fde7d0c..603fcc9ddc 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -35,8 +35,9 @@ github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3eP github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= -github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= +github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= +github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= @@ -55,14 +56,16 @@ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1B github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= @@ -93,8 +96,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/9 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= -github.com/aws/aws-sdk-go-v2/service/kms v1.24.6 h1:rp9DrFG3na9nuqsBZWb5KwvZrODhjayqFVJe8jmeVY8= -github.com/aws/aws-sdk-go-v2/service/kms v1.24.6/go.mod h1:I/absi3KLfE37J5QWMKyoYT8ZHA9t8JOC+Rb7Cyy+vc= +github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 h1:uRGw0UKo5hc7M2T7uGsK/Yg2qwecq/dnVjQbbq9RCzY= +github.com/aws/aws-sdk-go-v2/service/kms v1.24.7/go.mod h1:z3O9CXfVrKAV3c9fMWOUUv2C6N2ggXCDHeXpOB6lAEk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= From 96a564cf833ae087dd19dcd344f4f0d0a43562ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:35:34 +0000 Subject: [PATCH 35/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ec2 in /cli (#2575) Bumps [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) from 1.124.0 to 1.125.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.124.0...service/ec2/v1.125.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 4 ++-- cli/go.sum | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index aad0f8c72f..7a387ae121 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -48,7 +48,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect @@ -154,7 +154,7 @@ require ( require ( github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect diff --git a/cli/go.sum b/cli/go.sum index d65595b575..3cbfa552f7 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -260,8 +260,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiSt github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0 h1:3VsdIKjFmyXFkKV21tgn49/dxSziWhjnx3YbqrDofXc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.124.0/go.mod h1:f2AJtWtbonV7cSBVdxfs6e68cponNukbBDvzc4WIASo= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7xjzakkK0+QyP8fO0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 h1:y6LX9GUoEA3mO0qpFl1ZQHj1rFyPWVphlzebiSt2tKE= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2/go.mod h1:Q0LcmaN/Qr8+4aSBrdrXXePqoX0eOuYpJLbYpilmWnA= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 h1:xCzx8Zo4r9+jb1jrbzRSE5YY0Y2PbXdmjpdXjW2nFOE= @@ -276,8 +276,9 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= From 2b31b365a2a9c78ff27b8545a2e789c67feadbaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:42:25 +0000 Subject: [PATCH 36/80] chore: bump gorm.io/gorm from 1.25.4 to 1.25.5 in /api (#2585) Bumps [gorm.io/gorm](https://github.com/go-gorm/gorm) from 1.25.4 to 1.25.5. - [Release notes](https://github.com/go-gorm/gorm/releases) - [Commits](https://github.com/go-gorm/gorm/compare/v1.25.4...v1.25.5) --- updated-dependencies: - dependency-name: gorm.io/gorm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- api/go.mod | 2 +- api/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/go.mod b/api/go.mod index 8e70f93b0d..7925708ef3 100644 --- a/api/go.mod +++ b/api/go.mod @@ -32,7 +32,7 @@ require ( github.com/swaggo/swag v1.16.2 github.com/valyala/fasthttp v1.50.0 gopkg.in/yaml.v3 v3.0.1 - gorm.io/gorm v1.25.4 + gorm.io/gorm v1.25.5 ) require ( diff --git a/api/go.sum b/api/go.sum index b82fff1a42..95e7558d2e 100644 --- a/api/go.sum +++ b/api/go.sum @@ -969,8 +969,8 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw= -gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= +gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 37a4bf0d5fee318a2ee604aa32f7bf6b5a797c7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:47:30 +0000 Subject: [PATCH 37/80] chore: bump github.com/aws/aws-sdk-go-v2/config in /terraform/provider (#2583) Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.18.44 to 1.18.45. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.18.44...config/v1.18.45) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- terraform/provider/go.mod | 16 ++++++++-------- terraform/provider/go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 11b651a0b2..7a6740b245 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/aws/aws-sdk-go-v2 v1.21.2 - github.com/aws/aws-sdk-go-v2/config v1.18.44 - github.com/aws/aws-sdk-go-v2/credentials v1.13.42 + github.com/aws/aws-sdk-go-v2/config v1.18.45 + github.com/aws/aws-sdk-go-v2/credentials v1.13.43 github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 - github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 + github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 github.com/chanzuckerberg/happy/shared v0.0.0 github.com/golang-jwt/jwt/v4 v4.5.0 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 @@ -29,10 +29,10 @@ require ( github.com/armon/go-radix v1.0.0 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect @@ -42,11 +42,11 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/aws/smithy-go v1.15.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 603fcc9ddc..eaafb734aa 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -38,11 +38,11 @@ github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pf github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= -github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= -github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= +github.com/aws/aws-sdk-go-v2/config v1.18.45 h1:Aka9bI7n8ysuwPeFdm77nfbyHCAKQ3z9ghB3S/38zes= +github.com/aws/aws-sdk-go-v2/config v1.18.45/go.mod h1:ZwDUgFnQgsazQTnWfeLWk5GjeqTQTL8lMkoE1UXzxdE= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= -github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -50,8 +50,8 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= @@ -66,8 +66,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45/go.mod h1:lD5M20o09/LCuQ2mE62Mb/iSdSlCNuj6H5ci7tW7OsE= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= @@ -94,8 +94,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0Zzo github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 h1:uRGw0UKo5hc7M2T7uGsK/Yg2qwecq/dnVjQbbq9RCzY= github.com/aws/aws-sdk-go-v2/service/kms v1.24.7/go.mod h1:z3O9CXfVrKAV3c9fMWOUUv2C6N2ggXCDHeXpOB6lAEk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= @@ -103,14 +103,14 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvg github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= -github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= -github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= From 9bd90d128073d61c7e7f5467a9a8bcecc3250d20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:53:32 +0000 Subject: [PATCH 38/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ecs in /cli (#2576) Bumps [github.com/aws/aws-sdk-go-v2/service/ecs](https://github.com/aws/aws-sdk-go-v2) from 1.30.2 to 1.30.3. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.30.2...service/s3/v1.30.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 7a387ae121..2a61699774 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -156,7 +156,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 - github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 + github.com/aws/aws-sdk-go-v2/service/ecs v1.30.3 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect diff --git a/cli/go.sum b/cli/go.sum index 3cbfa552f7..7bbcd282ec 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -264,8 +264,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 h1:y6LX9GUoEA3mO0qpFl1ZQHj1rFyPWVphlzebiSt2tKE= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2/go.mod h1:Q0LcmaN/Qr8+4aSBrdrXXePqoX0eOuYpJLbYpilmWnA= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2 h1:xCzx8Zo4r9+jb1jrbzRSE5YY0Y2PbXdmjpdXjW2nFOE= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.2/go.mod h1:Ju05HZ9/Od0gSH8sozb32bpYdabJbQwyQR9lxonfaAE= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.3 h1:kaUxW8ZGd3cZYNfZ4QvCUUu+6GeyznPTk4qCYIjvtRc= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.3/go.mod h1:1pSCxO2RQKwIg2ibxUcSmg9jbIZtfrXrVU72nY2jF3g= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= From 53f9361d0cde9009aaec46ffdcaad616a8eac5cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:57:56 +0000 Subject: [PATCH 39/80] chore: bump github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs in /cli (#2579) Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs](https://github.com/aws/aws-sdk-go-v2) from 1.24.1 to 1.24.2. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ecs/v1.24.2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.24.1...service/ecs/v1.24.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 2a61699774..1f7041b133 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -6,7 +6,7 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 github.com/aws/aws-sdk-go-v2 v1.21.2 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 github.com/chanzuckerberg/go-misc v1.10.7 github.com/chanzuckerberg/happy/shared v0.0.0 github.com/fatih/color v1.15.0 diff --git a/cli/go.sum b/cli/go.sum index 7bbcd282ec..129dc846f9 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -251,8 +251,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQLXk86DnXQMXgx1omrAGEpF/d68= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= From 5b3aeb73c5603f22b4d1a4d0719ed6d8638f2244 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:59:45 +0000 Subject: [PATCH 40/80] chore: bump github.com/aws/aws-sdk-go-v2/config in /api (#2584) Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.18.44 to 1.18.45. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.18.44...config/v1.18.45) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- api/go.mod | 22 +++++++++++----------- api/go.sum | 41 ++++++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/api/go.mod b/api/go.mod index 7925708ef3..88689d917f 100644 --- a/api/go.mod +++ b/api/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( entgo.io/ent v0.12.4 - github.com/aws/aws-sdk-go-v2 v1.21.1 - github.com/aws/aws-sdk-go-v2/config v1.18.44 + github.com/aws/aws-sdk-go-v2 v1.21.2 + github.com/aws/aws-sdk-go-v2/config v1.18.45 github.com/blang/semver v3.5.1+incompatible github.com/chanzuckerberg/happy/shared v0.0.0 github.com/coreos/go-oidc/v3 v3.6.0 @@ -46,13 +46,13 @@ require ( github.com/agext/levenshtein v1.2.3 // indirect github.com/andybalholm/brotli v1.0.5 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.43 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect @@ -62,12 +62,12 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect github.com/aws/smithy-go v1.15.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/api/go.sum b/api/go.sum index 95e7558d2e..e5648441ce 100644 --- a/api/go.sum +++ b/api/go.sum @@ -76,13 +76,14 @@ github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3eP github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= -github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= -github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= -github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= +github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= +github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= +github.com/aws/aws-sdk-go-v2/config v1.18.45 h1:Aka9bI7n8ysuwPeFdm77nfbyHCAKQ3z9ghB3S/38zes= +github.com/aws/aws-sdk-go-v2/config v1.18.45/go.mod h1:ZwDUgFnQgsazQTnWfeLWk5GjeqTQTL8lMkoE1UXzxdE= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= -github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -90,22 +91,24 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45/go.mod h1:lD5M20o09/LCuQ2mE62Mb/iSdSlCNuj6H5ci7tW7OsE= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= @@ -132,21 +135,21 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0Zzo github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= -github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= -github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= From 7d3f70dbcba309967b7475dbb0aa54697f82d067 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 05:00:41 +0000 Subject: [PATCH 41/80] chore: bump github.com/hashicorp/go-tfe from 1.34.0 to 1.36.0 in /shared (#2589) * chore: bump github.com/hashicorp/go-tfe from 1.34.0 to 1.36.0 in /shared Bumps [github.com/hashicorp/go-tfe](https://github.com/hashicorp/go-tfe) from 1.34.0 to 1.36.0. - [Release notes](https://github.com/hashicorp/go-tfe/releases) - [Changelog](https://github.com/hashicorp/go-tfe/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/go-tfe/compare/v1.34.0...v1.36.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-tfe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] --- api/go.mod | 2 +- api/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/go.mod b/api/go.mod index 88689d917f..e874815820 100644 --- a/api/go.mod +++ b/api/go.mod @@ -101,7 +101,7 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.4 // indirect github.com/hashicorp/go-slug v0.12.2 // indirect - github.com/hashicorp/go-tfe v1.34.0 // indirect + github.com/hashicorp/go-tfe v1.36.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/hcl/v2 v2.18.1 // indirect diff --git a/api/go.sum b/api/go.sum index e5648441ce..352bbca0f2 100644 --- a/api/go.sum +++ b/api/go.sum @@ -350,8 +350,8 @@ github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZn github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= github.com/hashicorp/go-slug v0.12.2 h1:Gb6nxnV5GI1UVa3aLJGUj66J8AOZFnjIoYalNCp2Cbo= github.com/hashicorp/go-slug v0.12.2/go.mod h1:JZVtycnZZbiJ4oxpJ/zfhyfBD8XxT4f0uOSyjNLCqFY= -github.com/hashicorp/go-tfe v1.34.0 h1:33xcVQ8sbkdPVhubpVH208+S72l6l5bFEi14363yOIE= -github.com/hashicorp/go-tfe v1.34.0/go.mod h1:xA+N8r81ldvS7PC/DVbL+FqGsgfrcu1Ak4+6His+51s= +github.com/hashicorp/go-tfe v1.36.0 h1:Wq73gjjDo/f9gkKQ5MVSb+4NNJ6T7c5MVTivA0s/bZ0= +github.com/hashicorp/go-tfe v1.36.0/go.mod h1:awOuTZ4K9F1EJsKBIoxonJlb7Axn3PIb8YeBLtm/G/0= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= diff --git a/shared/go.mod b/shared/go.mod index 031c98beb6..fbffe4431c 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -28,7 +28,7 @@ require ( github.com/google/uuid v1.3.1 github.com/hashicorp/go-getter v1.7.2 github.com/hashicorp/go-multierror v1.1.1 - github.com/hashicorp/go-tfe v1.34.0 + github.com/hashicorp/go-tfe v1.36.0 github.com/hashicorp/go-uuid v1.0.3 github.com/hashicorp/hcl/v2 v2.18.1 github.com/hashicorp/terraform-config-inspect v0.0.0-20230522202058-dbe9bfcbfe7a diff --git a/shared/go.sum b/shared/go.sum index 130edb04e8..b854dba4a2 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -522,8 +522,8 @@ github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhE github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= github.com/hashicorp/go-slug v0.12.2 h1:Gb6nxnV5GI1UVa3aLJGUj66J8AOZFnjIoYalNCp2Cbo= github.com/hashicorp/go-slug v0.12.2/go.mod h1:JZVtycnZZbiJ4oxpJ/zfhyfBD8XxT4f0uOSyjNLCqFY= -github.com/hashicorp/go-tfe v1.34.0 h1:33xcVQ8sbkdPVhubpVH208+S72l6l5bFEi14363yOIE= -github.com/hashicorp/go-tfe v1.34.0/go.mod h1:xA+N8r81ldvS7PC/DVbL+FqGsgfrcu1Ak4+6His+51s= +github.com/hashicorp/go-tfe v1.36.0 h1:Wq73gjjDo/f9gkKQ5MVSb+4NNJ6T7c5MVTivA0s/bZ0= +github.com/hashicorp/go-tfe v1.36.0/go.mod h1:awOuTZ4K9F1EJsKBIoxonJlb7Axn3PIb8YeBLtm/G/0= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= From 0419a71f8edfc9e42d2d0a592596227120097798 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 05:01:58 +0000 Subject: [PATCH 42/80] chore: bump gorm.io/gorm from 1.25.4 to 1.25.5 in /shared (#2590) * chore: bump gorm.io/gorm from 1.25.4 to 1.25.5 in /shared Bumps [gorm.io/gorm](https://github.com/go-gorm/gorm) from 1.25.4 to 1.25.5. - [Release notes](https://github.com/go-gorm/gorm/releases) - [Commits](https://github.com/go-gorm/gorm/compare/v1.25.4...v1.25.5) --- updated-dependencies: - dependency-name: gorm.io/gorm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 1f7041b133..41af60ba77 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -141,7 +141,7 @@ require ( gopkg.in/src-d/go-git.v4 v4.13.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gorm.io/gorm v1.25.4 // indirect + gorm.io/gorm v1.25.5 // indirect k8s.io/client-go v0.28.2 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect diff --git a/cli/go.sum b/cli/go.sum index 129dc846f9..bd27468113 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1291,8 +1291,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw= -gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= +gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/shared/go.mod b/shared/go.mod index fbffe4431c..5b95c7823f 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -47,7 +47,7 @@ require ( golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 golang.org/x/sync v0.4.0 gopkg.in/src-d/go-git.v4 v4.13.1 - gorm.io/gorm v1.25.4 + gorm.io/gorm v1.25.5 k8s.io/kubectl v0.28.2 ) diff --git a/shared/go.sum b/shared/go.sum index b854dba4a2..263aec3216 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -1281,8 +1281,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw= -gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= +gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 7a6740b245..002a40125e 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -164,7 +164,7 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/gorm v1.25.4 // indirect + gorm.io/gorm v1.25.5 // indirect gotest.tools/v3 v3.4.0 // indirect k8s.io/api v0.28.2 // indirect k8s.io/apimachinery v0.28.2 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index eaafb734aa..4d6ec23f65 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -567,8 +567,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw= -gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= +gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= From 21d0ec457eae0b23ca553214de9ab9fd97885199 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 05:15:48 +0000 Subject: [PATCH 43/80] chore: bump github.com/hashicorp/go-getter from 1.7.2 to 1.7.3 in /shared (#2591) * chore: bump github.com/hashicorp/go-getter in /shared Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](https://github.com/hashicorp/go-getter/compare/v1.7.2...v1.7.3) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from cli-ci -- updated coverage --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 41af60ba77..9807975995 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -79,7 +79,7 @@ require ( github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect github.com/googleapis/gax-go/v2 v2.11.0 // indirect - github.com/hashicorp/go-getter v1.7.2 // indirect + github.com/hashicorp/go-getter v1.7.3 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index bd27468113..abd63c3319 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -516,8 +516,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-getter v1.7.2 h1:uJDtyXwEfalmp1PqdxuhZqrNkUyClZAhVeZYTArbqkg= -github.com/hashicorp/go-getter v1.7.2/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-getter v1.7.3 h1:bN2+Fw9XPFvOCjB0UOevFIMICZ7G2XSQHzfvLUyOM5E= +github.com/hashicorp/go-getter v1.7.3/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= diff --git a/shared/go.mod b/shared/go.mod index 5b95c7823f..c10c3b62eb 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -26,7 +26,7 @@ require ( github.com/golang/mock v1.6.0 github.com/google/go-github/v53 v53.2.0 github.com/google/uuid v1.3.1 - github.com/hashicorp/go-getter v1.7.2 + github.com/hashicorp/go-getter v1.7.3 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-tfe v1.36.0 github.com/hashicorp/go-uuid v1.0.3 diff --git a/shared/go.sum b/shared/go.sum index 263aec3216..72a881e784 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -509,8 +509,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-getter v1.7.2 h1:uJDtyXwEfalmp1PqdxuhZqrNkUyClZAhVeZYTArbqkg= -github.com/hashicorp/go-getter v1.7.2/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-getter v1.7.3 h1:bN2+Fw9XPFvOCjB0UOevFIMICZ7G2XSQHzfvLUyOM5E= +github.com/hashicorp/go-getter v1.7.3/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= From b7b33729a47dcbdeca92499a550da2220e5a527b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 05:16:58 +0000 Subject: [PATCH 44/80] chore: bump github.com/zclconf/go-cty from 1.14.0 to 1.14.1 in /shared (#2594) * chore: bump github.com/zclconf/go-cty from 1.14.0 to 1.14.1 in /shared Bumps [github.com/zclconf/go-cty](https://github.com/zclconf/go-cty) from 1.14.0 to 1.14.1. - [Release notes](https://github.com/zclconf/go-cty/releases) - [Changelog](https://github.com/zclconf/go-cty/blob/main/CHANGELOG.md) - [Commits](https://github.com/zclconf/go-cty/compare/v1.14.0...v1.14.1) --- updated-dependencies: - dependency-name: github.com/zclconf/go-cty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from cli-ci -- updated coverage * ci - update ent schema * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- api/go.mod | 2 +- api/go.sum | 4 ++-- cli/go.mod | 2 +- cli/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/go.mod b/api/go.mod index e874815820..bc0397f265 100644 --- a/api/go.mod +++ b/api/go.mod @@ -161,7 +161,7 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - github.com/zclconf/go-cty v1.14.0 // indirect + github.com/zclconf/go-cty v1.14.1 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.14.0 // indirect diff --git a/api/go.sum b/api/go.sum index 352bbca0f2..0375a0b3c5 100644 --- a/api/go.sum +++ b/api/go.sum @@ -573,8 +573,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.14.0 h1:/Xrd39K7DXbHzlisFP9c4pHao4yyf+/Ug9LEz+Y/yhc= -github.com/zclconf/go-cty v1.14.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= +github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= diff --git a/cli/go.mod b/cli/go.mod index 9807975995..c6dc22c8a1 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -120,7 +120,7 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/zalando/go-keyring v0.2.3 // indirect - github.com/zclconf/go-cty v1.14.0 // indirect + github.com/zclconf/go-cty v1.14.1 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect golang.org/x/mod v0.11.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index abd63c3319..b978509017 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -723,8 +723,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zalando/go-keyring v0.1.1 h1:w2V9lcx/Uj4l+dzAf1m9s+DJ1O8ROkEHnynonHjTcYE= github.com/zalando/go-keyring v0.1.1/go.mod h1:OIC+OZ28XbmwFxU/Rp9V7eKzZjamBJwRzC8UFJH9+L8= -github.com/zclconf/go-cty v1.14.0 h1:/Xrd39K7DXbHzlisFP9c4pHao4yyf+/Ug9LEz+Y/yhc= -github.com/zclconf/go-cty v1.14.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= +github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= diff --git a/shared/go.mod b/shared/go.mod index c10c3b62eb..c97fe26ffb 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -43,7 +43,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 - github.com/zclconf/go-cty v1.14.0 + github.com/zclconf/go-cty v1.14.1 golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 golang.org/x/sync v0.4.0 gopkg.in/src-d/go-git.v4 v4.13.1 diff --git a/shared/go.sum b/shared/go.sum index 72a881e784..4c3bb99279 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -712,8 +712,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.14.0 h1:/Xrd39K7DXbHzlisFP9c4pHao4yyf+/Ug9LEz+Y/yhc= -github.com/zclconf/go-cty v1.14.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= +github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 002a40125e..acb95d764c 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -142,7 +142,7 @@ require ( github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - github.com/zclconf/go-cty v1.14.0 // indirect + github.com/zclconf/go-cty v1.14.1 // indirect golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect golang.org/x/mod v0.12.0 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 4d6ec23f65..424e85f565 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -419,8 +419,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.14.0 h1:/Xrd39K7DXbHzlisFP9c4pHao4yyf+/Ug9LEz+Y/yhc= -github.com/zclconf/go-cty v1.14.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= +github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= From 79680459425fbd6e3ccb45c3bdcab0fd0813d8f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 05:19:35 +0000 Subject: [PATCH 45/80] chore: bump github.com/aws/aws-sdk-go-v2/service/sts from 1.23.1 to 1.23.2 in /shared (#2592) * chore: bump github.com/aws/aws-sdk-go-v2/service/sts in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2) from 1.23.1 to 1.23.2. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ecs/v1.23.2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.23.1...service/ecs/v1.23.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- cli/go.mod | 2 +- cli/go.sum | 3 ++- hvm/go.mod | 10 +++++----- hvm/go.sum | 15 ++++++++++----- shared/go.mod | 10 +++++----- shared/go.sum | 15 ++++++++++----- 6 files changed, 33 insertions(+), 22 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index c6dc22c8a1..2a19d08ddb 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -51,7 +51,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/compose-spec/compose-go v1.19.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index b978509017..d4272e64c1 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -290,8 +290,9 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= diff --git a/hvm/go.mod b/hvm/go.mod index 9281f1db31..02011b4c39 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -16,14 +16,14 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect - github.com/aws/aws-sdk-go-v2 v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2 v1.21.2 // indirect github.com/aws/aws-sdk-go-v2/config v1.18.44 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect @@ -34,12 +34,12 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect github.com/aws/smithy-go v1.15.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/creasty/defaults v1.7.0 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index e153ca7eec..21b3a4bcb2 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -18,8 +18,9 @@ github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3eP github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= -github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= +github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= +github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= @@ -38,14 +39,16 @@ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1B github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= @@ -74,8 +77,9 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0Zzo github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= @@ -87,8 +91,9 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= diff --git a/shared/go.mod b/shared/go.mod index c97fe26ffb..794f849945 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -6,7 +6,7 @@ require ( cirello.io/dynamolock/v2 v2.0.2 github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Masterminds/semver/v3 v3.2.1 - github.com/aws/aws-sdk-go-v2 v1.21.1 + github.com/aws/aws-sdk-go-v2 v1.21.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 - github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 + github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 github.com/chanzuckerberg/happy/hvm v0.0.0 github.com/compose-spec/compose-go v1.19.0 github.com/creasty/defaults v1.7.0 @@ -68,13 +68,13 @@ require ( github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect diff --git a/shared/go.sum b/shared/go.sum index 4c3bb99279..c77bc1f3cb 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -221,8 +221,9 @@ github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3eP github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= -github.com/aws/aws-sdk-go-v2 v1.21.1 h1:wjHYshtPpYOZm+/mu3NhVgRRc0baM6LJZOmxPZ5Cwzs= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= +github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= +github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= @@ -241,14 +242,16 @@ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1B github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42 h1:817VqVe6wvwE46xXy6YF5RywvjOX6U2zRQQ6IbQFK0s= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36 h1:7ZApaXzWbo8slc+W5TynuUlB4z66g44h7uqa3/d/BsY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= @@ -277,8 +280,9 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0Zzo github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36 h1:YXlm7LxwNlauqb2OrinWlcvtsflTzP8GaMvYfQBhoT4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= @@ -290,8 +294,9 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= -github.com/aws/aws-sdk-go-v2/service/sts v1.23.1 h1:ASNYk1ypWAxRhJjKS0jBnTUeDl7HROOpeSMu1xDA/I8= github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= From 6228300afc71124eaf8d001ac7ac1e528e24f456 Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Mon, 16 Oct 2023 07:32:30 -0700 Subject: [PATCH 46/80] feat: Helm chart (#2560) * feat: Happy stack helm chart * service * Create cronjob.yaml * remove defaults * Create ingress-bypass.yaml * ingress * horizontal * Create oidc-secret.yaml * hpa * Create sa.yaml * Create linkerd_ingress.yaml * linkerd server * linkerd messh tls * Update service.yaml * linkerd_authz_policy * Update deployment.yaml * target group binding * db password * password * helmify * Update _helpers.tpl * Update _helpers.tpl * Update deployment.yaml * bump * Update hpa.yaml * Update ingress_bypass.yaml * Update ingress_main.yaml * stack fullname * bump * bump * bump * bump * deployments * Update oidc_secret.yaml * bump * Update sa.yaml * deployment done * merge * Bump * Bump * Bump * bump * Bump * Bump * Bump * Bump * Bump * Added dns zone * Hpa * Bump * bump * Bump * Bump * Bump * Bump * Bump * Bump * Bump * Bump * Bump * Bump * values * Bump * bypasses * default no bypasses * main ingress group number * quote * suspend needs to be bool * Bump * add chart releaser * charts dir * arch * new version * update workflow * chart ci * test release please * release please * Update deployment.yaml * Update deployment.yaml * Update deployment.yaml * release please config * release as * Bump * chart releaser * Bump * Bump * Bump * Update ingress_main.yaml * chart release ci * polish --------- Co-authored-by: Jake Heath Co-authored-by: Jake Heath <76011913+jakeyheath@users.noreply.github.com> --- .github/workflows/charts-release.yml | 102 +++++++++ happy.code-workspace | 6 + helm-charts/charts/stack/.helmignore | 23 ++ helm-charts/charts/stack/Chart.yaml | 21 ++ .../charts/stack/templates/_helpers.tpl | 114 ++++++++++ .../charts/stack/templates/cronjob.yaml | 50 ++++ .../charts/stack/templates/deployment.yaml | 89 ++++++++ helm-charts/charts/stack/templates/hpa.yaml | 26 +++ .../stack/templates/ingress_bypass.yaml | 41 ++++ .../charts/stack/templates/ingress_main.yaml | 49 ++++ .../stack/templates/linkerd_authz_policy.yaml | 23 ++ .../stack/templates/linkerd_ingress.yaml | 39 ++++ .../templates/linkerd_mesh_tls_auth.yaml | 27 +++ .../stack/templates/linkerd_server.yaml | 19 ++ .../charts/stack/templates/oidc_secret.yaml | 19 ++ helm-charts/charts/stack/templates/sa.yaml | 27 +++ .../charts/stack/templates/service.yaml | 22 ++ .../stack/templates/target_group_binding.yaml | 30 +++ helm-charts/charts/stack/values.yaml | 215 ++++++++++++++++++ release-please-config.json | 5 + 20 files changed, 947 insertions(+) create mode 100644 .github/workflows/charts-release.yml create mode 100644 helm-charts/charts/stack/.helmignore create mode 100644 helm-charts/charts/stack/Chart.yaml create mode 100644 helm-charts/charts/stack/templates/_helpers.tpl create mode 100644 helm-charts/charts/stack/templates/cronjob.yaml create mode 100644 helm-charts/charts/stack/templates/deployment.yaml create mode 100644 helm-charts/charts/stack/templates/hpa.yaml create mode 100644 helm-charts/charts/stack/templates/ingress_bypass.yaml create mode 100644 helm-charts/charts/stack/templates/ingress_main.yaml create mode 100644 helm-charts/charts/stack/templates/linkerd_authz_policy.yaml create mode 100644 helm-charts/charts/stack/templates/linkerd_ingress.yaml create mode 100644 helm-charts/charts/stack/templates/linkerd_mesh_tls_auth.yaml create mode 100644 helm-charts/charts/stack/templates/linkerd_server.yaml create mode 100644 helm-charts/charts/stack/templates/oidc_secret.yaml create mode 100644 helm-charts/charts/stack/templates/sa.yaml create mode 100644 helm-charts/charts/stack/templates/service.yaml create mode 100644 helm-charts/charts/stack/templates/target_group_binding.yaml create mode 100644 helm-charts/charts/stack/values.yaml diff --git a/.github/workflows/charts-release.yml b/.github/workflows/charts-release.yml new file mode 100644 index 0000000000..9cb237856a --- /dev/null +++ b/.github/workflows/charts-release.yml @@ -0,0 +1,102 @@ +name: Release Charts + +on: + release: + types: [published] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + check-chart-released: + runs-on: [ARM64, self-hosted, Linux] + steps: + - name: Check Release + id: chart_released + uses: actions/github-script@v5 + with: + script: | + core.setOutput("released", context.ref.includes('refs/tags/happy-stack-helm')) + core.setOutput("tag", context.ref.split("/").pop()) + outputs: + chart_released: ${{ steps.chart_released.outputs.released }} + tag: ${{ steps.chart_released.outputs.tag }} + release: + if: ${{ needs.check-chart-released.outputs.chart_released == 'true' }} + needs: + - check-chart-released + # NOTE: needs to be X64 because of helm-releaser + runs-on: [ARM64, self-hosted, Linux] + steps: + - name: Generate token + id: generate_token + uses: chanzuckerberg/github-app-token@v1.1.4 + with: + app_id: ${{ secrets.CZI_RELEASE_PLEASE_APP_ID }} + private_key: ${{ secrets.CZI_RELEASE_PLEASE_PK }} + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + path: main + token: ${{ steps.generate_token.outputs.token }} + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + path: chart-repo + repository: chanzuckerberg/happy-helm-charts + token: ${{ steps.generate_token.outputs.token }} + - name: Publish charts + run: | + set -ue + set -o pipefail + + # install helm + RELEASE_URL=https://get.helm.sh/helm-v3.13.1-linux-arm64.tar.gz + DIR_NAME=helm + OUT_DIR="/tmp/${DIR_NAME}" + mkdir -p ${OUT_DIR} + OUT_FILE="${OUT_DIR}/helm.tar.gz" + curl -sSL ${RELEASE_URL} -o ${OUT_FILE} + tar -zxf ${OUT_FILE} -C ${OUT_DIR} + HELM_CMD=$(find ${OUT_DIR} -type f -name "helm") + chmod +x ${HELM_CMD} + + # install ghcli + GHCLI_URL="https://github.com/cli/cli/releases/download/v2.30.0/gh_2.30.0_linux_arm64.tar.gz" + GHCLI_DIR_NAME=ghcli + GHCLI_TOOL_PATH="/tmp/${GHCLI_DIR_NAME}" + mkdir -p ${GHCLI_TOOL_PATH} + GHCLI_OUT_FILE="${GHCLI_TOOL_PATH}/ghcli.tar.gz" + curl -sSL $GHCLI_URL -L -o ${GHCLI_OUT_FILE} + tar -zxf ${GHCLI_OUT_FILE} -C ${GHCLI_TOOL_PATH} --strip-components 1 + GHCLI_CMD=$(find ${GHCLI_TOOL_PATH} -type f -name "gh") + ${GHCLI_CMD} auth login --with-token < <(echo $GH_CRED) + ${GHCLI_CMD} auth status + + # packages will be uploaded to their release + PACKAGE_DIR="/tmp" + # the index.yaml file will be hosted by the happy github pages site + INDEX_DIR="${GITHUB_WORKSPACE}/chart-repo" + # the location of the chart package + CHARTS_DIR="${GITHUB_WORKSPACE}/main/helm-charts/charts/stack" + # location of release to download the chart from + CHART_DOWNLOAD_URL="https://github.com/chanzuckerberg/${{ github.repository }}/releases/download/${{ needs.check-chart-released.outputs.tag }}" + + git config --global user.email "czihelperbot@chanzuckerberg.com" + git config --global user.name "CZI Happy Helm Publisher Bot" + + cd main + ${HELM_CMD} package ${CHARTS_DIR} -d ${PACKAGE_DIR} + ${GHCLI_CMD} release upload ${{ needs.check-chart-released.outputs.tag }} ${PACKAGE_DIR}/*.tgz --clobber + ${HELM_CMD} repo index ${PACKAGE_DIR} --url ${CHART_DOWNLOAD_URL} --merge ${INDEX_DIR}/index.yaml + + cd ../chart-repo + mv ${PACKAGE_DIR}/index.yaml .${INDEX_DIR}/index.yaml + git add -A + git commit -m "chore: publish charts from ${{ github.repository }} ${{ needs.check-chart-released.outputs.tag }}" + git push + env: + GH_CRED: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/happy.code-workspace b/happy.code-workspace index 01d105206f..000682c3aa 100644 --- a/happy.code-workspace +++ b/happy.code-workspace @@ -20,6 +20,12 @@ }, { "path": "examples" + }, + { + "path": "helm-charts" + }, + { + "path": ".github" } ], "settings": {} diff --git a/helm-charts/charts/stack/.helmignore b/helm-charts/charts/stack/.helmignore new file mode 100644 index 0000000000..0e8a0eb36f --- /dev/null +++ b/helm-charts/charts/stack/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/helm-charts/charts/stack/Chart.yaml b/helm-charts/charts/stack/Chart.yaml new file mode 100644 index 0000000000..fd54f7af34 --- /dev/null +++ b/helm-charts/charts/stack/Chart.yaml @@ -0,0 +1,21 @@ +apiVersion: v2 +name: stack +description: A Helm chart for Kubernetes +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.3.0 +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "0.3.0" diff --git a/helm-charts/charts/stack/templates/_helpers.tpl b/helm-charts/charts/stack/templates/_helpers.tpl new file mode 100644 index 0000000000..f69001b5bb --- /dev/null +++ b/helm-charts/charts/stack/templates/_helpers.tpl @@ -0,0 +1,114 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "stack.name" -}} +{{- default .Values.stackName | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{- define "service.name" -}} +{{- default .name | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "stack.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "stack.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{- define "stack.labels" -}} +helm.sh/chart: {{ include "stack.chart" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: happy +app.kubernetes.io/part-of: {{ include "stack.name" . }} +stack: {{ include "stack.name" . }} +{{- end }} + +{{- define "service.labels" -}} +app: {{.}} +app.kubernetes.io/component: {{.}} +{{- end}} + +{{- define "happy.intSecretVolumeMount" -}} +anchor: +- mountPath: /var/happy + name: integration-secret + readOnly: true +{{- end}} + +{{- define "ingress.base.annotations" -}} +kubernetes.io/ingress.class: alb +alb.ingress.kubernetes.io/healthcheck-interval-seconds: "300" +alb.ingress.kubernetes.io/healthcheck-path: {{ .service.healthCheck.path | quote }} +alb.ingress.kubernetes.io/actions.redirect: '{"RedirectConfig":{"Port":"443","Protocol":"HTTPS","StatusCode":"HTTP_301"},"Type":"redirect"}' +alb.ingress.kubernetes.io/scheme: internet-facing +alb.ingress.kubernetes.io/success-codes: {{ .service.routing.successCodes | quote }} +alb.ingress.kubernetes.io/target-group-attributes: deregistration_delay.timeout_seconds=60 +alb.ingress.kubernetes.io/target-type: instance +{{- if eq .Values.routingMethod "CONTEXT" }} +alb.ingress.kubernetes.io/group.name: stack-{{ .Values.stackName }} +{{- else }} +alb.ingress.kubernetes.io/group.name: service-{{ .Values.stackName}}-{{ .service.name }} +{{- end }} +alb.ingress.kubernetes.io/certificate-arn: {{ required "The .Values.services[*].routing.certificateArn is required" .service.certificateArn }} +alb.ingress.kubernetes.io/ssl-policy: ELBSecurityPolicy-TLS-1-2-2017-01 +alb.ingress.kubernetes.io/load-balancer-attributes: {{ join "," .service.routing.loadBalancerAttributes | quote }} +alb.ingress.kubernetes.io/healthcheck-protocol: {{if eq .Values.serviceMesh.enabled true}}HTTPS{{else}}{{ .service.routing.scheme }}{{end}} +alb.ingress.kubernetes.io/backend-protocol: {{if eq .Values.serviceMesh.enabled true}}HTTPS{{else}}{{ .service.routing.scheme }}{{end}} +alb.ingress.kubernetes.io/subnets: {{ required ".Values.aws.cloudEnv.publicSubnets is required" (join "," .Values.aws.cloudEnv.publicSubnets) | quote }} +alb.ingress.kubernetes.io/tags: env={{.Values.deploymentStage}},happy_env={{.Values.deploymentStage}},happy_last_applied={{ now | date "20060102150405" }},happy_region={{ .Values.aws.region }},happy_stack_name={{ include "stack.name" . }},managedBy=happy,owner={{ .Values.aws.tags.owner }},project={{ .Values.aws.tags.project }},service={{ .Values.aws.tags.service }} +{{- end}} + +{{- define "container.probes" -}} +livenessProbe: + failureThreshold: 3 + httpGet: + path: {{ .healthCheck.path | quote }} + port: {{ .routing.port | int }} + scheme: {{ .routing.scheme | quote }} + initialDelaySeconds: {{ .healthCheck.initialDelaySeconds | int }} + periodSeconds: {{ .healthCheck.periodSeconds | int }} + successThreshold: 1 + timeoutSeconds: 1 +readinessProbe: + failureThreshold: 3 + httpGet: + path: {{ .healthCheck.path | quote }} + port: {{ .routing.port | int }} + scheme: {{ .routing.scheme | quote }} + initialDelaySeconds: {{ .healthCheck.initialDelaySeconds | int }} + periodSeconds: {{ .healthCheck.periodSeconds | int }} + successThreshold: 1 + timeoutSeconds: 1 +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "stack.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "stack.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/helm-charts/charts/stack/templates/cronjob.yaml b/helm-charts/charts/stack/templates/cronjob.yaml new file mode 100644 index 0000000000..6dd50660c6 --- /dev/null +++ b/helm-charts/charts/stack/templates/cronjob.yaml @@ -0,0 +1,50 @@ +{{ $global := . }} +{{- range $key, $value := .Values.tasks }} +{{ $fullTaskName := (printf "%s-%s" $global.Values.stackName $value.name) | trunc 63 | trimSuffix "-" }} +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + name: {{ $fullTaskName }} + labels: + {{- include "service.labels" $fullTaskName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} +spec: + concurrencyPolicy: Forbid + failedJobsHistoryLimit: 5 + jobTemplate: + metadata: + creationTimestamp: null + spec: + backoffLimit: 2 + completions: 1 + manualSelector: false + parallelism: 1 + template: + spec: + automountServiceAccountToken: true + containers: + - command: {{ toYaml $value.cmd | nindent 12 }} + image: {{ required ".Values.tasks[].image.repository required" $value.image.repository }}:{{ required ".Values.tasks[].image.tag required" $value.image.tag }} + imagePullPolicy: {{ $value.image.pullPolicy | default "IfNotPresent" | quote }} + name: {{ $value.name | quote }} + resources: {{- toYaml $value.resources | nindent 14 }} + env: {{- $value.env.additionalEnvVars| default list | toYaml | nindent 14 }} + envFrom: {{- (concat $value.env.additionalEnvVarsFromConfigMaps $value.env.additionalEnvVarsFromSecrets) | default list | toYaml | nindent 14 }} + volumeMounts: + {{- $intSecretVM := get ((include "happy.intSecretVolumeMount" .) | fromYaml) "anchor"}} + {{- (concat $intSecretVM $value.volumes.additionalVolumesFromSecrets $value.volumes.additionalVolumesFromConfigMaps) | toYaml | nindent 12 }} + dnsPolicy: ClusterFirst + enableServiceLinks: true + restartPolicy: Never + schedulerName: default-scheduler + securityContext: {} + serviceAccountName: {{ $fullTaskName }} + nodeSelector: {{- toYaml (merge $value.additionalNodeSelectors (dict "kubernetes.io/arch" $value.image.platformArchitecture)) }} + shareProcessNamespace: false + terminationGracePeriodSeconds: 30 + ttlSecondsAfterFinished: 10 + schedule: {{ $value.schedule | quote }} + suspend: {{ $value.suspend | toYaml }} +{{- end }} + diff --git a/helm-charts/charts/stack/templates/deployment.yaml b/helm-charts/charts/stack/templates/deployment.yaml new file mode 100644 index 0000000000..aaf21de87b --- /dev/null +++ b/helm-charts/charts/stack/templates/deployment.yaml @@ -0,0 +1,89 @@ +{{ $global := . }} +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ $fullServiceName }} + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} + annotations: + {{- if eq $global.Values.datadog.enabled true }} + ad.datadoghq.com/tags: '{"deployment_stage":"{{$global.deploymentStage}}","env":"{{$global.deploymentStage}}","happy_compute":"eks","happy_service":"{{$fullServiceName}}","happy_stack":"{{ include "stack.name" $global }}","managedby":"happy","owner":"{{$global.Values.aws.tags.owner}}","project":"{{$global.Values.aws.tags.project}}","service":"{{$global.Values.aws.tags.service}}"}' + {{- end }} + linkerd.io/inject: {{if eq $global.Values.serviceMesh.enabled true}}enabled{{else}}disabled{{end}} +spec: + replicas: {{ $value.scaling.desiredCount }} + selector: + matchLabels: + app: {{$fullServiceName}} + template: + metadata: + labels: + {{- include "service.labels" $fullServiceName | nindent 8 }} + {{- include "stack.labels" $global | nindent 8 }} + annotations: + {{- if eq $global.Values.datadog.enabled true }} + ad.datadoghq.com/tags: '{"deployment_stage":"{{$global.deploymentStage}}","env":"{{$global.deploymentStage}}","happy_compute":"eks","happy_service":"{{$fullServiceName}}","happy_stack":"{{ include "stack.name" $global }}","managedby":"happy","owner":"{{$global.Values.aws.tags.owner}}","project":"{{$global.Values.aws.tags.project}}","service":"{{$global.Values.aws.tags.service}}"}' + {{- end }} + {{ if eq $global.Values.serviceMesh.enabled true -}} + config.linkerd.io/default-inbound-policy: all-authenticated + config.linkerd.io/skip-outbound-ports: 25,587,3306,4444,4567,4568,5432,6379,9300,11211 + linkerd.io/inject: enabled + {{- else }}{{ end }} + spec: + automountServiceAccountToken: true + containers: + - env: {{- $value.env.additionalEnvVars| default list | toYaml | nindent 10 }} + envFrom: {{- (concat $value.env.additionalEnvVarsFromConfigMaps $value.env.additionalEnvVarsFromSecrets) | default list | toYaml | nindent 10}} + image: {{ required ".Values.services[].image.repository required" $value.image.repository }}:{{ required ".Values.services[].image.tag required" $value.image.tag }} + imagePullPolicy: {{ $value.image.pullPolicy | default "IfNotPresent" | quote }} + name: {{ $value.name | quote }} + ports: + - containerPort: {{ $value.routing.port | int }} + name: http + protocol: TCP + {{- include "container.probes" $value | nindent 10 }} + resources: {{- toYaml $value.resources | nindent 10 }} + volumeMounts: + {{- $intSecretVM := get ((include "happy.intSecretVolumeMount" .) | fromYaml) "anchor" }} + {{- (concat $intSecretVM $value.volumes.additionalVolumesFromSecrets $value.volumes.additionalVolumesFromConfigMaps) | toYaml | nindent 10 }} + {{- range $k, $v := $value.sidecars }} + - name: {{ $v.name }} + image: {{ required ".Values.services[].sidecars[].image.repository required" $v.image.repository }}:{{ required ".Values.services[].sidecars[].image.tag required" $v.image.tag }} + imagePullPolicy: {{ $v.image.pullPolicy | default "IfNotPresent" | quote }} + ports: + - containerPort: {{ $v.port | int }} + name: http + protocol: TCP + {{- include "container.probes" $v | nindent 10 }} + resources: {{- toYaml $v.resources | nindent 10 }} + volumeMounts: + {{- $intSecretVM := get ((include "happy.intSecretVolumeMount" .) | fromYaml) "anchor" }} + {{- (concat $intSecretVM $value.volumes.additionalVolumesFromSecrets $value.volumes.additionalVolumesFromConfigMaps) | toYaml | nindent 10}} + {{- $env := list (dict "name" "DEPLOYMENT_STAGE" "value" $global.Values.deploymentStage) (dict "name" "AWS_REGION" "value" $global.Values.aws.region) (dict "name" "AWS_DEFAULT_REGION" "value" $global.Values.aws.region) (dict "name" "HAPPY_STACK" "value" $global.Values.stackName) (dict "name" "HAPPY_SERVICE" "value" $v.name) }} + {{- $combinedEnv := concat $env $value.env.additionalEnvVars }} + env: {{- $combinedEnv | default list | toYaml | nindent 10 }} + envFrom: {{- (concat $value.env.additionalEnvVarsFromConfigMaps $value.env.additionalEnvVarsFromSecrets) | default list | toYaml | nindent 10 }} + {{- end }} + nodeSelector: {{- toYaml (merge $value.additionalNodeSelectors (dict "kubernetes.io/arch" $value.image.platformArchitecture)) }} + restartPolicy: Always + serviceAccountName: {{ $fullServiceName }} + volumes: + {{- range $k, $v := $value.volumes.additionalVolumesFromConfigMaps }} + - name: {{ $v.name }} + configMap: + name: {{ $v.name }} + {{- end}} + {{- range $k, $v := $value.volumes.additionalVolumesFromSecrets }} + - name: {{ $v.name }} + secret: + name: {{ $v.name }} + {{- end}} + - name: integration-secret + secret: + secretName: integration-secret +{{- end }} diff --git a/helm-charts/charts/stack/templates/hpa.yaml b/helm-charts/charts/stack/templates/hpa.yaml new file mode 100644 index 0000000000..020b12ce7a --- /dev/null +++ b/helm-charts/charts/stack/templates/hpa.yaml @@ -0,0 +1,26 @@ +{{ $global := . }} +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} +--- +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ $fullServiceName }} + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} +spec: + maxReplicas: {{ $value.scaling.maxCount }} + metrics: + - resource: + name: cpu + target: + averageUtilization: {{ $value.scaling.cpuThresholdPercentage }} + type: Utilization + type: Resource + minReplicas: {{ $value.scaling.desiredCount }} + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ $fullServiceName }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/ingress_bypass.yaml b/helm-charts/charts/stack/templates/ingress_bypass.yaml new file mode 100644 index 0000000000..231137fb52 --- /dev/null +++ b/helm-charts/charts/stack/templates/ingress_bypass.yaml @@ -0,0 +1,41 @@ +{{ $global := . }} +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} +{{- $service := dict "Values" $global.Values "service" $value -}} +{{ if or (eq $value.routing.serviceType "EXTERNAL") (eq $value.routing.serviceType "INTERNAL") }} +{{ $bypassI := 0 }} +{{- if gt (len $value.routing.bypasses) (int $value.routing.priority) -}} +{{ fail (printf "The .Values.services[*].routing.priority (%d) for %s must be higher than the number of bypasses (%d)." (int $value.routing.priority) $value.name (len $value.routing.bypasses)) }} +{{- end }} +{{- range $i := (untilStep (int (sub $value.routing.priority (len $value.routing.bypasses))) (int $value.routing.priority) 1) -}} +{{- with (index $value.routing.bypasses $bypassI) }} + +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ $fullServiceName }}-options-bypass + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} + annotations: + {{- include "ingress.base.annotations" $service | nindent 4 }} + alb.ingress.kubernetes.io/group.order: {{$i | quote }} + alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]' + alb.ingress.kubernetes.io/conditions.{{ $fullServiceName }}: {{ toJson . | quote }} +{{- end }} +{{- $bypassI = add1 $bypassI }} +spec: + rules: + - host: {{ $global.Values.stackName }}.{{ $global.Values.aws.dnsZone }} + http: + paths: + - backend: + service: + name: {{ $fullServiceName }} + port: + number: {{if eq $global.Values.serviceMesh.enabled true}}443{{else}}{{$value.routing.servicePort | int }}{{ end }} + pathType: ImplementationSpecific +{{- end }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/ingress_main.yaml b/helm-charts/charts/stack/templates/ingress_main.yaml new file mode 100644 index 0000000000..78b3d8c042 --- /dev/null +++ b/helm-charts/charts/stack/templates/ingress_main.yaml @@ -0,0 +1,49 @@ +{{ $global := . }} +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} +{{- $service := dict "Values" $global.Values "service" $value -}} +{{ if or (eq $value.routing.serviceType "EXTERNAL") (eq $value.routing.serviceType "INTERNAL") }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ $fullServiceName }} + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} + annotations: + {{- include "ingress.base.annotations" $service | nindent 4 }} + alb.ingress.kubernetes.io/group.order: {{ $value.routing.priority | quote }} + alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443},{"HTTP":80}]' + {{- if ne $global.Values.aws.wafAclArn "" }} + alb.ingress.kubernetes.io/wafv2-acl-arn: {{ $global.Values.aws.wafAclArn }} + {{- end }} + {{- if eq $value.routing.serviceType "INTERNAL" }} + alb.ingress.kubernetes.io/auth-type: "oidc" + alb.ingress.kubernetes.io/auth-on-unauthenticated-request: "authenticate" + alb.ingress.kubernetes.io/auth-idp-oidc: {{ toJson $value.routing.oidcConfig | quote }} + {{- end }} + +spec: + rules: + - http: + paths: + - backend: + service: + name: redirect + port: + name: use-annotation + path: /* + pathType: ImplementationSpecific + - host: {{ $global.Values.stackName }}.{{ $global.Values.aws.dnsZone }} + http: + paths: + - backend: + service: + name: {{ $fullServiceName }} + port: + number: {{if eq $global.Values.serviceMesh.enabled true}}443{{else}}{{$value.routing.port | int }}{{ end }} + path: /* + pathType: ImplementationSpecific +{{- end }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/linkerd_authz_policy.yaml b/helm-charts/charts/stack/templates/linkerd_authz_policy.yaml new file mode 100644 index 0000000000..1681decc6b --- /dev/null +++ b/helm-charts/charts/stack/templates/linkerd_authz_policy.yaml @@ -0,0 +1,23 @@ +{{ $global := . }} +{{if eq .Values.serviceMesh.enabled true}} +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} +--- +apiVersion: policy.linkerd.io/v1alpha1 +kind: AuthorizationPolicy +metadata: + name: {{ $fullServiceName }} + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} +spec: + requiredAuthenticationRefs: # TODO + - group: policy.linkerd.io + kind: MeshTLSAuthentication + name: {{ $fullServiceName }}-mesh-tls-auth + targetRef: + group: policy.linkerd.io + kind: Server + name: {{ $fullServiceName }}-server +{{- end }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/linkerd_ingress.yaml b/helm-charts/charts/stack/templates/linkerd_ingress.yaml new file mode 100644 index 0000000000..df5e391ed1 --- /dev/null +++ b/helm-charts/charts/stack/templates/linkerd_ingress.yaml @@ -0,0 +1,39 @@ +{{ $global := . }} +{{if eq .Values.serviceMesh.enabled true}} +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ $fullServiceName }}-nginx + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} + annotations: + cert-manager.io/cluster-issuer: nginx-issuer + external-dns.alpha.kubernetes.io/exclude: "true" + linkerd.io/inject: enabled + nginx.ingress.kubernetes.io/proxy-connect-timeout: "60" + nginx.ingress.kubernetes.io/proxy-read-timeout: "60" + nginx.ingress.kubernetes.io/proxy-send-timeout: "60" + nginx.ingress.kubernetes.io/service-upstream: "true" +spec: + ingressClassName: nginx + rules: + - host: {{ $global.Values.stackName }}.{{ $global.Values.aws.dnsZone }} + http: + paths: + - backend: + service: + name: {{ $fullServiceName }} + port: + number: {{ $value.routing.port | int }} + path: / + pathType: ImplementationSpecific + tls: + - hosts: + - {{ $global.Values.stackName }}.{{ $global.Values.aws.dnsZone }} + secretName: {{ $fullServiceName }}-nginx-tls-secret +{{- end }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/linkerd_mesh_tls_auth.yaml b/helm-charts/charts/stack/templates/linkerd_mesh_tls_auth.yaml new file mode 100644 index 0000000000..7542858c8c --- /dev/null +++ b/helm-charts/charts/stack/templates/linkerd_mesh_tls_auth.yaml @@ -0,0 +1,27 @@ +{{ $global := . }} +{{if eq .Values.serviceMesh.enabled true}} +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} +--- +apiVersion: policy.linkerd.io/v1alpha1 +kind: MeshTLSAuthentication +metadata: + name: {{ $fullServiceName }} + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} +spec: + identityRefs: # TODO + {{- range $service := $value.serviceMesh.allowServices }} + - kind: ServiceAccount + {{- if $service.serviceAccountName }} + name: {{ $service.serviceAccountName }} + {{- else }} + name: {{ $service.stack }}-{{ $service.name }}-{{ $global.Values.deploymentStage }}-{{ $service.stack }} + {{- end }} + {{- if .Release }} + namespace: {{ .Release.Namespace | default "" }} + {{- end }} + {{- end }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/linkerd_server.yaml b/helm-charts/charts/stack/templates/linkerd_server.yaml new file mode 100644 index 0000000000..638ed8e67b --- /dev/null +++ b/helm-charts/charts/stack/templates/linkerd_server.yaml @@ -0,0 +1,19 @@ +{{ $global := . }} +{{ if eq .Values.serviceMesh.enabled true }} +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} +--- +apiVersion: policy.linkerd.io/v1beta1 +kind: Server +metadata: + name: {{ $fullServiceName }} + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} +spec: + podSelector: + matchLabels: + app: {{$fullServiceName}} + port: {{ $value.routing.port | int }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/oidc_secret.yaml b/helm-charts/charts/stack/templates/oidc_secret.yaml new file mode 100644 index 0000000000..7eafdc8c49 --- /dev/null +++ b/helm-charts/charts/stack/templates/oidc_secret.yaml @@ -0,0 +1,19 @@ +{{ $global := . }} +{{- range $key, $value := .Values.services }} +{{ $fullServiceName := (printf "%s-%s" $global.Values.stackName $value.name) | trunc 63 | trimSuffix "-" }} +{{- if eq $value.routing.serviceType "INTERNAL" }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: {{ $fullServiceName }}-oidc-config + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} +data: + clientID: {{ required ".Values.services[].routing.oidcConfig.clientID is required" $value.routing.oidcConfig.clientID + | b64enc | quote }} + clientSecret: {{ required ".Values.services[].routing.oidcConfig.clientSecret is required" $value.routing.oidcConfig.clientSecret + | b64enc | quote }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/sa.yaml b/helm-charts/charts/stack/templates/sa.yaml new file mode 100644 index 0000000000..25988dd23f --- /dev/null +++ b/helm-charts/charts/stack/templates/sa.yaml @@ -0,0 +1,27 @@ +{{ $global := . }} +{{- range $key, $value := .Values.tasks }} +{{ $fullTaskName := (printf "%s-%s" $global.Values.stackName $value.name) | trunc 63 | trimSuffix "-" }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ $fullTaskName }} + labels: + {{- include "service.labels" $fullTaskName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} + annotations: + eks.amazonaws.com/role-arn: {{ $value.awsIam.roleArn }} # TODO +{{- end }} + +{{- range $key, $value := .Values.services }} +{{ $fullServiceName := (printf "%s-%s" $global.Values.stackName $value.name) | trunc 63 | trimSuffix "-" }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ $fullServiceName }} + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} + annotations: + eks.amazonaws.com/role-arn: {{ $value.awsIam.roleArn }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/service.yaml b/helm-charts/charts/stack/templates/service.yaml new file mode 100644 index 0000000000..920fda687d --- /dev/null +++ b/helm-charts/charts/stack/templates/service.yaml @@ -0,0 +1,22 @@ +{{ $global := . }} +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} +{{ if ne $value.routing.serviceType "IMAGE_TEMPLATE" }} + +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ $fullServiceName }} + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} +spec: + type: {{ if or (eq $value.routing.serviceType "PRIVATE") (eq $global.Values.serviceMesh.enabled true) -}}ClusterIP{{- else -}}NodePort{{- end }} + selector: + app: {{ $fullServiceName }} + ports: + - port: {{ $value.routing.port | int }} + targetPort: {{ $value.routing.port |int }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/templates/target_group_binding.yaml b/helm-charts/charts/stack/templates/target_group_binding.yaml new file mode 100644 index 0000000000..0a48991fc8 --- /dev/null +++ b/helm-charts/charts/stack/templates/target_group_binding.yaml @@ -0,0 +1,30 @@ +{{ $global := . }} + +{{- range $key, $value := .Values.services }} +{{- $fullServiceName := printf "%s-%s" $global.Values.stackName $value.name | trunc 63 | trimSuffix "-" }} +{{- $service := dict "Values" $global.Values "service" $value -}} +{{ if eq $value.routing.serviceType "TARGET_GROUP_ONLY" }} +apiVersion: elbv2.k8s.aws/v1beta1 +kind: TargetGroupBinding +metadata: + name: {{ $fullServiceName }} + {{- include "stack.labels" $global | nindent 4 }} + labels: + {{- include "service.labels" $fullServiceName | nindent 4 }} + {{- include "stack.labels" $global | nindent 4 }} +spec: + ipAddressType: ipv4 + networking: + ingress: + - from: + - securityGroup: + groupID: {{ required ".Values.services[].routing.alb.securityGroup is required" $service.routing.alb.securityGroup }} + ports: + - protocol: TCP + serviceRef: + name: {{ $fullServiceName }} + port: {{ $service.routing.port }} + targetGroupARN: {{ required ".Values.services[].routing.alb.targetGroupArn is required" $service.routing.alb.targetGroupArn }} + targetType: instance +{{- end }} +{{- end }} \ No newline at end of file diff --git a/helm-charts/charts/stack/values.yaml b/helm-charts/charts/stack/values.yaml new file mode 100644 index 0000000000..02c4938bd8 --- /dev/null +++ b/helm-charts/charts/stack/values.yaml @@ -0,0 +1,215 @@ +stackName: along3 +deploymentStage: rdev +aws: + region: us-west-2 + tags: + env: "ADDTAGS" + owner: "ADDTAGS" + project: "ADDTAGS" + service: "ADDTAGS" + managedBy: "ADDTAGS" + cloudEnv: + publicSubnets: ["subnet-a1", "subnet-a2"] + privateSubnets: [] + databaseSubnets: [] + databaseSubnetGroup: "" + vpcId: "" + vpcCidrBlock: "" + wafAclArn: "" + dnsZone: edu-platform.rdev.si.czi.technology +serviceMesh: + enabled: true +datadog: + enabled: true +services: +- name: "service2" + image: + repository: "blalbhal" + tag: "tag1" + tagMutability: true + scanOnPush: false + platformArchitecture: "amd64" + pullPolicy: "IfNotPresent" + cmd: [] + args: [] + resources: + limits: + cpu: "100m" + gpu: null + memory: "100Mi" + requests: + cpu: "10m" + gpu: null + memory: "10Mi" + scaling: + desiredCount: 2 + maxCount: 2 + cpuThresholdPercentage: 80 + env: + additionalEnvVars: [] + # additionalEnvVars: [{name: "balh", value: "blah"}] + # + # + additionalEnvVarsFromConfigMaps: [] + # additionalEnvVarsFromConfigMaps: [ + # {configMapRef: {name: "balh"}, prefix: "blah"} + #] + additionalEnvVarsFromSecrets: [] + # additionalEnvVarsFromSecrets: [ + # {secretRef: {name: "balh"}, prefix: "blah"} + #] + volumes: + additionalVolumesFromSecrets: [{mountPath: "blah2", readOnly: true, name: "blah2"}] + # additionalEnvVarsFromSecrets: [ + # {mountPath: "blah", readOnly: true, name: "blah"} + # - name: config-vol + configMap: + name: log-config + items: + - key: log_level + path: log_level + #] + additionalVolumesFromConfigMaps: [{mountPath: "blah", readOnly: true, name: "blah"}] + # additionalEnvVarsFromSecrets: [ + # {mountPath: "blah", readOnly: true, name: "blah"} + #] + stackPrefix: "" + datadog: + createDashboard: false + skipConfigInjection: false + waitForSteadyState: true + certificateArn: "blahblahbs" + serviceEndpoints: {} + healthCheck: + path: "/" + periodSeconds: 3 + initialDelaySeconds: 30 + awsIam: + roleArn: arn:aws:iam::00000000000:role/zzz/zzz + routing: + method: "DOMAIN" + hostMatch: "" + groupName: "" + alb: + loadBalancerAttributes: + - idle_timeout.timeout_seconds=60 + securityGroup: sg-123 + targetGroupArn: arn:aws:elasticloadbalancing:us-west-2:00000000000:targetgroup/zzz/zzz + targetGroup: group1 + priority: 4 + path: "/*" + serviceName: "" + port: 3000 + scheme: "HTTP" + successCodes: "200-499" + serviceType: "EXTERNAL" + oidcConfig: + issuer: "" + authorizationEndpoint: "" + tokenEndpoint: "" + userInfoEndpoint: "" + secretName: "" + bypasses: + - field: http-request-method + httpRequestMethodConfig: + Values: + - GET + - OPTIONS + - field: path-pattern + pathPatternConfig: + Values: + - /blah + - /test/skip + + # sidecars: + # sidecar1: + # image: "sidecar-image-1" + # tag: "1.0.0" + # port: 8080 + # scheme: "HTTP" + # memory: "256Mi" + # cpu: "250m" + # imagePullPolicy: "IfNotPresent" + # healthCheckPath: "/health" + # initialDelaySeconds: 15 + # periodSeconds: 5 + # sidecars: {} + sidecars: + - name: sidecar1 + image: + repository: "blalbhal" + tag: "tag1" + routing: + port: 8080 + scheme: "HTTP" + resources: + limits: + cpu: "100m" + memory: "100Mi" + requests: + cpu: "10m" + memory: "10Mi" + imagePullPolicy: "IfNotPresent" + healthCheck: + path: "/health" + periodSeconds: 3 + initialDelaySeconds: 30 + initialDelaySeconds: 15 + periodSeconds: 5 + regionalWafv2Arn: null + additionalNodeSelectors: {} + additionalPodLabels: {} + serviceMesh: + allowServices: + - service: "service1" + stack: "stack1" + serviceAccountName: "sa1" +tasks: +- name: migrate + suspend: true + schedule: "0 0 1 1 *" + cmd: ["./manage.py", "migrate"] + resources: + limits: + cpu: "100m" + memory: "100Mi" + requests: + cpu: "10m" + memory: "10Mi" + image: + repository: "blalbhal" + tag: "tag1" + platformArchitecture: "amd64" + pullPolicy: "IfNotPresent" + awsIam: + roleArn: arn:aws:iam::00000000000:role/zzz/zzz + env: + additionalEnvVars: [] + # additionalEnvVars: [{name: "balh", value: "blah"}] + # + # + additionalEnvVarsFromConfigMaps: [] + # additionalEnvVarsFromConfigMaps: [ + # {configMapRef: {name: "balh"}, prefix: "blah"} + #] + additionalEnvVarsFromSecrets: [] + # additionalEnvVarsFromSecrets: [ + # {secretRef: {name: "balh"}, prefix: "blah"} + #] + volumes: + additionalVolumesFromSecrets: [{mountPath: "blah2", readOnly: true, name: "blah2"}] + # additionalEnvVarsFromSecrets: [ + # {mountPath: "blah", readOnly: true, name: "blah"} + # - name: config-vol + configMap: + name: log-config + items: + - key: log_level + path: log_level + #] + additionalVolumesFromConfigMaps: [{mountPath: "blah", readOnly: true, name: "blah"}] + # additionalEnvVarsFromSecrets: [ + # {mountPath: "blah", readOnly: true, name: "blah"} + #] + additionalNodeSelectors: {} + additionalPodLabels: {} diff --git a/release-please-config.json b/release-please-config.json index e47eb6c8c0..8828fa17e1 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -20,6 +20,11 @@ } ], "packages": { + "helm-charts/charts/stack": { + "release-as": "0.1.0", + "release-type": "helm", + "package-name": "happy-stack-helm-chart" + }, "cli": { "package-name": "cli" }, From 76bc701e921617290394ed27a87de107eb362256 Mon Sep 17 00:00:00 2001 From: Hayden Spitzley <105455169+hspitzley-czi@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:40:32 -0400 Subject: [PATCH 47/80] feat: add 'source' column to app_configs table (#2596) --- api/pkg/ent/appconfig.go | 15 +++++- api/pkg/ent/appconfig/appconfig.go | 42 +++++++++++++++ api/pkg/ent/appconfig/where.go | 20 +++++++ api/pkg/ent/appconfig_create.go | 83 +++++++++++++++++++++++++++++- api/pkg/ent/appconfig_update.go | 80 ++++++++++++++++++++++++++-- api/pkg/ent/client.go | 3 +- api/pkg/ent/migrate/schema.go | 1 + api/pkg/ent/mutation.go | 56 +++++++++++++++++++- api/pkg/ent/runtime.go | 29 +---------- api/pkg/ent/runtime/runtime.go | 31 ++++++++++- api/pkg/ent/schema/appconfig.go | 34 ++++++------ 11 files changed, 340 insertions(+), 54 deletions(-) diff --git a/api/pkg/ent/appconfig.go b/api/pkg/ent/appconfig.go index 53999088dd..990308d687 100644 --- a/api/pkg/ent/appconfig.go +++ b/api/pkg/ent/appconfig.go @@ -32,7 +32,9 @@ type AppConfig struct { // Key holds the value of the "key" field. Key string `json:"key,omitempty"` // Value holds the value of the "value" field. - Value string `json:"value,omitempty"` + Value string `json:"value,omitempty"` + // 'stack' if the config is for a specific stack or 'environment' if available to all stacks in the environment + Source appconfig.Source `json:"source,omitempty"` selectValues sql.SelectValues } @@ -43,7 +45,7 @@ func (*AppConfig) scanValues(columns []string) ([]any, error) { switch columns[i] { case appconfig.FieldID: values[i] = new(sql.NullInt64) - case appconfig.FieldAppName, appconfig.FieldEnvironment, appconfig.FieldStack, appconfig.FieldKey, appconfig.FieldValue: + case appconfig.FieldAppName, appconfig.FieldEnvironment, appconfig.FieldStack, appconfig.FieldKey, appconfig.FieldValue, appconfig.FieldSource: values[i] = new(sql.NullString) case appconfig.FieldCreatedAt, appconfig.FieldUpdatedAt, appconfig.FieldDeletedAt: values[i] = new(sql.NullTime) @@ -117,6 +119,12 @@ func (ac *AppConfig) assignValues(columns []string, values []any) error { } else if value.Valid { ac.Value = value.String } + case appconfig.FieldSource: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field source", values[i]) + } else if value.Valid { + ac.Source = appconfig.Source(value.String) + } default: ac.selectValues.Set(columns[i], values[i]) } @@ -178,6 +186,9 @@ func (ac *AppConfig) String() string { builder.WriteString(", ") builder.WriteString("value=") builder.WriteString(ac.Value) + builder.WriteString(", ") + builder.WriteString("source=") + builder.WriteString(fmt.Sprintf("%v", ac.Source)) builder.WriteByte(')') return builder.String() } diff --git a/api/pkg/ent/appconfig/appconfig.go b/api/pkg/ent/appconfig/appconfig.go index 170c720ad0..764e4ea47d 100644 --- a/api/pkg/ent/appconfig/appconfig.go +++ b/api/pkg/ent/appconfig/appconfig.go @@ -3,8 +3,10 @@ package appconfig import ( + "fmt" "time" + "entgo.io/ent" "entgo.io/ent/dialect/sql" ) @@ -29,6 +31,8 @@ const ( FieldKey = "key" // FieldValue holds the string denoting the value field in the database. FieldValue = "value" + // FieldSource holds the string denoting the source field in the database. + FieldSource = "source" // Table holds the table name of the appconfig in the database. Table = "app_configs" ) @@ -44,6 +48,7 @@ var Columns = []string{ FieldStack, FieldKey, FieldValue, + FieldSource, } // ValidColumn reports if the column name is valid (part of the table columns). @@ -56,7 +61,13 @@ func ValidColumn(column string) bool { return false } +// Note that the variables below are initialized by the runtime +// package on the initialization of the application. Therefore, +// it should be imported in the main as follows: +// +// import _ "github.com/chanzuckerberg/happy/api/pkg/ent/runtime" var ( + Hooks [1]ent.Hook // DefaultCreatedAt holds the default value on creation for the "created_at" field. DefaultCreatedAt func() time.Time // DefaultUpdatedAt holds the default value on creation for the "updated_at" field. @@ -67,6 +78,32 @@ var ( DefaultStack string ) +// Source defines the type for the "source" enum field. +type Source string + +// SourceEnvironment is the default value of the Source enum. +const DefaultSource = SourceEnvironment + +// Source values. +const ( + SourceStack Source = "stack" + SourceEnvironment Source = "environment" +) + +func (s Source) String() string { + return string(s) +} + +// SourceValidator is a validator for the "source" field enum values. It is called by the builders before save. +func SourceValidator(s Source) error { + switch s { + case SourceStack, SourceEnvironment: + return nil + default: + return fmt.Errorf("appconfig: invalid enum value for source field: %q", s) + } +} + // OrderOption defines the ordering options for the AppConfig queries. type OrderOption func(*sql.Selector) @@ -114,3 +151,8 @@ func ByKey(opts ...sql.OrderTermOption) OrderOption { func ByValue(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldValue, opts...).ToFunc() } + +// BySource orders the results by the source field. +func BySource(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSource, opts...).ToFunc() +} diff --git a/api/pkg/ent/appconfig/where.go b/api/pkg/ent/appconfig/where.go index f48d8e5f18..bc4fce047a 100644 --- a/api/pkg/ent/appconfig/where.go +++ b/api/pkg/ent/appconfig/where.go @@ -549,6 +549,26 @@ func ValueContainsFold(v string) predicate.AppConfig { return predicate.AppConfig(sql.FieldContainsFold(FieldValue, v)) } +// SourceEQ applies the EQ predicate on the "source" field. +func SourceEQ(v Source) predicate.AppConfig { + return predicate.AppConfig(sql.FieldEQ(FieldSource, v)) +} + +// SourceNEQ applies the NEQ predicate on the "source" field. +func SourceNEQ(v Source) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNEQ(FieldSource, v)) +} + +// SourceIn applies the In predicate on the "source" field. +func SourceIn(vs ...Source) predicate.AppConfig { + return predicate.AppConfig(sql.FieldIn(FieldSource, vs...)) +} + +// SourceNotIn applies the NotIn predicate on the "source" field. +func SourceNotIn(vs ...Source) predicate.AppConfig { + return predicate.AppConfig(sql.FieldNotIn(FieldSource, vs...)) +} + // And groups predicates with the AND operator between them. func And(predicates ...predicate.AppConfig) predicate.AppConfig { return predicate.AppConfig(sql.AndPredicates(predicates...)) diff --git a/api/pkg/ent/appconfig_create.go b/api/pkg/ent/appconfig_create.go index 9cbf06057c..43cc00968f 100644 --- a/api/pkg/ent/appconfig_create.go +++ b/api/pkg/ent/appconfig_create.go @@ -102,6 +102,20 @@ func (acc *AppConfigCreate) SetValue(s string) *AppConfigCreate { return acc } +// SetSource sets the "source" field. +func (acc *AppConfigCreate) SetSource(a appconfig.Source) *AppConfigCreate { + acc.mutation.SetSource(a) + return acc +} + +// SetNillableSource sets the "source" field if the given value is not nil. +func (acc *AppConfigCreate) SetNillableSource(a *appconfig.Source) *AppConfigCreate { + if a != nil { + acc.SetSource(*a) + } + return acc +} + // SetID sets the "id" field. func (acc *AppConfigCreate) SetID(u uint) *AppConfigCreate { acc.mutation.SetID(u) @@ -115,7 +129,9 @@ func (acc *AppConfigCreate) Mutation() *AppConfigMutation { // Save creates the AppConfig in the database. func (acc *AppConfigCreate) Save(ctx context.Context) (*AppConfig, error) { - acc.defaults() + if err := acc.defaults(); err != nil { + return nil, err + } return withHooks(ctx, acc.sqlSave, acc.mutation, acc.hooks) } @@ -142,12 +158,18 @@ func (acc *AppConfigCreate) ExecX(ctx context.Context) { } // defaults sets the default values of the builder before save. -func (acc *AppConfigCreate) defaults() { +func (acc *AppConfigCreate) defaults() error { if _, ok := acc.mutation.CreatedAt(); !ok { + if appconfig.DefaultCreatedAt == nil { + return fmt.Errorf("ent: uninitialized appconfig.DefaultCreatedAt (forgotten import ent/runtime?)") + } v := appconfig.DefaultCreatedAt() acc.mutation.SetCreatedAt(v) } if _, ok := acc.mutation.UpdatedAt(); !ok { + if appconfig.DefaultUpdatedAt == nil { + return fmt.Errorf("ent: uninitialized appconfig.DefaultUpdatedAt (forgotten import ent/runtime?)") + } v := appconfig.DefaultUpdatedAt() acc.mutation.SetUpdatedAt(v) } @@ -155,6 +177,11 @@ func (acc *AppConfigCreate) defaults() { v := appconfig.DefaultStack acc.mutation.SetStack(v) } + if _, ok := acc.mutation.Source(); !ok { + v := appconfig.DefaultSource + acc.mutation.SetSource(v) + } + return nil } // check runs all checks and user-defined validators on the builder. @@ -180,6 +207,14 @@ func (acc *AppConfigCreate) check() error { if _, ok := acc.mutation.Value(); !ok { return &ValidationError{Name: "value", err: errors.New(`ent: missing required field "AppConfig.value"`)} } + if _, ok := acc.mutation.Source(); !ok { + return &ValidationError{Name: "source", err: errors.New(`ent: missing required field "AppConfig.source"`)} + } + if v, ok := acc.mutation.Source(); ok { + if err := appconfig.SourceValidator(v); err != nil { + return &ValidationError{Name: "source", err: fmt.Errorf(`ent: validator failed for field "AppConfig.source": %w`, err)} + } + } return nil } @@ -245,6 +280,10 @@ func (acc *AppConfigCreate) createSpec() (*AppConfig, *sqlgraph.CreateSpec) { _spec.SetField(appconfig.FieldValue, field.TypeString, value) _node.Value = value } + if value, ok := acc.mutation.Source(); ok { + _spec.SetField(appconfig.FieldSource, field.TypeEnum, value) + _node.Source = value + } return _node, _spec } @@ -387,6 +426,18 @@ func (u *AppConfigUpsert) UpdateValue() *AppConfigUpsert { return u } +// SetSource sets the "source" field. +func (u *AppConfigUpsert) SetSource(v appconfig.Source) *AppConfigUpsert { + u.Set(appconfig.FieldSource, v) + return u +} + +// UpdateSource sets the "source" field to the value that was provided on create. +func (u *AppConfigUpsert) UpdateSource() *AppConfigUpsert { + u.SetExcluded(appconfig.FieldSource) + return u +} + // UpdateNewValues updates the mutable fields using the new values that were set on create except the ID field. // Using this option is equivalent to using: // @@ -543,6 +594,20 @@ func (u *AppConfigUpsertOne) UpdateValue() *AppConfigUpsertOne { }) } +// SetSource sets the "source" field. +func (u *AppConfigUpsertOne) SetSource(v appconfig.Source) *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.SetSource(v) + }) +} + +// UpdateSource sets the "source" field to the value that was provided on create. +func (u *AppConfigUpsertOne) UpdateSource() *AppConfigUpsertOne { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateSource() + }) +} + // Exec executes the query. func (u *AppConfigUpsertOne) Exec(ctx context.Context) error { if len(u.create.conflict) == 0 { @@ -865,6 +930,20 @@ func (u *AppConfigUpsertBulk) UpdateValue() *AppConfigUpsertBulk { }) } +// SetSource sets the "source" field. +func (u *AppConfigUpsertBulk) SetSource(v appconfig.Source) *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.SetSource(v) + }) +} + +// UpdateSource sets the "source" field to the value that was provided on create. +func (u *AppConfigUpsertBulk) UpdateSource() *AppConfigUpsertBulk { + return u.Update(func(s *AppConfigUpsert) { + s.UpdateSource() + }) +} + // Exec executes the query. func (u *AppConfigUpsertBulk) Exec(ctx context.Context) error { if u.create.err != nil { diff --git a/api/pkg/ent/appconfig_update.go b/api/pkg/ent/appconfig_update.go index f11aca4903..c63d89134c 100644 --- a/api/pkg/ent/appconfig_update.go +++ b/api/pkg/ent/appconfig_update.go @@ -92,6 +92,20 @@ func (acu *AppConfigUpdate) SetValue(s string) *AppConfigUpdate { return acu } +// SetSource sets the "source" field. +func (acu *AppConfigUpdate) SetSource(a appconfig.Source) *AppConfigUpdate { + acu.mutation.SetSource(a) + return acu +} + +// SetNillableSource sets the "source" field if the given value is not nil. +func (acu *AppConfigUpdate) SetNillableSource(a *appconfig.Source) *AppConfigUpdate { + if a != nil { + acu.SetSource(*a) + } + return acu +} + // Mutation returns the AppConfigMutation object of the builder. func (acu *AppConfigUpdate) Mutation() *AppConfigMutation { return acu.mutation @@ -99,7 +113,9 @@ func (acu *AppConfigUpdate) Mutation() *AppConfigMutation { // Save executes the query and returns the number of nodes affected by the update operation. func (acu *AppConfigUpdate) Save(ctx context.Context) (int, error) { - acu.defaults() + if err := acu.defaults(); err != nil { + return 0, err + } return withHooks(ctx, acu.sqlSave, acu.mutation, acu.hooks) } @@ -126,14 +142,31 @@ func (acu *AppConfigUpdate) ExecX(ctx context.Context) { } // defaults sets the default values of the builder before save. -func (acu *AppConfigUpdate) defaults() { +func (acu *AppConfigUpdate) defaults() error { if _, ok := acu.mutation.UpdatedAt(); !ok { + if appconfig.UpdateDefaultUpdatedAt == nil { + return fmt.Errorf("ent: uninitialized appconfig.UpdateDefaultUpdatedAt (forgotten import ent/runtime?)") + } v := appconfig.UpdateDefaultUpdatedAt() acu.mutation.SetUpdatedAt(v) } + return nil +} + +// check runs all checks and user-defined validators on the builder. +func (acu *AppConfigUpdate) check() error { + if v, ok := acu.mutation.Source(); ok { + if err := appconfig.SourceValidator(v); err != nil { + return &ValidationError{Name: "source", err: fmt.Errorf(`ent: validator failed for field "AppConfig.source": %w`, err)} + } + } + return nil } func (acu *AppConfigUpdate) sqlSave(ctx context.Context) (n int, err error) { + if err := acu.check(); err != nil { + return n, err + } _spec := sqlgraph.NewUpdateSpec(appconfig.Table, appconfig.Columns, sqlgraph.NewFieldSpec(appconfig.FieldID, field.TypeUint)) if ps := acu.mutation.predicates; len(ps) > 0 { _spec.Predicate = func(selector *sql.Selector) { @@ -166,6 +199,9 @@ func (acu *AppConfigUpdate) sqlSave(ctx context.Context) (n int, err error) { if value, ok := acu.mutation.Value(); ok { _spec.SetField(appconfig.FieldValue, field.TypeString, value) } + if value, ok := acu.mutation.Source(); ok { + _spec.SetField(appconfig.FieldSource, field.TypeEnum, value) + } if n, err = sqlgraph.UpdateNodes(ctx, acu.driver, _spec); err != nil { if _, ok := err.(*sqlgraph.NotFoundError); ok { err = &NotFoundError{appconfig.Label} @@ -250,6 +286,20 @@ func (acuo *AppConfigUpdateOne) SetValue(s string) *AppConfigUpdateOne { return acuo } +// SetSource sets the "source" field. +func (acuo *AppConfigUpdateOne) SetSource(a appconfig.Source) *AppConfigUpdateOne { + acuo.mutation.SetSource(a) + return acuo +} + +// SetNillableSource sets the "source" field if the given value is not nil. +func (acuo *AppConfigUpdateOne) SetNillableSource(a *appconfig.Source) *AppConfigUpdateOne { + if a != nil { + acuo.SetSource(*a) + } + return acuo +} + // Mutation returns the AppConfigMutation object of the builder. func (acuo *AppConfigUpdateOne) Mutation() *AppConfigMutation { return acuo.mutation @@ -270,7 +320,9 @@ func (acuo *AppConfigUpdateOne) Select(field string, fields ...string) *AppConfi // Save executes the query and returns the updated AppConfig entity. func (acuo *AppConfigUpdateOne) Save(ctx context.Context) (*AppConfig, error) { - acuo.defaults() + if err := acuo.defaults(); err != nil { + return nil, err + } return withHooks(ctx, acuo.sqlSave, acuo.mutation, acuo.hooks) } @@ -297,14 +349,31 @@ func (acuo *AppConfigUpdateOne) ExecX(ctx context.Context) { } // defaults sets the default values of the builder before save. -func (acuo *AppConfigUpdateOne) defaults() { +func (acuo *AppConfigUpdateOne) defaults() error { if _, ok := acuo.mutation.UpdatedAt(); !ok { + if appconfig.UpdateDefaultUpdatedAt == nil { + return fmt.Errorf("ent: uninitialized appconfig.UpdateDefaultUpdatedAt (forgotten import ent/runtime?)") + } v := appconfig.UpdateDefaultUpdatedAt() acuo.mutation.SetUpdatedAt(v) } + return nil +} + +// check runs all checks and user-defined validators on the builder. +func (acuo *AppConfigUpdateOne) check() error { + if v, ok := acuo.mutation.Source(); ok { + if err := appconfig.SourceValidator(v); err != nil { + return &ValidationError{Name: "source", err: fmt.Errorf(`ent: validator failed for field "AppConfig.source": %w`, err)} + } + } + return nil } func (acuo *AppConfigUpdateOne) sqlSave(ctx context.Context) (_node *AppConfig, err error) { + if err := acuo.check(); err != nil { + return _node, err + } _spec := sqlgraph.NewUpdateSpec(appconfig.Table, appconfig.Columns, sqlgraph.NewFieldSpec(appconfig.FieldID, field.TypeUint)) id, ok := acuo.mutation.ID() if !ok { @@ -354,6 +423,9 @@ func (acuo *AppConfigUpdateOne) sqlSave(ctx context.Context) (_node *AppConfig, if value, ok := acuo.mutation.Value(); ok { _spec.SetField(appconfig.FieldValue, field.TypeString, value) } + if value, ok := acuo.mutation.Source(); ok { + _spec.SetField(appconfig.FieldSource, field.TypeEnum, value) + } _node = &AppConfig{config: acuo.config} _spec.Assign = _node.assignValues _spec.ScanValues = _node.scanValues diff --git a/api/pkg/ent/client.go b/api/pkg/ent/client.go index 8277f1947c..ad7bc593da 100644 --- a/api/pkg/ent/client.go +++ b/api/pkg/ent/client.go @@ -301,7 +301,8 @@ func (c *AppConfigClient) GetX(ctx context.Context, id uint) *AppConfig { // Hooks returns the client hooks. func (c *AppConfigClient) Hooks() []Hook { - return c.hooks.AppConfig + hooks := c.hooks.AppConfig + return append(hooks[:len(hooks):len(hooks)], appconfig.Hooks[:]...) } // Interceptors returns the client interceptors. diff --git a/api/pkg/ent/migrate/schema.go b/api/pkg/ent/migrate/schema.go index 7ac7afa0f4..fc9444d01a 100644 --- a/api/pkg/ent/migrate/schema.go +++ b/api/pkg/ent/migrate/schema.go @@ -19,6 +19,7 @@ var ( {Name: "stack", Type: field.TypeString, Default: ""}, {Name: "key", Type: field.TypeString}, {Name: "value", Type: field.TypeString, Size: 2147483647}, + {Name: "source", Type: field.TypeEnum, Enums: []string{"stack", "environment"}, Default: "environment"}, } // AppConfigsTable holds the schema information for the "app_configs" table. AppConfigsTable = &schema.Table{ diff --git a/api/pkg/ent/mutation.go b/api/pkg/ent/mutation.go index 27d777abfc..0caf8e37bd 100644 --- a/api/pkg/ent/mutation.go +++ b/api/pkg/ent/mutation.go @@ -41,6 +41,7 @@ type AppConfigMutation struct { stack *string key *string value *string + source *appconfig.Source clearedFields map[string]struct{} done bool oldValue func(context.Context) (*AppConfig, error) @@ -452,6 +453,42 @@ func (m *AppConfigMutation) ResetValue() { m.value = nil } +// SetSource sets the "source" field. +func (m *AppConfigMutation) SetSource(a appconfig.Source) { + m.source = &a +} + +// Source returns the value of the "source" field in the mutation. +func (m *AppConfigMutation) Source() (r appconfig.Source, exists bool) { + v := m.source + if v == nil { + return + } + return *v, true +} + +// OldSource returns the old "source" field's value of the AppConfig entity. +// If the AppConfig object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AppConfigMutation) OldSource(ctx context.Context) (v appconfig.Source, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldSource is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldSource requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldSource: %w", err) + } + return oldValue.Source, nil +} + +// ResetSource resets all changes to the "source" field. +func (m *AppConfigMutation) ResetSource() { + m.source = nil +} + // Where appends a list predicates to the AppConfigMutation builder. func (m *AppConfigMutation) Where(ps ...predicate.AppConfig) { m.predicates = append(m.predicates, ps...) @@ -486,7 +523,7 @@ func (m *AppConfigMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *AppConfigMutation) Fields() []string { - fields := make([]string, 0, 8) + fields := make([]string, 0, 9) if m.created_at != nil { fields = append(fields, appconfig.FieldCreatedAt) } @@ -511,6 +548,9 @@ func (m *AppConfigMutation) Fields() []string { if m.value != nil { fields = append(fields, appconfig.FieldValue) } + if m.source != nil { + fields = append(fields, appconfig.FieldSource) + } return fields } @@ -535,6 +575,8 @@ func (m *AppConfigMutation) Field(name string) (ent.Value, bool) { return m.Key() case appconfig.FieldValue: return m.Value() + case appconfig.FieldSource: + return m.Source() } return nil, false } @@ -560,6 +602,8 @@ func (m *AppConfigMutation) OldField(ctx context.Context, name string) (ent.Valu return m.OldKey(ctx) case appconfig.FieldValue: return m.OldValue(ctx) + case appconfig.FieldSource: + return m.OldSource(ctx) } return nil, fmt.Errorf("unknown AppConfig field %s", name) } @@ -625,6 +669,13 @@ func (m *AppConfigMutation) SetField(name string, value ent.Value) error { } m.SetValue(v) return nil + case appconfig.FieldSource: + v, ok := value.(appconfig.Source) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetSource(v) + return nil } return fmt.Errorf("unknown AppConfig field %s", name) } @@ -707,6 +758,9 @@ func (m *AppConfigMutation) ResetField(name string) error { case appconfig.FieldValue: m.ResetValue() return nil + case appconfig.FieldSource: + m.ResetSource() + return nil } return fmt.Errorf("unknown AppConfig field %s", name) } diff --git a/api/pkg/ent/runtime.go b/api/pkg/ent/runtime.go index 8aa9ec17cc..7e75d0174f 100644 --- a/api/pkg/ent/runtime.go +++ b/api/pkg/ent/runtime.go @@ -2,31 +2,4 @@ package ent -import ( - "time" - - "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" - "github.com/chanzuckerberg/happy/api/pkg/ent/schema" -) - -// The init function reads all schema descriptors with runtime code -// (default values, validators, hooks and policies) and stitches it -// to their package variables. -func init() { - appconfigFields := schema.AppConfig{}.Fields() - _ = appconfigFields - // appconfigDescCreatedAt is the schema descriptor for created_at field. - appconfigDescCreatedAt := appconfigFields[1].Descriptor() - // appconfig.DefaultCreatedAt holds the default value on creation for the created_at field. - appconfig.DefaultCreatedAt = appconfigDescCreatedAt.Default.(func() time.Time) - // appconfigDescUpdatedAt is the schema descriptor for updated_at field. - appconfigDescUpdatedAt := appconfigFields[2].Descriptor() - // appconfig.DefaultUpdatedAt holds the default value on creation for the updated_at field. - appconfig.DefaultUpdatedAt = appconfigDescUpdatedAt.Default.(func() time.Time) - // appconfig.UpdateDefaultUpdatedAt holds the default value on update for the updated_at field. - appconfig.UpdateDefaultUpdatedAt = appconfigDescUpdatedAt.UpdateDefault.(func() time.Time) - // appconfigDescStack is the schema descriptor for stack field. - appconfigDescStack := appconfigFields[6].Descriptor() - // appconfig.DefaultStack holds the default value on creation for the stack field. - appconfig.DefaultStack = appconfigDescStack.Default.(string) -} +// The schema-stitching logic is generated in github.com/chanzuckerberg/happy/api/pkg/ent/runtime/runtime.go diff --git a/api/pkg/ent/runtime/runtime.go b/api/pkg/ent/runtime/runtime.go index e902b9175a..6554cde539 100644 --- a/api/pkg/ent/runtime/runtime.go +++ b/api/pkg/ent/runtime/runtime.go @@ -2,7 +2,36 @@ package runtime -// The schema-stitching logic is generated in github.com/chanzuckerberg/happy/api/pkg/ent/runtime.go +import ( + "time" + + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" + "github.com/chanzuckerberg/happy/api/pkg/ent/schema" +) + +// The init function reads all schema descriptors with runtime code +// (default values, validators, hooks and policies) and stitches it +// to their package variables. +func init() { + appconfigHooks := schema.AppConfig{}.Hooks() + appconfig.Hooks[0] = appconfigHooks[0] + appconfigFields := schema.AppConfig{}.Fields() + _ = appconfigFields + // appconfigDescCreatedAt is the schema descriptor for created_at field. + appconfigDescCreatedAt := appconfigFields[1].Descriptor() + // appconfig.DefaultCreatedAt holds the default value on creation for the created_at field. + appconfig.DefaultCreatedAt = appconfigDescCreatedAt.Default.(func() time.Time) + // appconfigDescUpdatedAt is the schema descriptor for updated_at field. + appconfigDescUpdatedAt := appconfigFields[2].Descriptor() + // appconfig.DefaultUpdatedAt holds the default value on creation for the updated_at field. + appconfig.DefaultUpdatedAt = appconfigDescUpdatedAt.Default.(func() time.Time) + // appconfig.UpdateDefaultUpdatedAt holds the default value on update for the updated_at field. + appconfig.UpdateDefaultUpdatedAt = appconfigDescUpdatedAt.UpdateDefault.(func() time.Time) + // appconfigDescStack is the schema descriptor for stack field. + appconfigDescStack := appconfigFields[6].Descriptor() + // appconfig.DefaultStack holds the default value on creation for the stack field. + appconfig.DefaultStack = appconfigDescStack.Default.(string) +} const ( Version = "v0.12.4" // Version of ent codegen. diff --git a/api/pkg/ent/schema/appconfig.go b/api/pkg/ent/schema/appconfig.go index 5ebaf1e2a5..0805ca8c0c 100644 --- a/api/pkg/ent/schema/appconfig.go +++ b/api/pkg/ent/schema/appconfig.go @@ -1,11 +1,15 @@ package schema import ( + "context" "time" "entgo.io/ent" "entgo.io/ent/schema/field" "entgo.io/ent/schema/index" + gen "github.com/chanzuckerberg/happy/api/pkg/ent" + "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" + "github.com/chanzuckerberg/happy/api/pkg/ent/hook" ) type AppConfig struct { @@ -41,11 +45,11 @@ func (AppConfig) Fields() []ent.Field { String("key"), field. Text("value"), - // field. - // Enum("source"). - // Values("stack", "environment"). - // Default("environment"). - // Comment("'stack' if the config is for a specific stack or 'environment' if available to all stacks in the environment"), + field. + Enum("source"). + Values("stack", "environment"). + Default("environment"). + Comment("'stack' if the config is for a specific stack or 'environment' if available to all stacks in the environment"), } } @@ -66,15 +70,15 @@ func (AppConfig) Edges() []ent.Edge { func (AppConfig) Hooks() []ent.Hook { return []ent.Hook{ // hook to populate the source field - // func(next ent.Mutator) ent.Mutator { - // return hook.AppConfigFunc(func(ctx context.Context, m *gen.AppConfigMutation) (ent.Value, error) { - // source := appconfig.SourceEnvironment - // if stack, ok := m.Stack(); ok && stack != "" { - // source = appconfig.SourceStack - // } - // m.SetSource(source) - // return next.Mutate(ctx, m) - // }) - // }, + func(next ent.Mutator) ent.Mutator { + return hook.AppConfigFunc(func(ctx context.Context, m *gen.AppConfigMutation) (ent.Value, error) { + source := appconfig.SourceEnvironment + if stack, ok := m.Stack(); ok && stack != "" { + source = appconfig.SourceStack + } + m.SetSource(source) + return next.Mutate(ctx, m) + }) + }, } } From 2169245304f9600a85627492aa14b4662f125605 Mon Sep 17 00:00:00 2001 From: "czi-github-helper[bot]" <95879977+czi-github-helper[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:49:33 -0400 Subject: [PATCH 48/80] chore: release main (#2573) --- .release-please-manifest.json | 15 ++++++++------- api/CHANGELOG.md | 7 +++++++ cli/CHANGELOG.md | 7 +++++++ helm-charts/charts/stack/CHANGELOG.md | 8 ++++++++ helm-charts/charts/stack/Chart.yaml | 2 +- hvm/CHANGELOG.md | 7 +++++++ shared/CHANGELOG.md | 7 +++++++ terraform/modules/happy-service-eks/CHANGELOG.md | 7 +++++++ terraform/provider/CHANGELOG.md | 7 +++++++ 9 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 helm-charts/charts/stack/CHANGELOG.md diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 0885a3fd8b..bbc0e6ee2a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,21 +1,22 @@ { - "cli": "0.111.0", - "api": "0.111.0", - "shared": "0.111.0", - "terraform/provider": "0.111.0", + "cli": "0.112.0", + "api": "0.112.0", + "shared": "0.112.0", + "terraform/provider": "0.112.0", "terraform/modules/happy-dns-ecs": "1.5.0", "terraform/modules/happy-env-ecs": "3.3.0", "terraform/modules/happy-env-eks": "4.12.2", "terraform/modules/happy-github-ci-role": "1.4.2", "terraform/modules/happy-route53": "1.3.0", "terraform/modules/happy-service-ecs": "2.1.0", - "terraform/modules/happy-service-eks": "3.17.1", + "terraform/modules/happy-service-eks": "3.17.2", "terraform/modules/happy-stack-ecs": "2.1.0", "terraform/modules/happy-stack-eks": "4.19.0", "terraform/modules/happy-tfe-okta-app": "3.0.0", "terraform/modules/happy-tfe-user": "1.3.0", "terraform/modules/happy-ingress-eks": "2.9.0", - "hvm": "0.111.0", + "hvm": "0.112.0", "hapi-proto": "0.1.0", - "terraform/modules/happy-cloudfront": "1.0.0" + "terraform/modules/happy-cloudfront": "1.0.0", + "helm-charts/charts/stack": "0.1.0" } diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md index 1f01e00406..ef0bf4e98c 100644 --- a/api/CHANGELOG.md +++ b/api/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.0](https://github.com/chanzuckerberg/happy/compare/api-v0.111.0...api-v0.112.0) (2023-10-16) + + +### Features + +* add 'source' column to app_configs table ([#2596](https://github.com/chanzuckerberg/happy/issues/2596)) ([76bc701](https://github.com/chanzuckerberg/happy/commit/76bc701e921617290394ed27a87de107eb362256)) + ## [0.111.0](https://github.com/chanzuckerberg/happy/compare/api-v0.110.1...api-v0.111.0) (2023-10-13) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 1e59b0c2ca..318106c7b2 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.0](https://github.com/chanzuckerberg/happy/compare/cli-v0.111.0...cli-v0.112.0) (2023-10-16) + + +### Miscellaneous Chores + +* **cli:** Synchronize happy platform versions + ## [0.111.0](https://github.com/chanzuckerberg/happy/compare/cli-v0.110.1...cli-v0.111.0) (2023-10-13) diff --git a/helm-charts/charts/stack/CHANGELOG.md b/helm-charts/charts/stack/CHANGELOG.md new file mode 100644 index 0000000000..0245e2254d --- /dev/null +++ b/helm-charts/charts/stack/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +## 0.1.0 (2023-10-16) + + +### Features + +* Helm chart ([#2560](https://github.com/chanzuckerberg/happy/issues/2560)) ([6228300](https://github.com/chanzuckerberg/happy/commit/6228300afc71124eaf8d001ac7ac1e528e24f456)) diff --git a/helm-charts/charts/stack/Chart.yaml b/helm-charts/charts/stack/Chart.yaml index fd54f7af34..4fd89e015c 100644 --- a/helm-charts/charts/stack/Chart.yaml +++ b/helm-charts/charts/stack/Chart.yaml @@ -13,7 +13,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.0 +version: 0.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/hvm/CHANGELOG.md b/hvm/CHANGELOG.md index 87ff8b399b..fb4eece2e9 100644 --- a/hvm/CHANGELOG.md +++ b/hvm/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.0](https://github.com/chanzuckerberg/happy/compare/hvm-v0.111.0...hvm-v0.112.0) (2023-10-16) + + +### Miscellaneous Chores + +* **hvm:** Synchronize happy platform versions + ## [0.111.0](https://github.com/chanzuckerberg/happy/compare/hvm-v0.110.1...hvm-v0.111.0) (2023-10-13) diff --git a/shared/CHANGELOG.md b/shared/CHANGELOG.md index cc36028d80..69a351a2e3 100644 --- a/shared/CHANGELOG.md +++ b/shared/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.0](https://github.com/chanzuckerberg/happy/compare/shared-v0.111.0...shared-v0.112.0) (2023-10-16) + + +### Miscellaneous Chores + +* **shared:** Synchronize happy platform versions + ## [0.111.0](https://github.com/chanzuckerberg/happy/compare/shared-v0.110.1...shared-v0.111.0) (2023-10-13) diff --git a/terraform/modules/happy-service-eks/CHANGELOG.md b/terraform/modules/happy-service-eks/CHANGELOG.md index dce4a572f6..487a8bdfa7 100644 --- a/terraform/modules/happy-service-eks/CHANGELOG.md +++ b/terraform/modules/happy-service-eks/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.17.2](https://github.com/chanzuckerberg/happy/compare/happy-service-eks-v3.17.1...happy-service-eks-v3.17.2) (2023-10-16) + + +### Bug Fixes + +* trim the target group name to only 32 chars ([#2572](https://github.com/chanzuckerberg/happy/issues/2572)) ([2527f87](https://github.com/chanzuckerberg/happy/commit/2527f8761c3a4d913f76563be22291ba00af3421)) + ## [3.17.1](https://github.com/chanzuckerberg/happy/compare/happy-service-eks-v3.17.0...happy-service-eks-v3.17.1) (2023-10-12) diff --git a/terraform/provider/CHANGELOG.md b/terraform/provider/CHANGELOG.md index 5efb6f34a9..3d5ff6dc34 100644 --- a/terraform/provider/CHANGELOG.md +++ b/terraform/provider/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.0](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.111.0...terraform-provider-v0.112.0) (2023-10-16) + + +### Miscellaneous Chores + +* **terraform-provider:** Synchronize happy platform versions + ## [0.111.0](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.110.1...terraform-provider-v0.111.0) (2023-10-13) From df6bfde906b24cf8b4f4434c2da582cf8f01680e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:49:45 +0000 Subject: [PATCH 49/80] chore: bump github.com/gofiber/fiber/v2 (#2598) Bumps [github.com/gofiber/fiber/v2](https://github.com/gofiber/fiber) from 2.49.2 to 2.50.0. - [Release notes](https://github.com/gofiber/fiber/releases) - [Commits](https://github.com/gofiber/fiber/compare/v2.49.2...v2.50.0) --- updated-dependencies: - dependency-name: github.com/gofiber/fiber/v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/typical_app/src/internal-api/go.mod | 6 +++--- examples/typical_app/src/internal-api/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/typical_app/src/internal-api/go.mod b/examples/typical_app/src/internal-api/go.mod index d9c5493cdd..872afa82aa 100644 --- a/examples/typical_app/src/internal-api/go.mod +++ b/examples/typical_app/src/internal-api/go.mod @@ -2,7 +2,7 @@ module api go 1.20 -require github.com/gofiber/fiber/v2 v2.49.2 +require github.com/gofiber/fiber/v2 v2.50.0 require ( github.com/andybalholm/brotli v1.0.5 // indirect @@ -13,7 +13,7 @@ require ( github.com/mattn/go-runewidth v0.0.15 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.49.0 // indirect + github.com/valyala/fasthttp v1.50.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect ) diff --git a/examples/typical_app/src/internal-api/go.sum b/examples/typical_app/src/internal-api/go.sum index 370c65b1d3..98444c2d19 100644 --- a/examples/typical_app/src/internal-api/go.sum +++ b/examples/typical_app/src/internal-api/go.sum @@ -1,7 +1,7 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/gofiber/fiber/v2 v2.49.2 h1:ONEN3/Vc+dUCxxDgZZwpqvhISgHqb+bu+isBiEyKEQs= -github.com/gofiber/fiber/v2 v2.49.2/go.mod h1:gNsKnyrmfEWFpJxQAV0qvW6l70K1dZGno12oLtukcts= +github.com/gofiber/fiber/v2 v2.50.0 h1:ia0JaB+uw3GpNSCR5nvC5dsaxXjRU5OEu36aytx+zGw= +github.com/gofiber/fiber/v2 v2.50.0/go.mod h1:21eytvay9Is7S6z+OgPi7c7n4++tnClWmhpimVHMimw= 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/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= @@ -18,11 +18,11 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.49.0 h1:9FdvCpmxB74LH4dPb7IJ1cOSsluR07XG3I1txXWwJpE= -github.com/valyala/fasthttp v1.49.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= +github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From 4968cb91e9e09d6d18ebd09c8911a9177f3a27fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:50:07 +0000 Subject: [PATCH 50/80] chore: bump github.com/gofiber/fiber/v2 (#2599) Bumps [github.com/gofiber/fiber/v2](https://github.com/gofiber/fiber) from 2.49.2 to 2.50.0. - [Release notes](https://github.com/gofiber/fiber/releases) - [Commits](https://github.com/gofiber/fiber/compare/v2.49.2...v2.50.0) --- updated-dependencies: - dependency-name: github.com/gofiber/fiber/v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/ecs_test_app/src/api/go.mod | 6 +++--- examples/ecs_test_app/src/api/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/ecs_test_app/src/api/go.mod b/examples/ecs_test_app/src/api/go.mod index d9c5493cdd..872afa82aa 100644 --- a/examples/ecs_test_app/src/api/go.mod +++ b/examples/ecs_test_app/src/api/go.mod @@ -2,7 +2,7 @@ module api go 1.20 -require github.com/gofiber/fiber/v2 v2.49.2 +require github.com/gofiber/fiber/v2 v2.50.0 require ( github.com/andybalholm/brotli v1.0.5 // indirect @@ -13,7 +13,7 @@ require ( github.com/mattn/go-runewidth v0.0.15 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.49.0 // indirect + github.com/valyala/fasthttp v1.50.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect ) diff --git a/examples/ecs_test_app/src/api/go.sum b/examples/ecs_test_app/src/api/go.sum index 370c65b1d3..98444c2d19 100644 --- a/examples/ecs_test_app/src/api/go.sum +++ b/examples/ecs_test_app/src/api/go.sum @@ -1,7 +1,7 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/gofiber/fiber/v2 v2.49.2 h1:ONEN3/Vc+dUCxxDgZZwpqvhISgHqb+bu+isBiEyKEQs= -github.com/gofiber/fiber/v2 v2.49.2/go.mod h1:gNsKnyrmfEWFpJxQAV0qvW6l70K1dZGno12oLtukcts= +github.com/gofiber/fiber/v2 v2.50.0 h1:ia0JaB+uw3GpNSCR5nvC5dsaxXjRU5OEu36aytx+zGw= +github.com/gofiber/fiber/v2 v2.50.0/go.mod h1:21eytvay9Is7S6z+OgPi7c7n4++tnClWmhpimVHMimw= 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/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= @@ -18,11 +18,11 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.49.0 h1:9FdvCpmxB74LH4dPb7IJ1cOSsluR07XG3I1txXWwJpE= -github.com/valyala/fasthttp v1.49.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= +github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From be97d1ffeb9f11bd565277ac3619813a8eb3204d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:53:41 +0000 Subject: [PATCH 51/80] chore: bump github.com/gofiber/fiber/v2 (#2600) Bumps [github.com/gofiber/fiber/v2](https://github.com/gofiber/fiber) from 2.49.2 to 2.50.0. - [Release notes](https://github.com/gofiber/fiber/releases) - [Commits](https://github.com/gofiber/fiber/compare/v2.49.2...v2.50.0) --- updated-dependencies: - dependency-name: github.com/gofiber/fiber/v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/integration_test/src/api/go.mod | 4 ++-- examples/integration_test/src/api/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/integration_test/src/api/go.mod b/examples/integration_test/src/api/go.mod index e13c6a67e3..c68f5b9e3b 100644 --- a/examples/integration_test/src/api/go.mod +++ b/examples/integration_test/src/api/go.mod @@ -2,7 +2,7 @@ module api go 1.21 -require github.com/gofiber/fiber/v2 v2.49.2 +require github.com/gofiber/fiber/v2 v2.50.0 require ( github.com/andybalholm/brotli v1.0.5 // indirect @@ -15,5 +15,5 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.50.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect ) diff --git a/examples/integration_test/src/api/go.sum b/examples/integration_test/src/api/go.sum index cf60271170..a4aacd7f84 100644 --- a/examples/integration_test/src/api/go.sum +++ b/examples/integration_test/src/api/go.sum @@ -1,7 +1,7 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/gofiber/fiber/v2 v2.49.2 h1:ONEN3/Vc+dUCxxDgZZwpqvhISgHqb+bu+isBiEyKEQs= -github.com/gofiber/fiber/v2 v2.49.2/go.mod h1:gNsKnyrmfEWFpJxQAV0qvW6l70K1dZGno12oLtukcts= +github.com/gofiber/fiber/v2 v2.50.0 h1:ia0JaB+uw3GpNSCR5nvC5dsaxXjRU5OEu36aytx+zGw= +github.com/gofiber/fiber/v2 v2.50.0/go.mod h1:21eytvay9Is7S6z+OgPi7c7n4++tnClWmhpimVHMimw= 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/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= @@ -24,5 +24,5 @@ github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVS github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From 9578eb9787eb952b1dd0fb88e4fe548ae566c8a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:56:55 +0000 Subject: [PATCH 52/80] chore: bump github.com/gofiber/fiber/v2 in /examples/typical_app/src/api (#2602) Bumps [github.com/gofiber/fiber/v2](https://github.com/gofiber/fiber) from 2.49.2 to 2.50.0. - [Release notes](https://github.com/gofiber/fiber/releases) - [Commits](https://github.com/gofiber/fiber/compare/v2.49.2...v2.50.0) --- updated-dependencies: - dependency-name: github.com/gofiber/fiber/v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/typical_app/src/api/go.mod | 6 +++--- examples/typical_app/src/api/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/typical_app/src/api/go.mod b/examples/typical_app/src/api/go.mod index d9c5493cdd..872afa82aa 100644 --- a/examples/typical_app/src/api/go.mod +++ b/examples/typical_app/src/api/go.mod @@ -2,7 +2,7 @@ module api go 1.20 -require github.com/gofiber/fiber/v2 v2.49.2 +require github.com/gofiber/fiber/v2 v2.50.0 require ( github.com/andybalholm/brotli v1.0.5 // indirect @@ -13,7 +13,7 @@ require ( github.com/mattn/go-runewidth v0.0.15 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.49.0 // indirect + github.com/valyala/fasthttp v1.50.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect ) diff --git a/examples/typical_app/src/api/go.sum b/examples/typical_app/src/api/go.sum index 370c65b1d3..98444c2d19 100644 --- a/examples/typical_app/src/api/go.sum +++ b/examples/typical_app/src/api/go.sum @@ -1,7 +1,7 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/gofiber/fiber/v2 v2.49.2 h1:ONEN3/Vc+dUCxxDgZZwpqvhISgHqb+bu+isBiEyKEQs= -github.com/gofiber/fiber/v2 v2.49.2/go.mod h1:gNsKnyrmfEWFpJxQAV0qvW6l70K1dZGno12oLtukcts= +github.com/gofiber/fiber/v2 v2.50.0 h1:ia0JaB+uw3GpNSCR5nvC5dsaxXjRU5OEu36aytx+zGw= +github.com/gofiber/fiber/v2 v2.50.0/go.mod h1:21eytvay9Is7S6z+OgPi7c7n4++tnClWmhpimVHMimw= 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/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= @@ -18,11 +18,11 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.49.0 h1:9FdvCpmxB74LH4dPb7IJ1cOSsluR07XG3I1txXWwJpE= -github.com/valyala/fasthttp v1.49.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= +github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From 53ac68f67cc84ffca8875984057ff8456adcc072 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:57:20 +0000 Subject: [PATCH 53/80] chore: bump github.com/gofiber/fiber/v2 in /examples/gpu_app/src/api (#2604) Bumps [github.com/gofiber/fiber/v2](https://github.com/gofiber/fiber) from 2.49.2 to 2.50.0. - [Release notes](https://github.com/gofiber/fiber/releases) - [Commits](https://github.com/gofiber/fiber/compare/v2.49.2...v2.50.0) --- updated-dependencies: - dependency-name: github.com/gofiber/fiber/v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/gpu_app/src/api/go.mod | 6 +++--- examples/gpu_app/src/api/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/gpu_app/src/api/go.mod b/examples/gpu_app/src/api/go.mod index d9c5493cdd..872afa82aa 100644 --- a/examples/gpu_app/src/api/go.mod +++ b/examples/gpu_app/src/api/go.mod @@ -2,7 +2,7 @@ module api go 1.20 -require github.com/gofiber/fiber/v2 v2.49.2 +require github.com/gofiber/fiber/v2 v2.50.0 require ( github.com/andybalholm/brotli v1.0.5 // indirect @@ -13,7 +13,7 @@ require ( github.com/mattn/go-runewidth v0.0.15 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.49.0 // indirect + github.com/valyala/fasthttp v1.50.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect ) diff --git a/examples/gpu_app/src/api/go.sum b/examples/gpu_app/src/api/go.sum index 370c65b1d3..98444c2d19 100644 --- a/examples/gpu_app/src/api/go.sum +++ b/examples/gpu_app/src/api/go.sum @@ -1,7 +1,7 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/gofiber/fiber/v2 v2.49.2 h1:ONEN3/Vc+dUCxxDgZZwpqvhISgHqb+bu+isBiEyKEQs= -github.com/gofiber/fiber/v2 v2.49.2/go.mod h1:gNsKnyrmfEWFpJxQAV0qvW6l70K1dZGno12oLtukcts= +github.com/gofiber/fiber/v2 v2.50.0 h1:ia0JaB+uw3GpNSCR5nvC5dsaxXjRU5OEu36aytx+zGw= +github.com/gofiber/fiber/v2 v2.50.0/go.mod h1:21eytvay9Is7S6z+OgPi7c7n4++tnClWmhpimVHMimw= 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/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= @@ -18,11 +18,11 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.49.0 h1:9FdvCpmxB74LH4dPb7IJ1cOSsluR07XG3I1txXWwJpE= -github.com/valyala/fasthttp v1.49.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= +github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From 30a4ece77db50d5086cc88261f229d07c8c93b4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:59:03 +0000 Subject: [PATCH 54/80] chore: bump github.com/gofiber/fiber/v2 in /examples/sidecar/src/api (#2603) Bumps [github.com/gofiber/fiber/v2](https://github.com/gofiber/fiber) from 2.49.2 to 2.50.0. - [Release notes](https://github.com/gofiber/fiber/releases) - [Commits](https://github.com/gofiber/fiber/compare/v2.49.2...v2.50.0) --- updated-dependencies: - dependency-name: github.com/gofiber/fiber/v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/sidecar/src/api/go.mod | 6 +++--- examples/sidecar/src/api/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/sidecar/src/api/go.mod b/examples/sidecar/src/api/go.mod index d9c5493cdd..872afa82aa 100644 --- a/examples/sidecar/src/api/go.mod +++ b/examples/sidecar/src/api/go.mod @@ -2,7 +2,7 @@ module api go 1.20 -require github.com/gofiber/fiber/v2 v2.49.2 +require github.com/gofiber/fiber/v2 v2.50.0 require ( github.com/andybalholm/brotli v1.0.5 // indirect @@ -13,7 +13,7 @@ require ( github.com/mattn/go-runewidth v0.0.15 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.49.0 // indirect + github.com/valyala/fasthttp v1.50.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect ) diff --git a/examples/sidecar/src/api/go.sum b/examples/sidecar/src/api/go.sum index 370c65b1d3..98444c2d19 100644 --- a/examples/sidecar/src/api/go.sum +++ b/examples/sidecar/src/api/go.sum @@ -1,7 +1,7 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/gofiber/fiber/v2 v2.49.2 h1:ONEN3/Vc+dUCxxDgZZwpqvhISgHqb+bu+isBiEyKEQs= -github.com/gofiber/fiber/v2 v2.49.2/go.mod h1:gNsKnyrmfEWFpJxQAV0qvW6l70K1dZGno12oLtukcts= +github.com/gofiber/fiber/v2 v2.50.0 h1:ia0JaB+uw3GpNSCR5nvC5dsaxXjRU5OEu36aytx+zGw= +github.com/gofiber/fiber/v2 v2.50.0/go.mod h1:21eytvay9Is7S6z+OgPi7c7n4++tnClWmhpimVHMimw= 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/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= @@ -18,11 +18,11 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.49.0 h1:9FdvCpmxB74LH4dPb7IJ1cOSsluR07XG3I1txXWwJpE= -github.com/valyala/fasthttp v1.49.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= +github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From c637dda0cfdb4575643f6b41e9c4c2a90f5ce734 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 13:01:01 +0000 Subject: [PATCH 55/80] chore: bump github.com/gofiber/fiber/v2 in /examples/tasks/src/api (#2601) Bumps [github.com/gofiber/fiber/v2](https://github.com/gofiber/fiber) from 2.49.2 to 2.50.0. - [Release notes](https://github.com/gofiber/fiber/releases) - [Commits](https://github.com/gofiber/fiber/compare/v2.49.2...v2.50.0) --- updated-dependencies: - dependency-name: github.com/gofiber/fiber/v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/tasks/src/api/go.mod | 6 +++--- examples/tasks/src/api/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/tasks/src/api/go.mod b/examples/tasks/src/api/go.mod index d9c5493cdd..872afa82aa 100644 --- a/examples/tasks/src/api/go.mod +++ b/examples/tasks/src/api/go.mod @@ -2,7 +2,7 @@ module api go 1.20 -require github.com/gofiber/fiber/v2 v2.49.2 +require github.com/gofiber/fiber/v2 v2.50.0 require ( github.com/andybalholm/brotli v1.0.5 // indirect @@ -13,7 +13,7 @@ require ( github.com/mattn/go-runewidth v0.0.15 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.49.0 // indirect + github.com/valyala/fasthttp v1.50.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect ) diff --git a/examples/tasks/src/api/go.sum b/examples/tasks/src/api/go.sum index 370c65b1d3..98444c2d19 100644 --- a/examples/tasks/src/api/go.sum +++ b/examples/tasks/src/api/go.sum @@ -1,7 +1,7 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/gofiber/fiber/v2 v2.49.2 h1:ONEN3/Vc+dUCxxDgZZwpqvhISgHqb+bu+isBiEyKEQs= -github.com/gofiber/fiber/v2 v2.49.2/go.mod h1:gNsKnyrmfEWFpJxQAV0qvW6l70K1dZGno12oLtukcts= +github.com/gofiber/fiber/v2 v2.50.0 h1:ia0JaB+uw3GpNSCR5nvC5dsaxXjRU5OEu36aytx+zGw= +github.com/gofiber/fiber/v2 v2.50.0/go.mod h1:21eytvay9Is7S6z+OgPi7c7n4++tnClWmhpimVHMimw= 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/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= @@ -18,11 +18,11 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.49.0 h1:9FdvCpmxB74LH4dPb7IJ1cOSsluR07XG3I1txXWwJpE= -github.com/valyala/fasthttp v1.49.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= +github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From 470c0a12d1a4763c011bd89f4686414fbfc781dd Mon Sep 17 00:00:00 2001 From: Hayden Spitzley <105455169+hspitzley-czi@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:52:15 -0400 Subject: [PATCH 56/80] fix: revert aws config dep to allow creation of shared config (#2606) --- api/go.mod | 6 +++++- api/go.sum | 11 +++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/api/go.mod b/api/go.mod index bc0397f265..93ae3fd4ef 100644 --- a/api/go.mod +++ b/api/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( entgo.io/ent v0.12.4 github.com/aws/aws-sdk-go-v2 v1.21.2 - github.com/aws/aws-sdk-go-v2/config v1.18.45 + github.com/aws/aws-sdk-go-v2/config v1.18.44 github.com/blang/semver v3.5.1+incompatible github.com/chanzuckerberg/happy/shared v0.0.0 github.com/coreos/go-oidc/v3 v3.6.0 @@ -197,3 +197,7 @@ require ( ) replace github.com/chanzuckerberg/happy/shared v0.0.0 => ../shared + +// prevent error from api: +// [FATAL]: response error inspection failed: status code 500: [map[message:making happy client: failed to construct an AWS backend: unable to create an aws session: failed to get shared config profile, czi-si]] +replace github.com/aws/aws-sdk-go-v2/config => github.com/aws/aws-sdk-go-v2/config v1.18.44 diff --git a/api/go.sum b/api/go.sum index 0375a0b3c5..1fd200eacf 100644 --- a/api/go.sum +++ b/api/go.sum @@ -79,9 +79,10 @@ github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pf github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= -github.com/aws/aws-sdk-go-v2/config v1.18.45 h1:Aka9bI7n8ysuwPeFdm77nfbyHCAKQ3z9ghB3S/38zes= -github.com/aws/aws-sdk-go-v2/config v1.18.45/go.mod h1:ZwDUgFnQgsazQTnWfeLWk5GjeqTQTL8lMkoE1UXzxdE= +github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= +github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= +github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8= github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= @@ -91,6 +92,7 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= @@ -107,6 +109,7 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45/go.mod h1:lD5M20o09/LCuQ2mE62Mb/iSdSlCNuj6H5ci7tW7OsE= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= @@ -135,6 +138,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0Zzo github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= @@ -142,12 +146,15 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvg github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= +github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= From 0bd3c20d7275d6784d62b482f736b45d38624735 Mon Sep 17 00:00:00 2001 From: "czi-github-helper[bot]" <95879977+czi-github-helper[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:59:57 -0400 Subject: [PATCH 57/80] chore: release main (#2607) --- .release-please-manifest.json | 10 +++++----- api/CHANGELOG.md | 7 +++++++ cli/CHANGELOG.md | 7 +++++++ hvm/CHANGELOG.md | 7 +++++++ shared/CHANGELOG.md | 7 +++++++ terraform/provider/CHANGELOG.md | 7 +++++++ 6 files changed, 40 insertions(+), 5 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index bbc0e6ee2a..68cd73bc86 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,8 +1,8 @@ { - "cli": "0.112.0", - "api": "0.112.0", - "shared": "0.112.0", - "terraform/provider": "0.112.0", + "cli": "0.112.1", + "api": "0.112.1", + "shared": "0.112.1", + "terraform/provider": "0.112.1", "terraform/modules/happy-dns-ecs": "1.5.0", "terraform/modules/happy-env-ecs": "3.3.0", "terraform/modules/happy-env-eks": "4.12.2", @@ -15,7 +15,7 @@ "terraform/modules/happy-tfe-okta-app": "3.0.0", "terraform/modules/happy-tfe-user": "1.3.0", "terraform/modules/happy-ingress-eks": "2.9.0", - "hvm": "0.112.0", + "hvm": "0.112.1", "hapi-proto": "0.1.0", "terraform/modules/happy-cloudfront": "1.0.0", "helm-charts/charts/stack": "0.1.0" diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md index ef0bf4e98c..9f08b9ae10 100644 --- a/api/CHANGELOG.md +++ b/api/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.1](https://github.com/chanzuckerberg/happy/compare/api-v0.112.0...api-v0.112.1) (2023-10-17) + + +### Bug Fixes + +* revert aws config dep to allow creation of shared config ([#2606](https://github.com/chanzuckerberg/happy/issues/2606)) ([470c0a1](https://github.com/chanzuckerberg/happy/commit/470c0a12d1a4763c011bd89f4686414fbfc781dd)) + ## [0.112.0](https://github.com/chanzuckerberg/happy/compare/api-v0.111.0...api-v0.112.0) (2023-10-16) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 318106c7b2..ca75c46e2f 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.1](https://github.com/chanzuckerberg/happy/compare/cli-v0.112.0...cli-v0.112.1) (2023-10-17) + + +### Miscellaneous Chores + +* **cli:** Synchronize happy platform versions + ## [0.112.0](https://github.com/chanzuckerberg/happy/compare/cli-v0.111.0...cli-v0.112.0) (2023-10-16) diff --git a/hvm/CHANGELOG.md b/hvm/CHANGELOG.md index fb4eece2e9..6950eaf70f 100644 --- a/hvm/CHANGELOG.md +++ b/hvm/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.1](https://github.com/chanzuckerberg/happy/compare/hvm-v0.112.0...hvm-v0.112.1) (2023-10-17) + + +### Miscellaneous Chores + +* **hvm:** Synchronize happy platform versions + ## [0.112.0](https://github.com/chanzuckerberg/happy/compare/hvm-v0.111.0...hvm-v0.112.0) (2023-10-16) diff --git a/shared/CHANGELOG.md b/shared/CHANGELOG.md index 69a351a2e3..cfe6be4f8b 100644 --- a/shared/CHANGELOG.md +++ b/shared/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.1](https://github.com/chanzuckerberg/happy/compare/shared-v0.112.0...shared-v0.112.1) (2023-10-17) + + +### Miscellaneous Chores + +* **shared:** Synchronize happy platform versions + ## [0.112.0](https://github.com/chanzuckerberg/happy/compare/shared-v0.111.0...shared-v0.112.0) (2023-10-16) diff --git a/terraform/provider/CHANGELOG.md b/terraform/provider/CHANGELOG.md index 3d5ff6dc34..be2551e03e 100644 --- a/terraform/provider/CHANGELOG.md +++ b/terraform/provider/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.112.1](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.112.0...terraform-provider-v0.112.1) (2023-10-17) + + +### Miscellaneous Chores + +* **terraform-provider:** Synchronize happy platform versions + ## [0.112.0](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.111.0...terraform-provider-v0.112.0) (2023-10-16) From 2c639678867e1514105e00d06eb2c5ea007861e4 Mon Sep 17 00:00:00 2001 From: Hayden Spitzley <105455169+hspitzley-czi@users.noreply.github.com> Date: Tue, 17 Oct 2023 10:20:56 -0400 Subject: [PATCH 58/80] feat: start using the appconfig 'source' column (#2597) --- api/pkg/cmd/config.go | 27 +++++++++++---------------- shared/model/config.go | 11 ----------- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/api/pkg/cmd/config.go b/api/pkg/cmd/config.go index 3ce616f99e..bb976be7da 100644 --- a/api/pkg/cmd/config.go +++ b/api/pkg/cmd/config.go @@ -95,7 +95,11 @@ func (c *dbConfig) GetAllAppConfigs(payload *model.AppMetadata) ([]*model.AppCon return nil, errors.Wrap(err, "[GetAllAppConfigs] unable to query app configs") } - return entArrayToSharedModelArray(records), nil + results := make([]*model.AppConfig, len(records)) + for idx, record := range records { + results[idx] = MakeAppConfigFromEnt(record) + } + return results, nil } // Returns only env-level configs for the given app and env @@ -108,10 +112,9 @@ func (c *dbConfig) GetAppConfigsForEnv(payload *model.AppMetadata) ([]*model.Res return nil, errors.Wrap(err, "[GetAppConfigsForEnv] unable to query app configs") } - results := entArrayToSharedModelArray(records) - resolvedResults := []*model.ResolvedAppConfig{} - for _, result := range results { - resolvedResults = append(resolvedResults, model.NewResolvedAppConfig(result)) + resolvedResults := make([]*model.ResolvedAppConfig, len(records)) + for idx, record := range records { + resolvedResults[idx] = &model.ResolvedAppConfig{AppConfig: *MakeAppConfigFromEnt(record), Source: record.Source.String()} } return resolvedResults, nil @@ -140,7 +143,7 @@ func (c *dbConfig) GetAppConfigsForStack(payload *model.AppMetadata) ([]*model.R results := []*model.ResolvedAppConfig{} for _, record := range resolvedMap { - results = append(results, model.NewResolvedAppConfig(MakeAppConfigFromEnt(record))) + results = append(results, &model.ResolvedAppConfig{AppConfig: *MakeAppConfigFromEnt(record), Source: record.Source.String()}) } return results, nil @@ -163,14 +166,6 @@ func rollback(tx *ent.Tx, err error) error { return err } -func entArrayToSharedModelArray(records []*ent.AppConfig) []*model.AppConfig { - results := make([]*model.AppConfig, len(records)) - for idx, record := range records { - results[idx] = MakeAppConfigFromEnt(record) - } - return results -} - func (c *dbConfig) GetResolvedAppConfig(payload *model.AppConfigLookupPayload) (*model.ResolvedAppConfig, error) { db := c.DB.GetDB() records, err := appEnvScopedQuery(db.AppConfig, &payload.AppMetadata). @@ -189,8 +184,8 @@ func (c *dbConfig) GetResolvedAppConfig(payload *model.AppConfigLookupPayload) ( } // at most 2 records are defined and since we order by stack DESC, the first record is the stack-specific one if it exists - result := MakeAppConfigFromEnt(records[0]) - return model.NewResolvedAppConfig(result), nil + record := records[0] + return &model.ResolvedAppConfig{AppConfig: *MakeAppConfigFromEnt(record), Source: record.Source.String()}, nil } func (c *dbConfig) DeleteAppConfig(payload *model.AppConfigLookupPayload) (*model.AppConfig, error) { diff --git a/shared/model/config.go b/shared/model/config.go index 9e820a793e..94f146531e 100644 --- a/shared/model/config.go +++ b/shared/model/config.go @@ -97,17 +97,6 @@ func NewAppConfigDiffPayload(appName, srcEnv, srcStack, destEnv, destStack strin } } -func NewResolvedAppConfig(appConfig *AppConfig) *ResolvedAppConfig { - source := "stack" - if appConfig.Stack == "" { - source = "environment" - } - return &ResolvedAppConfig{ - AppConfig: *appConfig, - Source: source, - } -} - // @Description App config key/value pair wrapped in "record" key type WrappedResolvedAppConfig struct { Record *ResolvedAppConfig `json:"record"` From e9062adc7983b7b16e7271b4c65eec939a068f62 Mon Sep 17 00:00:00 2001 From: Jake Heath <76011913+jakeyheath@users.noreply.github.com> Date: Tue, 17 Oct 2023 10:07:06 -0700 Subject: [PATCH 59/80] feat: allow AWS account ID to change for ECR policy (#2609) * feat: allow AWS account ID to change for ECR policy * commit from ci -- ran terraform-docs and pushed --------- Co-authored-by: github-actions[bot] --- terraform/modules/happy-github-ci-role/README.md | 1 + terraform/modules/happy-github-ci-role/ecr.tf | 6 +++++- terraform/modules/happy-github-ci-role/variables.tf | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/terraform/modules/happy-github-ci-role/README.md b/terraform/modules/happy-github-ci-role/README.md index 790628ed11..0a37be84c7 100644 --- a/terraform/modules/happy-github-ci-role/README.md +++ b/terraform/modules/happy-github-ci-role/README.md @@ -38,6 +38,7 @@ | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| +| [aws\_account\_id](#input\_aws\_account\_id) | The account ID of the ECR you want to grant access to | `string` | `""` | no | | [dynamodb\_table\_arn](#input\_dynamodb\_table\_arn) | The ARN of the dynamodb table that the role should have permissions to | `string` | n/a | yes | | [ecrs](#input\_ecrs) | The ECRs that the role should have permissions to | 
map(object({
    repository_arn : string,
  }))
| `{}` | no | | [ecs](#input\_ecs) | The ARN and happy app name of the ECS cluster that the role should have permissions to | 
object({
    arn            = string
    happy_app_name = string
  })
| 
{
  "arn": "",
  "happy_app_name": ""
}
| no | diff --git a/terraform/modules/happy-github-ci-role/ecr.tf b/terraform/modules/happy-github-ci-role/ecr.tf index f9508d3d83..efeda84026 100644 --- a/terraform/modules/happy-github-ci-role/ecr.tf +++ b/terraform/modules/happy-github-ci-role/ecr.tf @@ -1,5 +1,9 @@ data "aws_caller_identity" "current" {} +local { + account_id = var.aws_account_id == "" ? data.aws_caller_identity.current.account_id : var.aws_account_id +} + resource "random_pet" "this" { keepers = { role_name = var.gh_actions_role_name @@ -24,7 +28,7 @@ module "autocreated_ecr_writer_policy" { source = "git@github.com:chanzuckerberg/shared-infra//terraform/modules/aws-iam-policy-ecr-writer?ref=v0.125.0" role_name = var.gh_actions_role_name // TODO: not a super fan of this. Would be ideal to have the role only have access to the stacks created by this happy project - ecr_repository_arns = ["arn:aws:ecr:us-west-2:${data.aws_caller_identity.current.account_id}:repository/*/${var.tags.env}/*"] + ecr_repository_arns = ["arn:aws:ecr:us-west-2:${local.account_id}:repository/*/${var.tags.env}/*"] policy_name = "gh_actions_ecr_push_${random_pet.this.id}" project = var.tags.project diff --git a/terraform/modules/happy-github-ci-role/variables.tf b/terraform/modules/happy-github-ci-role/variables.tf index 6f9cce600e..6f7ad58065 100644 --- a/terraform/modules/happy-github-ci-role/variables.tf +++ b/terraform/modules/happy-github-ci-role/variables.tf @@ -41,3 +41,9 @@ variable "ecs" { }) default = { arn = "", happy_app_name = "" } } + +variable "aws_account_id" { + description = "The account ID of the ECR you want to grant access to" + type = string + default = "" +} \ No newline at end of file From f7bdaa565aaa1381b0f5e30794cad63fdccff8cb Mon Sep 17 00:00:00 2001 From: Jake Heath <76011913+jakeyheath@users.noreply.github.com> Date: Tue, 17 Oct 2023 10:18:34 -0700 Subject: [PATCH 60/80] fix: typo for locals (#2610) --- terraform/modules/happy-github-ci-role/ecr.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/modules/happy-github-ci-role/ecr.tf b/terraform/modules/happy-github-ci-role/ecr.tf index efeda84026..947d578fd7 100644 --- a/terraform/modules/happy-github-ci-role/ecr.tf +++ b/terraform/modules/happy-github-ci-role/ecr.tf @@ -1,6 +1,6 @@ data "aws_caller_identity" "current" {} -local { +locals { account_id = var.aws_account_id == "" ? data.aws_caller_identity.current.account_id : var.aws_account_id } From 0b7120e7073f9d686fb69163aa30ee2c8b671036 Mon Sep 17 00:00:00 2001 From: "czi-github-helper[bot]" <95879977+czi-github-helper[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:13:22 -0400 Subject: [PATCH 61/80] chore: release main (#2608) --- .release-please-manifest.json | 12 ++++++------ api/CHANGELOG.md | 7 +++++++ cli/CHANGELOG.md | 7 +++++++ hvm/CHANGELOG.md | 7 +++++++ shared/CHANGELOG.md | 7 +++++++ terraform/modules/happy-github-ci-role/CHANGELOG.md | 12 ++++++++++++ terraform/provider/CHANGELOG.md | 7 +++++++ 7 files changed, 53 insertions(+), 6 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 68cd73bc86..53930ef6f2 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,12 +1,12 @@ { - "cli": "0.112.1", - "api": "0.112.1", - "shared": "0.112.1", - "terraform/provider": "0.112.1", + "cli": "0.113.0", + "api": "0.113.0", + "shared": "0.113.0", + "terraform/provider": "0.113.0", "terraform/modules/happy-dns-ecs": "1.5.0", "terraform/modules/happy-env-ecs": "3.3.0", "terraform/modules/happy-env-eks": "4.12.2", - "terraform/modules/happy-github-ci-role": "1.4.2", + "terraform/modules/happy-github-ci-role": "1.5.0", "terraform/modules/happy-route53": "1.3.0", "terraform/modules/happy-service-ecs": "2.1.0", "terraform/modules/happy-service-eks": "3.17.2", @@ -15,7 +15,7 @@ "terraform/modules/happy-tfe-okta-app": "3.0.0", "terraform/modules/happy-tfe-user": "1.3.0", "terraform/modules/happy-ingress-eks": "2.9.0", - "hvm": "0.112.1", + "hvm": "0.113.0", "hapi-proto": "0.1.0", "terraform/modules/happy-cloudfront": "1.0.0", "helm-charts/charts/stack": "0.1.0" diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md index 9f08b9ae10..38169f2012 100644 --- a/api/CHANGELOG.md +++ b/api/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.0](https://github.com/chanzuckerberg/happy/compare/api-v0.112.1...api-v0.113.0) (2023-10-17) + + +### Features + +* start using the appconfig 'source' column ([#2597](https://github.com/chanzuckerberg/happy/issues/2597)) ([2c63967](https://github.com/chanzuckerberg/happy/commit/2c639678867e1514105e00d06eb2c5ea007861e4)) + ## [0.112.1](https://github.com/chanzuckerberg/happy/compare/api-v0.112.0...api-v0.112.1) (2023-10-17) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index ca75c46e2f..999ab1042d 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.0](https://github.com/chanzuckerberg/happy/compare/cli-v0.112.1...cli-v0.113.0) (2023-10-17) + + +### Miscellaneous Chores + +* **cli:** Synchronize happy platform versions + ## [0.112.1](https://github.com/chanzuckerberg/happy/compare/cli-v0.112.0...cli-v0.112.1) (2023-10-17) diff --git a/hvm/CHANGELOG.md b/hvm/CHANGELOG.md index 6950eaf70f..270b0365e9 100644 --- a/hvm/CHANGELOG.md +++ b/hvm/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.0](https://github.com/chanzuckerberg/happy/compare/hvm-v0.112.1...hvm-v0.113.0) (2023-10-17) + + +### Miscellaneous Chores + +* **hvm:** Synchronize happy platform versions + ## [0.112.1](https://github.com/chanzuckerberg/happy/compare/hvm-v0.112.0...hvm-v0.112.1) (2023-10-17) diff --git a/shared/CHANGELOG.md b/shared/CHANGELOG.md index cfe6be4f8b..6a7ced1809 100644 --- a/shared/CHANGELOG.md +++ b/shared/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.0](https://github.com/chanzuckerberg/happy/compare/shared-v0.112.1...shared-v0.113.0) (2023-10-17) + + +### Features + +* start using the appconfig 'source' column ([#2597](https://github.com/chanzuckerberg/happy/issues/2597)) ([2c63967](https://github.com/chanzuckerberg/happy/commit/2c639678867e1514105e00d06eb2c5ea007861e4)) + ## [0.112.1](https://github.com/chanzuckerberg/happy/compare/shared-v0.112.0...shared-v0.112.1) (2023-10-17) diff --git a/terraform/modules/happy-github-ci-role/CHANGELOG.md b/terraform/modules/happy-github-ci-role/CHANGELOG.md index 40a38af4f3..c79f73113e 100644 --- a/terraform/modules/happy-github-ci-role/CHANGELOG.md +++ b/terraform/modules/happy-github-ci-role/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.5.0](https://github.com/chanzuckerberg/happy/compare/happy-github-ci-role-v1.4.2...happy-github-ci-role-v1.5.0) (2023-10-17) + + +### Features + +* allow AWS account ID to change for ECR policy ([#2609](https://github.com/chanzuckerberg/happy/issues/2609)) ([e9062ad](https://github.com/chanzuckerberg/happy/commit/e9062adc7983b7b16e7271b4c65eec939a068f62)) + + +### Bug Fixes + +* typo for locals ([#2610](https://github.com/chanzuckerberg/happy/issues/2610)) ([f7bdaa5](https://github.com/chanzuckerberg/happy/commit/f7bdaa565aaa1381b0f5e30794cad63fdccff8cb)) + ## [1.4.2](https://github.com/chanzuckerberg/happy/compare/happy-github-ci-role-v1.4.1...happy-github-ci-role-v1.4.2) (2023-09-22) diff --git a/terraform/provider/CHANGELOG.md b/terraform/provider/CHANGELOG.md index be2551e03e..e605ee59b4 100644 --- a/terraform/provider/CHANGELOG.md +++ b/terraform/provider/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.0](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.112.1...terraform-provider-v0.113.0) (2023-10-17) + + +### Miscellaneous Chores + +* **terraform-provider:** Synchronize happy platform versions + ## [0.112.1](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.112.0...terraform-provider-v0.112.1) (2023-10-17) From 2c693897054b03d530c4d23a1969da7c8558e5d1 Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Wed, 18 Oct 2023 08:35:44 -0700 Subject: [PATCH 62/80] fix: Allow image src aws role arn to be provided for cross-account image promotion (#2611) * fix: Allow image src aws role arn to be provided for cross-account image promotion * ci - update go.mod * commit from cli-ci -- updated coverage * Update init.go --------- Co-authored-by: alexlokshin-czi Co-authored-by: czi-github-helper[bot] --- cli/COVERAGE | 2 +- cli/cmd/COVERAGE | 2 +- cli/cmd/create.go | 19 ++++++++++--------- cli/cmd/init.go | 14 ++++++++++++-- cli/cmd/update.go | 4 ++-- cli/pkg/cmd/COVERAGE | 2 +- cli/pkg/cmd/flags.go | 4 +++- shared/backend/aws/backend.go | 11 +++++++++++ shared/backend/aws/options.go | 5 +++++ shared/config/bootstrap.go | 2 ++ shared/go.mod | 2 +- 11 files changed, 49 insertions(+), 18 deletions(-) diff --git a/cli/COVERAGE b/cli/COVERAGE index 35371314c1..56664f9c2b 100644 --- a/cli/COVERAGE +++ b/cli/COVERAGE @@ -1 +1 @@ -23.03 \ No newline at end of file +22.97 \ No newline at end of file diff --git a/cli/cmd/COVERAGE b/cli/cmd/COVERAGE index 4a01f41a89..021bd571a2 100644 --- a/cli/cmd/COVERAGE +++ b/cli/cmd/COVERAGE @@ -1 +1 @@ -11.9 \ No newline at end of file +11.8 \ No newline at end of file diff --git a/cli/cmd/create.go b/cli/cmd/create.go index 5cba93476a..3ca5291f5b 100644 --- a/cli/cmd/create.go +++ b/cli/cmd/create.go @@ -17,13 +17,14 @@ import ( ) var ( - force bool - skipCheckTag bool - createTag bool - tag string - dryRun bool - imageSrcEnv string - imageSrcStack string + force bool + skipCheckTag bool + createTag bool + tag string + dryRun bool + imageSrcEnv string + imageSrcStack string + imageSrcRoleArn string ) func init() { @@ -31,7 +32,7 @@ func init() { config.ConfigureCmdWithBootstrapConfig(createCmd) happyCmd.SupportUpdateSlices(createCmd, &sliceName, &sliceDefaultTag) // Should this function be renamed to something more generalized? happyCmd.SetMigrationFlags(createCmd) - happyCmd.SetImagePromotionFlags(createCmd, &imageSrcEnv, &imageSrcStack) + happyCmd.SetImagePromotionFlags(createCmd, &imageSrcEnv, &imageSrcStack, &imageSrcRoleArn) happyCmd.SetDryRunFlag(createCmd, &dryRun) createCmd.Flags().StringVar(&tag, "tag", "", "Specify the tag for the docker images. If not specified we will generate a default tag.") createCmd.Flags().BoolVar(&createTag, "create-tag", true, "Will build, tag, and push images when set. Otherwise, assumes images already exist.") @@ -90,7 +91,7 @@ func runCreate( validateTFEBackLog(ctx, happyClient.AWSBackend), validateStackExistsCreate(ctx, stackName, happyClient, message), validateECRExists(ctx, stackName, terraformECRTargetPathTemplate, happyClient, message), - validateImageExists(ctx, createTag, skipCheckTag, imageSrcEnv, imageSrcStack, happyClient, cmd.Flags().Changed(config.FlagAWSProfile)), + validateImageExists(ctx, createTag, skipCheckTag, imageSrcEnv, imageSrcStack, imageSrcRoleArn, happyClient, cmd.Flags().Changed(config.FlagAWSProfile)), ) if err != nil { return errors.Wrap(err, "failed one of the happy client validations") diff --git a/cli/cmd/init.go b/cli/cmd/init.go index 9f375432ba..856423e5d1 100644 --- a/cli/cmd/init.go +++ b/cli/cmd/init.go @@ -55,7 +55,12 @@ func makeHappyClientFromBootstrap(ctx context.Context, bootstrapConfig *config.B } } - awsBackend, err := backend.NewAWSBackend(ctx, happyConfig.GetEnvironmentContext()) + opts := []backend.AWSBackendOption{} + if bootstrapConfig.AWSRoleARN != nil && *bootstrapConfig.AWSRoleARN != "" { + opts = append(opts, backend.WithAWSRoleARN(*bootstrapConfig.AWSRoleARN)) + } + + awsBackend, err := backend.NewAWSBackend(ctx, happyConfig.GetEnvironmentContext(), opts...) if err != nil { return nil, err } @@ -158,7 +163,7 @@ type validation func() error func validateImageExists( ctx context.Context, createTag, skipCheckTag bool, - imageSrcEnv, imageSrcStack string, + imageSrcEnv, imageSrcStack, imageSrcRoleArn string, happyClient *HappyClient, useAWSProfile bool, ) validation { @@ -185,6 +190,11 @@ func validateImageExists( if err != nil { return errors.Wrapf(err, "unable to bootstrap %s env", imageSrcEnv) } + + if len(imageSrcRoleArn) > 0 { + bs.AWSRoleARN = &imageSrcRoleArn + } + srcHappyClient, err := makeHappyClientFromBootstrap(ctx, bs, "", stack, []string{tag}, false) if err != nil { return errors.Wrapf(err, "unable to create happy client for env %s", imageSrcEnv) diff --git a/cli/cmd/update.go b/cli/cmd/update.go index feedb7b7f3..21550143b5 100644 --- a/cli/cmd/update.go +++ b/cli/cmd/update.go @@ -25,7 +25,7 @@ func init() { config.ConfigureCmdWithBootstrapConfig(updateCmd) happyCmd.SupportUpdateSlices(updateCmd, &sliceName, &sliceDefaultTag) happyCmd.SetMigrationFlags(updateCmd) - happyCmd.SetImagePromotionFlags(updateCmd, &imageSrcEnv, &imageSrcStack) + happyCmd.SetImagePromotionFlags(updateCmd, &imageSrcEnv, &imageSrcStack, &imageSrcRoleArn) happyCmd.SetDryRunFlag(updateCmd, &dryRun) updateCmd.Flags().StringVar(&tag, "tag", "", "Tag name for docker image. Leave empty to generate one automatically.") @@ -79,7 +79,7 @@ func runUpdate(cmd *cobra.Command, args []string) error { validateTFEBackLog(ctx, happyClient.AWSBackend), validateStackExistsUpdate(ctx, stackName, happyClient), validateECRExists(ctx, stackName, terraformECRTargetPathTemplate, happyClient), - validateImageExists(ctx, createTag, skipCheckTag, imageSrcEnv, imageSrcStack, happyClient, cmd.Flags().Changed(config.FlagAWSProfile)), + validateImageExists(ctx, createTag, skipCheckTag, imageSrcEnv, imageSrcStack, imageSrcRoleArn, happyClient, cmd.Flags().Changed(config.FlagAWSProfile)), ) if err != nil { return errors.Wrap(err, "failed one of the happy client validations") diff --git a/cli/pkg/cmd/COVERAGE b/cli/pkg/cmd/COVERAGE index 58f1cd76c3..ab9da2702d 100644 --- a/cli/pkg/cmd/COVERAGE +++ b/cli/pkg/cmd/COVERAGE @@ -1 +1 @@ -13.8 \ No newline at end of file +13.6 \ No newline at end of file diff --git a/cli/pkg/cmd/flags.go b/cli/pkg/cmd/flags.go index 7b6e8be56f..48ffde0165 100644 --- a/cli/pkg/cmd/flags.go +++ b/cli/pkg/cmd/flags.go @@ -30,6 +30,7 @@ const ( flagSkipMigrations = "skip-migrations" flagImageSrcEnv = "image-src-env" flagImageSrcStack = "image-src-stack" + flagimageSrcRoleArn = "image-src-role-arn" ) func SetMigrationFlags(cmd *cobra.Command) { @@ -37,9 +38,10 @@ func SetMigrationFlags(cmd *cobra.Command) { cmd.Flags().Bool(flagSkipMigrations, false, "Specify if you want to skip migrations") } -func SetImagePromotionFlags(cmd *cobra.Command, imageSrcEnv, imageSrcStack *string) { +func SetImagePromotionFlags(cmd *cobra.Command, imageSrcEnv, imageSrcStack, imageSrcRoleArn *string) { cmd.Flags().StringVar(imageSrcEnv, flagImageSrcEnv, "", "Will pull an image from a specified environment. Must be used with image-src-stack") cmd.Flags().StringVar(imageSrcStack, flagImageSrcStack, "", "The stack and optional tag to pull an image from. Takes the form <:optional_tag> (i.e. my-stack:latest, my-stack). Must be used with image-src-env") + cmd.Flags().StringVar(imageSrcRoleArn, flagimageSrcRoleArn, "", "The role arn to assume when pulling an image from a different account. Must be used with image-src-env and image-src-stack") } func SetDryRunFlag(cmd *cobra.Command, dryRun *bool) { diff --git a/shared/backend/aws/backend.go b/shared/backend/aws/backend.go index 2e58b4b6e7..139510a6c9 100644 --- a/shared/backend/aws/backend.go +++ b/shared/backend/aws/backend.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/retry" configv2 "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go-v2/credentials/stscreds" cwlv2 "github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs" "github.com/aws/aws-sdk-go-v2/service/dynamodb" "github.com/aws/aws-sdk-go-v2/service/ec2" @@ -53,6 +54,8 @@ type Backend struct { awsAccountID *string + awsRoleArn *string + // aws config: provided or inferred awsConfig *aws.Config @@ -137,6 +140,14 @@ func NewAWSBackend( return nil, errors.Wrap(err, "unable to create an aws session") } + if b.awsRoleArn != nil && len(*b.awsRoleArn) > 0 { + stsClient := sts.NewFromConfig(conf) + roleCreds := stscreds.NewAssumeRoleProvider(stsClient, *b.awsRoleArn) + roleCfg := conf.Copy() + roleCfg.Credentials = aws.NewCredentialsCache(roleCreds) + conf = roleCfg + } + b.awsConfig = &conf } diff --git a/shared/backend/aws/options.go b/shared/backend/aws/options.go index b5781934e6..8f4416bbef 100644 --- a/shared/backend/aws/options.go +++ b/shared/backend/aws/options.go @@ -26,6 +26,11 @@ func WithAWSProfile(profile string) AWSBackendOption { return func(ab *Backend) { ab.awsProfile = &profile } } +// WithAWSProfile sets the AWS profile to use for this Backend +func WithAWSRoleARN(awsRoleArn string) AWSBackendOption { + return func(ab *Backend) { ab.awsRoleArn = &awsRoleArn } +} + // WithIntegrationSecret sets the IntegrationSecret for this Backend func WithIntegrationSecret(integrationSecret *config.IntegrationSecret) AWSBackendOption { return func(b *Backend) { b.integrationSecret = integrationSecret } diff --git a/shared/config/bootstrap.go b/shared/config/bootstrap.go index 2d5b3c7567..150d09afbb 100644 --- a/shared/config/bootstrap.go +++ b/shared/config/bootstrap.go @@ -67,6 +67,7 @@ type Bootstrap struct { AWSProfile *string `envconfig:"AWS_PROFILE"` AWSRegion *string `envconfig:"AWS_REGION"` + AWSRoleARN *string Env string `envconfig:"HAPPY_ENV"` } @@ -157,6 +158,7 @@ func NewSimpleBootstrap(cmd *cobra.Command) (*Bootstrap, error) { if b.DockerComposeConfigPath == "" { b.DockerComposeConfigPath = filepath.Join(b.HappyProjectRoot, "/docker-compose.yml") } + return b, nil } diff --git a/shared/go.mod b/shared/go.mod index 794f849945..f5f4b3785d 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -7,6 +7,7 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Masterminds/semver/v3 v3.2.1 github.com/aws/aws-sdk-go-v2 v1.21.2 + github.com/aws/aws-sdk-go-v2/credentials v1.13.42 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 @@ -64,7 +65,6 @@ require ( github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/aws/aws-sdk-go v1.44.122 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect From ebfedcea9e9e103c8d22d07c9847e86308a5e69e Mon Sep 17 00:00:00 2001 From: "czi-github-helper[bot]" <95879977+czi-github-helper[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:44:24 +0000 Subject: [PATCH 63/80] chore: release main (#2612) Co-authored-by: czi-github-helper[bot] <95879977+czi-github-helper[bot]@users.noreply.github.com> --- .release-please-manifest.json | 10 +++++----- api/CHANGELOG.md | 7 +++++++ cli/CHANGELOG.md | 7 +++++++ hvm/CHANGELOG.md | 7 +++++++ shared/CHANGELOG.md | 7 +++++++ terraform/provider/CHANGELOG.md | 7 +++++++ 6 files changed, 40 insertions(+), 5 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 53930ef6f2..6250b5c0b9 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,8 +1,8 @@ { - "cli": "0.113.0", - "api": "0.113.0", - "shared": "0.113.0", - "terraform/provider": "0.113.0", + "cli": "0.113.1", + "api": "0.113.1", + "shared": "0.113.1", + "terraform/provider": "0.113.1", "terraform/modules/happy-dns-ecs": "1.5.0", "terraform/modules/happy-env-ecs": "3.3.0", "terraform/modules/happy-env-eks": "4.12.2", @@ -15,7 +15,7 @@ "terraform/modules/happy-tfe-okta-app": "3.0.0", "terraform/modules/happy-tfe-user": "1.3.0", "terraform/modules/happy-ingress-eks": "2.9.0", - "hvm": "0.113.0", + "hvm": "0.113.1", "hapi-proto": "0.1.0", "terraform/modules/happy-cloudfront": "1.0.0", "helm-charts/charts/stack": "0.1.0" diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md index 38169f2012..a6be65c484 100644 --- a/api/CHANGELOG.md +++ b/api/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.1](https://github.com/chanzuckerberg/happy/compare/api-v0.113.0...api-v0.113.1) (2023-10-18) + + +### Miscellaneous Chores + +* **api:** Synchronize happy platform versions + ## [0.113.0](https://github.com/chanzuckerberg/happy/compare/api-v0.112.1...api-v0.113.0) (2023-10-17) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 999ab1042d..6f8f6a96bd 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.1](https://github.com/chanzuckerberg/happy/compare/cli-v0.113.0...cli-v0.113.1) (2023-10-18) + + +### Bug Fixes + +* Allow image src aws role arn to be provided for cross-account image promotion ([#2611](https://github.com/chanzuckerberg/happy/issues/2611)) ([2c69389](https://github.com/chanzuckerberg/happy/commit/2c693897054b03d530c4d23a1969da7c8558e5d1)) + ## [0.113.0](https://github.com/chanzuckerberg/happy/compare/cli-v0.112.1...cli-v0.113.0) (2023-10-17) diff --git a/hvm/CHANGELOG.md b/hvm/CHANGELOG.md index 270b0365e9..9c82e8329a 100644 --- a/hvm/CHANGELOG.md +++ b/hvm/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.1](https://github.com/chanzuckerberg/happy/compare/hvm-v0.113.0...hvm-v0.113.1) (2023-10-18) + + +### Miscellaneous Chores + +* **hvm:** Synchronize happy platform versions + ## [0.113.0](https://github.com/chanzuckerberg/happy/compare/hvm-v0.112.1...hvm-v0.113.0) (2023-10-17) diff --git a/shared/CHANGELOG.md b/shared/CHANGELOG.md index 6a7ced1809..50d5f53581 100644 --- a/shared/CHANGELOG.md +++ b/shared/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.1](https://github.com/chanzuckerberg/happy/compare/shared-v0.113.0...shared-v0.113.1) (2023-10-18) + + +### Bug Fixes + +* Allow image src aws role arn to be provided for cross-account image promotion ([#2611](https://github.com/chanzuckerberg/happy/issues/2611)) ([2c69389](https://github.com/chanzuckerberg/happy/commit/2c693897054b03d530c4d23a1969da7c8558e5d1)) + ## [0.113.0](https://github.com/chanzuckerberg/happy/compare/shared-v0.112.1...shared-v0.113.0) (2023-10-17) diff --git a/terraform/provider/CHANGELOG.md b/terraform/provider/CHANGELOG.md index e605ee59b4..84275e7d1f 100644 --- a/terraform/provider/CHANGELOG.md +++ b/terraform/provider/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.113.1](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.113.0...terraform-provider-v0.113.1) (2023-10-18) + + +### Miscellaneous Chores + +* **terraform-provider:** Synchronize happy platform versions + ## [0.113.0](https://github.com/chanzuckerberg/happy/compare/terraform-provider-v0.112.1...terraform-provider-v0.113.0) (2023-10-17) From ea1deb92e2534f4301896b3d21279f0c5e42354c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:45:43 +0000 Subject: [PATCH 64/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ssm from 1.38.1 to 1.38.2 in /shared (#2595) * chore: bump github.com/aws/aws-sdk-go-v2/service/ssm in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/ssm](https://github.com/aws/aws-sdk-go-v2) from 1.38.1 to 1.38.2. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.38.1...service/s3/v1.38.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update ent schema * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] Co-authored-by: Alex Lokshin --- api/go.mod | 2 +- api/go.sum | 4 ++-- cli/go.mod | 2 +- cli/go.sum | 4 ++-- hvm/go.mod | 2 +- hvm/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/api/go.mod b/api/go.mod index 93ae3fd4ef..9466f05fbd 100644 --- a/api/go.mod +++ b/api/go.mod @@ -64,7 +64,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect diff --git a/api/go.sum b/api/go.sum index 1fd200eacf..85ea268d53 100644 --- a/api/go.sum +++ b/api/go.sum @@ -143,8 +143,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= diff --git a/cli/go.mod b/cli/go.mod index 2a19d08ddb..e0a1dc97f0 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -159,7 +159,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.30.3 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect github.com/aws/smithy-go v1.15.0 github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect diff --git a/cli/go.sum b/cli/go.sum index d4272e64c1..3f966e1283 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -281,8 +281,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= diff --git a/hvm/go.mod b/hvm/go.mod index 02011b4c39..57bf2656a7 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index 21b3a4bcb2..baad6fc76f 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -82,8 +82,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= diff --git a/shared/go.mod b/shared/go.mod index f5f4b3785d..633665265d 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 github.com/chanzuckerberg/happy/hvm v0.0.0 github.com/compose-spec/compose-go v1.19.0 diff --git a/shared/go.sum b/shared/go.sum index c77bc1f3cb..0ba6439b83 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -285,8 +285,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index acb95d764c..25b7ee9de3 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -44,7 +44,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/aws/smithy-go v1.15.0 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 424e85f565..f219f6fe70 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -100,8 +100,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 h1:uRGw0UKo5hc7M2T7uGsK/Yg2qwec github.com/aws/aws-sdk-go-v2/service/kms v1.24.7/go.mod h1:z3O9CXfVrKAV3c9fMWOUUv2C6N2ggXCDHeXpOB6lAEk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1 h1:jkHph1+6MkoWuccP79ITWu8BsiH2RIFiviLoJOrS3+I= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.1/go.mod h1:8SQhWZMknHq72Fr4HifgriuZszL0EQRohngHgGgRfyY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= From 964e73559e4838546d7df04925f98a51bfc641c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:48:28 +0000 Subject: [PATCH 65/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ec2 from 1.122.0 to 1.125.0 in /shared (#2588) * chore: bump github.com/aws/aws-sdk-go-v2/service/ec2 in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) from 1.122.0 to 1.125.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.122.0...service/ec2/v1.125.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update ent schema * ci - update go.mod * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] Co-authored-by: Alex Lokshin Co-authored-by: alexlokshin-czi --- api/go.mod | 2 +- api/go.sum | 5 ++--- hvm/go.mod | 2 +- hvm/go.sum | 5 ++--- shared/go.mod | 2 +- shared/go.sum | 5 ++--- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 5 ++--- 8 files changed, 12 insertions(+), 16 deletions(-) diff --git a/api/go.mod b/api/go.mod index 9466f05fbd..de0c5ffdcd 100644 --- a/api/go.mod +++ b/api/go.mod @@ -56,7 +56,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect diff --git a/api/go.sum b/api/go.sum index 85ea268d53..036fddbe33 100644 --- a/api/go.sum +++ b/api/go.sum @@ -121,8 +121,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiSt github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7xjzakkK0+QyP8fO0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= @@ -137,7 +137,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= diff --git a/hvm/go.mod b/hvm/go.mod index 57bf2656a7..a42f4deafa 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -28,7 +28,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index baad6fc76f..0552ce62bb 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -60,8 +60,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiSt github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7xjzakkK0+QyP8fO0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= @@ -76,7 +76,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= diff --git a/shared/go.mod b/shared/go.mod index 633665265d..4ac1baad31 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -10,7 +10,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.13.42 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 diff --git a/shared/go.sum b/shared/go.sum index 0ba6439b83..675cf46d3e 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -263,8 +263,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiSt github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7xjzakkK0+QyP8fO0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= @@ -279,7 +279,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 25b7ee9de3..af7c147804 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index f219f6fe70..f6659c72a2 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -77,8 +77,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiSt github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0 h1:i+YnwvmUy51p+8nwH9eDMzn5GWVLK+Pvva6To8O4AaI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.122.0/go.mod h1:0FhI2Rzcv5BNM3dNnbcCx2qa2naFZoAidJi11cQgzL0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7xjzakkK0+QyP8fO0= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= @@ -93,7 +93,6 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 h1:uRGw0UKo5hc7M2T7uGsK/Yg2qwecq/dnVjQbbq9RCzY= From a1affe852cd433cbd7a1e494f97307595e20314b Mon Sep 17 00:00:00 2001 From: Jake Heath <76011913+jakeyheath@users.noreply.github.com> Date: Fri, 20 Oct 2023 04:17:05 -0700 Subject: [PATCH 66/80] feat: allow stacks to change cpu/mem requests (#2614) --- terraform/modules/happy-stack-eks/README.md | 2 +- terraform/modules/happy-stack-eks/main.tf | 2 ++ terraform/modules/happy-stack-eks/variables.tf | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/terraform/modules/happy-stack-eks/README.md b/terraform/modules/happy-stack-eks/README.md index 6b45ca92d7..485583c965 100644 --- a/terraform/modules/happy-stack-eks/README.md +++ b/terraform/modules/happy-stack-eks/README.md @@ -59,7 +59,7 @@ | [image\_tags](#input\_image\_tags) | Override image tag for each docker image | `map(string)` | `{}` | no | | [k8s\_namespace](#input\_k8s\_namespace) | K8S namespace for this stack | `string` | n/a | yes | | [routing\_method](#input\_routing\_method) | Traffic routing method for this stack. Valid options are 'DOMAIN', when every service gets a unique domain name, or a 'CONTEXT' when all services share the same domain name, and routing is done by request path. | `string` | `"DOMAIN"` | no | -| [services](#input\_services) | The services you want to deploy as part of this stack. | 
map(object({
    name : string,
    service_type : optional(string, "INTERNAL"),
    allow_mesh_services : optional(list(object({
      service : optional(string, null),
      stack : optional(string, null),
      service_account_name : optional(string, null)
    })), null),
    ingress_security_groups : optional(list(string), []), // Only used for VPC service_type
    alb : optional(object({
      name : string,
      listener_port : number,
    }), null), // Only used for TARGET_GROUP_ONLY
    desired_count : optional(number, 2),
    max_count : optional(number, 2),
    scaling_cpu_threshold_percentage : optional(number, 80),
    port : optional(number, 80),
    scheme : optional(string, "HTTP"),
    cmd : optional(list(string), []),
    args : optional(list(string), []),
    image_pull_policy : optional(string, "IfNotPresent"), // Supported values: IfNotPresent, Always, Never
    tag_mutability : optional(bool, true),
    scan_on_push : optional(bool, false),
    service_port : optional(number, null),
    service_scheme : optional(string, "HTTP"),
    memory : optional(string, "100Mi"),
    cpu : optional(string, "100m"),
    gpu : optional(number, null), // Whole number of GPUs to request, 0 will schedule all available GPUs. Requires GPU-enabled nodes in the cluster, `k8s-device-plugin` installed, platform_architecture = "amd64", and additional_node_selectors = { "nvidia.com/gpu.present" = "true" } present.
    health_check_path : optional(string, "/"),
    aws_iam : optional(object({
      policy_json : optional(string, ""),
      service_account_name : optional(string, null),
    }), {}),
    path : optional(string, "/*"),  // Only used for CONTEXT and TARGET_GROUP_ONLY routing
    priority : optional(number, 0), // Only used for CONTEXT and TARGET_GROUP_ONLY routing
    success_codes : optional(string, "200-499"),
    synthetics : optional(bool, false),
    initial_delay_seconds : optional(number, 30),
    alb_idle_timeout : optional(number, 60) // in seconds
    period_seconds : optional(number, 3),
    platform_architecture : optional(string, "amd64"),     // Supported values: amd64, arm64; GPU nodes are amd64 only.
    additional_node_selectors : optional(map(string), {}), // For GPU use: { "nvidia.com/gpu.present" = "true" }
    bypasses : optional(map(object({                       // Only used for INTERNAL service_type
      paths   = optional(set(string), [])
      methods = optional(set(string), [])
    })), {})
    sidecars : optional(map(object({
      image : string
      tag : string
      port : optional(number, 80),
      scheme : optional(string, "HTTP"),
      memory : optional(string, "100Mi")
      cpu : optional(string, "100m")
      image_pull_policy : optional(string, "IfNotPresent") // Supported values: IfNotPresent, Always, Never
      health_check_path : optional(string, "/")
      initial_delay_seconds : optional(number, 30),
      period_seconds : optional(number, 3),
    })), {})
  }))
| n/a | yes | +| [services](#input\_services) | The services you want to deploy as part of this stack. | 
map(object({
    name : string,
    service_type : optional(string, "INTERNAL"),
    allow_mesh_services : optional(list(object({
      service : optional(string, null),
      stack : optional(string, null),
      service_account_name : optional(string, null)
    })), null),
    ingress_security_groups : optional(list(string), []), // Only used for VPC service_type
    alb : optional(object({
      name : string,
      listener_port : number,
    }), null), // Only used for TARGET_GROUP_ONLY
    desired_count : optional(number, 2),
    max_count : optional(number, 2),
    scaling_cpu_threshold_percentage : optional(number, 80),
    port : optional(number, 80),
    scheme : optional(string, "HTTP"),
    cmd : optional(list(string), []),
    args : optional(list(string), []),
    image_pull_policy : optional(string, "IfNotPresent"), // Supported values: IfNotPresent, Always, Never
    tag_mutability : optional(bool, true),
    scan_on_push : optional(bool, false),
    service_port : optional(number, null),
    service_scheme : optional(string, "HTTP"),
    memory : optional(string, "100Mi"),
    memory_requests : optional(string, "100Mi"),
    cpu : optional(string, "100m"),
    cpu_requests : optional(string, "100m"),
    gpu : optional(number, null), // Whole number of GPUs to request, 0 will schedule all available GPUs. Requires GPU-enabled nodes in the cluster, `k8s-device-plugin` installed, platform_architecture = "amd64", and additional_node_selectors = { "nvidia.com/gpu.present" = "true" } present.
    health_check_path : optional(string, "/"),
    aws_iam : optional(object({
      policy_json : optional(string, ""),
      service_account_name : optional(string, null),
    }), {}),
    path : optional(string, "/*"),  // Only used for CONTEXT and TARGET_GROUP_ONLY routing
    priority : optional(number, 0), // Only used for CONTEXT and TARGET_GROUP_ONLY routing
    success_codes : optional(string, "200-499"),
    synthetics : optional(bool, false),
    initial_delay_seconds : optional(number, 30),
    alb_idle_timeout : optional(number, 60) // in seconds
    period_seconds : optional(number, 3),
    platform_architecture : optional(string, "amd64"),     // Supported values: amd64, arm64; GPU nodes are amd64 only.
    additional_node_selectors : optional(map(string), {}), // For GPU use: { "nvidia.com/gpu.present" = "true" }
    bypasses : optional(map(object({                       // Only used for INTERNAL service_type
      paths   = optional(set(string), [])
      methods = optional(set(string), [])
    })), {})
    sidecars : optional(map(object({
      image : string
      tag : string
      port : optional(number, 80),
      scheme : optional(string, "HTTP"),
      memory : optional(string, "100Mi")
      cpu : optional(string, "100m")
      image_pull_policy : optional(string, "IfNotPresent") // Supported values: IfNotPresent, Always, Never
      health_check_path : optional(string, "/")
      initial_delay_seconds : optional(number, 30),
      period_seconds : optional(number, 3),
    })), {})
  }))
| n/a | yes | | [skip\_config\_injection](#input\_skip\_config\_injection) | Skip injecting app configs into the services / tasks | `bool` | `false` | no | | [stack\_name](#input\_stack\_name) | Happy Path stack name | `string` | n/a | yes | | [stack\_prefix](#input\_stack\_prefix) | Do bucket storage paths and db schemas need to be prefixed with the stack name? (Usually '/{stack\_name}' for dev stacks, and '' for staging/prod stacks) | `string` | `""` | no | diff --git a/terraform/modules/happy-stack-eks/main.tf b/terraform/modules/happy-stack-eks/main.tf index 9ef5d8fa0c..93fa1e60ee 100644 --- a/terraform/modules/happy-stack-eks/main.tf +++ b/terraform/modules/happy-stack-eks/main.tf @@ -169,7 +169,9 @@ module "services" { max_count = try(each.value.max_count, each.value.desired_count) scaling_cpu_threshold_percentage = each.value.scaling_cpu_threshold_percentage memory = each.value.memory + memory_requests = each.value.memory_requests cpu = each.value.cpu + cpu_requests = each.value.cpu_requests gpu = each.value.gpu health_check_path = each.value.health_check_path k8s_namespace = var.k8s_namespace diff --git a/terraform/modules/happy-stack-eks/variables.tf b/terraform/modules/happy-stack-eks/variables.tf index 1260b35025..79f8b64d92 100644 --- a/terraform/modules/happy-stack-eks/variables.tf +++ b/terraform/modules/happy-stack-eks/variables.tf @@ -69,7 +69,9 @@ variable "services" { service_port : optional(number, null), service_scheme : optional(string, "HTTP"), memory : optional(string, "100Mi"), + memory_requests : optional(string, "100Mi"), cpu : optional(string, "100m"), + cpu_requests : optional(string, "100m"), gpu : optional(number, null), // Whole number of GPUs to request, 0 will schedule all available GPUs. Requires GPU-enabled nodes in the cluster, `k8s-device-plugin` installed, platform_architecture = "amd64", and additional_node_selectors = { "nvidia.com/gpu.present" = "true" } present. health_check_path : optional(string, "/"), aws_iam : optional(object({ From 1d70aa0637d99c9fb7b6bcb53bd1036ce7be44bb Mon Sep 17 00:00:00 2001 From: Hayden Spitzley <105455169+hspitzley-czi@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:09:56 -0400 Subject: [PATCH 67/80] chore: rename dbutil package to store (#2616) --- api/pkg/api/app.go | 10 +++++----- api/pkg/api/app_test.go | 4 ++-- api/pkg/cmd/cmd_test.go | 6 +++--- api/pkg/cmd/config.go | 6 +++--- api/pkg/cmd/stack.go | 4 ++-- api/pkg/{dbutil => store}/db.go | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) rename api/pkg/{dbutil => store}/db.go (98%) diff --git a/api/pkg/api/app.go b/api/pkg/api/app.go index ebcddda108..46689ff165 100644 --- a/api/pkg/api/app.go +++ b/api/pkg/api/app.go @@ -6,9 +6,9 @@ import ( "time" "github.com/chanzuckerberg/happy/api/pkg/cmd" - "github.com/chanzuckerberg/happy/api/pkg/dbutil" "github.com/chanzuckerberg/happy/api/pkg/request" "github.com/chanzuckerberg/happy/api/pkg/setup" + "github.com/chanzuckerberg/happy/api/pkg/store" "github.com/getsentry/sentry-go" "github.com/gofiber/contrib/fibersentry" "github.com/gofiber/fiber/v2" @@ -21,7 +21,7 @@ import ( type APIApplication struct { FiberApp *fiber.App - DB *dbutil.DB + DB *store.DB Cfg *setup.Configuration } @@ -37,11 +37,11 @@ func MakeAPIApplication(cfg *setup.Configuration) *APIApplication { } func MakeApp(ctx context.Context, cfg *setup.Configuration) *APIApplication { - db := dbutil.MakeDB(cfg.Database) + db := store.MakeDB(cfg.Database) return MakeAppWithDB(ctx, cfg, db) } -func MakeAppWithDB(ctx context.Context, cfg *setup.Configuration, db *dbutil.DB) *APIApplication { +func MakeAppWithDB(ctx context.Context, cfg *setup.Configuration, db *store.DB) *APIApplication { apiApp := MakeAPIApplication(cfg).WithDatabase(db) apiApp.FiberApp.Use(requestid.New()) apiApp.FiberApp.Use(cors.New(cors.Config{ @@ -109,7 +109,7 @@ func MakeAppWithDB(ctx context.Context, cfg *setup.Configuration, db *dbutil.DB) return apiApp } -func (a *APIApplication) WithDatabase(db *dbutil.DB) *APIApplication { +func (a *APIApplication) WithDatabase(db *store.DB) *APIApplication { a.DB = db err := a.DB.AutoMigrate() if err != nil { diff --git a/api/pkg/api/app_test.go b/api/pkg/api/app_test.go index cb00a47b5a..a73cfb79f3 100644 --- a/api/pkg/api/app_test.go +++ b/api/pkg/api/app_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/blang/semver" - "github.com/chanzuckerberg/happy/api/pkg/dbutil" "github.com/chanzuckerberg/happy/api/pkg/ent/enttest" "github.com/chanzuckerberg/happy/api/pkg/request" "github.com/chanzuckerberg/happy/api/pkg/setup" + "github.com/chanzuckerberg/happy/api/pkg/store" "github.com/gofiber/fiber/v2" "github.com/google/uuid" "github.com/stretchr/testify/require" @@ -31,7 +31,7 @@ func MakeTestApp(t *testing.T) *APIApplication { client := enttest.Open(t, "sqlite3", fmt.Sprintf("file:memdb%s?mode=memory&cache=shared&_fk=1", uuid.NewString())) mu.Unlock() - testDB := dbutil.MakeDB(cfg.Database).WithClient(client) + testDB := store.MakeDB(cfg.Database).WithClient(client) app := MakeAppWithDB(context.Background(), cfg, testDB) return app } diff --git a/api/pkg/cmd/cmd_test.go b/api/pkg/cmd/cmd_test.go index 2cab382842..02185a2b29 100644 --- a/api/pkg/cmd/cmd_test.go +++ b/api/pkg/cmd/cmd_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - "github.com/chanzuckerberg/happy/api/pkg/dbutil" "github.com/chanzuckerberg/happy/api/pkg/ent/enttest" "github.com/chanzuckerberg/happy/api/pkg/setup" + "github.com/chanzuckerberg/happy/api/pkg/store" "github.com/google/uuid" ) @@ -15,7 +15,7 @@ var ( mu sync.Mutex ) -func MakeTestDB(t *testing.T) *dbutil.DB { +func MakeTestDB(t *testing.T) *store.DB { config := setup.GetConfiguration() // Even with a UUID in the data source name this is not thread safe so we need to use a mutex to prevent concurrent access @@ -23,5 +23,5 @@ func MakeTestDB(t *testing.T) *dbutil.DB { client := enttest.Open(t, "sqlite3", fmt.Sprintf("file:memdb%s?mode=memory&cache=shared&_fk=1", uuid.NewString())) mu.Unlock() - return dbutil.MakeDB(config.Database).WithClient(client) + return store.MakeDB(config.Database).WithClient(client) } diff --git a/api/pkg/cmd/config.go b/api/pkg/cmd/config.go index bb976be7da..55d3f6942a 100644 --- a/api/pkg/cmd/config.go +++ b/api/pkg/cmd/config.go @@ -3,9 +3,9 @@ package cmd import ( "context" - "github.com/chanzuckerberg/happy/api/pkg/dbutil" "github.com/chanzuckerberg/happy/api/pkg/ent" "github.com/chanzuckerberg/happy/api/pkg/ent/appconfig" + "github.com/chanzuckerberg/happy/api/pkg/store" "github.com/chanzuckerberg/happy/shared/model" "github.com/pkg/errors" "github.com/samber/lo" @@ -25,10 +25,10 @@ type Config interface { } type dbConfig struct { - DB *dbutil.DB + DB *store.DB } -func MakeConfig(db *dbutil.DB) Config { +func MakeConfig(db *store.DB) Config { return &dbConfig{ DB: db, } diff --git a/api/pkg/cmd/stack.go b/api/pkg/cmd/stack.go index 8250dc6649..82db56fd11 100644 --- a/api/pkg/cmd/stack.go +++ b/api/pkg/cmd/stack.go @@ -3,8 +3,8 @@ package cmd import ( "context" - "github.com/chanzuckerberg/happy/api/pkg/dbutil" "github.com/chanzuckerberg/happy/api/pkg/request" + "github.com/chanzuckerberg/happy/api/pkg/store" "github.com/chanzuckerberg/happy/shared/model" "github.com/pkg/errors" ) @@ -17,7 +17,7 @@ type StackManager interface { type Stack struct{} -func MakeStack(db *dbutil.DB) StackManager { +func MakeStack(db *store.DB) StackManager { return &Stack{} } diff --git a/api/pkg/dbutil/db.go b/api/pkg/store/db.go similarity index 98% rename from api/pkg/dbutil/db.go rename to api/pkg/store/db.go index 37af50490a..7f5a83e15f 100644 --- a/api/pkg/dbutil/db.go +++ b/api/pkg/store/db.go @@ -1,4 +1,4 @@ -package dbutil +package store import ( "context" From 7da3836684fc44fcf07495e4a6396d6e19098fac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 04:34:37 +0000 Subject: [PATCH 68/80] chore: bump k8s.io/kubectl from 0.28.2 to 0.28.3 in /shared (#2618) * chore: bump k8s.io/kubectl from 0.28.2 to 0.28.3 in /shared Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.28.2 to 0.28.3. - [Commits](https://github.com/kubernetes/kubectl/compare/v0.28.2...v0.28.3) --- updated-dependencies: - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update ent schema * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- api/go.mod | 8 ++++---- api/go.sum | 16 ++++++++-------- cli/go.mod | 8 ++++---- cli/go.sum | 16 ++++++++-------- hvm/go.mod | 6 +++--- hvm/go.sum | 12 ++++++------ shared/go.mod | 8 ++++---- shared/go.sum | 16 ++++++++-------- terraform/provider/go.mod | 6 +++--- terraform/provider/go.sum | 12 ++++++------ 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/api/go.mod b/api/go.mod index de0c5ffdcd..52e6fb5fd0 100644 --- a/api/go.mod +++ b/api/go.mod @@ -184,12 +184,12 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gotest.tools/v3 v3.4.0 // indirect - k8s.io/api v0.28.2 // indirect - k8s.io/apimachinery v0.28.2 // indirect - k8s.io/client-go v0.28.2 // indirect + k8s.io/api v0.28.3 // indirect + k8s.io/apimachinery v0.28.3 // indirect + k8s.io/client-go v0.28.3 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect - k8s.io/kubectl v0.28.2 // indirect + k8s.io/kubectl v0.28.3 // indirect k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect diff --git a/api/go.sum b/api/go.sum index 036fddbe33..0ac8cd1e9d 100644 --- a/api/go.sum +++ b/api/go.sum @@ -989,18 +989,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= -k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= -k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= -k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= -k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= -k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= +k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM= +k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc= +k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A= +k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8= +k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4= +k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/kubectl v0.28.2 h1:fOWOtU6S0smdNjG1PB9WFbqEIMlkzU5ahyHkc7ESHgM= -k8s.io/kubectl v0.28.2/go.mod h1:6EQWTPySF1fn7yKoQZHYf9TPwIl2AygHEcJoxFekr64= +k8s.io/kubectl v0.28.3 h1:H1Peu1O3EbN9zHkJCcvhiJ4NUj6lb88sGPO5wrWIM6k= +k8s.io/kubectl v0.28.3/go.mod h1:RDAudrth/2wQ3Sg46fbKKl4/g+XImzvbsSRZdP2RiyE= k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU= k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/cli/go.mod b/cli/go.mod index e0a1dc97f0..cdaf318efe 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -20,8 +20,8 @@ require ( github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.28.2 - k8s.io/apimachinery v0.28.2 + k8s.io/api v0.28.3 + k8s.io/apimachinery v0.28.3 ) require ( @@ -142,10 +142,10 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gorm.io/gorm v1.25.5 // indirect - k8s.io/client-go v0.28.2 // indirect + k8s.io/client-go v0.28.3 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect - k8s.io/kubectl v0.28.2 // indirect + k8s.io/kubectl v0.28.3 // indirect k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect diff --git a/cli/go.sum b/cli/go.sum index 3f966e1283..f59cbd1f3c 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1302,18 +1302,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= -k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= -k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= -k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= -k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= -k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= +k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM= +k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc= +k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A= +k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8= +k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4= +k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/kubectl v0.28.2 h1:fOWOtU6S0smdNjG1PB9WFbqEIMlkzU5ahyHkc7ESHgM= -k8s.io/kubectl v0.28.2/go.mod h1:6EQWTPySF1fn7yKoQZHYf9TPwIl2AygHEcJoxFekr64= +k8s.io/kubectl v0.28.3 h1:H1Peu1O3EbN9zHkJCcvhiJ4NUj6lb88sGPO5wrWIM6k= +k8s.io/kubectl v0.28.3/go.mod h1:RDAudrth/2wQ3Sg46fbKKl4/g+XImzvbsSRZdP2RiyE= k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU= k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/hvm/go.mod b/hvm/go.mod index a42f4deafa..35f2750ca3 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -119,9 +119,9 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.5.0 // indirect - k8s.io/api v0.28.2 // indirect - k8s.io/apimachinery v0.28.2 // indirect - k8s.io/client-go v0.28.2 // indirect + k8s.io/api v0.28.3 // indirect + k8s.io/apimachinery v0.28.3 // indirect + k8s.io/client-go v0.28.3 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index 0552ce62bb..30800ae010 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -400,12 +400,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= -k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= -k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= -k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= -k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= -k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= -k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= +k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM= +k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc= +k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A= +k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8= +k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4= +k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= diff --git a/shared/go.mod b/shared/go.mod index 4ac1baad31..9aaf408857 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -49,7 +49,7 @@ require ( golang.org/x/sync v0.4.0 gopkg.in/src-d/go-git.v4 v4.13.1 gorm.io/gorm v1.25.5 - k8s.io/kubectl v0.28.2 + k8s.io/kubectl v0.28.3 ) require ( @@ -183,9 +183,9 @@ require ( gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.28.2 - k8s.io/apimachinery v0.28.2 - k8s.io/client-go v0.28.2 + k8s.io/api v0.28.3 + k8s.io/apimachinery v0.28.3 + k8s.io/client-go v0.28.3 k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect diff --git a/shared/go.sum b/shared/go.sum index 675cf46d3e..e7fa3fd862 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -1295,18 +1295,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= -k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= -k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= -k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= -k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= -k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= +k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM= +k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc= +k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A= +k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8= +k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4= +k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/kubectl v0.28.2 h1:fOWOtU6S0smdNjG1PB9WFbqEIMlkzU5ahyHkc7ESHgM= -k8s.io/kubectl v0.28.2/go.mod h1:6EQWTPySF1fn7yKoQZHYf9TPwIl2AygHEcJoxFekr64= +k8s.io/kubectl v0.28.3 h1:H1Peu1O3EbN9zHkJCcvhiJ4NUj6lb88sGPO5wrWIM6k= +k8s.io/kubectl v0.28.3/go.mod h1:RDAudrth/2wQ3Sg46fbKKl4/g+XImzvbsSRZdP2RiyE= k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU= k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index af7c147804..4ecd74aa41 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -166,9 +166,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/gorm v1.25.5 // indirect gotest.tools/v3 v3.4.0 // indirect - k8s.io/api v0.28.2 // indirect - k8s.io/apimachinery v0.28.2 // indirect - k8s.io/client-go v0.28.2 // indirect + k8s.io/api v0.28.3 // indirect + k8s.io/apimachinery v0.28.3 // indirect + k8s.io/client-go v0.28.3 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index f6659c72a2..3e8f1afbe3 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -570,12 +570,12 @@ gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= -k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= -k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= -k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= -k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= -k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= -k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= +k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM= +k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc= +k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A= +k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8= +k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4= +k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= From ffffbd01009bdf1e6881876feb603e83d8c7b526 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 04:35:17 +0000 Subject: [PATCH 69/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ecs from 1.30.1 to 1.30.4 in /shared (#2619) * chore: bump github.com/aws/aws-sdk-go-v2/service/ecs in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/ecs](https://github.com/aws/aws-sdk-go-v2) from 1.30.1 to 1.30.4. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.30.1...service/s3/v1.30.4) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * ci - update go.mod * commit from hvm-ci -- updated coverage --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- api/go.mod | 2 +- api/go.sum | 8 ++------ cli/go.mod | 2 +- cli/go.sum | 4 ++-- hvm/go.mod | 2 +- hvm/go.sum | 8 ++------ shared/go.mod | 2 +- shared/go.sum | 8 ++------ terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 8 ++------ 10 files changed, 15 insertions(+), 31 deletions(-) diff --git a/api/go.mod b/api/go.mod index 52e6fb5fd0..d61200a0d5 100644 --- a/api/go.mod +++ b/api/go.mod @@ -58,7 +58,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect diff --git a/api/go.sum b/api/go.sum index 0ac8cd1e9d..4b69e9608a 100644 --- a/api/go.sum +++ b/api/go.sum @@ -75,7 +75,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= @@ -98,14 +97,12 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qds github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= @@ -125,8 +122,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 h1:j0VhL2v86gbsOKLQ1EDMhS2Lb0TROVIep7eFobc2Qq0= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4/go.mod h1:1pSCxO2RQKwIg2ibxUcSmg9jbIZtfrXrVU72nY2jF3g= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= @@ -158,7 +155,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwF github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/cli/go.mod b/cli/go.mod index cdaf318efe..e533e1c3aa 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -156,7 +156,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 - github.com/aws/aws-sdk-go-v2/service/ecs v1.30.3 + github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect diff --git a/cli/go.sum b/cli/go.sum index f59cbd1f3c..0a24997f40 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -264,8 +264,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 h1:y6LX9GUoEA3mO0qpFl1ZQHj1rFyPWVphlzebiSt2tKE= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2/go.mod h1:Q0LcmaN/Qr8+4aSBrdrXXePqoX0eOuYpJLbYpilmWnA= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.3 h1:kaUxW8ZGd3cZYNfZ4QvCUUu+6GeyznPTk4qCYIjvtRc= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.3/go.mod h1:1pSCxO2RQKwIg2ibxUcSmg9jbIZtfrXrVU72nY2jF3g= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 h1:j0VhL2v86gbsOKLQ1EDMhS2Lb0TROVIep7eFobc2Qq0= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4/go.mod h1:1pSCxO2RQKwIg2ibxUcSmg9jbIZtfrXrVU72nY2jF3g= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= diff --git a/hvm/go.mod b/hvm/go.mod index 35f2750ca3..a083d8cf5f 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -30,7 +30,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index 30800ae010..a1106ef575 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -17,7 +17,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= @@ -38,14 +37,12 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zp github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= @@ -64,8 +61,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 h1:j0VhL2v86gbsOKLQ1EDMhS2Lb0TROVIep7eFobc2Qq0= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4/go.mod h1:1pSCxO2RQKwIg2ibxUcSmg9jbIZtfrXrVU72nY2jF3g= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= @@ -95,7 +92,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwF github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= diff --git a/shared/go.mod b/shared/go.mod index 9aaf408857..589db640ae 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -12,7 +12,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 - github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 + github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 diff --git a/shared/go.sum b/shared/go.sum index e7fa3fd862..675d45aa35 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -220,7 +220,6 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= @@ -241,14 +240,12 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zp github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= @@ -267,8 +264,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 h1:j0VhL2v86gbsOKLQ1EDMhS2Lb0TROVIep7eFobc2Qq0= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4/go.mod h1:1pSCxO2RQKwIg2ibxUcSmg9jbIZtfrXrVU72nY2jF3g= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= @@ -298,7 +295,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwF github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 4ecd74aa41..ba8e041bfa 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -38,7 +38,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 3e8f1afbe3..0732174e6b 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -34,7 +34,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= -github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M= github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= @@ -55,14 +54,12 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qds github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.42/go.mod h1:oDfgXoBBmj+kXnqxDDnIDnC56QBosglKp8ftRCTxR+0= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43/go.mod h1:auo+PiyLl0n1l8A0e8RIeR8tOzYPfZZH/JNlrJ8igTQ= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.25/go.mod h1:zBHOPwhBc3FlQjQJE/D3IfPWiWaQmT06Vq9aNukDo0k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32/go.mod h1:0ZXSqrty4FtQ7p8TEuRde/SZm9X05KT18LAUlR40Ln0= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.36/go.mod h1:rwr4WnmFi3RJO0M4dxbJtgi9BPLMpVBMX1nUte5ha9U= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= @@ -81,8 +78,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 h1:Y2zGozmCogCCQbO2fplC6tZylBTBBgt/2EcdVRRK5go= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1/go.mod h1:J9goPpIjXafA1u3XGJeoHu9WlMp5qAGwWmS1A8LfZVw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1 h1:bOS7hAfvd8+glVAG88WnvRITe5N1vopGFHh10ORe/BI= -github.com/aws/aws-sdk-go-v2/service/ecs v1.30.1/go.mod h1:cxbA26Kf4UlTb40f5FON22ZPNMyEVmMS82KUJZC1E1w= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 h1:j0VhL2v86gbsOKLQ1EDMhS2Lb0TROVIep7eFobc2Qq0= +github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4/go.mod h1:1pSCxO2RQKwIg2ibxUcSmg9jbIZtfrXrVU72nY2jF3g= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 h1:cZhJzuUYDqWEx5aWUeYEK8z0a51o5JV+uAWBpp5zArA= github.com/aws/aws-sdk-go-v2/service/eks v1.29.6/go.mod h1:tQn6wLs+/9umB4Xj1z4RW+EMLWxPxs6ajfM5UcUlhnI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= @@ -112,7 +109,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwF github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.14.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= -github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= From a3855562c69a8f3b533553e95629b11bb03cc519 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 04:42:06 +0000 Subject: [PATCH 70/80] chore: bump github.com/compose-spec/compose-go from 1.19.0 to 1.20.0 in /shared (#2625) * chore: bump github.com/compose-spec/compose-go in /shared Bumps [github.com/compose-spec/compose-go](https://github.com/compose-spec/compose-go) from 1.19.0 to 1.20.0. - [Release notes](https://github.com/compose-spec/compose-go/releases) - [Commits](https://github.com/compose-spec/compose-go/compare/v1.19.0...v1.20.0) --- updated-dependencies: - dependency-name: github.com/compose-spec/compose-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index e533e1c3aa..317bf6c9d2 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -54,7 +54,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect - github.com/compose-spec/compose-go v1.19.0 // indirect + github.com/compose-spec/compose-go v1.20.0 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect github.com/creasty/defaults v1.7.0 // indirect github.com/danieljoos/wincred v1.2.0 // indirect diff --git a/cli/go.sum b/cli/go.sum index 0a24997f40..1efea1a0da 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -320,8 +320,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/compose-spec/compose-go v1.19.0 h1:t68gAcwStDg0hy2kFvqHJIksf6xkqRnlSKfL45/ETqo= -github.com/compose-spec/compose-go v1.19.0/go.mod h1:+MdqXV4RA7wdFsahh/Kb8U0pAJqkg7mr4PM9tFKU8RM= +github.com/compose-spec/compose-go v1.20.0 h1:h4ZKOst1EF/DwZp7dWkb+wbTVE4nEyT9Lc89to84Ol4= +github.com/compose-spec/compose-go v1.20.0/go.mod h1:+MdqXV4RA7wdFsahh/Kb8U0pAJqkg7mr4PM9tFKU8RM= github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= diff --git a/shared/go.mod b/shared/go.mod index 589db640ae..e4fc4db912 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -18,7 +18,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 github.com/chanzuckerberg/happy/hvm v0.0.0 - github.com/compose-spec/compose-go v1.19.0 + github.com/compose-spec/compose-go v1.20.0 github.com/creasty/defaults v1.7.0 github.com/docker/docker v24.0.6+incompatible github.com/docker/go-units v0.5.0 diff --git a/shared/go.sum b/shared/go.sum index 675d45aa35..fbbde9678f 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -320,8 +320,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/compose-spec/compose-go v1.19.0 h1:t68gAcwStDg0hy2kFvqHJIksf6xkqRnlSKfL45/ETqo= -github.com/compose-spec/compose-go v1.19.0/go.mod h1:+MdqXV4RA7wdFsahh/Kb8U0pAJqkg7mr4PM9tFKU8RM= +github.com/compose-spec/compose-go v1.20.0 h1:h4ZKOst1EF/DwZp7dWkb+wbTVE4nEyT9Lc89to84Ol4= +github.com/compose-spec/compose-go v1.20.0/go.mod h1:+MdqXV4RA7wdFsahh/Kb8U0pAJqkg7mr4PM9tFKU8RM= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= From 401d150b443c07ab9fc9ff5444c9c295ad3c85ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 04:43:35 +0000 Subject: [PATCH 71/80] chore: bump github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs from 1.24.1 to 1.24.2 in /shared (#2623) * chore: bump github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs](https://github.com/aws/aws-sdk-go-v2) from 1.24.1 to 1.24.2. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ecs/v1.24.2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.24.1...service/ecs/v1.24.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- api/go.mod | 2 +- api/go.sum | 4 ++-- hvm/go.mod | 2 +- hvm/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/go.mod b/api/go.mod index d61200a0d5..75b2a7523f 100644 --- a/api/go.mod +++ b/api/go.mod @@ -53,7 +53,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect diff --git a/api/go.sum b/api/go.sum index 4b69e9608a..5a213de9b1 100644 --- a/api/go.sum +++ b/api/go.sum @@ -109,8 +109,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+F github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45/go.mod h1:lD5M20o09/LCuQ2mE62Mb/iSdSlCNuj6H5ci7tW7OsE= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQLXk86DnXQMXgx1omrAGEpF/d68= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= diff --git a/hvm/go.mod b/hvm/go.mod index a083d8cf5f..ca91f82e82 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index a1106ef575..a5ff6e1626 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -48,8 +48,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQLXk86DnXQMXgx1omrAGEpF/d68= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= diff --git a/shared/go.mod b/shared/go.mod index e4fc4db912..8ae99836e8 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -8,7 +8,7 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 github.com/aws/aws-sdk-go-v2 v1.21.2 github.com/aws/aws-sdk-go-v2/credentials v1.13.42 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 diff --git a/shared/go.sum b/shared/go.sum index fbbde9678f..5baf0294ff 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -251,8 +251,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 h1:quOJOqlbSfeJTboXLjYXM1M9T52LBXqLoTPlmsKLpBo= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44/go.mod h1:LNy+P1+1LiRcCsVYr/4zG5n8zWFL0xsvZkOybjbftm8= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQLXk86DnXQMXgx1omrAGEpF/d68= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index ba8e041bfa..2167e3e455 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -33,7 +33,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 0732174e6b..990268c1e5 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -65,8 +65,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 h1:JRVhO25+r3ar2mKGP7 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37/go.mod h1:Qe+2KtKml+FEsQF/DHmDV+xjtche/hwoF75EG4UlHW8= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45/go.mod h1:lD5M20o09/LCuQ2mE62Mb/iSdSlCNuj6H5ci7tW7OsE= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1 h1:NL2HEgcchk/QTa9/8GgrZvmfvCwqCDknvzAOMuvANnU= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.1/go.mod h1:ZD/6Xew+gqhnRBg9iRXNYZOhp4BXKfqe7JRrtOnIh8s= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQLXk86DnXQMXgx1omrAGEpF/d68= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= From c4eb3c80dc44ced8a5f03d09e2799bfb93551f03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 04:46:57 +0000 Subject: [PATCH 72/80] chore: bump k8s.io/client-go from 0.28.2 to 0.28.3 in /shared (#2622) * chore: bump k8s.io/client-go from 0.28.2 to 0.28.3 in /shared Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.28.2 to 0.28.3. - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/kubernetes/client-go/compare/v0.28.2...v0.28.3) --- updated-dependencies: - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update ent schema * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] From 8daa0cfe4659ca75531f3f1c5b8bf5a0bac31642 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 04:48:04 +0000 Subject: [PATCH 73/80] chore: bump github.com/coreos/go-oidc/v3 from 3.6.0 to 3.7.0 in /api (#2630) Bumps [github.com/coreos/go-oidc/v3](https://github.com/coreos/go-oidc) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/coreos/go-oidc/releases) - [Commits](https://github.com/coreos/go-oidc/compare/v3.6.0...v3.7.0) --- updated-dependencies: - dependency-name: github.com/coreos/go-oidc/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- api/go.mod | 6 +++--- api/go.sum | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/api/go.mod b/api/go.mod index 75b2a7523f..6c8acb0b74 100644 --- a/api/go.mod +++ b/api/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.44 github.com/blang/semver v3.5.1+incompatible github.com/chanzuckerberg/happy/shared v0.0.0 - github.com/coreos/go-oidc/v3 v3.6.0 + github.com/coreos/go-oidc/v3 v3.7.0 github.com/getsentry/sentry-go v0.25.0 github.com/go-playground/locales v0.14.1 github.com/go-playground/universal-translator v0.18.1 @@ -168,14 +168,14 @@ require ( golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.12.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect golang.org/x/sync v0.4.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.13.0 // indirect - google.golang.org/appengine v1.6.7 // indirect + google.golang.org/appengine v1.6.8 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/api/go.sum b/api/go.sum index 5a213de9b1..d9b873e129 100644 --- a/api/go.sum +++ b/api/go.sum @@ -171,8 +171,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/go-oidc/v3 v3.6.0 h1:AKVxfYw1Gmkn/w96z0DbT/B/xFnzTd3MkZvWLjF4n/o= -github.com/coreos/go-oidc/v3 v3.6.0/go.mod h1:ZpHUsHBucTUj6WOkrP4E20UPynbLZzhTQ1XKCXkxyPc= +github.com/coreos/go-oidc/v3 v3.7.0 h1:FTdj0uexT4diYIPlF4yoFVI5MRO1r5+SEcIpEw9vC0o= +github.com/coreos/go-oidc/v3 v3.7.0/go.mod h1:yQzSCqBnK3e6Fs5l+f5i0F8Kwf0zpH9bPEsbY00KanM= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -293,6 +293,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -693,8 +694,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= -golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -780,6 +781,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= @@ -877,8 +879,9 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= From 7ae36ca6aefbdf693ac7462ac288171a7a941b5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 04:53:57 +0000 Subject: [PATCH 74/80] chore: bump github.com/aws/aws-sdk-go-v2/credentials from 1.13.42 to 1.13.43 in /shared (#2628) * chore: bump github.com/aws/aws-sdk-go-v2/credentials in /shared Bumps [github.com/aws/aws-sdk-go-v2/credentials](https://github.com/aws/aws-sdk-go-v2) from 1.13.42 to 1.13.43. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.13.42...credentials/v1.13.43) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] --- cli/go.mod | 8 ++++---- cli/go.sum | 12 ++++++++---- hvm/go.mod | 8 ++++---- hvm/go.sum | 12 ++++++++---- shared/go.mod | 8 ++++---- shared/go.sum | 12 ++++++++---- 6 files changed, 36 insertions(+), 24 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 317bf6c9d2..2ff4a1a94e 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -37,10 +37,10 @@ require ( github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/aws/aws-sdk-go v1.45.12 // indirect github.com/aws/aws-sdk-go-v2/config v1.18.44 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.43 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect @@ -49,8 +49,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect diff --git a/cli/go.sum b/cli/go.sum index 1efea1a0da..0b6857ead0 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -226,8 +226,9 @@ github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVA github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -235,8 +236,9 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= @@ -284,11 +286,13 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvg github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= diff --git a/hvm/go.mod b/hvm/go.mod index ca91f82e82..18427ef05b 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -18,10 +18,10 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect github.com/aws/aws-sdk-go-v2 v1.21.2 // indirect github.com/aws/aws-sdk-go-v2/config v1.18.44 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.42 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.13.43 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect @@ -37,8 +37,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect github.com/aws/smithy-go v1.15.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index a5ff6e1626..0d3c8b7ac4 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -23,8 +23,9 @@ github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVA github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -32,8 +33,9 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= @@ -81,11 +83,13 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvg github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= diff --git a/shared/go.mod b/shared/go.mod index 8ae99836e8..5e0cc4592f 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -7,7 +7,7 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Masterminds/semver/v3 v3.2.1 github.com/aws/aws-sdk-go-v2 v1.21.2 - github.com/aws/aws-sdk-go-v2/credentials v1.13.42 + github.com/aws/aws-sdk-go-v2/credentials v1.13.43 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 @@ -67,7 +67,7 @@ require ( github.com/aws/aws-sdk-go v1.44.122 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect @@ -75,8 +75,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/distribution/reference v0.5.0 // indirect diff --git a/shared/go.sum b/shared/go.sum index 5baf0294ff..92a06fe794 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -226,8 +226,9 @@ github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVA github.com/aws/aws-sdk-go-v2/config v1.18.44 h1:U10NQ3OxiY0dGGozmVIENIDnCT0W432PWxk2VO8wGnY= github.com/aws/aws-sdk-go-v2/config v1.18.44/go.mod h1:pHxnQBldd0heEdJmolLBk78D1Bf69YnKLY3LOpFImlU= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= -github.com/aws/aws-sdk-go-v2/credentials v1.13.42 h1:KMkjpZqcMOwtRHChVlHdNxTUUAC6NC/b58mRZDIdcRg= github.com/aws/aws-sdk-go-v2/credentials v1.13.42/go.mod h1:7ltKclhvEB8305sBhrpls24HGxORl6qgnQqSJ314Uw8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8= +github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.19/go.mod h1:sMgThC49I+7ud4V7stUsJwaaM6W/KYxRHl2A5pZDrE4= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 h1:/+Z/dCO+1QHOlCm7m9G61snvIaDRUTv/HXp+8HdESiY= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25/go.mod h1:JQ0HJ+3LaAKHx3uwRUAfR/tb/gOlgAGPT6mZfIq55Ec= @@ -235,8 +236,9 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.46/go.mod h1:A52W+ github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52 h1:lVqqyVoBUy7Kp2sOo9xJtC37FafV2sDtee9qpC5bm3w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/expression v1.4.52/go.mod h1:+wabPhA5NvnAA/VSQAHIlfvdDn0nnA7P3S5Lc0Q5UiQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.1/go.mod h1:lfUx8puBRdM5lVVMQlwt2v+ofiG/X6Ms+dy0UkG/kXw= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12 h1:3j5lrl9kVQrJ1BU4O0z7MQ8sa+UXdiLuo4j0V+odNI8= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.12/go.mod h1:JbFpcHDBdsex1zpIKuVRorZSQiZEyc3MykNCcjgz174= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.31/go.mod h1:QT0BqUvX1Bh2ABdTGnjqEjvjzrCfIniM9Sc8zn9Yndo= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38/go.mod h1:qggunOChCMu9ZF/UkAfhTz25+U2rLVb3ya0Ua6TTfCA= @@ -284,11 +286,13 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvg github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= -github.com/aws/aws-sdk-go-v2/service/sso v1.15.1 h1:ZN3bxw9OYC5D6umLw6f57rNJfGfhg1DIAAcKpzyUTOE= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= +github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.6/go.mod h1:Lh/bc9XUf8CfOY6Jp5aIkQtN+j1mc+nExc+KXj9jx2s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2 h1:fSCCJuT5i6ht8TqGdZc5Q5K9pz/atrf7qH4iK5C9XzU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.2/go.mod h1:5eNtr+vNc5vVd92q7SJ+U/HszsIdhZBEyi9dkMRKsp8= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg= github.com/aws/aws-sdk-go-v2/service/sts v1.18.7/go.mod h1:JuTnSoeePXmMVe9G8NcjjwgOKEfZ4cOjMuT2IBT/2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.23.1/go.mod h1:2cnsAhVT3mqusovc2stUSUrSBGTcX9nh8Tu6xh//2eI= github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= From fd73ca23173168029376479e93de7e2551c83ea9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 04:58:55 +0000 Subject: [PATCH 75/80] chore: bump github.com/aws/aws-sdk-go-v2/config in /terraform/provider (#2631) Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.18.45 to 1.19.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.19.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.18.45...v1.19.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 2167e3e455..8baf4cf551 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/aws/aws-sdk-go-v2 v1.21.2 - github.com/aws/aws-sdk-go-v2/config v1.18.45 + github.com/aws/aws-sdk-go-v2/config v1.19.0 github.com/aws/aws-sdk-go-v2/credentials v1.13.43 github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 990268c1e5..7ed02171d2 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -37,8 +37,8 @@ github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+ github.com/aws/aws-sdk-go-v2 v1.21.1/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= -github.com/aws/aws-sdk-go-v2/config v1.18.45 h1:Aka9bI7n8ysuwPeFdm77nfbyHCAKQ3z9ghB3S/38zes= -github.com/aws/aws-sdk-go-v2/config v1.18.45/go.mod h1:ZwDUgFnQgsazQTnWfeLWk5GjeqTQTL8lMkoE1UXzxdE= +github.com/aws/aws-sdk-go-v2/config v1.19.0 h1:AdzDvwH6dWuVARCl3RTLGRc4Ogy+N7yLFxVxXe1ClQ0= +github.com/aws/aws-sdk-go-v2/config v1.19.0/go.mod h1:ZwDUgFnQgsazQTnWfeLWk5GjeqTQTL8lMkoE1UXzxdE= github.com/aws/aws-sdk-go-v2/credentials v1.13.18/go.mod h1:vnwlwjIe+3XJPBYKu1et30ZPABG3VaXJYr8ryohpIyM= github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8= github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg= From 43e3fc6e5ff9d8795472b19b5b2d09f149d5415d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 05:03:39 +0000 Subject: [PATCH 76/80] chore: bump github.com/chanzuckerberg/go-misc in /cli (#2632) Bumps [github.com/chanzuckerberg/go-misc](https://github.com/chanzuckerberg/go-misc) from 1.10.7 to 1.10.8. - [Release notes](https://github.com/chanzuckerberg/go-misc/releases) - [Commits](https://github.com/chanzuckerberg/go-misc/compare/v1.10.7...v1.10.8) --- updated-dependencies: - dependency-name: github.com/chanzuckerberg/go-misc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 6 +++--- cli/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 2ff4a1a94e..5e401ea732 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -7,7 +7,7 @@ require ( github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 github.com/aws/aws-sdk-go-v2 v1.21.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 - github.com/chanzuckerberg/go-misc v1.10.7 + github.com/chanzuckerberg/go-misc v1.10.8 github.com/chanzuckerberg/happy/shared v0.0.0 github.com/fatih/color v1.15.0 github.com/gen2brain/beeep v0.0.0-20230307103607-6e717729cb4f @@ -35,7 +35,7 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect - github.com/aws/aws-sdk-go v1.45.12 // indirect + github.com/aws/aws-sdk-go v1.45.26 // indirect github.com/aws/aws-sdk-go-v2/config v1.18.44 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.13.43 // indirect github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.25 // indirect @@ -124,7 +124,7 @@ require ( go.opencensus.io v0.24.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect golang.org/x/mod v0.11.0 // indirect - golang.org/x/oauth2 v0.12.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect golang.org/x/sync v0.4.0 // indirect golang.org/x/tools v0.9.3 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect diff --git a/cli/go.sum b/cli/go.sum index 0b6857ead0..d8e231c8ef 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -215,8 +215,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.45.12 h1:+bKbbesGNPp+TeGrcqfrWuZoqcIEhjwKyBMHQPp80Jo= -github.com/aws/aws-sdk-go v1.45.12/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.45.26 h1:PJ2NJNY5N/yeobLYe1Y+xLdavBi67ZI8gvph6ftwVCg= +github.com/aws/aws-sdk-go v1.45.26/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.17.7/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.20.1/go.mod h1:NU06lETsFm8fUC6ZjhgDpVBcGZTFQ6XM+LZWZxMI4ac= @@ -308,8 +308,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chanzuckerberg/go-misc v1.10.7 h1:n/y5g2cAjigdiZ4qeqBR0ha5FcObPaM7h3m6ECVZZCI= -github.com/chanzuckerberg/go-misc v1.10.7/go.mod h1:Qs6hWHqlqnOqAv9K3ZFmLu4eMNxjjCUnNnFrzhljpng= +github.com/chanzuckerberg/go-misc v1.10.8 h1:gjcYS2z22DYCMOvP3QWlycmcTz70oCXcPgyxHFqAnHQ= +github.com/chanzuckerberg/go-misc v1.10.8/go.mod h1:k9XXsgya63Sv/dHMgmMqV8j2Z8fRjz9miVzTRlaG2tc= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -867,8 +867,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= -golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= +golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= +golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From e47f6fdc9933af7418067b7863949ef58982bee6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 05:04:39 +0000 Subject: [PATCH 77/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ec2 in /cli (#2633) Bumps [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) from 1.125.0 to 1.126.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.125.0...service/ec2/v1.126.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 5e401ea732..53b3c47993 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -154,7 +154,7 @@ require ( require ( github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.126.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect diff --git a/cli/go.sum b/cli/go.sum index d8e231c8ef..7057bf259c 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -262,8 +262,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiSt github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 h1:XnUTMYuPGOrQjlTcf9XoRYBLrN7xjzakkK0+QyP8fO0= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.126.0 h1:EGYP4IDYHYe4IcpCUxEAIVKr9nZXvtql4HNhEPK1Y3w= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.126.0/go.mod h1:raUdIDoNuDPn9dMG3cCmIm8RoWOmZUqQPzuw8xpmB8Y= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 h1:y6LX9GUoEA3mO0qpFl1ZQHj1rFyPWVphlzebiSt2tKE= github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2/go.mod h1:Q0LcmaN/Qr8+4aSBrdrXXePqoX0eOuYpJLbYpilmWnA= github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 h1:j0VhL2v86gbsOKLQ1EDMhS2Lb0TROVIep7eFobc2Qq0= From 4b67aa8449abad5d204f52df641c0b488144b5d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 13:05:44 +0000 Subject: [PATCH 78/80] chore: bump github.com/aws/aws-sdk-go-v2/service/ssm from 1.38.2 to 1.39.0 in /shared (#2627) * chore: bump github.com/aws/aws-sdk-go-v2/service/ssm in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/ssm](https://github.com/aws/aws-sdk-go-v2) from 1.38.2 to 1.39.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.38.2...service/s3/v1.39.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * commit from hvm-ci -- updated coverage * ci - update ent schema * ci - update go.mod --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] Co-authored-by: Alex Lokshin --- api/go.mod | 2 +- api/go.sum | 4 ++-- cli/go.mod | 2 +- cli/go.sum | 4 ++-- hvm/go.mod | 2 +- hvm/go.sum | 4 ++-- shared/go.mod | 2 +- shared/go.sum | 4 ++-- terraform/provider/go.mod | 2 +- terraform/provider/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/api/go.mod b/api/go.mod index 6c8acb0b74..0bf7b64c19 100644 --- a/api/go.mod +++ b/api/go.mod @@ -64,7 +64,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect diff --git a/api/go.sum b/api/go.sum index d9b873e129..4a3520a4e7 100644 --- a/api/go.sum +++ b/api/go.sum @@ -139,8 +139,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 h1:TDA81vAA0TIaw64bYe0ItJw0gxCZnKa9wcxgr1i9Ow0= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= diff --git a/cli/go.mod b/cli/go.mod index 53b3c47993..631e21a01f 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -159,7 +159,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 // indirect github.com/aws/smithy-go v1.15.0 github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect diff --git a/cli/go.sum b/cli/go.sum index 7057bf259c..0b9e5245b2 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -283,8 +283,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 h1:TDA81vAA0TIaw64bYe0ItJw0gxCZnKa9wcxgr1i9Ow0= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= diff --git a/hvm/go.mod b/hvm/go.mod index 18427ef05b..3250956f3c 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index 0d3c8b7ac4..381884bc9c 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -80,8 +80,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 h1:TDA81vAA0TIaw64bYe0ItJw0gxCZnKa9wcxgr1i9Ow0= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= diff --git a/shared/go.mod b/shared/go.mod index 5e0cc4592f..bed962bae7 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 + github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 github.com/chanzuckerberg/happy/hvm v0.0.0 github.com/compose-spec/compose-go v1.20.0 diff --git a/shared/go.sum b/shared/go.sum index 92a06fe794..dffe26c738 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -283,8 +283,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 h1:TDA81vAA0TIaw64bYe0ItJw0gxCZnKa9wcxgr1i9Ow0= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.1/go.mod h1:PieckvBoT5HtyB9AsJRrYZFY2Z+EyfVM/9zG6gbV8DQ= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 8baf4cf551..9626bc5182 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -44,7 +44,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect github.com/aws/smithy-go v1.15.0 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index 7ed02171d2..ca22696271 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -96,8 +96,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.24.7 h1:uRGw0UKo5hc7M2T7uGsK/Yg2qwec github.com/aws/aws-sdk-go-v2/service/kms v1.24.7/go.mod h1:z3O9CXfVrKAV3c9fMWOUUv2C6N2ggXCDHeXpOB6lAEk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 h1:z9faFYBvadv9HdY+oFBgxqCnew9TK+jp9ccxktB5fl4= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0/go.mod h1:Z6Oq1mXqvgwmUxvMrV/jMkQhwm06A9XO015dzGnS8TM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2 h1:NMZiW2pbSW/PFCGT/J6R/8xaiFsF/SDdRN49q0NUhA8= -github.com/aws/aws-sdk-go-v2/service/ssm v1.38.2/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 h1:TDA81vAA0TIaw64bYe0ItJw0gxCZnKa9wcxgr1i9Ow0= +github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0/go.mod h1:qpnJ98BgJ3YUEvHMgJ1OADwaOgqhgv0nxnqAjTKupeY= github.com/aws/aws-sdk-go-v2/service/sso v1.12.6/go.mod h1:Y1VOmit/Fn6Tz1uFAeCO6Q7M2fmfXSCLeL5INVYsLuY= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= From fd14575f94a9a0a33894b27414e7a2c887904b5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 13:06:24 +0000 Subject: [PATCH 79/80] chore: bump github.com/aws/aws-sdk-go-v2/service/dynamodb from 1.22.1 to 1.23.0 in /shared (#2626) * chore: bump github.com/aws/aws-sdk-go-v2/service/dynamodb in /shared Bumps [github.com/aws/aws-sdk-go-v2/service/dynamodb](https://github.com/aws/aws-sdk-go-v2) from 1.22.1 to 1.23.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.23.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/eks/v1.22.1...service/s3/v1.23.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/dynamodb dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * commit from cli-ci -- updated coverage * ci - update ent schema * ci - update go.mod * commit from hvm-ci -- updated coverage --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] Co-authored-by: czi-github-helper[bot] Co-authored-by: Alex Lokshin Co-authored-by: alexlokshin-czi --- api/go.mod | 4 ++-- api/go.sum | 8 ++++---- cli/go.mod | 4 ++-- cli/go.sum | 8 ++++---- hvm/go.mod | 4 ++-- hvm/go.sum | 8 ++++---- shared/go.mod | 4 ++-- shared/go.sum | 8 ++++---- terraform/provider/go.mod | 4 ++-- terraform/provider/go.sum | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/api/go.mod b/api/go.mod index 0bf7b64c19..97263cd11a 100644 --- a/api/go.mod +++ b/api/go.mod @@ -54,14 +54,14 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 // indirect diff --git a/api/go.sum b/api/go.sum index 4a3520a4e7..f2f0b1fd77 100644 --- a/api/go.sum +++ b/api/go.sum @@ -113,8 +113,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 h1:xmSAn14nM6IdHyuWO/bsrAagOQtnqzuUCLxdVmj9nhg= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0/go.mod h1:1HkLh8vaL4obF95fne7ZOu7sxomS/+vkBt3/+gqqwE4= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -131,8 +131,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYy github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 h1:4LoizcvPT9A0tiAFhepxn0bGZXkzvN0pG0epydY3Pno= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37/go.mod h1:7xBUZyP6LeLc+5Ym9PG7atqw4sR28sBtYcHETik+bPE= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= diff --git a/cli/go.mod b/cli/go.mod index 631e21a01f..47d9fcc88a 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -44,10 +44,10 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect diff --git a/cli/go.sum b/cli/go.sum index 0b9e5245b2..2f72c1bb8b 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -257,8 +257,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 h1:xmSAn14nM6IdHyuWO/bsrAagOQtnqzuUCLxdVmj9nhg= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0/go.mod h1:1HkLh8vaL4obF95fne7ZOu7sxomS/+vkBt3/+gqqwE4= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -275,8 +275,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYy github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 h1:4LoizcvPT9A0tiAFhepxn0bGZXkzvN0pG0epydY3Pno= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37/go.mod h1:7xBUZyP6LeLc+5Ym9PG7atqw4sR28sBtYcHETik+bPE= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= diff --git a/hvm/go.mod b/hvm/go.mod index 3250956f3c..5cf6c9533e 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -26,14 +26,14 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 // indirect diff --git a/hvm/go.sum b/hvm/go.sum index 381884bc9c..08b830e9dd 100644 --- a/hvm/go.sum +++ b/hvm/go.sum @@ -54,8 +54,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 h1:xmSAn14nM6IdHyuWO/bsrAagOQtnqzuUCLxdVmj9nhg= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0/go.mod h1:1HkLh8vaL4obF95fne7ZOu7sxomS/+vkBt3/+gqqwE4= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -72,8 +72,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYy github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 h1:4LoizcvPT9A0tiAFhepxn0bGZXkzvN0pG0epydY3Pno= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37/go.mod h1:7xBUZyP6LeLc+5Ym9PG7atqw4sR28sBtYcHETik+bPE= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= diff --git a/shared/go.mod b/shared/go.mod index bed962bae7..ceed1f8543 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -9,7 +9,7 @@ require ( github.com/aws/aws-sdk-go-v2 v1.21.2 github.com/aws/aws-sdk-go-v2/credentials v1.13.43 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 @@ -73,7 +73,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/ini v1.3.44 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 // indirect diff --git a/shared/go.sum b/shared/go.sum index dffe26c738..c377bdc9f6 100644 --- a/shared/go.sum +++ b/shared/go.sum @@ -257,8 +257,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 h1:xmSAn14nM6IdHyuWO/bsrAagOQtnqzuUCLxdVmj9nhg= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0/go.mod h1:1HkLh8vaL4obF95fne7ZOu7sxomS/+vkBt3/+gqqwE4= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -275,8 +275,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYy github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 h1:4LoizcvPT9A0tiAFhepxn0bGZXkzvN0pG0epydY3Pno= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37/go.mod h1:7xBUZyP6LeLc+5Ym9PG7atqw4sR28sBtYcHETik+bPE= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.36/go.mod h1:ou9ffqJ9hKOVZmjlC6kQ6oROAyG1M4yBKzR+9BKbDwk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 9626bc5182..421a33e530 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -34,14 +34,14 @@ require ( github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.37 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.125.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.30.4 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.29.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.39.0 // indirect diff --git a/terraform/provider/go.sum b/terraform/provider/go.sum index ca22696271..7aa50135ac 100644 --- a/terraform/provider/go.sum +++ b/terraform/provider/go.sum @@ -69,8 +69,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2 h1:g2t+hNCOYWICWs0cQ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.24.2/go.mod h1:5ngOUsc/7/voqXQ5Mn5T5l9/rWopTMgu7hk+4Fl2AS4= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.2/go.mod h1:KdM++ikeFLtf0RX0WHUdF/nugF8uUntGmJS3Ywo7lVo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1 h1:TYq4EU2vEEluoaBG0RCPnbibSndTQSzlpbZdmT/YRcs= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.22.1/go.mod h1:1EJb9/tJwI7iqiStZBcmHijQxcgp7dlPuD2YgoZIrJQ= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0 h1:xmSAn14nM6IdHyuWO/bsrAagOQtnqzuUCLxdVmj9nhg= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.23.0/go.mod h1:1HkLh8vaL4obF95fne7ZOu7sxomS/+vkBt3/+gqqwE4= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.7/go.mod h1:eRmcVwDpfeYgamYv+57cqM9hMWw+/TOqwGsbm39JHgc= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11 h1:WHi9VKMYGtWt2DzqeYHXzt55aflymO2EZ6axuKla8oU= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.14.11/go.mod h1:pP+91QTpJMvcFTqGky6puHrkBs8oqoB3XOCiGRDaXwI= @@ -87,8 +87,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15 h1:7R8uRYy github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.15/go.mod h1:26SQUPcTNgV1Tapwdt4a1rOsYRsnBsJHLMPoxK2b0d8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.25/go.mod h1:zrjXfehNxd4la9SByaw7KQk4AmGkdmeASpOJezwed0g= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36 h1:0ZzowXTZABVqnJnwDMlTDP3eeEkuP1r6RYnhSBmgK2o= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.36/go.mod h1:zAE5h/4VanzBpqyWoCZX/nJImdsqjjsGt2r3MtbKSFA= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37 h1:4LoizcvPT9A0tiAFhepxn0bGZXkzvN0pG0epydY3Pno= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.37/go.mod h1:7xBUZyP6LeLc+5Ym9PG7atqw4sR28sBtYcHETik+bPE= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.25/go.mod h1:/95IA+0lMnzW6XzqYJRpjjsAbKEORVeO0anQqjd2CNU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= From fe3273a9917d6aa6aa70874d177cd9d05ceb73a3 Mon Sep 17 00:00:00 2001 From: "czi-github-helper[bot]" <95879977+czi-github-helper[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 13:29:26 +0000 Subject: [PATCH 80/80] chore: release main (#2615) Co-authored-by: czi-github-helper[bot] <95879977+czi-github-helper[bot]@users.noreply.github.com> Co-authored-by: Alex Lokshin --- .release-please-manifest.json | 2 +- terraform/modules/happy-stack-eks/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 6250b5c0b9..c34da872b1 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -11,7 +11,7 @@ "terraform/modules/happy-service-ecs": "2.1.0", "terraform/modules/happy-service-eks": "3.17.2", "terraform/modules/happy-stack-ecs": "2.1.0", - "terraform/modules/happy-stack-eks": "4.19.0", + "terraform/modules/happy-stack-eks": "4.20.0", "terraform/modules/happy-tfe-okta-app": "3.0.0", "terraform/modules/happy-tfe-user": "1.3.0", "terraform/modules/happy-ingress-eks": "2.9.0", diff --git a/terraform/modules/happy-stack-eks/CHANGELOG.md b/terraform/modules/happy-stack-eks/CHANGELOG.md index 8782d7e91c..9ad4ca353a 100644 --- a/terraform/modules/happy-stack-eks/CHANGELOG.md +++ b/terraform/modules/happy-stack-eks/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [4.20.0](https://github.com/chanzuckerberg/happy/compare/happy-stack-eks-v4.19.0...happy-stack-eks-v4.20.0) (2023-10-23) + + +### Features + +* allow stacks to change cpu/mem requests ([#2614](https://github.com/chanzuckerberg/happy/issues/2614)) ([a1affe8](https://github.com/chanzuckerberg/happy/commit/a1affe852cd433cbd7a1e494f97307595e20314b)) + ## [4.19.0](https://github.com/chanzuckerberg/happy/compare/happy-stack-eks-v4.18.0...happy-stack-eks-v4.19.0) (2023-10-03)