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(github): Fix GHA IR resource names in case of 2 identical images #4108

Merged
merged 3 commits into from
Dec 19, 2022

Conversation

Eliran-Turgeman
Copy link
Contributor

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Description

In case the image name appears twice in the same file, we calculated its start & end lines by it's first reference in the file, which caused empty related_resource_ids for images.

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

New/Edited policies (Delete if not relevant)

Description

Include a description of what makes it a violation and any relevant external links.

Fix

How does someone fix the issue in code and/or in runtime?

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • [] I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my feature, policy, or fix is effective and works
  • New and existing tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

Copy link
Contributor

@gruebel gruebel left a comment

Choose a reason for hiding this comment

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

🎄

Comment on lines 51 to 52
start_line = [line_number for line_number, line in self.workflow_line_numbers if image in line
and line_number >= job_object[START_LINE]][0]
Copy link
Contributor

Choose a reason for hiding this comment

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

sneaky container images 😄
how about

Suggested change
start_line = [line_number for line_number, line in self.workflow_line_numbers if image in line
and line_number >= job_object[START_LINE]][0]
start_line = [line_number for line_number, line in self.workflow_line_numbers[job_object[START_LINE]][0]:] if image in line]

@Eliran-Turgeman Eliran-Turgeman merged commit f1ff7c6 into main Dec 19, 2022
@Eliran-Turgeman Eliran-Turgeman deleted the fix_line_numbers_in_gha_ir branch December 19, 2022 14:40
itai1357 pushed a commit that referenced this pull request Dec 19, 2022
…4108)

* fix gha ir resource names

* fix fixture

* iterate only over lines after jobs start line

Co-authored-by: Eliran Turgeman <elturgeman@paloaltonetworks.com>
This pull request was closed.
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