hashicorp / consul

Consul is a distributed, highly available, and data center aware solution to connect and configure applications across dynamic, distributed infrastructure.
https://www.consul.io
Other
28.41k stars 4.43k forks source link

Backport of Update security-scan.hcl into release/1.19.x #21743

Closed hc-github-team-consul-core closed 2 months ago

hc-github-team-consul-core commented 2 months ago

Backport

This PR is auto-generated from #21739 to be assessed for backporting due to the inclusion of the label backport/1.19.

:rotating_light:

Warning automatic cherry-pick of commits failed. If the first commit failed, you will see a blank no-op commit below. If at least one commit succeeded, you will see the cherry-picked commits up to, not including, the commit where the merge conflict occurred.

The person who merged in the original PR is: @sarahalsmiller This person should manually cherry-pick the original PR into a new backport PR, and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "3f36a9e1a0fde3a904e71d8348504bef2fb95c9b", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

Prepare job is still failing despite suppression, attempting to add a line with the updated version

Testing & Reproduction steps

Links

PR Checklist


Overview of commits - 8ac0e6c21d4ebc693f2009ba9768fd9ea2083ee0 - 3f36a9e1a0fde3a904e71d8348504bef2fb95c9b