search

kubescape / operator

Operator is an in-cluster component of the Kubescape security platform. It allows clients to connect to itself, listens for commands from the connected clients and controls other in-cluster components according to received commands.
Apache License 2.0
12 stars 20 forks source link

Fix/instance #205

Closed dwertent closed 8 months ago

dwertent commented 8 months ago

User description

Overview

This PR fixes #

Signed Commits

Type

Bug fix

Description

This PR primarily addresses issues related to instance ID handling and SBOM (Software Bill of Materials) processing.

Changes walkthrough

Relevant files                                                                                                                                 
Tests
watcher_test.go                                                                                         
    watcher/watcher_test.go

    **The import path for the instance ID handler was updated from
    `instanceidv1` to `helpersv1`. A new test function
    `TestSkipSBOM` was added to test the skipping of SBOM based
    on different annotation statuses.**
+58/-16
Bug fix
watcher.go                                                                                                   
    watcher/watcher.go

    **The import path for the instance ID handler was updated from
    `instanceidv1` to `helpersv1`. A new function `skipSBOM`
    was added to determine whether to skip SBOM based on the
    status in the annotations. The error message in
    `VulnerabilityManifestWatch` was updated for better
    clarity. The handling of unsupported objects in
    `HandleSBOMFilteredEvents` was updated for better error
    logging. A check was added in `HandleSBOMFilteredEvents` to
    skip filtered SBOM based on the status in the annotations.**
+23/-10
Enhancement
getworkload.go                                                                                           
    mainhandler/getworkload.go

    **The function `listWorkloadImages` was updated to include
    instance IDs for initContainers. Debug logs were added for
    tracking instance IDs and skipping when instance ID is nil.**
