build(deps): bump github.com/mistifyio/go-zfs/v3 from 3.0.0 to 3.0.1
Bumps [github.com/mistifyio/go-zfs/v3](https://github.com/mistifyio/go-zfs) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/mistifyio/go-zfs/releases) - [Changelog](https://github.com/mistifyio/go-zfs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mistifyio/go-zfs/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: github.com/mistifyio/go-zfs/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
parent
60e72ea3f6
commit
b901b0d7d4
2
go.mod
2
go.mod
|
|
@ -15,7 +15,7 @@ require (
|
||||||
github.com/klauspost/compress v1.16.5
|
github.com/klauspost/compress v1.16.5
|
||||||
github.com/klauspost/pgzip v1.2.6
|
github.com/klauspost/pgzip v1.2.6
|
||||||
github.com/mattn/go-shellwords v1.0.12
|
github.com/mattn/go-shellwords v1.0.12
|
||||||
github.com/mistifyio/go-zfs/v3 v3.0.0
|
github.com/mistifyio/go-zfs/v3 v3.0.1
|
||||||
github.com/moby/sys/mountinfo v0.6.2
|
github.com/moby/sys/mountinfo v0.6.2
|
||||||
github.com/opencontainers/go-digest v1.0.0
|
github.com/opencontainers/go-digest v1.0.0
|
||||||
github.com/opencontainers/runc v1.1.7
|
github.com/opencontainers/runc v1.1.7
|
||||||
|
|
|
||||||
4
go.sum
4
go.sum
|
|
@ -457,8 +457,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182aff
|
||||||
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
|
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
|
||||||
github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
|
github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
|
||||||
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
|
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
|
||||||
github.com/mistifyio/go-zfs/v3 v3.0.0 h1:J5QK618xRcXnQYZ2GE5FdmpS1ufIrWue+lR/mpe6/14=
|
github.com/mistifyio/go-zfs/v3 v3.0.1 h1:YaoXgBePoMA12+S1u/ddkv+QqxcfiZK4prI6HPnkFiU=
|
||||||
github.com/mistifyio/go-zfs/v3 v3.0.0/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
|
github.com/mistifyio/go-zfs/v3 v3.0.1/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
|
||||||
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||||
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||||
github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
|
github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
|
||||||
|
|
|
||||||
|
|
@ -37,13 +37,16 @@ func (c *command) Run(arg ...string) ([][]string, error) {
|
||||||
cmd.Stderr = &stderr
|
cmd.Stderr = &stderr
|
||||||
|
|
||||||
id := uuid.New().String()
|
id := uuid.New().String()
|
||||||
joinedArgs := strings.Join(cmd.Args, " ")
|
joinedArgs := cmd.Path
|
||||||
|
if len(cmd.Args) > 1 {
|
||||||
|
joinedArgs = strings.Join(append([]string{cmd.Path}, cmd.Args[1:]...), " ")
|
||||||
|
}
|
||||||
|
|
||||||
logger.Log([]string{"ID:" + id, "START", joinedArgs})
|
logger.Log([]string{"ID:" + id, "START", joinedArgs})
|
||||||
if err := cmd.Run(); err != nil {
|
if err := cmd.Run(); err != nil {
|
||||||
return nil, &Error{
|
return nil, &Error{
|
||||||
Err: err,
|
Err: err,
|
||||||
Debug: strings.Join([]string{cmd.Path, joinedArgs[1:]}, " "),
|
Debug: joinedArgs,
|
||||||
Stderr: stderr.String(),
|
Stderr: stderr.String(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -61,7 +64,7 @@ func (c *command) Run(arg ...string) ([][]string, error) {
|
||||||
output := make([][]string, len(lines))
|
output := make([][]string, len(lines))
|
||||||
|
|
||||||
for i, l := range lines {
|
for i, l := range lines {
|
||||||
output[i] = strings.Fields(l)
|
output[i] = strings.Split(l, "\t")
|
||||||
}
|
}
|
||||||
|
|
||||||
return output, nil
|
return output, nil
|
||||||
|
|
|
||||||
|
|
@ -15,5 +15,5 @@ var (
|
||||||
zpoolPropList = []string{"name", "health", "allocated", "size", "free", "readonly", "dedupratio", "fragmentation", "freeing", "leaked"}
|
zpoolPropList = []string{"name", "health", "allocated", "size", "free", "readonly", "dedupratio", "fragmentation", "freeing", "leaked"}
|
||||||
|
|
||||||
zpoolPropListOptions = strings.Join(zpoolPropList, ",")
|
zpoolPropListOptions = strings.Join(zpoolPropList, ",")
|
||||||
zpoolArgs = []string{"get", "-p", zpoolPropListOptions}
|
zpoolArgs = []string{"get", "-Hp", zpoolPropListOptions}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -15,5 +15,5 @@ var (
|
||||||
zpoolPropList = []string{"name", "health", "allocated", "size", "free", "readonly", "dedupratio"}
|
zpoolPropList = []string{"name", "health", "allocated", "size", "free", "readonly", "dedupratio"}
|
||||||
|
|
||||||
zpoolPropListOptions = strings.Join(zpoolPropList, ",")
|
zpoolPropListOptions = strings.Join(zpoolPropList, ",")
|
||||||
zpoolArgs = []string{"get", "-p", zpoolPropListOptions}
|
zpoolArgs = []string{"get", "-Hp", zpoolPropListOptions}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -49,9 +49,6 @@ func GetZpool(name string) (*Zpool, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// there is no -H
|
|
||||||
out = out[1:]
|
|
||||||
|
|
||||||
z := &Zpool{Name: name}
|
z := &Zpool{Name: name}
|
||||||
for _, line := range out {
|
for _, line := range out {
|
||||||
if err := z.parseLine(line); err != nil {
|
if err := z.parseLine(line); err != nil {
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ github.com/klauspost/pgzip
|
||||||
# github.com/mattn/go-shellwords v1.0.12
|
# github.com/mattn/go-shellwords v1.0.12
|
||||||
## explicit; go 1.13
|
## explicit; go 1.13
|
||||||
github.com/mattn/go-shellwords
|
github.com/mattn/go-shellwords
|
||||||
# github.com/mistifyio/go-zfs/v3 v3.0.0
|
# github.com/mistifyio/go-zfs/v3 v3.0.1
|
||||||
## explicit; go 1.14
|
## explicit; go 1.14
|
||||||
github.com/mistifyio/go-zfs/v3
|
github.com/mistifyio/go-zfs/v3
|
||||||
# github.com/moby/sys/mountinfo v0.6.2
|
# github.com/moby/sys/mountinfo v0.6.2
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue