Skip to content

Backport of [NET-2420] security: re-enable security scan release block into release/1.3.x#3650

Merged
zalimeni merged 2 commits intorelease/1.3.xfrom
backport/zalimeni/net-2420-reenable-security-scans-k8s/nationally-saving-lionfish
Feb 21, 2024
Merged

Backport of [NET-2420] security: re-enable security scan release block into release/1.3.x#3650
zalimeni merged 2 commits intorelease/1.3.xfrom
backport/zalimeni/net-2420-reenable-security-scans-k8s/nationally-saving-lionfish

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
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.3.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
Copy Markdown

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/nationally-saving-lionfish branch from 36e8b8b to 9777914 Compare February 17, 2024 17:23
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/nationally-saving-lionfish branch from c6a8ce9 to af0d217 Compare February 21, 2024 13:20
@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 ea04b4a into release/1.3.x Feb 21, 2024
@zalimeni zalimeni deleted the backport/zalimeni/net-2420-reenable-security-scans-k8s/nationally-saving-lionfish branch February 21, 2024 13:42
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