warning when formulas commands conflicts #638

victorschumacherzup · 2020-10-27T21:38:44Z

Description

Sometimes we got confliting formulas commands on different repos, the idea of this pull request is to warn the user about this.

The user will be informed on two commands:
rit create formula
rit add repo

Example:

Changelog

Added warning on conflicting formulas

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

codecov-io · 2020-10-27T21:43:55Z

Codecov Report

Merging #638 into master will increase coverage by 0.17%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #638      +/-   ##
==========================================
+ Coverage   80.52%   80.69%   +0.17%     
==========================================
  Files         104      105       +1     
  Lines        3610     3642      +32     
==========================================
+ Hits         2907     2939      +32     
  Misses        506      506              
  Partials      197      197

Impacted Files	Coverage Δ
pkg/formula/formula.go	`75.00% <ø> (ø)`
pkg/formula/tree/default_tree.go	`97.01% <ø> (ø)`
pkg/cmd/add_repo.go	`60.71% <100.00%> (+0.71%)`	⬆️
pkg/cmd/create_formula.go	`55.26% <100.00%> (+0.59%)`	⬆️
pkg/commands/builder.go	`89.32% <100.00%> (+0.06%)`	⬆️
pkg/formula/input/prompt/prompt.go	`97.08% <100.00%> (ø)`
pkg/formula/tree/checker.go	`100.00% <100.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a3dee5e...165f5d2. Read the comment docs.

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

metrics.json

pkg/formula/input/prompt/prompt.go

pkg/formula/tree/checker.go

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

henriquemoraeszup

Im good to go 🚀

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

pkg/formula/tree/checker.go

pkg/cmd/add_repo.go

pkg/cmd/create_formula.go

pkg/formula/tree/checker.go

victorschumacherzup · 2020-11-06T18:49:38Z

/merge qa

ritchie-bot · 2020-11-06T18:49:43Z

👌 Merged branch feature/warnOnConflictingCmds into qa

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

victorschumacherzup · 2020-11-06T20:10:25Z

/merge qa

ritchie-bot · 2020-11-06T20:10:30Z

👌 Merged branch feature/warnOnConflictingCmds into qa

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

victorschumacherzup · 2020-11-09T12:33:19Z

/merge qa

ritchie-bot · 2020-11-09T12:33:23Z

👌 Merged branch feature/warnOnConflictingCmds into qa

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

kaduartur · 2020-11-09T14:01:31Z

/merge qa

ritchie-bot · 2020-11-09T14:01:35Z

👌 Merged branch feature/warnOnConflictingCmds into qa

* add reading and filtering * adding Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * finding and printing conflicts Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * add basic test Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * fix lint Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * remove spaces Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * fix main Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * little refactor Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * little refactor Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * added a better test Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * added a repeated command Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * added dir Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * add check for no conflicting commands Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * added tree check to add repo Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * fix empty warning Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * fixing tests Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * Apply suggestions from code review Co-authored-by: henriquemoraeszup <68074718+henriquemoraeszup@users.noreply.github.com> * using treeManager now Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * removed miss code Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * addde total commands Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * remove changes Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * remove comments Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * added a check for output Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * syntax and formula check Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * fix tests Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> * remove println Signed-off-by: victor-schumacher <victorschumacher255@gmail.com> Co-authored-by: victor-schumacher <victorschumacher255@gmail.com> Co-authored-by: henriquemoraeszup <68074718+henriquemoraeszup@users.noreply.github.com> Signed-off-by: Bruno N. Melo <brunonobrega.melo@gmail.com>

victor-schumacher added 2 commits October 27, 2020 18:36

add reading and filtering

19d8d93

adding

3f21521

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

victorschumacherzup changed the title ~~add reading and filtering~~ warning when formulas commands conflicts Oct 27, 2020

victor-schumacher added 2 commits October 29, 2020 11:45

finding and printing conflicts

7fde33e

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

add basic test

d507737

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

victorschumacherzup force-pushed the feature/warnOnConflictingCmds branch from 6341418 to db13c90 Compare October 29, 2020 19:47

fix lint

4f5b39d

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

victorschumacherzup force-pushed the feature/warnOnConflictingCmds branch from db13c90 to 4f5b39d Compare October 29, 2020 19:48

victor-schumacher added 8 commits October 29, 2020 16:58

remove spaces

b2011fd

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

merge master

a674ca6

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

fix main

19768d8

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

little refactor

7da4ee9

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

little refactor

a5e35d3

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

added a better test

6265bff

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

added a repeated command

5c3ce8f

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

added dir

1de7820

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

victorschumacherzup marked this pull request as ready for review October 30, 2020 16:03

victorschumacherzup requested review from brunasilvazup, henriquemoraeszup, kaduartur, lucasdittrichzup and rodrigomedeirosf as code owners October 30, 2020 16:03

victorschumacherzup self-assigned this Oct 30, 2020

victorschumacherzup added 🔨 improvement Improvement in features ✔️ ready-for-review ready for review labels Oct 30, 2020

victorschumacherzup requested a review from sandokandias October 30, 2020 16:04

victor-schumacher added 3 commits October 30, 2020 15:48

add check for no conflicting commands

b3fbcc0

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

added tree check to add repo

31fafd8

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

fix empty warning

0aede6f

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

victorschumacherzup dismissed brunasilvazup’s stale review via 8177672 November 6, 2020 13:19

henriquemoraeszup reviewed Nov 6, 2020

View reviewed changes

metrics.json Outdated Show resolved Hide resolved

henriquemoraeszup reviewed Nov 6, 2020

View reviewed changes

pkg/formula/input/prompt/prompt.go Outdated Show resolved Hide resolved

henriquemoraeszup reviewed Nov 6, 2020

View reviewed changes

pkg/formula/tree/checker.go Outdated Show resolved Hide resolved

victor-schumacher added 2 commits November 6, 2020 12:20

remove changes

ff1b177

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

remove comments

172adb3

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

henriquemoraeszup previously approved these changes Nov 6, 2020

View reviewed changes

added a check for output

6a9be03

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

victorschumacherzup dismissed henriquemoraeszup’s stale review via 6a9be03 November 6, 2020 16:05

brunasilvazup reviewed Nov 6, 2020

View reviewed changes

pkg/formula/tree/checker.go Outdated Show resolved Hide resolved

brunasilvazup previously approved these changes Nov 6, 2020

View reviewed changes

kaduartur suggested changes Nov 6, 2020

View reviewed changes

pkg/cmd/add_repo.go Outdated Show resolved Hide resolved

pkg/cmd/create_formula.go Outdated Show resolved Hide resolved

pkg/formula/tree/checker.go Outdated Show resolved Hide resolved

pkg/formula/tree/checker.go Outdated Show resolved Hide resolved

syntax and formula check

56e1fb4

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

victorschumacherzup dismissed brunasilvazup’s stale review via 56e1fb4 November 6, 2020 20:09

fix tests

a982635

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

remove println

7feac77

Signed-off-by: victor-schumacher <victorschumacher255@gmail.com>

henriquemoraeszup approved these changes Nov 9, 2020

View reviewed changes

kaduartur approved these changes Nov 9, 2020

View reviewed changes

kaduartur merged commit 7998361 into ZupIT:master Nov 9, 2020

henriquemoraeszup mentioned this pull request Nov 9, 2020

Notify the user of conflicting formula on the current tree #473

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

warning when formulas commands conflicts #638

warning when formulas commands conflicts #638

victorschumacherzup commented Oct 27, 2020 •

edited

Loading

codecov-io commented Oct 27, 2020 •

edited

Loading

henriquemoraeszup left a comment

victorschumacherzup commented Nov 6, 2020

ritchie-bot bot commented Nov 6, 2020

victorschumacherzup commented Nov 6, 2020

ritchie-bot bot commented Nov 6, 2020

victorschumacherzup commented Nov 9, 2020

ritchie-bot bot commented Nov 9, 2020

kaduartur commented Nov 9, 2020

ritchie-bot bot commented Nov 9, 2020

warning when formulas commands conflicts #638

warning when formulas commands conflicts #638

Conversation

victorschumacherzup commented Oct 27, 2020 • edited Loading

Description

Changelog

codecov-io commented Oct 27, 2020 • edited Loading

Codecov Report

henriquemoraeszup left a comment

Choose a reason for hiding this comment

victorschumacherzup commented Nov 6, 2020

ritchie-bot bot commented Nov 6, 2020

victorschumacherzup commented Nov 6, 2020

ritchie-bot bot commented Nov 6, 2020

victorschumacherzup commented Nov 9, 2020

ritchie-bot bot commented Nov 9, 2020

kaduartur commented Nov 9, 2020

ritchie-bot bot commented Nov 9, 2020

victorschumacherzup commented Oct 27, 2020 •

edited

Loading

codecov-io commented Oct 27, 2020 •

edited

Loading