+15/-7
✨ Usage guide:
**Overview:** The `describe` tool scans the PR code changes, and generates a description for the PR - title, type, summary, walkthrough and labels. The tool can be triggered [automatically](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) every time a new PR is opened, or can be invoked manually by commenting on a PR. When commenting, to edit [configurations](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L46) related to the describe tool (`pr_description` section), use the following template: ``` /describe --pr_description.some_config1=... --pr_description.some_config2=... ``` With a [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-app), use the following template: ``` [pr_description] some_config1=... some_config2=... ```
Enabling\disabling automation
- When you first install the app, the [default mode](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) for the describe tool is: ``` pr_commands = ["/describe --pr_description.add_original_user_description=true" "--pr_description.keep_original_user_title=true", ...] ``` meaning the `describe` tool will run automatically on every PR, will keep the original title, and will add the original user description above the generated description. - Markers are an alternative way to control the generated description, to give maximal control to the user. If you set: ``` pr_commands = ["/describe --pr_description.use_description_markers=true", ...] ``` the tool will replace every marker of the form `pr_agent:marker_name` in the PR description with the relevant content, where `marker_name` is one of the following: - `type`: the PR type. - `summary`: the PR summary. - `walkthrough`: the PR walkthrough. Note that when markers are enabled, if the original PR description does not contain any markers, the tool will not alter the description at all.
Custom labels
The default labels of the `describe` tool are quite generic: [`Bug fix`, `Tests`, `Enhancement`, `Documentation`, `Other`]. If you specify [custom labels](https://github.com/Codium-ai/pr-agent/blob/main/docs/DESCRIBE.md#handle-custom-labels-from-the-repos-labels-page-gem) in the repo's labels page or via configuration file, you can get tailored labels for your use cases. Examples for custom labels: - `Main topic:performance` - pr_agent:The main topic of this PR is performance - `New endpoint` - pr_agent:A new endpoint was added in this PR - `SQL query` - pr_agent:A new SQL query was added in this PR - `Dockerfile changes` - pr_agent:The PR contains changes in the Dockerfile - ... The list above is eclectic, and aims to give an idea of different possibilities. Define custom labels that are relevant for your repo and use cases. Note that Labels are not mutually exclusive, so you can add multiple label categories. Make sure to provide proper title, and a detailed and well-phrased description for each label, so the tool will know when to suggest it.
Utilizing extra instructions
The `describe` tool can be configured with extra instructions, to guide the model to a feedback tailored to the needs of your project. Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Notice that the general structure of the description is fixed, and cannot be changed. Extra instructions can change the content or style of each sub-section of the PR description. Examples for extra instructions: ``` [pr_description] extra_instructions=""" - The PR title should be in the format: ': ' - The title should be short and concise (up to 10 words) - ... """ ``` Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable. </details></td></tr> <tr><td><details> <summary><strong> More PR-Agent commands</strong></summary><hr> > To invoke the PR-Agent, add a comment using one of the following commands: > - **/review**: Request a review of your Pull Request. > - **/describe**: Update the PR title and description based on the contents of the PR. > - **/improve [--extended]**: Suggest code improvements. Extended mode provides a higher quality feedback. > - **/ask \<QUESTION\>**: Ask a question about the PR. > - **/update_changelog**: Update the changelog based on the PR's contents. > - **/add_docs** 💎: Generate docstring for new components introduced in the PR. > - **/generate_labels** 💎: Generate labels for the PR based on the PR's contents. > - **/analyze** 💎: Automatically analyzes the PR, and presents changes walkthrough for each component. >See the [tools guide](https://github.com/Codium-ai/pr-agent/blob/main/docs/TOOLS_GUIDE.md) for more details. >To list the possible configuration parameters, add a **/config** comment. </details></td></tr> </table> See the [describe usage](https://github.com/Codium-ai/pr-agent/blob/main/docs/DESCRIBE.md) page for a comprehensive guide on using this tool. </details> </div> </div> <div class="comment"> <div class="user"> <a rel="noreferrer nofollow" target="_blank" href="https://github.com/codiumai-pr-agent-free[bot]"><img src="https://avatars.githubusercontent.com/in/354216?v=4" />codiumai-pr-agent-free[bot]</a> commented <strong> 8 months ago</strong> </div> <div class="markdown-body"> <p><strong><a href="https://github.com/kubescape/operator/pull/205">PR Description</a></strong> updated to latest commit (<a href="https://github.com/kubescape/operator/commit/8202c7a09029eae2963b9766d7d16d24ba554852">https://github.com/kubescape/operator/commit/8202c7a09029eae2963b9766d7d16d24ba554852</a>)</p> </div> </div> <div class="comment"> <div class="user"> <a rel="noreferrer nofollow" target="_blank" href="https://github.com/codiumai-pr-agent-free[bot]"><img src="https://avatars.githubusercontent.com/in/354216?v=4" />codiumai-pr-agent-free[bot]</a> commented <strong> 8 months ago</strong> </div> <div class="markdown-body"> <h2>PR Analysis</h2> <ul> <li>🎯 <strong>Main theme:</strong> The PR primarily addresses issues related to instance ID handling and Software Bill of Materials (SBOM) processing in a Go project.</li> <li>📝 <strong>PR summary:</strong> This PR introduces changes to the handling of instance IDs and SBOM processing. It updates the import path for the instance ID handler in several places and adds a new function to determine whether to skip SBOM based on the status in the annotations. It also improves error logging for unsupported objects and adds a check in the SBOM handling function.</li> <li>📌 <strong>Type of PR:</strong> Bug fix</li> <li>🧪 <strong>Relevant tests added:</strong> Yes</li> <li>⏱️ <strong>Estimated effort to review [1-5]:</strong> 3, because the PR includes changes to the core functionality and also adds new tests. The changes are not too complex but require a good understanding of the project to review effectively.</li> <li>🔒 <strong>Security concerns:</strong> No security concerns found <h2>PR Feedback</h2></li> </ul> <p><strong>💡 General suggestions:</strong> The changes in the PR are well-structured and the addition of the new function <code>skipSBOM</code> is a good approach to handle the SBOM based on the status in the annotations. However, it would be beneficial to add more comments in the code to explain the logic and purpose of the changes, especially for the new function and the updated error handling.</p> <hr> <details> <summary><strong>✨ Usage guide:</strong></summary><hr> **Overview:** The `review` tool scans the PR code changes, and generates a PR review. The tool can be triggered [automatically](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) every time a new PR is opened, or can be invoked manually by commenting on any PR. When commenting, to edit [configurations](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L19) related to the review tool (`pr_reviewer` section), use the following template: ``` /review --pr_reviewer.some_config1=... --pr_reviewer.some_config2=... ``` With a [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-app), use the following template: ``` [pr_reviewer] some_config1=... some_config2=... ``` <table><tr><td><details> <summary><strong> Utilizing extra instructions</strong></summary><hr> The `review` tool can be configured with extra instructions, which can be used to guide the model to a feedback tailored to the needs of your project. Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify the relevant sub-tool, and the relevant aspects of the PR that you want to emphasize. Examples for extra instructions: ``` [pr_reviewer] # /review # extra_instructions=""" In the code feedback section, emphasize the following: - Does the code logic cover relevant edge cases? - Is the code logic clear and easy to understand? - Is the code logic efficient? ... """ ``` Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable. </details></td></tr> <tr><td><details> <summary><strong> How to enable\disable automation</strong></summary><hr> - When you first install PR-Agent app, the [default mode](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) for the `review` tool is: ``` pr_commands = ["/review", ...] ``` meaning the `review` tool will run automatically on every PR, with the default configuration. Edit this field to enable/disable the tool, or to change the used configurations </details></td></tr> <tr><td><details> <summary><strong> About the 'Code feedback' section</strong></summary><hr> The `review` tool provides several type of feedbacks, one of them is code suggestions. If you are interested **only** in the code suggestions, it is recommended to use the [`improve`](https://github.com/Codium-ai/pr-agent/blob/main/docs/IMPROVE.md) feature instead, since it dedicated only to code suggestions, and usually gives better results. Use the `review` tool if you want to get a more comprehensive feedback, which includes code suggestions as well. </details></td></tr> <tr><td><details> <summary><strong> Auto-labels</strong></summary><hr> The `review` tool can auto-generate two specific types of labels for a PR: - a `possible security issue` label, that detects possible [security issues](https://github.com/Codium-ai/pr-agent/blob/tr/user_description/pr_agent/settings/pr_reviewer_prompts.toml#L136) (`enable_review_labels_security` flag) - a `Review effort [1-5]: x` label, where x is the estimated effort to review the PR (`enable_review_labels_effort` flag) </details></td></tr> <tr><td><details> <summary><strong> Extra sub-tools</strong></summary><hr> The `review` tool provides a collection of possible feedbacks about a PR. It is recommended to review the [possible options](https://github.com/Codium-ai/pr-agent/blob/main/docs/REVIEW.md#enabledisable-features), and choose the ones relevant for your use case. Some of the feature that are disabled by default are quite useful, and should be considered for enabling. For example: `require_score_review`, `require_soc2_review`, `enable_review_labels_effort`, and more. </details></td></tr> <tr><td><details> <summary><strong> More PR-Agent commands</strong></summary><hr> > To invoke the PR-Agent, add a comment using one of the following commands: > - **/review**: Request a review of your Pull Request. > - **/describe**: Update the PR title and description based on the contents of the PR. > - **/improve [--extended]**: Suggest code improvements. Extended mode provides a higher quality feedback. > - **/ask \<QUESTION\>**: Ask a question about the PR. > - **/update_changelog**: Update the changelog based on the PR's contents. > - **/add_docs** 💎: Generate docstring for new components introduced in the PR. > - **/generate_labels** 💎: Generate labels for the PR based on the PR's contents. > - **/analyze** 💎: Automatically analyzes the PR, and presents changes walkthrough for each component. >See the [tools guide](https://github.com/Codium-ai/pr-agent/blob/main/docs/TOOLS_GUIDE.md) for more details. >To list the possible configuration parameters, add a **/config** comment. </details></td></tr> </table> See the [review usage](https://github.com/Codium-ai/pr-agent/blob/main/docs/REVIEW.md) page for a comprehensive guide on using this tool. </details> </div> </div> <div class="comment"> <div class="user"> <a rel="noreferrer nofollow" target="_blank" href="https://github.com/codiumai-pr-agent-free[bot]"><img src="https://avatars.githubusercontent.com/in/354216?v=4" />codiumai-pr-agent-free[bot]</a> commented <strong> 8 months ago</strong> </div> <div class="markdown-body"> <h2>PR Code Suggestions</h2> <table><thead><tr><th></th><th>Suggestions                                                                                                                                                          </th></tr></thead><tbody><tr><td><strong>maintainability</strong></td><td><table><tr><td> <details><summary>Reduce redundancy in the <code>TestSkipSBOM</code> test by creating a helper function.</summary> ___ **The test `TestSkipSBOM` has a lot of repeated code. Consider creating a helper function to <br>reduce redundancy.** [watcher/watcher_test.go [1336-1382]](https://github.com/kubescape/operator/pull/205/files#diff-5c95cf6ba876fbcc25df8a57f2afdee0befadddf78ce75d9fa2f0cd7c77af7e5R1336-R1382) ```diff func TestSkipSBOM(t *testing.T) { tt := []struct { annotations map[string]string name string expected bool }{ { name: "Empty annotations", annotations: map[string]string{}, expected: false, }, { name: "Annotations with empty status", annotations: map[string]string{ helpersv1.StatusMetadataKey: "", }, expected: false, }, ... } for _, tc := range tt { t.Run(tc.name, func(t *testing.T) { - actual := skipSBOM(tc.annotations) - assert.Equal(t, tc.expected, actual) + runSkipSBOMTest(t, tc.annotations, tc.expected) }) } } +func runSkipSBOMTest(t *testing.T, annotations map[string]string, expected bool) { + actual := skipSBOM(annotations) + assert.Equal(t, expected, actual) +} + ``` </details></td></tr><tr><td> <details><summary>Improve readability and maintainability by using a switch statement in the <code>skipSBOM</code> function.</summary> ___ **Consider using a switch statement instead of multiple if conditions in the `skipSBOM` <br>function. This will improve readability and maintainability.** [watcher/watcher.go [147-157]](https://github.com/kubescape/operator/pull/205/files#diff-f3e51e5940406948b035ad0368619d886caa53276805328fc1c897b5eed22498R147-R157) ```diff func skipSBOM(annotations map[string]string) bool { - ann := []string{ - "", // empty string for backward compatibility - helpersv1.Ready, - helpersv1.Completed, + status, ok := annotations[helpersv1.StatusMetadataKey] + if !ok { + return false // do not skip } - if status, ok := annotations[helpersv1.StatusMetadataKey]; ok { - return !slices.Contains(ann, status) + switch status { + case "", helpersv1.Ready, helpersv1.Completed: + return false + default: + return true } - return false // do not skip } ``` </details></td></tr><tr><td> <details><summary>Refactor the <code>listWorkloadImages</code> function to reduce the level of nesting.</summary> ___ **The `listWorkloadImages` function has a lot of nested code. Consider refactoring this <br>function to reduce the level of nesting.** [mainhandler/getworkload.go [44-62]](https://github.com/kubescape/operator/pull/205/files#diff-f30d02253897ca250f8e024abe7f2e725f94be0fd72d7e4bc8edeb970627a31bR44-R62) ```diff for i := range initContainers { - c := "" - id := getContainerID(instanceIDs, initContainers[i].Name) - if id != nil { - c, _ = id.GetSlug() - containersData = append(containersData, - ContainerData{ - image: initContainers[i].Image, - container: initContainers[i].Name, - id: c, - }, - ) - logger.L().Debug("instanceID", helpers.String("str", id.GetStringFormatted()), helpers.String("id", id.GetHashed()), helpers.String("workloadID", workload.GetID()), helpers.String("initContainer", containers[i].Name), helpers.String("image", containers[i].Image)) - } else { - logger.L().Debug("instanceID is nil, skipping", helpers.String("workloadID", workload.GetID()), helpers.String("initContainer", containers[i].Name), helpers.String("image", containers[i].Image)) - } + appendContainerData(instanceIDs, initContainers[i], workload, &containersData) } +func appendContainerData(instanceIDs []instanceidhandler.InstanceID, container corev1.Container, workload k8sinterface.IWorkload, containersData *[]ContainerData) { + id := getContainerID(instanceIDs, container.Name) + if id == nil { + logger.L().Debug("instanceID is nil, skipping", helpers.String("workloadID", workload.GetID()), helpers.String("initContainer", container.Name), helpers.String("image", container.Image)) + return + } + c, _ := id.GetSlug() + *containersData = append(*containersData, + ContainerData{ + image: container.Image, + container: container.Name, + id: c, + }, + ) + logger.L().Debug("instanceID", helpers.String("str", id.GetStringFormatted()), helpers.String("id", id.GetHashed()), helpers.String("workloadID", workload.GetID()), helpers.String("initContainer", container.Name), helpers.String("image", container.Image)) +} + ``` </details></td></tr></table></td></tr><tr><td><strong>best practice</strong></td><td><table><tr><td> <details><summary>Use <code>errors.Is</code> for error comparison in the <code>HandleSBOMFilteredEvents</code> function.</summary> ___ **Consider using `errors.Is` for error comparison in the `HandleSBOMFilteredEvents` <br>function. This is a best practice for error handling in Go.** [watcher/watcher.go [262-266]](https://github.com/kubescape/operator/pull/205/files#diff-f3e51e5940406948b035ad0368619d886caa53276805328fc1c897b5eed22498R262-R266) ```diff if err != nil { - if err == ErrMissingInstanceIDAnnotation { + if errors.Is(err, ErrMissingInstanceIDAnnotation) { continue } errorCh <- err continue } ``` </details></td></tr></table></td></tr></tr></tbody></table><hr> <details> <summary><strong>✨ Usage guide:</strong></summary><hr> **Overview:** The `improve` tool scans the PR code changes, and automatically generates suggestions for improving the PR code. The tool can be triggered [automatically](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) every time a new PR is opened, or can be invoked manually by commenting on a PR. When commenting, to edit [configurations](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L69) related to the improve tool (`pr_code_suggestions` section), use the following template: ``` /improve --pr_code_suggestions.some_config1=... --pr_code_suggestions.some_config2=... ``` With a [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-app), use the following template: ``` [pr_code_suggestions] some_config1=... some_config2=... ``` <table><tr><td><details> <summary><strong> Enabling\disabling automation </strong></summary><hr> When you first install the app, the [default mode](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) for the improve tool is: ``` pr_commands = ["/improve --pr_code_suggestions.summarize=true", ...] ``` meaning the `improve` tool will run automatically on every PR, with summarization enabled. Delete this line to disable the tool from running automatically. </details></td></tr> <tr><td><details> <summary><strong> Utilizing extra instructions</strong></summary><hr> Extra instructions are very important for the `improve` tool, since they enable to guide the model to suggestions that are more relevant to the specific needs of the project. Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify relevant aspects that you want the model to focus on. Examples for extra instructions: ``` [pr_code_suggestions] # /improve # extra_instructions=""" Emphasize the following aspects: - Does the code logic cover relevant edge cases? - Is the code logic clear and easy to understand? - Is the code logic efficient? ... """ ``` Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable. </details></td></tr> <tr><td><details> <summary><strong> A note on code suggestions quality</strong></summary><hr> - While the current AI for code is getting better and better (GPT-4), it's not flawless. Not all the suggestions will be perfect, and a user should not accept all of them automatically. - Suggestions are not meant to be simplistic. Instead, they aim to give deep feedback and raise questions, ideas and thoughts to the user, who can then use his judgment, experience, and understanding of the code base. - Recommended to use the 'extra_instructions' field to guide the model to suggestions that are more relevant to the specific needs of the project. - Best quality will be obtained by using 'improve --extended' mode. </details></td></tr> <tr><td><details> <summary><strong> More PR-Agent commands</strong></summary><hr> > To invoke the PR-Agent, add a comment using one of the following commands: > - **/review**: Request a review of your Pull Request. > - **/describe**: Update the PR title and description based on the contents of the PR. > - **/improve [--extended]**: Suggest code improvements. Extended mode provides a higher quality feedback. > - **/ask \<QUESTION\>**: Ask a question about the PR. > - **/update_changelog**: Update the changelog based on the PR's contents. > - **/add_docs** 💎: Generate docstring for new components introduced in the PR. > - **/generate_labels** 💎: Generate labels for the PR based on the PR's contents. > - **/analyze** 💎: Automatically analyzes the PR, and presents changes walkthrough for each component. >See the [tools guide](https://github.com/Codium-ai/pr-agent/blob/main/docs/TOOLS_GUIDE.md) for more details. >To list the possible configuration parameters, add a **/config** comment. </details></td></tr> </table> See the [improve usage](https://github.com/Codium-ai/pr-agent/blob/main/docs/IMPROVE.md) page for a more comprehensive guide on using this tool. </details> </div> </div> <div class="comment"> <div class="user"> <a rel="noreferrer nofollow" target="_blank" href="https://github.com/github-actions[bot]"><img src="https://avatars.githubusercontent.com/in/15368?v=4" />github-actions[bot]</a> commented <strong> 8 months ago</strong> </div> <div class="markdown-body"> <p>Summary:</p> <ul> <li>License scan: failure</li> <li>Credentials scan: success</li> <li>Vulnerabilities scan: failure</li> <li>Unit test: success</li> <li>Go linting: success</li> </ul> </div> </div> <div class="comment"> <div class="user"> <a rel="noreferrer nofollow" target="_blank" href="https://github.com/github-actions[bot]"><img src="https://avatars.githubusercontent.com/in/15368?v=4" />github-actions[bot]</a> commented <strong> 8 months ago</strong> </div> <div class="markdown-body"> <p>Summary:</p> <ul> <li>License scan: failure</li> <li>Credentials scan: success</li> <li>Vulnerabilities scan: failure</li> <li>Unit test: success</li> <li>Go linting: success</li> </ul> </div> </div> <div class="page-bar-simple"> </div> <div class="footer"> <ul class="body"> <li>© <script> document.write(new Date().getFullYear()) </script> Githubissues.</li> <li>Githubissues is a development platform for aggregating issues.</li> </ul> </div> <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.min.js"></script> <script src="/githubissues/assets/js.js"></script> <script src="/githubissues/assets/markdown.js"></script> <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/highlight.min.js"></script> <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/languages/go.min.js"></script> <script> hljs.highlightAll(); </script> </body> </html>