Bump cheggaaa/pb library to newer version

joaopapereira · joaopapereira · commit 6b87db86c132 · 2024-11-20T13:58:46.000-06:00
Signed-off-by: João Pereira &lt;joao.pereira@broadcom.com&gt;
diff --git a/.github/license/LICENSE-WITH-3RD-PARTY-LICENSES b/.github/license/LICENSE-WITH-3RD-PARTY-LICENSES
@@ -840,34 +840,35 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-For vendor/gopkg.in/cheggaaa/pb.v1:
-
-Copyright (c) 2012-2015, Sergey Cherepanov All rights reserved.
+For vendor/github.com/cheggaaa/pb:
+Copyright (c) 2012-2024, Sergey Cherepanov
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
 
 * Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following disclaimer in the documentation
-* and/or other materials provided with the distribution.
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-* Neither the name of the author nor the names of its contributors may be used
-* to endorse or promote products derived from this software without specific
-* prior written permission.
+* Neither the name of the author nor the names of its contributors may be
+  used to endorse or promote products derived from this software without
+  specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
 
 For vendor/github.com/sabhiram/go-gitignore:
 
diff --git a/actor/v7action/progress_bar.go b/actor/v7action/progress_bar.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"gopkg.in/cheggaaa/pb.v1"
+	"github.com/cheggaaa/pb/v3"
 )
 
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SimpleProgressBar
@@ -34,8 +34,7 @@ func (p *ProgressBar) Initialize(path string) (io.Reader, int64, error) {
 		return nil, 0, err
 	}
 
-	p.bar = pb.New(int(fileInfo.Size())).SetUnits(pb.U_BYTES)
-	p.bar.ShowTimeLeft = false
+	p.bar = pb.New(int(fileInfo.Size())).Set(pb.Bytes, true)
 	p.bar.Start()
 	return p.bar.NewProxyReader(file), fileInfo.Size(), nil
 
diff --git a/command/plugin/shared/progress_bar_proxy_reader.go b/command/plugin/shared/progress_bar_proxy_reader.go
@@ -3,7 +3,7 @@ package shared
 import (
 	"io"
 
-	pb "gopkg.in/cheggaaa/pb.v1"
+	"github.com/cheggaaa/pb/v3"
 )
 
 // ProgressBarProxyReader wraps a progress bar in a ProxyReader interface.
@@ -17,8 +17,9 @@ func (p ProgressBarProxyReader) Wrap(reader io.Reader) io.ReadCloser {
 }
 
 func (p *ProgressBarProxyReader) Start(size int64) {
-	p.bar = pb.New(int(size)).SetUnits(pb.U_BYTES)
-	p.bar.Output = p.writer
+	p.bar = pb.New(int(size))
+	p.bar.Set(pb.Bytes, true)
+	p.bar.SetWriter(p.writer)
 	p.bar.Start()
 }
 
