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 [NET-2420] security: re-enable security scan release block into release/1.1.x #3648

Conversation

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

@hc-github-team-consul-core hc-github-team-consul-core commented Feb 17, 2024

Backport

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

🚨

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:
@zalimeni
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-k8s/merges: 409 Merge conflict []

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


Follow-up to #3625 to re-enable scans.

Changes proposed in this PR

Scanner config is intentionally aligned w/ changes made in hashicorp/consul#19978 for consistency.

How I've tested this PR

CI continues to pass, scan results are working as expected.

How I expect reviewers to test this PR

👀

Checklist


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Feb 17, 2024

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/net-2420-reenable-security-scans-k8s/gratefully-enabled-foxhound branch from 93649e9 to 104ca96 Compare February 17, 2024 17:25
This was previously disabled due to an unresolved false-positive CVE.
Re-enabling both secrets and OSV + Go Modules scanning, which per our
current scan results should not be a blocker to future releases.

Also add security scans on PR and merge to protected branches to allow
proactive triage going forward.

See hashicorp/consul#19978 for similar change in that repo, adapted
here.
Triage this scan result as `consul-k8s` should not be directly
impacted and it is medium severity. Follow-up ticket filed for
remediation.

Also improve formatting of scan config since this change will be
backported.
@zalimeni zalimeni force-pushed the backport/zalimeni/net-2420-reenable-security-scans-k8s/gratefully-enabled-foxhound branch from cec7365 to 4517717 Compare February 21, 2024 13:18
@zalimeni zalimeni marked this pull request as ready for review February 21, 2024 13:26
@zalimeni zalimeni enabled auto-merge (squash) February 21, 2024 13:26
@zalimeni zalimeni merged commit 5c8c20f into release/1.1.x Feb 21, 2024
23 of 44 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/net-2420-reenable-security-scans-k8s/gratefully-enabled-foxhound branch February 21, 2024 13:34
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.

3 participants