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

(feat) add ability to skip field during drift evaluation for purpose of ignoring drift detection #227

Merged
merged 1 commit into from
Aug 6, 2024

Conversation

Abhi5125
Copy link
Contributor

@Abhi5125 Abhi5125 commented Aug 3, 2024

unstructured hash has patches input parameter where user can specify list of paths for drift detection to ignore; the unstructured hash function will apply a 'remove' patch to these fields and thus drift detection will compute equivalent hashes for an unstructured object even if a field changes (given that the field was chosen to be ignored)

@gianlucam76
Copy link
Member

gianlucam76 commented Aug 4, 2024

Thank you. After rebase, build is failing for one or more tests.

Also please squash all your commits into one. As of now, you have 4 commits (and one is not yours).

The way to proceed is:

  1. git checkout dev
  2. git fetch upstream
  3. git merge upstream/dev
  4. git checkout ignore-drift
  5. git rebase -I dev

this will bring all new commits in dev to your local branch

Then squash your commits (you have 3 seperate commits in this PR) into one:

git rebase -i HEAD~3

Also ideally do not create new PRs. Amend what you already have (git push origin ignore-drift --force). Otherwise comments are lost and files which were already reviewed need to be reviewed again if there is no change.

thanks

@Abhi5125
Copy link
Contributor Author

Abhi5125 commented Aug 5, 2024

Closing because duplicate of #225

@Abhi5125 Abhi5125 closed this Aug 5, 2024
@Abhi5125 Abhi5125 reopened this Aug 5, 2024
@Abhi5125
Copy link
Contributor Author

Abhi5125 commented Aug 5, 2024

Reopened because #225 is pushing to main and not dev

@kprav33n
Copy link

kprav33n commented Aug 5, 2024

Review comments were taken care of and the multiple commits are now squashed into a single commit.

Copy link
Member

@gianlucam76 gianlucam76 left a comment

Choose a reason for hiding this comment

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

Thank you

@gianlucam76 gianlucam76 merged commit 78dd484 into projectsveltos:dev Aug 6, 2024
15 checks passed
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