Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency updates: #157

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Dependency updates: #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions csc/cmd/vartypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@ func (s *volumeCapabilitySliceArg) Type() string {
func (s *volumeCapabilitySliceArg) Set(val string) error {
// The data can be split into a max of 4 components:
// 1. mode
// 2. cap
// 3. fsType (if cap is mount)
// 4. mntFlags (if cap is mount)
// 2. volCap
// 3. fsType (if volCap is mount)
// 4. mntFlags (if volCap is mount)
data := strings.SplitN(val, ",", 4)
if len(data) < 2 {
return fmt.Errorf("invalid volume capability: %s", val)
}

var cap csi.VolumeCapability
var volCap csi.VolumeCapability

szMode := data[0]
if i, ok := csi.VolumeCapability_AccessMode_Mode_value[szMode]; ok {
cap.AccessMode = &csi.VolumeCapability_AccessMode{
volCap.AccessMode = &csi.VolumeCapability_AccessMode{
Mode: csi.VolumeCapability_AccessMode_Mode(i),
}
} else {
Expand All @@ -80,7 +80,7 @@ func (s *volumeCapabilitySliceArg) Set(val string) error {
return fmt.Errorf("invalid access mode: %v: %v", szMode, err)
}
if _, ok := csi.VolumeCapability_AccessMode_Mode_name[int32(i)]; ok {
cap.AccessMode = &csi.VolumeCapability_AccessMode{
volCap.AccessMode = &csi.VolumeCapability_AccessMode{
Mode: csi.VolumeCapability_AccessMode_Mode(i),
}
}
Expand All @@ -90,10 +90,10 @@ func (s *volumeCapabilitySliceArg) Set(val string) error {

// Handle a block volume capability
if szType == "1" || strings.EqualFold(szType, "block") {
cap.AccessType = &csi.VolumeCapability_Block{
volCap.AccessType = &csi.VolumeCapability_Block{
Block: &csi.VolumeCapability_BlockVolume{},
}
s.data = append(s.data, &cap)
s.data = append(s.data, &volCap)
return nil
}

Expand All @@ -105,7 +105,7 @@ func (s *volumeCapabilitySliceArg) Set(val string) error {
mountCap := &csi.VolumeCapability_MountVolume{
FsType: data[2],
}
cap.AccessType = &csi.VolumeCapability_Mount{
volCap.AccessType = &csi.VolumeCapability_Mount{
Mount: mountCap,
}

Expand All @@ -114,7 +114,7 @@ func (s *volumeCapabilitySliceArg) Set(val string) error {
mountCap.MountFlags = strings.Split(data[3], ",")
}

s.data = append(s.data, &cap)
s.data = append(s.data, &volCap)
return nil
}

Expand Down
60 changes: 29 additions & 31 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,39 @@
module github.com/rexray/gocsi

go 1.12
go 1.17

require (
github.com/akutz/gosync v0.1.0
github.com/akutz/memconn v0.1.0
github.com/container-storage-interface/spec v1.2.0
github.com/coreos/bbolt v1.3.3 // indirect
github.com/coreos/etcd v3.3.13+incompatible
github.com/container-storage-interface/spec v1.5.0
github.com/golang/protobuf v1.5.2
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.17.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
go.etcd.io/etcd/client/v3 v3.5.1
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9
google.golang.org/grpc v1.42.0
)

require (
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20190612170431-362f06ec6bc1 // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
github.com/golang/protobuf v1.3.1
github.com/google/btree v1.0.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.9.1 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jonboulle/clockwork v0.1.0 // indirect
github.com/onsi/ginkgo v1.4.0
github.com/onsi/gomega v1.3.0
github.com/prometheus/client_golang v0.9.4 // indirect
github.com/sirupsen/logrus v1.2.0
github.com/soheilhy/cmux v0.1.4 // indirect
github.com/spf13/cobra v0.0.1
github.com/spf13/pflag v1.0.0
github.com/nxadm/tail v1.4.8 // indirect
github.com/thecodeteam/gosync v0.1.0 // indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
go.etcd.io/bbolt v1.3.3 // indirect
go.uber.org/atomic v1.4.0 // indirect
go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.10.0 // indirect
golang.org/x/net v0.0.0-20181220203305-927f97764cc3
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
google.golang.org/grpc v1.19.0
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
golang.org/x/text v0.3.6 // indirect
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading