Previously, we did a DeepEqual of all the returned data about each changed entity,
but due to our template overrides that is not actually all the information
available for each entity. So we marked trivial things as 'conflicts' (e.g.
telegraf config ID's 'changing' from the empty string to the real, current value)
while not catching important conflicts like flux script changes in checks and tasks.
Changes to make things more straightforward:
Change the --force behaviour to be more similar to apt install, where even
in non-interactive mode --force yes is required to bypass the prompt to apply.
Before, there were two stages of diff checking - once to print diffs, and once
after the 'Yes/No' prompt. If any conflicts were detected in the second check,
the user got an inscrutable error message that did not highlight what the difference
was or how to force it to apply. --force conflict was required to avoid this error.
Instead, we now have simplified to --force yes to bypass the 'Yes/No' prompt, and
we never do a second stage of diff checking.
Because we do not currently properly account for more complicated diffs (e.g.
flux tasks), we now assume in the diff printing that every object has changes,
except for Labels, Buckets, Variables, and Label Mappings. This could be improved
in the future.
lesam
commented
2 years ago
fix: when statestatus is 'remove', mark as removed
fix: template apply uses better diff checking
Closes: https://github.com/influxdata/influx-cli/issues/233
Previously, we did a DeepEqual of all the returned data about each changed entity, but due to our template overrides that is not actually all the information available for each entity. So we marked trivial things as 'conflicts' (e.g. telegraf config ID's 'changing' from the empty string to the real, current value) while not catching important conflicts like flux script changes in checks and tasks.
Changes to make things more straightforward:
Change the --force behaviour to be more similar to
apt install, where even in non-interactive mode--force yesis required to bypass the prompt to apply.Before, there were two stages of diff checking - once to print diffs, and once after the 'Yes/No' prompt. If any conflicts were detected in the second check, the user got an inscrutable error message that did not highlight what the difference was or how to force it to apply.
--force conflictwas required to avoid this error. Instead, we now have simplified to--force yesto bypass the 'Yes/No' prompt, and we never do a second stage of diff checking.Because we do not currently properly account for more complicated diffs (e.g. flux tasks), we now assume in the diff printing that every object has changes, except for Labels, Buckets, Variables, and Label Mappings. This could be improved in the future.