diff --git a/go.mod b/go.mod
@@ -18,6 +18,7 @@ require (
 	code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d
 	github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2
 	github.com/blang/semver/v4 v4.0.0
+	github.com/cheggaaa/pb/v3 v3.1.6-0.20241030110445-d0803d4621f5
 	github.com/cloudfoundry/bosh-cli v6.4.1+incompatible
 	github.com/creack/pty v1.1.24
 	github.com/cyphar/filepath-securejoin v0.3.4
@@ -43,7 +44,6 @@ require (
 	golang.org/x/net v0.31.0
 	golang.org/x/term v0.26.0
 	golang.org/x/text v0.20.0
-	gopkg.in/cheggaaa/pb.v1 v1.0.28
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/apimachinery v0.31.2
 	k8s.io/client-go v0.31.2
@@ -52,6 +52,7 @@ require (
 require (
 	code.cloudfoundry.org/inigo v0.0.0-20230612153013-b300679e6ed6 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/bmatcuk/doublestar v1.3.4 // indirect
 	github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect
 	github.com/charlievieth/fs v0.0.3 // indirect
diff --git a/go.sum b/go.sum
@@ -35,6 +35,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 h1:koK7z0nSsRiRiBWwa+E714Puh+DO+ZRdIyAXiXzL+lg=
 github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
+github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
+github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
@@ -45,6 +47,8 @@ github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
 github.com/charlievieth/fs v0.0.3 h1:3lZQXTj4PbE81CVPwALSn+JoyCNXkZgORHN6h2XHGlg=
 github.com/charlievieth/fs v0.0.3/go.mod h1:hD4sRzto1Hw8zCua76tNVKZxaeZZr1RiKftjAJQRLLo=
+github.com/cheggaaa/pb/v3 v3.1.6-0.20241030110445-d0803d4621f5 h1:0WNR2UJeJpJs1EmPSa7nxmCeCyXrf8wjegGddFcgeCM=
+github.com/cheggaaa/pb/v3 v3.1.6-0.20241030110445-d0803d4621f5/go.mod h1:zg5MTEnDmw0iIbV8UYIwRA7NiCpf4FBVCXGZUtlDlJQ=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -376,8 +380,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk=
-gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
diff --git a/util/download/downloadfakes/fake_progress_bar.go b/util/download/downloadfakes/fake_progress_bar.go
diff --git a/util/download/progress_bar.go b/util/download/progress_bar.go
@@ -3,7 +3,7 @@ package download
 import (
 	"io"
 
-	pb "gopkg.in/cheggaaa/pb.v1"
+	"github.com/cheggaaa/pb/v3"
 )
 
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ProgressBar
diff --git a/util/progressbar/progress_bar.go b/util/progressbar/progress_bar.go
@@ -4,8 +4,8 @@ import (
 	"io"
 	"time"
 
+	"github.com/cheggaaa/pb/v3"
 	log "github.com/sirupsen/logrus"
-	pb "gopkg.in/cheggaaa/pb.v1"
 )
 
 type ProgressBar struct {
@@ -34,8 +34,8 @@ func (p *ProgressBar) NewProgressBarWrapper(reader io.Reader, sizeOfFile int64)
 	}
 
 	log.Debug("progress bar ready")
-	p.bar = pb.New(int(sizeOfFile)).SetUnits(pb.U_BYTES)
-	p.bar.ShowTimeLeft = false
+	p.bar = pb.New(int(sizeOfFile))
+	p.bar.Set(pb.Bytes, true)
 	p.bar.Start()
 	return p.bar.NewProxyReader(reader)
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`	`"time"`
`7`	`7`
`8`		`- "gopkg.in/cheggaaa/pb.v1"`
	`8`	`+ "github.com/cheggaaa/pb/v3"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . SimpleProgressBar`
`@@ -34,8 +34,7 @@ func (p *ProgressBar) Initialize(path string) (io.Reader, int64, error) {`
`34`	`34`	`return nil, 0, err`
`35`	`35`	`}`
`36`	`36`
`37`		`- p.bar = pb.New(int(fileInfo.Size())).SetUnits(pb.U_BYTES)`
`38`		`- p.bar.ShowTimeLeft = false`
	`37`	`+ p.bar = pb.New(int(fileInfo.Size())).Set(pb.Bytes, true)`
`39`	`38`	`p.bar.Start()`
`40`	`39`	`return p.bar.NewProxyReader(file), fileInfo.Size(), nil`
`41`	`40`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package shared`
`3`	`3`	`import (`
`4`	`4`	`"io"`
`5`	`5`
`6`		`- pb "gopkg.in/cheggaaa/pb.v1"`
	`6`	`+ "github.com/cheggaaa/pb/v3"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// ProgressBarProxyReader wraps a progress bar in a ProxyReader interface.`
`@@ -17,8 +17,9 @@ func (p ProgressBarProxyReader) Wrap(reader io.Reader) io.ReadCloser {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`func (p *ProgressBarProxyReader) Start(size int64) {`
`20`		`- p.bar = pb.New(int(size)).SetUnits(pb.U_BYTES)`
`21`		`- p.bar.Output = p.writer`
	`20`	`+ p.bar = pb.New(int(size))`
	`21`	`+ p.bar.Set(pb.Bytes, true)`
	`22`	`+ p.bar.SetWriter(p.writer)`
`22`	`23`	`p.bar.Start()`
`23`	`24`	`}`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package download`
`3`	`3`	`import (`
`4`	`4`	`"io"`
`5`	`5`
`6`		`- pb "gopkg.in/cheggaaa/pb.v1"`
	`6`	`+ "github.com/cheggaaa/pb/v3"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ProgressBar`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"io"`
`5`	`5`	`"time"`
`6`	`6`
	`7`	`+ "github.com/cheggaaa/pb/v3"`
`7`	`8`	`log "github.com/sirupsen/logrus"`
`8`		`- pb "gopkg.in/cheggaaa/pb.v1"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type ProgressBar struct {`
`@@ -34,8 +34,8 @@ func (p *ProgressBar) NewProgressBarWrapper(reader io.Reader, sizeOfFile int64)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`log.Debug("progress bar ready")`
`37`		`- p.bar = pb.New(int(sizeOfFile)).SetUnits(pb.U_BYTES)`
`38`		`- p.bar.ShowTimeLeft = false`
	`37`	`+ p.bar = pb.New(int(sizeOfFile))`
	`38`	`+ p.bar.Set(pb.Bytes, true)`
`39`	`39`	`p.bar.Start()`
`40`	`40`	`return p.bar.NewProxyReader(reader)`
`41`	`41`	`}`