chore(cmd/cli): Reduce cyclomatic complexity of uninstall command #4825

shalier · 2022-06-16T04:05:01Z

Description:
Separate code into functions to reduce the cyclomatic complexity
Helps unblock #4555

Signed-off-by: Shalier Xia [email protected]

Reduces cyclomatic complexity 30->19

Testing done:

Affected area:

Functional Area
CLI Tool	[x ]
Other	[ ]

Please answer the following questions with yes/no.

Does this change contain code from or inspired by another project?
- Did you notify the maintainers and provide attribution?
Is this a breaking change?
Has documentation corresponding to this change been updated in the osm-docs repo (if applicable)?

codecov-commenter · 2022-06-16T04:18:28Z

Codecov Report

Merging #4825 (c05af3e) into main (aa1abf1) will increase coverage by 0.02%.
The diff coverage is 64.40%.

❗ Current head c05af3e differs from pull request most recent head 2355600. Consider uploading reports for the commit 2355600 to get more accurate results

@@            Coverage Diff             @@
##             main    #4825      +/-   ##
==========================================
+ Coverage   68.71%   68.73%   +0.02%     
==========================================
  Files         220      220              
  Lines       15907    15927      +20     
==========================================
+ Hits        10930    10947      +17     
- Misses       4925     4928       +3     
  Partials       52       52

