Bumps the go-deps group with 7 updates in the / directory: | Package | From | To | | --- | --- | --- | | [cloud.google.com/go/compute](https://github.com/googleapis/google-cloud-go) | `1.27.3` | `1.27.4` | | [github.com/Azure/azure-sdk-for-go/sdk/storage/azblob](https://github.com/Azure/azure-sdk-for-go) | `1.3.2` | `1.4.0` | | [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) | `1.54.18` | `1.55.2` | | [github.com/gophercloud/gophercloud](https://github.com/gophercloud/gophercloud) | `1.13.0` | `1.14.0` | | [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) | `0.1.429` | `0.1.432` | | [github.com/osbuild/images](https://github.com/osbuild/images) | `0.70.0` | `0.72.0` | | [github.com/vmware/govmomi](https://github.com/vmware/govmomi) | `0.38.0` | `0.39.0` | Updates `cloud.google.com/go/compute` from 1.27.3 to 1.27.4 - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/compute/v1.27.3...compute/v1.27.4) Updates `github.com/Azure/azure-sdk-for-go/sdk/storage/azblob` from 1.3.2 to 1.4.0 - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/storage/azblob/v1.3.2...sdk/azcore/v1.4.0) Updates `github.com/aws/aws-sdk-go` from 1.54.18 to 1.55.2 - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.54.18...v1.55.2) Updates `github.com/gophercloud/gophercloud` from 1.13.0 to 1.14.0 - [Release notes](https://github.com/gophercloud/gophercloud/releases) - [Changelog](https://github.com/gophercloud/gophercloud/blob/v1.14.0/CHANGELOG.md) - [Commits](https://github.com/gophercloud/gophercloud/compare/v1.13.0...v1.14.0) Updates `github.com/openshift-online/ocm-sdk-go` from 0.1.429 to 0.1.432 - [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases) - [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md) - [Commits](https://github.com/openshift-online/ocm-sdk-go/compare/v0.1.429...v0.1.432) Updates `github.com/osbuild/images` from 0.70.0 to 0.72.0 - [Release notes](https://github.com/osbuild/images/releases) - [Commits](https://github.com/osbuild/images/compare/v0.70.0...v0.72.0) Updates `github.com/vmware/govmomi` from 0.38.0 to 0.39.0 - [Release notes](https://github.com/vmware/govmomi/releases) - [Changelog](https://github.com/vmware/govmomi/blob/main/CHANGELOG.md) - [Commits](https://github.com/vmware/govmomi/compare/v0.38.0...v0.39.0) Updates `google.golang.org/api` from 0.188.0 to 0.189.0 - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.188.0...v0.189.0) --- updated-dependencies: - dependency-name: cloud.google.com/go/compute dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/storage/azblob dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/gophercloud/gophercloud dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/openshift-online/ocm-sdk-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-deps - dependency-name: github.com/osbuild/images dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: github.com/vmware/govmomi dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-deps ... Signed-off-by: dependabot[bot] <support@github.com>
125 lines
2.3 KiB
Go
125 lines
2.3 KiB
Go
/*
|
|
Copyright (c) 2024-2024 VMware, Inc. All Rights Reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package progress
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
type LogFunc func(msg string) (int, error)
|
|
|
|
type ProgressLogger struct {
|
|
log LogFunc
|
|
prefix string
|
|
|
|
wg sync.WaitGroup
|
|
|
|
sink chan chan Report
|
|
done chan struct{}
|
|
}
|
|
|
|
func NewProgressLogger(log LogFunc, prefix string) *ProgressLogger {
|
|
p := &ProgressLogger{
|
|
log: log,
|
|
prefix: prefix,
|
|
|
|
sink: make(chan chan Report),
|
|
done: make(chan struct{}),
|
|
}
|
|
|
|
p.wg.Add(1)
|
|
|
|
go p.loopA()
|
|
|
|
return p
|
|
}
|
|
|
|
// loopA runs before Sink() has been called.
|
|
func (p *ProgressLogger) loopA() {
|
|
var err error
|
|
|
|
defer p.wg.Done()
|
|
|
|
tick := time.NewTicker(100 * time.Millisecond)
|
|
defer tick.Stop()
|
|
|
|
called := false
|
|
|
|
for stop := false; !stop; {
|
|
select {
|
|
case ch := <-p.sink:
|
|
err = p.loopB(tick, ch)
|
|
stop = true
|
|
called = true
|
|
case <-p.done:
|
|
stop = true
|
|
case <-tick.C:
|
|
line := fmt.Sprintf("\r%s", p.prefix)
|
|
p.log(line)
|
|
}
|
|
}
|
|
|
|
if err != nil && err != io.EOF {
|
|
p.log(fmt.Sprintf("\r%sError: %s\n", p.prefix, err))
|
|
} else if called {
|
|
p.log(fmt.Sprintf("\r%sOK\n", p.prefix))
|
|
}
|
|
}
|
|
|
|
// loopA runs after Sink() has been called.
|
|
func (p *ProgressLogger) loopB(tick *time.Ticker, ch <-chan Report) error {
|
|
var r Report
|
|
var ok bool
|
|
var err error
|
|
|
|
for ok = true; ok; {
|
|
select {
|
|
case r, ok = <-ch:
|
|
if !ok {
|
|
break
|
|
}
|
|
err = r.Error()
|
|
case <-tick.C:
|
|
line := fmt.Sprintf("\r%s", p.prefix)
|
|
if r != nil {
|
|
line += fmt.Sprintf("(%.0f%%", r.Percentage())
|
|
detail := r.Detail()
|
|
if detail != "" {
|
|
line += fmt.Sprintf(", %s", detail)
|
|
}
|
|
line += ")"
|
|
}
|
|
p.log(line)
|
|
}
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func (p *ProgressLogger) Sink() chan<- Report {
|
|
ch := make(chan Report)
|
|
p.sink <- ch
|
|
return ch
|
|
}
|
|
|
|
func (p *ProgressLogger) Wait() {
|
|
close(p.done)
|
|
p.wg.Wait()
|
|
}
|