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

fix(report): update Gitlab template #5721

Merged
merged 7 commits into from
Dec 7, 2023
Merged

fix(report): update Gitlab template #5721

merged 7 commits into from
Dec 7, 2023

Conversation

dklimpel
Copy link
Contributor

@dklimpel dklimpel commented Dec 4, 2023

Description

Update Gitlab Container Scanning template from version 14 to 15, compatible with Gitlab 16.

Discussion #4235

Some information: Gitlab has different reports:

Related issues

Related PRs

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@dklimpel dklimpel changed the title Update gitlab tpl fix(report): update Gitlab template Dec 4, 2023
@knqyf263
Copy link
Collaborator

knqyf263 commented Dec 5, 2023

@dklimpel Thanks for your contribution. Could you take a look at the failure tests?

@dklimpel dklimpel marked this pull request as draft December 5, 2023 09:17
@dklimpel
Copy link
Contributor Author

dklimpel commented Dec 5, 2023

@dklimpel Thanks for your contribution. Could you take a look at the failure tests?

TestClientServerWithFormat/alpine_3.10_with_gitlab_template is passing localy.

@dklimpel dklimpel marked this pull request as ready for review December 5, 2023 09:48
"id": "trivy",
"name": "Trivy",
"vendor": {
"name": "Aquasecurity"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
"name": "Aquasecurity"
"name": "Aqua Security"

or Aqua_Security if spaces are not allowed.

"name": "Trivy",
"url": "https://github.com/aquasecurity/trivy/",
"vendor": {
"name": "Aquasecurity"
Copy link
Collaborator

Choose a reason for hiding this comment

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

ditto

@dklimpel
Copy link
Contributor Author

dklimpel commented Dec 6, 2023

I have seen that I still need to fix this:
Error: pkg/report/template_test.go:181:45: not enough arguments in call to report.NewTemplateWriter

Edit:
hopefully done

@knqyf263 knqyf263 added this pull request to the merge queue Dec 7, 2023
Merged via the queue into aquasecurity:main with commit eb97419 Dec 7, 2023
12 checks passed
@dklimpel dklimpel deleted the update-gitlab-tpl branch December 7, 2023 12:07
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.

Gitlab template uses deprecated json schema
2 participants