Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of ci: update the security-scanner gha token into release/1.4.x #622

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

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

🚨

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:
@dduzgun-security
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: POST https://api.github.com/repos/hashicorp/consul-dataplane/merges: 409 Merge conflict []

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


Description

Using the org level secret instead of the repository one and removing conditional check to use paths-ignore.

Testing & Reproduction steps

If the security scan passes, we are good.

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

Copy link

hashicorp-cla-app bot commented Sep 17, 2024

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • dduzgun-security
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@dduzgun-security dduzgun-security marked this pull request as ready for review September 17, 2024 18:43
@dduzgun-security dduzgun-security requested a review from a team as a code owner September 17, 2024 18:43
@dduzgun-security dduzgun-security enabled auto-merge (squash) September 17, 2024 18:43
@dduzgun-security dduzgun-security merged commit 875b45d into release/1.4.x Sep 17, 2024
44 of 45 checks passed
@dduzgun-security dduzgun-security deleted the backport/ci/update-security-scanner-token/abnormally-renewing-shrimp branch September 17, 2024 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants