diff --git a/cmd/karavictl/cmd/role.go b/cmd/karavictl/cmd/role.go index 8f82c3f3..3c5eca62 100644 --- a/cmd/karavictl/cmd/role.go +++ b/cmd/karavictl/cmd/role.go @@ -242,7 +242,7 @@ func validatePowerScaleIsiPath(storageSystemDetails System, storageSystemID stri } epURL.Scheme = "https" - c, err := pscale.NewClientWithArgs(context.Background(), epURL.String(), storageSystemDetails.Insecure, 1, storageSystemDetails.User, "Administrators", storageSystemDetails.Password, "", "777", 0) + c, err := pscale.NewClientWithArgs(context.Background(), epURL.String(), storageSystemDetails.Insecure, uint(1), storageSystemDetails.User, "Administrators", storageSystemDetails.Password, "", "777", false, uint8(0)) if err != nil { return fmt.Errorf("powerscale authentication failed: %+v", err) } diff --git a/cmd/karavictl/cmd/storage_create.go b/cmd/karavictl/cmd/storage_create.go index b7a1ccbe..1f4c0590 100644 --- a/cmd/karavictl/cmd/storage_create.go +++ b/cmd/karavictl/cmd/storage_create.go @@ -332,7 +332,7 @@ func NewStorageCreateCmd() *cobra.Command { tempStorage = make(map[string]System) } - psClient, err := pscale.NewClientWithArgs(context.Background(), epURL.String(), input.ArrayInsecure, 1, input.User, "Administrators", input.Password, "", "777", 0) + psClient, err := pscale.NewClientWithArgs(context.Background(), epURL.String(), input.ArrayInsecure, uint(1), input.User, "Administrators", input.Password, "", "777", false, uint8(0)) if err != nil { errAndExit(err) } diff --git a/go.mod b/go.mod index d8d84943..6a143db0 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/alicebob/miniredis/v2 v2.17.0 - github.com/dell/goisilon v1.9.1-0.20221109063552-faabba2ba665 - github.com/dell/gopowermax/v2 v2.0.1-0.20221110125204-19ba5b526a77 - github.com/dell/goscaleio v1.8.1-0.20221028175854-ea08d8f5e7ad + github.com/dell/goisilon v1.10.0 + github.com/dell/gopowermax/v2 v2.1.0 + github.com/dell/goscaleio v1.9.0 github.com/dustin/go-humanize v1.0.0 github.com/fsnotify/fsnotify v1.5.1 github.com/go-redis/redis v6.15.9+incompatible @@ -114,7 +114,7 @@ require ( go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect - golang.org/x/sys v0.1.0 // indirect + golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.3.8 // indirect google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index b524c81e..50061920 100644 --- a/go.sum +++ b/go.sum @@ -120,12 +120,12 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d h1:1iy2qD6JEhHKKhUOA9IWs7mjco7lnw2qx8FsRI2wirE= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE= -github.com/dell/goisilon v1.9.1-0.20221109063552-faabba2ba665 h1:a78mtVQYNB+wgiUI2oaIvhJAwtyv3GFQcMXHihtXCeA= -github.com/dell/goisilon v1.9.1-0.20221109063552-faabba2ba665/go.mod h1:fJXHyh1JBcbsmPBquEulaNOFTpj1eEN5vISDf/UY1RQ= -github.com/dell/gopowermax/v2 v2.0.1-0.20221110125204-19ba5b526a77 h1:ddQ13jjKJa1wr1B38GR4C+kIFFhR5jT9pSq1yo8/7JA= -github.com/dell/gopowermax/v2 v2.0.1-0.20221110125204-19ba5b526a77/go.mod h1:m5/9UOSuhs12+CnSpytJaWC53m2i4TNJ1360w7gChmc= -github.com/dell/goscaleio v1.8.1-0.20221028175854-ea08d8f5e7ad h1:N9BUiu8ZkCt+k19hRTj1QPeSltmw0Tty2KdlpL+MH8A= -github.com/dell/goscaleio v1.8.1-0.20221028175854-ea08d8f5e7ad/go.mod h1:TJbQ8N6hk48w5rEyBa+pRtrRJbPVnCTsYM3mmUyPNaY= +github.com/dell/goisilon v1.10.0 h1:3TgECPV/6RzTQsDfhc1rR5rFyKJMNLYopbUJtHpYfyc= +github.com/dell/goisilon v1.10.0/go.mod h1:fJXHyh1JBcbsmPBquEulaNOFTpj1eEN5vISDf/UY1RQ= +github.com/dell/gopowermax/v2 v2.1.0 h1:KsR3GwW1YxD798G+Sdnix6f7ot8zIA1vGRal57CcwLo= +github.com/dell/gopowermax/v2 v2.1.0/go.mod h1:m5/9UOSuhs12+CnSpytJaWC53m2i4TNJ1360w7gChmc= +github.com/dell/goscaleio v1.9.0 h1:7A43HVUIYdIt0o0r3wlDVeZDOUlrVEjX+A+IAseGsSs= +github.com/dell/goscaleio v1.9.0/go.mod h1:f+OsYKdKJc8j/a0uHI6nJZpiMfx7wDd6yq78dAeBHsg= github.com/docker/distribution v2.8.0+incompatible h1:l9EaZDICImO1ngI+uTifW+ZYvvz7fKISBAKpg+MbWbY= github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v20.10.18+incompatible h1:SN84VYXTBNGn92T/QwIRPlum9zfemfitN7pbsp26WSc= @@ -789,8 +789,8 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= diff --git a/internal/role-service/validate/powerscale.go b/internal/role-service/validate/powerscale.go index 42f4a002..25fc71db 100644 --- a/internal/role-service/validate/powerscale.go +++ b/internal/role-service/validate/powerscale.go @@ -53,7 +53,7 @@ func PowerScale(ctx context.Context, log *logrus.Entry, system types.System, sys }).Debug("Establishing connection to PowerScale") epURL.Scheme = "https" - c, err := pscale.NewClientWithArgs(ctx, epURL.String(), system.Insecure, 1, system.User, "Administrators", system.Password, "", "777", 0) + c, err := pscale.NewClientWithArgs(ctx, epURL.String(), system.Insecure, uint(1), system.User, "Administrators", system.Password, "", "777", false, uint8(0)) if err != nil { return fmt.Errorf("powerscale authentication failed: %+v", err) } diff --git a/internal/storage-service/validate/powerscale.go b/internal/storage-service/validate/powerscale.go index 45709a27..907ebf00 100644 --- a/internal/storage-service/validate/powerscale.go +++ b/internal/storage-service/validate/powerscale.go @@ -39,7 +39,7 @@ func PowerScale(ctx context.Context, log *logrus.Entry, system types.System, sys } epURL.Scheme = "https" - psClient, err := pscale.NewClientWithArgs(context.Background(), epURL.String(), system.Insecure, 1, system.User, "Administrators", system.Password, "", "777", 0) + psClient, err := pscale.NewClientWithArgs(context.Background(), epURL.String(), system.Insecure, uint(1), system.User, "Administrators", system.Password, "", "777", false, uint8(0)) if err != nil { return fmt.Errorf("failed to connect to powerscale %s: %+v", systemID, err) }