From c0c98fda8d9c8aa8a1f4736a589b90a8da65196e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:02:12 +0000 Subject: [PATCH 1/4] [8.x](backport #2643) [updatecli] Update hermit and pre-commit dependencies (#2676) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [updatecli] Update hermit and pre-commit dependencies (#2643) chore: Update hermit and pre-commit packages Made with ❤️️ by updatecli Co-authored-by: Rômulo Farias (cherry picked from commit 38ee11d9d2506b3366ea141836e3be3453816db1) Co-authored-by: cloudsecmachine <157478105+cloudsecmachine@users.noreply.github.com> Co-authored-by: Rômulo Farias --- .pre-commit-config.yaml | 2 +- bin/{.awscli-2.17.51.pkg => .awscli-2.19.1.pkg} | 0 bin/{.gcloud-497.0.0.pkg => .gcloud-499.0.0.pkg} | 0 bin/{.gh-2.59.0.pkg => .gh-2.60.1.pkg} | 0 bin/{.opa-0.69.0.pkg => .opa-0.70.0.pkg} | 0 bin/aws | 2 +- bin/aws_completer | 2 +- bin/bq | 2 +- bin/docker-credential-gcloud | 2 +- bin/gcloud | 2 +- bin/gh | 2 +- bin/git-credential-gcloud.sh | 2 +- bin/gsutil | 2 +- bin/opa | 2 +- 14 files changed, 10 insertions(+), 10 deletions(-) rename bin/{.awscli-2.17.51.pkg => .awscli-2.19.1.pkg} (100%) rename bin/{.gcloud-497.0.0.pkg => .gcloud-499.0.0.pkg} (100%) rename bin/{.gh-2.59.0.pkg => .gh-2.60.1.pkg} (100%) rename bin/{.opa-0.69.0.pkg => .opa-0.70.0.pkg} (100%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dc460aacbc..ca84f8d04f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,7 +77,7 @@ repos: files: deploy/cloudformation/.*yml - repo: https://github.com/aws-cloudformation/cfn-lint - rev: v1.17.2 + rev: v1.18.3 hooks: - id: cfn-python-lint files: deploy/cloudformation/.*.yml diff --git a/bin/.awscli-2.17.51.pkg b/bin/.awscli-2.19.1.pkg similarity index 100% rename from bin/.awscli-2.17.51.pkg rename to bin/.awscli-2.19.1.pkg diff --git a/bin/.gcloud-497.0.0.pkg b/bin/.gcloud-499.0.0.pkg similarity index 100% rename from bin/.gcloud-497.0.0.pkg rename to bin/.gcloud-499.0.0.pkg diff --git a/bin/.gh-2.59.0.pkg b/bin/.gh-2.60.1.pkg similarity index 100% rename from bin/.gh-2.59.0.pkg rename to bin/.gh-2.60.1.pkg diff --git a/bin/.opa-0.69.0.pkg b/bin/.opa-0.70.0.pkg similarity index 100% rename from bin/.opa-0.69.0.pkg rename to bin/.opa-0.70.0.pkg diff --git a/bin/aws b/bin/aws index 58952b34cb..b00571dbec 120000 --- a/bin/aws +++ b/bin/aws @@ -1 +1 @@ -.awscli-2.17.51.pkg \ No newline at end of file +.awscli-2.19.1.pkg \ No newline at end of file diff --git a/bin/aws_completer b/bin/aws_completer index 58952b34cb..b00571dbec 120000 --- a/bin/aws_completer +++ b/bin/aws_completer @@ -1 +1 @@ -.awscli-2.17.51.pkg \ No newline at end of file +.awscli-2.19.1.pkg \ No newline at end of file diff --git a/bin/bq b/bin/bq index 0ee7b5acef..0bd7ad7dea 120000 --- a/bin/bq +++ b/bin/bq @@ -1 +1 @@ -.gcloud-497.0.0.pkg \ No newline at end of file +.gcloud-499.0.0.pkg \ No newline at end of file diff --git a/bin/docker-credential-gcloud b/bin/docker-credential-gcloud index 0ee7b5acef..0bd7ad7dea 120000 --- a/bin/docker-credential-gcloud +++ b/bin/docker-credential-gcloud @@ -1 +1 @@ -.gcloud-497.0.0.pkg \ No newline at end of file +.gcloud-499.0.0.pkg \ No newline at end of file diff --git a/bin/gcloud b/bin/gcloud index 0ee7b5acef..0bd7ad7dea 120000 --- a/bin/gcloud +++ b/bin/gcloud @@ -1 +1 @@ -.gcloud-497.0.0.pkg \ No newline at end of file +.gcloud-499.0.0.pkg \ No newline at end of file diff --git a/bin/gh b/bin/gh index ddd6bc0401..ee6c814240 120000 --- a/bin/gh +++ b/bin/gh @@ -1 +1 @@ -.gh-2.59.0.pkg \ No newline at end of file +.gh-2.60.1.pkg \ No newline at end of file diff --git a/bin/git-credential-gcloud.sh b/bin/git-credential-gcloud.sh index 0ee7b5acef..0bd7ad7dea 120000 --- a/bin/git-credential-gcloud.sh +++ b/bin/git-credential-gcloud.sh @@ -1 +1 @@ -.gcloud-497.0.0.pkg \ No newline at end of file +.gcloud-499.0.0.pkg \ No newline at end of file diff --git a/bin/gsutil b/bin/gsutil index 0ee7b5acef..0bd7ad7dea 120000 --- a/bin/gsutil +++ b/bin/gsutil @@ -1 +1 @@ -.gcloud-497.0.0.pkg \ No newline at end of file +.gcloud-499.0.0.pkg \ No newline at end of file diff --git a/bin/opa b/bin/opa index 1b6734eeb5..f2c02f5e68 120000 --- a/bin/opa +++ b/bin/opa @@ -1 +1 @@ -.opa-0.69.0.pkg \ No newline at end of file +.opa-0.70.0.pkg \ No newline at end of file From 6720bc7267b4a81b5ef3392912e82a7e9e0f0459 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 10:35:15 +0200 Subject: [PATCH 2/4] [8.x](backport #2674) build(deps): Bump the aws group across 1 directory with 7 updates (#2687) build(deps): Bump the aws group across 1 directory with 7 updates (#2674) Bumps the aws group with 7 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/service/accessanalyzer](https://github.com/aws/aws-sdk-go-v2) | `1.33.3` | `1.34.3` | | [github.com/aws/aws-sdk-go-v2/service/cloudtrail](https://github.com/aws/aws-sdk-go-v2) | `1.43.3` | `1.44.3` | | [github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs](https://github.com/aws/aws-sdk-go-v2) | `1.40.3` | `1.43.0` | | [github.com/aws/aws-sdk-go-v2/service/configservice](https://github.com/aws/aws-sdk-go-v2) | `1.49.3` | `1.50.3` | | [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) | `1.179.2` | `1.187.0` | | [github.com/aws/aws-sdk-go-v2/service/rds](https://github.com/aws/aws-sdk-go-v2) | `1.85.2` | `1.89.0` | | [github.com/aws/aws-sdk-go-v2/service/sns](https://github.com/aws/aws-sdk-go-v2) | `1.32.3` | `1.33.3` | Updates `github.com/aws/aws-sdk-go-v2/service/accessanalyzer` from 1.33.3 to 1.34.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ivs/v1.33.3...service/iot/v1.34.3) Updates `github.com/aws/aws-sdk-go-v2/service/cloudtrail` from 1.43.3 to 1.44.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ssm/v1.43.3...service/ssm/v1.44.3) Updates `github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs` from 1.40.3 to 1.43.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.40.3...service/s3/v1.43.0) Updates `github.com/aws/aws-sdk-go-v2/service/configservice` from 1.49.3 to 1.50.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/eks/v1.49.3...service/s3/v1.50.3) Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.179.2 to 1.187.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.179.2...service/ec2/v1.187.0) Updates `github.com/aws/aws-sdk-go-v2/service/rds` from 1.85.2 to 1.89.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ec2/v1.89.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.85.2...service/ec2/v1.89.0) Updates `github.com/aws/aws-sdk-go-v2/service/sns` from 1.32.3 to 1.33.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.32.3...service/ivs/v1.33.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/accessanalyzer dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudtrail dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws - dependency-name: github.com/aws/aws-sdk-go-v2/service/configservice dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws - dependency-name: github.com/aws/aws-sdk-go-v2/service/rds dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws - dependency-name: github.com/aws/aws-sdk-go-v2/service/sns dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 1564bd267b2a6a67cb5b9de8ee90dccd5a17d0a3) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 14 +++++++------- go.sum | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 7c6244e0f5..8e01b7d4bf 100644 --- a/go.mod +++ b/go.mod @@ -24,25 +24,25 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.28.1 github.com/aws/aws-sdk-go-v2/credentials v1.17.42 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.33.3 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.34.3 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.47.0 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.55.4 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.43.3 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.44.3 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.42.3 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.40.3 - github.com/aws/aws-sdk-go-v2/service/configservice v1.49.3 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.179.2 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.43.0 + github.com/aws/aws-sdk-go-v2/service/configservice v1.50.3 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.36.3 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.3 github.com/aws/aws-sdk-go-v2/service/iam v1.37.3 github.com/aws/aws-sdk-go-v2/service/kms v1.37.3 github.com/aws/aws-sdk-go-v2/service/lambda v1.64.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.34.3 - github.com/aws/aws-sdk-go-v2/service/rds v1.85.2 + github.com/aws/aws-sdk-go-v2/service/rds v1.89.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2 github.com/aws/aws-sdk-go-v2/service/s3control v1.49.3 github.com/aws/aws-sdk-go-v2/service/securityhub v1.54.4 - github.com/aws/aws-sdk-go-v2/service/sns v1.32.3 + github.com/aws/aws-sdk-go-v2/service/sns v1.33.3 github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 github.com/aws/smithy-go v1.22.0 github.com/dgraph-io/ristretto v0.1.1 diff --git a/go.sum b/go.sum index 200cb8b489..a1a99498c6 100644 --- a/go.sum +++ b/go.sum @@ -457,24 +457,24 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvK github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 h1:yV+hCAHZZYJQcwAaszoBNwLbPItHvApxT0kVIw6jRgs= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22/go.mod h1:kbR1TL8llqB1eGnVbybcA4/wgScxdylOdyAd51yxPdw= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.33.3 h1:W7jyHvnVaMnNAuRp4miA1fwjHwCx3M+o0ADQiqYpy58= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.33.3/go.mod h1:lJHy3hPT0NATCHF+ZbrShk+WFmp0SRF10+zoIPTFRlU= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.34.3 h1:ScJw+8v6RPTJbuWxowSiUw8xdPL0aQOAbakC6mF1uZU= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.34.3/go.mod h1:PTv5/X1+6atCKR/vK3kbm9Ra/zzX/T/92Y/4MuL6ArU= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.47.0 h1:3yvZKeDa/slOTk8Gym4ym9u7AKhYAvy0Y00oRE+HRvE= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.47.0/go.mod h1:SDmFD5Xuoa8dHPOLakoiURaUXei4zcqrkZ0/myZch/A= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.55.4 h1:qDwupUgEv+kwdclW5fV63gLus/cEpk6bx3uH7bCzoGw= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.55.4/go.mod h1:3FwFjD0BF50aMKU/vUX0SV8kkueM7A61+ytaLorHTE4= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.43.3 h1:stQcRph9IKChCONQNNdcHuqrkH5IZJoaxoz0s/CrehA= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.43.3/go.mod h1:ODEcuhq+MDaWP9fpgCPcYMKE12pyK5g5W2U0z0nHEiI= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.44.3 h1:wVATQoy9BnfUTPlcfliv8IVboUxfbFl36tIxjQ6LR3c= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.44.3/go.mod h1:L6MMlS0mAPMESZ7sZLUAw9jbu0RV72tgO6cXcNW7g/Y= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.42.3 h1:C6oS3hSFIB1ydz3dhgkZ0HyzWV41qVjNxS/mA0AGLMQ= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.42.3/go.mod h1:OXYzq1k1XwhwghGdHASEDeFr0Ij8dyFRaIy6w0yrIms= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.40.3 h1:s4rC9SWlq5hh6EDe+90LNkHuNQ6LOWZ2/7F2GaeOjaA= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.40.3/go.mod h1:3p7NzlLlJesNGovq7Vqx8+0UibawzodrBRQAbaza6pI= -github.com/aws/aws-sdk-go-v2/service/configservice v1.49.3 h1:zTd2HAD0LHfgN7WGlXW56gJ0bzQwJLd9BzucyGIrKnQ= -github.com/aws/aws-sdk-go-v2/service/configservice v1.49.3/go.mod h1:Qy3rMJB0ubAZERN7lLz8LFvZsDu3lky1FxgRi9YL1Wo= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.43.0 h1:nrCD0LVzOlmD4KLxvrZf1E/4K+jj1gBp7ljLQLGZZkk= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.43.0/go.mod h1:t/Gxp3yK6TAkcJzsxHLkkaxcNGuLvgFphZiWuSp8qHk= +github.com/aws/aws-sdk-go-v2/service/configservice v1.50.3 h1:DxbBEwn87rRW0rey0sraMv9WoTfFIhqNlvg42DaLb9w= +github.com/aws/aws-sdk-go-v2/service/configservice v1.50.3/go.mod h1:0lMwsdLUdrWOtd8c2KSdjb+fbxHe9k7Nm2BB8VCyM1Q= github.com/aws/aws-sdk-go-v2/service/ebs v1.23.10 h1:E32txvrH8iV3IEk6fU9uj4Ryp3VdauHHl/1LoWeIaYo= github.com/aws/aws-sdk-go-v2/service/ebs v1.23.10/go.mod h1:NjSslvHZ7oYBz7foWl/cuDEailjdmp16Auy6pHz3R+g= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.179.2 h1:rGBv2N0zWvNTKnxOfbBH4mNM8WMdDNkaxdqtz152G40= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.179.2/go.mod h1:W6sNzs5T4VpZn1Vy+FMKw8s24vt5k6zPJXcNOK0asBo= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.0 h1:cA4hWo269CN5RY7Arqt8BfzXF0KIN8DSNo/KcqHKkWk= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.187.0/go.mod h1:ossaD9Z1ugYb6sq9QIqQLEOorCGcqUoxlhud9M9yE70= github.com/aws/aws-sdk-go-v2/service/ecr v1.36.3 h1:bqmoQEKpWFRDRxOv4lC5yZLc+N1cogZHPLeQACfVUJo= github.com/aws/aws-sdk-go-v2/service/ecr v1.36.3/go.mod h1:KwOqlt4MOBK9EpOGkj8RU9fqfTEae5AOUHi1pDEZ3OQ= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.18.2 h1:PpbXaecV3sLAS6rjQiaKw4/jyq3Z8gNzmoJupHAoBp0= @@ -499,16 +499,16 @@ github.com/aws/aws-sdk-go-v2/service/lambda v1.64.1 h1:0njE+T0N80Kl2bPfK85Lnz1+d github.com/aws/aws-sdk-go-v2/service/lambda v1.64.1/go.mod h1:hr+VpAzvznKumy8q8TFEJfx3Xx+zfK2gDrrWjBqLLPw= github.com/aws/aws-sdk-go-v2/service/organizations v1.34.3 h1:Er5y2CAfS0ddI6+/7bq7mk/dQjhvqt6B5i24K5PnHRQ= github.com/aws/aws-sdk-go-v2/service/organizations v1.34.3/go.mod h1:hrfV1T+dtQ8AGlImCftiCAYZCTvn2hNVEcA9gPXui8E= -github.com/aws/aws-sdk-go-v2/service/rds v1.85.2 h1:KDO/FSO8V+zlvnQF6v4nOariw2qwPx5/z2pyb6X7ibk= -github.com/aws/aws-sdk-go-v2/service/rds v1.85.2/go.mod h1:lhiPj6RvoJHWG2STp+k5az55YqGgFLBzkKYdYHgUh9g= +github.com/aws/aws-sdk-go-v2/service/rds v1.89.0 h1:4x0WbBa+i/AS0AFlj7yvx3n+GuK3XR58J6t61pW6h8U= +github.com/aws/aws-sdk-go-v2/service/rds v1.89.0/go.mod h1:WB+SVZKu1IBpsy3GrpR2EBnqB6A05Bd0r4RDLRqMbdk= github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2 h1:p9TNFL8bFUMd+38YIpTAXpoxyz0MxC7FlbFEH4P4E1U= github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2/go.mod h1:fNjyo0Coen9QTwQLWeV6WO2Nytwiu+cCcWaTdKCAqqE= github.com/aws/aws-sdk-go-v2/service/s3control v1.49.3 h1:pyew4T6nc5Eg1tw8XGGMFrzSH4uyjfie2/iG50TX3TI= github.com/aws/aws-sdk-go-v2/service/s3control v1.49.3/go.mod h1:s8exH8MgdtCXUgKuwiYer+F58t62LNtL5bJSYVe0s6s= github.com/aws/aws-sdk-go-v2/service/securityhub v1.54.4 h1:/dZV1aa+UyaP17M/gHQ6qHDEnvfHAF98CIXzerGQv9M= github.com/aws/aws-sdk-go-v2/service/securityhub v1.54.4/go.mod h1:3Aq0KVVKwxbRdEywQbgQLnVrimltVKejsW1fVMnK2Uc= -github.com/aws/aws-sdk-go-v2/service/sns v1.32.3 h1:LC5JBrEAdJ0SSRLfNcLzOLsfoc3xO/BAsHiUNcQfDI4= -github.com/aws/aws-sdk-go-v2/service/sns v1.32.3/go.mod h1:ZO606Jfatw51c8q29gHVVCnufg2dq3MnmkNLlTZFrkE= +github.com/aws/aws-sdk-go-v2/service/sns v1.33.3 h1:coZW/SqpINT0VWG8vRWWY9TWUof8TDdxublw2Xur0Zc= +github.com/aws/aws-sdk-go-v2/service/sns v1.33.3/go.mod h1:J/G2xuhwNBlDvEi0WR/bnBbac4KSgpkERna/IXEF52w= github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 h1:UTpsIf0loCIWEbrqdLb+0RxnTXfWh2vhw4nQmFi4nPc= github.com/aws/aws-sdk-go-v2/service/sso v1.24.3/go.mod h1:FZ9j3PFHHAR+w0BSEjK955w5YD2UwB/l/H0yAK3MJvI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 h1:2YCmIXv3tmiItw0LlYf6v7gEHebLY45kBEnPezbUKyU= From a266ce7678a701d662b7a373f6995aa5514661d5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 08:49:40 +0000 Subject: [PATCH 3/4] [8.x](backport #2672) build(deps): Bump github.com/Azure/azure-sdk-for-go/sdk/azidentity from 1.7.0 to 1.8.0 in the azure group across 1 directory (#2686) build(deps): Bump github.com/Azure/azure-sdk-for-go/sdk/azidentity from 1.7.0 to 1.8.0 in the azure group across 1 directory (#2672) build(deps): Bump github.com/Azure/azure-sdk-for-go/sdk/azidentity Bumps the azure group with 1 update in the / directory: [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go). Updates `github.com/Azure/azure-sdk-for-go/sdk/azidentity` from 1.7.0 to 1.8.0 - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/azcore/v1.7.0...sdk/azcore/v1.8.0) --- updated-dependencies: - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 16c34252dd566e0486e25113b80980ada0c2687b) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oren Zohar <85433724+oren-zohar@users.noreply.github.com> --- go.mod | 2 +- go.sum | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8e01b7d4bf..172ccc5d57 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.0 require ( cloud.google.com/go/asset v1.20.3 cloud.google.com/go/iam v1.2.2 - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2 v2.3.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0 diff --git a/go.sum b/go.sum index a1a99498c6..1fb1b16f49 100644 --- a/go.sum +++ b/go.sum @@ -227,8 +227,10 @@ github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0 github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 h1:JZg6HRh6W6U4OLl6lk7BZ7BLisIzM9dG1R50zUk9C/M= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0/go.mod h1:YL1xnZ6QejvQHWJrX/AvhFl4WW4rqHVoKspWNVwFk0M= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 h1:B/dfvscEQtew9dVuoxqxrUKKv8Ih2f55PydknDamU+g= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0/go.mod h1:fiPSssYvltE08HJchL04dOy+RD4hgrjph0cwGGMntdI= +github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.0 h1:+m0M/LFxN43KvULkDNfdXOgrjtg6UYJPFBJyuEcRCAw= +github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.0/go.mod h1:PwOyop78lveYMRs6oCxjiVyBdyCgIYH6XHIVZO9/SFQ= github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice/v2 v2.3.0 h1:JI8PcWOImyvIUEZ0Bbmfe05FOlWkMi2KhjG+cAKaUms= @@ -287,6 +289,8 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM= +github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -1190,6 +1194,8 @@ github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwS github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6 h1:IsMZxCuZqKuao2vNdfD82fjjgPLfyHLpR41Z88viRWs= +github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6/go.mod h1:3VeWNIJaW+O5xpRQbPp0Ybqu1vJd/pm7s2F473HRrkw= 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.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= @@ -1472,6 +1478,8 @@ github.com/protocolbuffers/txtpbfmt v0.0.0-20231025115547-084445ff1adf h1:014O62 github.com/protocolbuffers/txtpbfmt v0.0.0-20231025115547-084445ff1adf/go.mod h1:jgxiZysxFPM+iWKwQwPR+y+Jvo54ARd4EisXxKYpB5c= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= +github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= From a6225adfd18bb63f5b1709a158684129529d176b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 10:26:30 +0000 Subject: [PATCH 4/4] [8.x](backport #2651) cnvm: include full ec2 instance id in findings fields (#2690) --- internal/resources/providers/awslib/ec2/ec2_instance.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/resources/providers/awslib/ec2/ec2_instance.go b/internal/resources/providers/awslib/ec2/ec2_instance.go index c05cafea43..699a4fca9d 100644 --- a/internal/resources/providers/awslib/ec2/ec2_instance.go +++ b/internal/resources/providers/awslib/ec2/ec2_instance.go @@ -19,7 +19,6 @@ package ec2 import ( "fmt" - "strings" "github.com/aws/aws-sdk-go-v2/service/ec2/types" @@ -61,7 +60,7 @@ func (i Ec2Instance) GetResourceId() string { return "" } - return strings.Split(*i.Instance.InstanceId, "-")[1] + return *i.Instance.InstanceId } func (i Ec2Instance) GetResourceType() string {