Flag	Coverage Δ
unittests	`68.73% <64.40%> (+0.02%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
cmd/cli/uninstall_mesh.go	`69.91% <64.40%> (+0.63%)`	⬆️
pkg/ticker/ticker.go	`83.33% <0.00%> (-3.85%)`	⬇️
pkg/certificate/manager.go	`77.51% <0.00%> (+0.80%)`	⬆️
cmd/cli/util.go	`67.04% <0.00%> (+1.13%)`	⬆️

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 aa1abf1...2355600. Read the comment docs.

cmd/cli/uninstall_mesh.go

allenlsy · 2022-06-20T20:10:56Z

LGTM other than Thomas's comments

cmd/cli/uninstall_mesh.go

draychev

Who can argue against reduction in cyclomatic complexity!

Thank you for these changes @shalier

cmd/cli/uninstall_mesh.go

steeling

a couple small comments, but otherwise LGTM!

cmd/cli/uninstall_mesh.go

Separate code into functions to reduce the cyclomatic complexity And adds unit tests to functions created Helps unblock openservicemesh#4555 Signed-off-by: Shalier Xia <[email protected]>

Signed-off-by: Shalier Xia <[email protected]>

…function signature Signed-off-by: Shalier Xia <[email protected]>

Signed-off-by: Shalier Xia <[email protected]>

…to errors pkg Signed-off-by: Shalier Xia <[email protected]>

Signed-off-by: Shalier Xia <[email protected]>

* chore(cmd/cli): Reduce cyclomatic complexity of uninstall command (#4825) * chore(cmd/cli): Reduce cyclomatic complexity of uninstall command Separate code into functions to reduce the cyclomatic complexity And adds unit tests to functions created Helps unblock #4555 Signed-off-by: Shalier Xia <[email protected]> (cherry picked from commit d5d3a25) * Golang errors pkg (#4904) This PR partially resolves #4524 * Removes "github.com/pkg/errors" package from the repo * Wrap errors wherever possible rather than using the string format of the error as part of the message Signed-off-by: Allen Leigh <[email protected]> (cherry picked from commit 8030047) * fix golints and security scan issues (#4915) fix golints and security for: 1. G112 (ReadHeaderTimeout) 2. prometheus client_go version pinned to bad version Signed-off-by: Sean Teeling <[email protected]> (cherry picked from commit f768f64) * Fix lints by removing superfluous var type from var instantiation (#4917) Remove unnecessary var types during instantiation to fix lints Signed-off-by: Sean Teeling <[email protected]> (cherry picked from commit 9e9f712) Co-authored-by: Shalier Xia <[email protected]> Co-authored-by: allenlsy <[email protected]> Co-authored-by: steeling <[email protected]>

shalier requested review from shashankram, snehachhabria, nojnhuh, draychev, jaellio and trstringer as code owners June 16, 2022 04:05

shalier marked this pull request as draft June 16, 2022 05:14

shalier force-pushed the cyclomaticComplexityUninstall branch from 5bdb0b0 to ffc87fa Compare June 19, 2022 22:53

shalier marked this pull request as ready for review June 20, 2022 08:01

trstringer suggested changes Jun 20, 2022

View reviewed changes

cmd/cli/uninstall_mesh.go Outdated Show resolved Hide resolved

cmd/cli/uninstall_mesh.go Outdated Show resolved Hide resolved

jaellio reviewed Jun 20, 2022

View reviewed changes

cmd/cli/uninstall_mesh.go Outdated Show resolved Hide resolved

shalier force-pushed the cyclomaticComplexityUninstall branch from 0fbcb45 to 9ba7ab2 Compare June 20, 2022 20:36

mudit-01 reviewed Jun 21, 2022

View reviewed changes

cmd/cli/uninstall_mesh.go Outdated Show resolved Hide resolved

steeling suggested changes Jun 21, 2022

View reviewed changes

shalier force-pushed the cyclomaticComplexityUninstall branch 4 times, most recently from aaf0a87 to 1141e73 Compare June 28, 2022 19:28

shalier requested review from steeling, jaellio and trstringer June 28, 2022 20:21

shalier force-pushed the cyclomaticComplexityUninstall branch from 3272702 to 81f70f8 Compare June 29, 2022 18:22

nojnhuh approved these changes Jun 29, 2022

View reviewed changes

draychev approved these changes Jul 1, 2022

View reviewed changes

steeling reviewed Jul 1, 2022

View reviewed changes

cmd/cli/uninstall_mesh.go Outdated Show resolved Hide resolved

steeling reviewed Jul 1, 2022

View reviewed changes

cmd/cli/uninstall_mesh.go Outdated Show resolved Hide resolved

steeling reviewed Jul 1, 2022

View reviewed changes

shalier requested a review from keithmattix as a code owner July 1, 2022 20:30

shalier requested a review from steeling July 1, 2022 20:31

shalier force-pushed the cyclomaticComplexityUninstall branch from f994bdb to ef6890d Compare July 1, 2022 20:34

steeling approved these changes Jul 1, 2022

View reviewed changes

jaellio suggested changes Jul 6, 2022

View reviewed changes

cmd/cli/uninstall_mesh.go Outdated Show resolved Hide resolved

shalier force-pushed the cyclomaticComplexityUninstall branch from acdb9ec to c05af3e Compare July 7, 2022 16:21

shalier added 6 commits July 7, 2022 09:32

chore(cmd/cli): Reduce cyclomatic complexity of uninstall command

6a246d5

Separate code into functions to reduce the cyclomatic complexity And adds unit tests to functions created Helps unblock openservicemesh#4555 Signed-off-by: Shalier Xia <[email protected]>

simplify code + reduce indentation

a819521

Signed-off-by: Shalier Xia <[email protected]>

change function name: findFlagSpecifiedMesh -> findSpecifiedMesh and …

9c1354e

…function signature Signed-off-by: Shalier Xia <[email protected]>

import chartutil

9e125d4

Signed-off-by: Shalier Xia <[email protected]>

refactor meshFlagSpecified var use to meshSpecified() and remove ref …

c5852f8

…to errors pkg Signed-off-by: Shalier Xia <[email protected]>

add back check for if mesh is specified

2355600

Signed-off-by: Shalier Xia <[email protected]>

shalier force-pushed the cyclomaticComplexityUninstall branch from c05af3e to 2355600 Compare July 7, 2022 16:33

shalier requested a review from jaellio July 8, 2022 16:51

jaellio approved these changes Jul 8, 2022

View reviewed changes

trstringer approved these changes Jul 14, 2022

View reviewed changes

trstringer merged commit d5d3a25 into openservicemesh:main Jul 14, 2022

nojnhuh mentioned this pull request Jul 20, 2022

chore(release): add missing cherry picks #4932

Merged

shalier deleted the cyclomaticComplexityUninstall branch November 16, 2022 00:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(cmd/cli): Reduce cyclomatic complexity of uninstall command #4825

chore(cmd/cli): Reduce cyclomatic complexity of uninstall command #4825

shalier commented Jun 16, 2022 •

edited

Loading

codecov-commenter commented Jun 16, 2022 •

edited

Loading

allenlsy commented Jun 20, 2022

draychev left a comment

steeling left a comment

chore(cmd/cli): Reduce cyclomatic complexity of uninstall command #4825

chore(cmd/cli): Reduce cyclomatic complexity of uninstall command #4825

Conversation

shalier commented Jun 16, 2022 • edited Loading

codecov-commenter commented Jun 16, 2022 • edited Loading

Codecov Report

allenlsy commented Jun 20, 2022

draychev left a comment

Choose a reason for hiding this comment

steeling left a comment

Choose a reason for hiding this comment

shalier commented Jun 16, 2022 •

edited

Loading

codecov-commenter commented Jun 16, 2022 •

edited

Loading