From 60dd2e55f2224beeaab6b7b7a746658ac02ea5a3 Mon Sep 17 00:00:00 2001
From: Sara Omari <114062096+sarao1310@users.noreply.github.com>
Date: Wed, 14 Jun 2023 12:18:32 +0300
Subject: [PATCH] Bug Fix - Bug - CLI upload status bar keep increasing (#2017)

Bug Fix - Bug - CLI upload status bar keep increasing
---
 go.mod                                | 4 ++--
 go.sum                                | 8 ++++----
 utils/progressbar/filesprogressbar.go | 5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 3d5105db3..c91291965 100644
--- a/go.mod
+++ b/go.mod
@@ -123,8 +123,8 @@ require (
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go
 
-replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230611135850-d003935e8875
+replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230613104333-33061fa53a01
 
 // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27
 
-replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230611131847-a3b84a9004c3
+replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230614081045-ef833fcb4fdd
diff --git a/go.sum b/go.sum
index a5df7bd89..35e394b39 100644
--- a/go.sum
+++ b/go.sum
@@ -238,10 +238,10 @@ github.com/jfrog/build-info-go v1.9.6 h1:lCJ2j5uXAlJsSwDe5J8WD7Co1f/hUlZvMfwfb5A
 github.com/jfrog/build-info-go v1.9.6/go.mod h1:GbuFS+viHCKZYx9nWHYu7ab1DgQkFdtVN3BJPUNb2D4=
 github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk=
 github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0=
-github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230611135850-d003935e8875 h1:Ix7WQLxWNPuh36vAalOJsHZU6LWvfIKVV3gVpbCeATk=
-github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230611135850-d003935e8875/go.mod h1:Kzh4oTlJu1iYFNQcgAHgKIMvsvgC5LN2DlV/NHWCXZM=
-github.com/jfrog/jfrog-client-go v1.28.1-0.20230611131847-a3b84a9004c3 h1:bIpljSo/bnilaRky2mtXcljC0JmONgc97AEy1YG6rXE=
-github.com/jfrog/jfrog-client-go v1.28.1-0.20230611131847-a3b84a9004c3/go.mod h1:qEJxoe68sUtqHJ1YhXv/7pKYP/9p1D5tJrruzJKYeoI=
+github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230613104333-33061fa53a01 h1:MvKxuFsgCeIL74qeXJ7Z6rbDO0tfE15M3D24U0kGgFs=
+github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230613104333-33061fa53a01/go.mod h1:Kzh4oTlJu1iYFNQcgAHgKIMvsvgC5LN2DlV/NHWCXZM=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20230614081045-ef833fcb4fdd h1:/X2eIts0BRy3Y6AhzBnM+8Dmrl0assoBFG1iyW6Jq8U=
+github.com/jfrog/jfrog-client-go v1.28.1-0.20230614081045-ef833fcb4fdd/go.mod h1:qEJxoe68sUtqHJ1YhXv/7pKYP/9p1D5tJrruzJKYeoI=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jszwec/csvutil v1.8.0 h1:G7vS2LGdpZZDH1HmHeNbxOaJ/ZnJlpwGFvOkTkJzzNk=
diff --git a/utils/progressbar/filesprogressbar.go b/utils/progressbar/filesprogressbar.go
index a70e09a38..57997bedc 100644
--- a/utils/progressbar/filesprogressbar.go
+++ b/utils/progressbar/filesprogressbar.go
@@ -185,8 +185,11 @@ func (p *filesProgressBarManager) RemoveProgress(id int) {
 	defer p.barsWg.Done()
 	defer p.barsRWMutex.RUnlock()
 	p.bars[id-1].Abort()
-	p.generalProgressBar.Increment()
+}
 
+// Increases general progress bar by 1
+func (p *filesProgressBarManager) IncrementGeneralProgress() {
+	p.generalProgressBar.Increment()
 }
 
 // Quits the progress bar while aborting the initial bars.