Skip to content

Commit

Permalink
Fix build (#37)
Browse files Browse the repository at this point in the history 
Signed-off-by: Emruz Hossain <[email protected]>
  • Loading branch information
@hossainemruz
hossainemruz authored Aug 26, 2020
1 parent 77a76a7 commit 132ae15
Show file tree
Hide file tree
Showing 84 changed files with 17,229 additions and 4,037 deletions.
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require (
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/json-iterator/go v1.1.8
github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1-0.20200521091436-82ef6e66e992
github.com/pkg/errors v0.8.1
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v0.0.5
k8s.io/api v0.18.3
k8s.io/apimachinery v0.18.3
k8s.io/apimachinery v0.18.8
k8s.io/cli-runtime v0.18.3
k8s.io/client-go v12.0.0+incompatible
k8s.io/component-base v0.18.3
Expand All @@ -20,8 +20,8 @@ require (
kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d
kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226
kmodules.xyz/openshift v0.0.0-20200522123204-ce4abf5433c8
stash.appscode.dev/apimachinery v0.10.0-beta.1
stash.appscode.dev/stash v0.10.0-beta.1
stash.appscode.dev/apimachinery v0.10.0-beta.1.0.20200824083420-254ee64edd3b
stash.appscode.dev/stash v0.10.0-beta.1.0.20200822080632-48e5c87e68ba
)

replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
Expand Down
22 changes: 16 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,8 @@ github.com/peterbourgon/mergemap v0.0.0-20130613134717-e21c03b7a721/go.mod h1:jQ
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
Expand Down Expand Up @@ -637,6 +639,8 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3Ifn
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI=
github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
go.bytebuilders.dev/license-verifier v0.2.2/go.mod h1:0zzm7+djZ/Ff41BNZYWH80t9mMb42T3Nx2KqQGV9N8s=
go.bytebuilders.dev/license-verifier/kubernetes v0.2.2/go.mod h1:6EBz3hqfm1eesfeYMnN86t8YSjemJY5TSrojFXaLBxI=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
Expand Down Expand Up @@ -673,6 +677,8 @@ golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 h1:/Tl7pH94bvbAAHBdZJT947
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand Down Expand Up @@ -727,6 +733,8 @@ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8ou
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -827,6 +835,7 @@ gomodules.xyz/envsubst v0.1.0/go.mod h1:2o5f7bd13XIITbE2ZKieE05YkqB2KDoZkqKccGeb
gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k=
gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
gomodules.xyz/sets v0.0.0-20200817084356-ae6e5e14ce3d/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc=
gomodules.xyz/stow v0.2.3/go.mod h1:S9/zV1kNAWAvqmdum0oByA4+aNdTdoK9hKb1bObf1BI=
gomodules.xyz/version v0.1.0 h1:inGItCg/egI0jPMeIE0SQkiDIJaodOMoCrxYqasQLR0=
gomodules.xyz/version v0.1.0/go.mod h1:Y8xuV02mL/45psyPKG3NCVOwvAOy6T5Kx0l3rCjKSjU=
Expand Down Expand Up @@ -953,8 +962,8 @@ kmodules.xyz/client-go v0.0.0-20200522120609-c6430d66212f h1:8UjB4zeASqedORHWpGo
kmodules.xyz/client-go v0.0.0-20200522120609-c6430d66212f/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371 h1:PPawDOMyDHGeDPN8j1epNozaIB/Z7MlJsXpwm/r4jgk=
kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
kmodules.xyz/client-go v0.0.0-20200630053911-20d035822d35 h1:gDzZWVvgAaEBzo4lxMGhPUWqySgFyFDkcqw3NskZiwQ=
kmodules.xyz/client-go v0.0.0-20200630053911-20d035822d35/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
kmodules.xyz/client-go v0.0.0-20200807163543-64a96054c515/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
kmodules.xyz/client-go v0.0.0-20200818143024-600fef263e03/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
kmodules.xyz/client-go v0.0.0-20200818171030-24b2ce405feb h1:0yIIoTfkhR4JAgx8UyXbP7oAveVAOcf66+D+20Uj/Uc=
kmodules.xyz/client-go v0.0.0-20200818171030-24b2ce405feb/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
Expand Down Expand Up @@ -995,8 +1004,9 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
stash.appscode.dev/apimachinery v0.10.0-beta.1 h1:R1IhAhZ/iUbs2M+v9LYJacDCOmc4lk00JzSjVBrxOG0=
stash.appscode.dev/apimachinery v0.10.0-beta.1/go.mod h1:v3rBovazmdCv/9rAA5U7LpDRFhVqcLsagnLlbPfD2Eg=
stash.appscode.dev/stash v0.10.0-beta.1 h1:8XZkMwUjVWEul2J1pfjw5HXLDBTHDCWvhrNRPt4qeF8=
stash.appscode.dev/stash v0.10.0-beta.1/go.mod h1:BCQ3neoNjAfKGfkztVecCbTw4jy5b6Ppzc+eyCFRLsM=
stash.appscode.dev/apimachinery v0.10.0-beta.1.0.20200817055640-692909fead2f/go.mod h1:eXRYGS4tRLNLGAdJEGTZEejXMDyHydzZkOLcAE+va4g=
stash.appscode.dev/apimachinery v0.10.0-beta.1.0.20200824083420-254ee64edd3b h1:mt/+94mcXtOaqpVEv06MoFCSOkHDrZpWZEdckr5tyck=
stash.appscode.dev/apimachinery v0.10.0-beta.1.0.20200824083420-254ee64edd3b/go.mod h1:TpdBIAiHCtpkUB13SDUyCZ6y+5wmzXBMAf9e72cSPO4=
stash.appscode.dev/stash v0.10.0-beta.1.0.20200822080632-48e5c87e68ba h1:FfOEaY1pCfsR4F6Zi8mLL7AF2pJYE6PPWLQGXUYadDA=
stash.appscode.dev/stash v0.10.0-beta.1.0.20200822080632-48e5c87e68ba/go.mod h1:tQhrffq8av48D2+gHNEp/POrp3swOyAu1kue4yQXkNs=
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
9 changes: 6 additions & 3 deletions pkg/create_restoresession.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ type restoreSessionOption struct {
repository string
driver string
replica int32
alias string

rule v1beta1.Rule
volumeClaimTemplate volumeclaimTemplate
Expand Down Expand Up @@ -104,6 +105,7 @@ func NewCmdCreateRestoreSession() *cobra.Command {
cmd.Flags().StringVar(&restoreSessionOpt.driver, "driver", restoreSessionOpt.driver, "Driver indicates the mechanism used to backup (i.e. VolumeSnapshotter, Restic)")
cmd.Flags().StringVar(&restoreSessionOpt.task, "task", restoreSessionOpt.task, "Name of the Task")
cmd.Flags().Int32Var(&restoreSessionOpt.replica, "replica", restoreSessionOpt.replica, "Replica specifies the number of replicas whose data should be backed up")
cmd.Flags().StringVar(&restoreSessionOpt.alias, "alias", restoreSessionOpt.alias, "Host identifier of the backed up data. It must be same as the alias used during backup")

cmd.Flags().StringSliceVar(&restoreSessionOpt.volumeMounts, "volume-mounts", restoreSessionOpt.volumeMounts, "List of volumes and their mountPaths")
cmd.Flags().StringSliceVar(&restoreSessionOpt.rule.Paths, "paths", restoreSessionOpt.rule.Paths, "List of paths to backup")
Expand All @@ -130,10 +132,9 @@ func (opt restoreSessionOption) newRestoreSession(name string, namespace string)
restoreSession.Spec.Driver = v1beta1.Snapshotter(opt.driver)
} else {
restoreSession.Spec = v1beta1.RestoreSessionSpec{
Task: v1beta1.TaskRef{Name: opt.task},
Rules: append(make([]v1beta1.Rule, 0), opt.rule),
Repository: core.LocalObjectReference{Name: opt.repository},
}
restoreSession.Spec.Task = v1beta1.TaskRef{Name: opt.task}
}

err := opt.setRestoreTarget(restoreSession)
Expand Down Expand Up @@ -187,6 +188,8 @@ func (opt restoreSessionOption) setRestoreTarget(restoreSession *v1beta1.Restore
}
restoreSession.Spec.Target.VolumeMounts = volumeMounts
}
restoreSession.Spec.Target.Alias = opt.alias
restoreSession.Spec.Target.Rules = []v1beta1.Rule{opt.rule}
}
if opt.replica > 0 {
restoreSession.Spec.Target.Replicas = &opt.replica
Expand All @@ -209,7 +212,7 @@ func (opt restoreSessionOption) getRestoredPVCTemplates() []ofst.PersistentVolum
}
if opt.volumeClaimTemplate.size != "" {
pvcs[0].Spec.Resources.Requests = core.ResourceList{
core.ResourceName(core.ResourceStorage): resource.MustParse(opt.volumeClaimTemplate.size),
core.ResourceStorage: resource.MustParse(opt.volumeClaimTemplate.size),
}
}
return pvcs
Expand Down
3 changes: 2 additions & 1 deletion pkg/docker/download.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package docker
import (
"path/filepath"

"stash.appscode.dev/apimachinery/apis/stash/v1beta1"
"stash.appscode.dev/apimachinery/pkg/restic"

"github.com/appscode/go/log"
Expand Down Expand Up @@ -47,7 +48,7 @@ func NewDownloadCmd() *cobra.Command {
return err
}
// run restore
if _, err = resticWrapper.RunRestore(*restoreOpt); err != nil {
if _, err = resticWrapper.RunRestore(*restoreOpt, v1beta1.TargetRef{}); err != nil {
return err
}
log.Infof("Restore completed")
Expand Down
4 changes: 2 additions & 2 deletions pkg/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ func WaitUntilRestoreSessionCompleted(name string, namespace string) error {
return wait.PollImmediate(PullInterval, WaitTimeOut, func() (done bool, err error) {
restoreSession, err := stashClient.StashV1beta1().RestoreSessions(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err == nil {
if restoreSession.Status.Phase == v1beta1.RestoreSessionSucceeded {
if restoreSession.Status.Phase == v1beta1.RestoreSucceeded {
return true, nil
}
if restoreSession.Status.Phase == v1beta1.RestoreSessionFailed {
if restoreSession.Status.Phase == v1beta1.RestoreFailed {
return true, fmt.Errorf("RestoreSession has been failed")
}
}
Expand Down
11 changes: 3 additions & 8 deletions vendor/github.com/pkg/errors/.travis.yml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions vendor/github.com/pkg/errors/Makefile
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions vendor/github.com/pkg/errors/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion vendor/github.com/pkg/errors/errors.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions vendor/github.com/pkg/errors/go113.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 132ae15

Please sign in to comment.