Skip to content

Commit

Permalink
Merge pull request #7 from vngcloud/dev
Browse files Browse the repository at this point in the history
[release] upgrade dependencies
  • Loading branch information
cuongpiger authored Jan 14, 2025
2 parents a4c1851 + 120a8bf commit ad2fc1c
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ go 1.22.3

require (
github.com/container-storage-interface/spec v1.9.0
github.com/cuongpiger/joat v1.0.12
github.com/cuongpiger/joat v1.0.17
github.com/spf13/pflag v1.0.5
github.com/vngcloud/vngcloud-csi-volume-modifier v1.0.2
github.com/vngcloud/vngcloud-go-sdk/v2 v2.2.32
github.com/vngcloud/vngcloud-go-sdk/v2 v2.11.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0
go.opentelemetry.io/otel v1.26.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0
Expand Down Expand Up @@ -35,8 +35,8 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/imroc/req/v3 v3.43.7 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/imroc/req/v3 v3.44.0 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/onsi/ginkgo/v2 v2.17.3 // indirect
github.com/onsi/gomega v1.33.1 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBS
github.com/container-storage-interface/spec v1.9.0 h1:zKtX4STsq31Knz3gciCYCi1SXtO2HJDecIjDVboYavY=
github.com/container-storage-interface/spec v1.9.0/go.mod h1:ZfDu+3ZRyeVqxZM0Ds19MVLkN2d1XJ5MAfi1L3VjlT0=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cuongpiger/joat v1.0.12 h1:jWaWJ0yI9iotmU41yvkgrdoC57tg0lL1Hh5c2ErzUso=
github.com/cuongpiger/joat v1.0.12/go.mod h1:Oi1GvzXKHc0nlEnh9pGCFK13h8+EhDnWmfv2TiNH35g=
github.com/cuongpiger/joat v1.0.17 h1:P6VZZhZplLjKRnfbHRal8jkgXNBp69Sj9lQ7aST6Hmo=
github.com/cuongpiger/joat v1.0.17/go.mod h1:Oi1GvzXKHc0nlEnh9pGCFK13h8+EhDnWmfv2TiNH35g=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -64,8 +64,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
github.com/imroc/req/v3 v3.43.7 h1:dOcNb9n0X83N5/5/AOkiU+cLhzx8QFXjv5MhikazzQA=
github.com/imroc/req/v3 v3.43.7/go.mod h1:SQIz5iYop16MJxbo8ib+4LnostGCok8NQf8ToyQc2xA=
github.com/imroc/req/v3 v3.44.0 h1:JBrxoN5DykYvkeEZx3dski8/A+WVz9HD147cwEeyFlM=
github.com/imroc/req/v3 v3.44.0/go.mod h1:6cQ91w7qPn+bYjcWnA1S/LmTh6z3cz8Oa9qdwm7gS8w=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
Expand All @@ -74,8 +74,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
Expand Down Expand Up @@ -126,8 +126,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/vngcloud/vngcloud-csi-volume-modifier v1.0.2 h1:LBSW1T0W4HxJKtpgSYbL5ZL1XiyOTF2nHIs8uqG5uoo=
github.com/vngcloud/vngcloud-csi-volume-modifier v1.0.2/go.mod h1:wkhxk+x3ILNOk0aUxGivvhdiOXxPOVNXeRDHUx/IR50=
github.com/vngcloud/vngcloud-go-sdk/v2 v2.2.32 h1:lBxiMs77vhcJbom5SNWNsOegDjHgUSKTlnujy5e9ecM=
github.com/vngcloud/vngcloud-go-sdk/v2 v2.2.32/go.mod h1:TN4rl3ifgmGoFCBOEdzr0lV4raBDmo13XKbRvxtlktw=
github.com/vngcloud/vngcloud-go-sdk/v2 v2.11.0 h1:+W3rrDyFWfaU7jIvcoy00yO52ZGS6pb7VU10Edz4SyY=
github.com/vngcloud/vngcloud-go-sdk/v2 v2.11.0/go.mod h1:FetWUe2fEuqySEkYgkuDgt/WOAlI/YC02reGqjdJRMU=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0=
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (s *cloud) EitherCreateResizeVolume(preq lsdkVolumeV2.ICreateBlockVolumeReq
var (
vol, tmpVol *lsdkEntity.Volume
serr lserr.IError
sdkErr lsdkErrs.ISdkError
sdkErr lsdkErrs.IError
)

// Get the volume depend on the volume name
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloud/cloud_private.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,14 @@ func (s *cloud) waitVolumeAchieveStatus(pvolID string, pdesiredStatus lset.Set[s
return resVolume, nil
}

func (s *cloud) checkSameZone(pvolTypeA, pvolTypeB string) (bool, lsdkErrs.ISdkError) {
func (s *cloud) checkSameZone(pvolTypeA, pvolTypeB string) (bool, lsdkErrs.IError) {
if pvolTypeA == pvolTypeB {
return true, nil
}

var (
zoneSet = ljset.NewSet[string]()
sdkErr lsdkErrs.ISdkError
sdkErr lsdkErrs.IError
)

group, _ := lerrgroup.WithContext(lctx.TODO())
Expand Down
8 changes: 4 additions & 4 deletions pkg/cloud/errors/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var (
WithKVparameters("volumeId", pvolId))
}

ErrVolumeFailedToDetach = func(pinstanceId, pvolId string, psdkErr lsdkErr.ISdkError) IError {
ErrVolumeFailedToDetach = func(pinstanceId, pvolId string, psdkErr lsdkErr.IError) IError {
return NewError(new(lsdkErr.SdkError).
WithErrorCode(EcVServerVolumeFailedToDetach).
WithErrors(psdkErr.GetError()).
Expand All @@ -23,7 +23,7 @@ var (
WithParameters(psdkErr.GetParameters()))
}

ErrVolumeFailedToGet = func(pvolId string, psdkErr lsdkErr.ISdkError) IError {
ErrVolumeFailedToGet = func(pvolId string, psdkErr lsdkErr.IError) IError {
return NewError(new(lsdkErr.SdkError).
WithErrorCode(EcVServerVolumeFailedToGet).
WithErrors(psdkErr.GetError()).
Expand All @@ -32,7 +32,7 @@ var (
WithParameters(psdkErr.GetParameters()))
}

ErrVolumeFailedToDelete = func(pvolId string, psdkErr lsdkErr.ISdkError) IError {
ErrVolumeFailedToDelete = func(pvolId string, psdkErr lsdkErr.IError) IError {
return NewError(new(lsdkErr.SdkError).
WithErrorCode(EcVServerVolumeFailedToDelete).
WithErrors(psdkErr.GetError()).
Expand All @@ -48,7 +48,7 @@ var (
WithKVparameters("volumeId", pvolId))
}

ErrVolumeFailedToAttach = func(pinstanceId, pvolId string, psdkErr lsdkErr.ISdkError) IError {
ErrVolumeFailedToAttach = func(pinstanceId, pvolId string, psdkErr lsdkErr.IError) IError {
return NewError(new(lsdkErr.SdkError).
WithErrorCode(EcVServerVolumeFailedToAttach).
WithErrors(psdkErr.GetError()).
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloud/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package errors
import lsdkErrs "github.com/vngcloud/vngcloud-go-sdk/v2/vngcloud/sdk_error"

type errors struct {
lsdkErrs.ISdkError
lsdkErrs.IError
}

func NewError(psdkErr lsdkErrs.ISdkError) IError {
func NewError(psdkErr lsdkErrs.IError) IError {
return &errors{psdkErr}
}
2 changes: 1 addition & 1 deletion pkg/cloud/errors/ierrors.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ package errors
import lsdkErrs "github.com/vngcloud/vngcloud-go-sdk/v2/vngcloud/sdk_error"

type IError interface {
lsdkErrs.ISdkError
lsdkErrs.IError
}

0 comments on commit ad2fc1c

Please sign in to comment.