🐛 Improve scaffolding to filter existing multiline code fragments

[armsnyder]

Signed-off-by: Adam Snyder [email protected]

Scaffolding can only detect existing generated code if the code fragments are single-line. As a result, multi-line scaffolding can be inserted into code more than once. This fix improves the scaffolding to detect multi-line code fragments and not inject them.

Fixes #2326

[k8s-ci-robot]

Welcome @armsnyder!

It looks like this is your first PR to kubernetes-sigs/kubebuilder 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubebuilder has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @armsnyder. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[camilamacedo86]

.

[camilamacedo86]

Thank you for your contribution. 🥇
Yes, you are right that was duplicated.

The test https://github.com/kubernetes-sigs/kubebuilder/pull/2343/checks?check_run_id=3771656261 is failing. Could you please check? The KB is used as a LIB and we cannot break the backwards compatibility. I think a rebase with the master branch will solve this problem. If not, please feel free to ping me after that for we check if it is a false positive.

We need to fix the breaking changes in the API first: https://github.com/kubernetes-sigs/kubebuilder/pull/2343/checks?check_run_id=3771656261

[camilamacedo86]

/ok-to-test

[armsnyder]

@camilamacedo86 Thanks, I rebased and the API check passes. Just to note, when I ran make generate it added an unrelated line which should fix the master branch failing.

[camilamacedo86]

/approved
/lgtm

[camilamacedo86]

/approved

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: armsnyder, camilamacedo86

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [camilamacedo86]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment