Skip to content

update godeps #680

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

Closed
zhouhao3 wants to merge 2 commits into from
Closed

update godeps #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
379b768
update godeps
Jan 16, 2019
cd3cabf
Update the corresponding code according to the updated library
Jan 16, 2019
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
18 changes: 10 additions & 8 deletions Godeps/Godeps.json
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion validation/config_updates_without_affect/config_updates_without_affect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ func main() {
}

testPath := filepath.Join(bundleDir, "test.json")
r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
// generate a config has all the testing properties
g, err := util.GetDefaultGenerator()
if err != nil {
Expand Down
6 changes: 5 additions & 1 deletion validation/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ func main() {
util.Fatal(err)
}

containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()
cases := []struct {
id string
errExpected bool
Expand Down
6 changes: 5 additions & 1 deletion validation/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ func main() {
util.Fatal(err)
}
runningConfig.SetProcessArgs([]string{"sleep", "30"})
containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()
testRuntime, _ := util.NewRuntime(util.RuntimeCommand, bundleDir)
cases := []struct {
config *generate.Generator
Expand Down
6 changes: 5 additions & 1 deletion validation/delete_only_create_resources/delete_only_create_resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ func main() {
util.Fatal(err)
}

r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
g, err := util.GetDefaultGenerator()
if err != nil {
util.Fatal(err)
Expand Down
7 changes: 5 additions & 2 deletions validation/delete_resources/delete_resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ func main() {
if err != nil {
util.Fatal(err)
}

r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
g, err := util.GetDefaultGenerator()
if err != nil {
util.Fatal(err)
Expand Down
6 changes: 5 additions & 1 deletion validation/hooks/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ func main() {
config := util.LifecycleConfig{
Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
PreCreate: func(r *util.Runtime) error {
r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
g, err := util.GetDefaultGenerator()
if err != nil {
util.Fatal(err)
Expand Down
6 changes: 5 additions & 1 deletion validation/hooks_stdin/hooks_stdin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ func main() {
if err != nil {
util.Fatal(err)
}
containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()
defer os.RemoveAll(bundleDir)

var containerPid int
Expand Down
6 changes: 5 additions & 1 deletion validation/kill/kill.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ func main() {
util.Fatal(err)
}
runningConfig.SetProcessArgs([]string{"sleep", "30"})
containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()

cases := []struct {
config *generate.Generator
Expand Down
6 changes: 5 additions & 1 deletion validation/kill_no_effect/kill_no_effect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ func main() {
defer os.RemoveAll(bundleDir)

targetErr := specerror.NewError(specerror.KillNonCreateRunHaveNoEffect, fmt.Errorf("attempting to send a signal to a container that is neither `created` nor `running` MUST have no effect on the container"), rspecs.Version)
containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()
g, err := util.GetDefaultGenerator()
if err != nil {
util.Fatal(err)
Expand Down
6 changes: 5 additions & 1 deletion validation/killsig/killsig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ func main() {
}
defer os.RemoveAll(bundleDir)

containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()
sigConfig, err := util.GetDefaultGenerator()
if err != nil {
os.RemoveAll(bundleDir)
Expand Down
7 changes: 5 additions & 2 deletions validation/misc_props/misc_props.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ func main() {
rspecs.Spec
Unknown string `json:"unknown,omitempty"`
}

containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()
basicConfig, err := util.GetDefaultGenerator()
if err != nil {
util.Fatal(err)
Expand Down
6 changes: 5 additions & 1 deletion validation/pidfile/pidfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ func main() {
Config: g,
Actions: util.LifecycleActionCreate | util.LifecycleActionDelete,
PreCreate: func(r *util.Runtime) error {
r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
r.PidFile = tempPidFile
return nil
},
Expand Down
6 changes: 5 additions & 1 deletion validation/poststart/poststart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ func main() {
config := util.LifecycleConfig{
Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
PreCreate: func(r *util.Runtime) error {
r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
g, err := util.GetDefaultGenerator()
if err != nil {
util.Fatal(err)
Expand Down
6 changes: 5 additions & 1 deletion validation/poststart_fail/poststart_fail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ func main() {
BundleDir: bundleDir,
Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
PreCreate: func(r *util.Runtime) error {
r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
return nil
},
PreDelete: func(r *util.Runtime) error {
Expand Down
6 changes: 5 additions & 1 deletion validation/poststop/poststop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ func main() {
config := util.LifecycleConfig{
Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
PreCreate: func(r *util.Runtime) error {
r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
g, err := util.GetDefaultGenerator()
if err != nil {
util.Fatal(err)
Expand Down
6 changes: 5 additions & 1 deletion validation/poststop_fail/poststop_fail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ func main() {
BundleDir: bundleDir,
Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
PreCreate: func(r *util.Runtime) error {
r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
return nil
},
PreDelete: func(r *util.Runtime) error {
Expand Down
6 changes: 5 additions & 1 deletion validation/prestart/prestart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ func main() {
config := util.LifecycleConfig{
Actions: util.LifecycleActionCreate | util.LifecycleActionStart | util.LifecycleActionDelete,
PreCreate: func(r *util.Runtime) error {
r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
r.SetID(uid.String())
g, err := util.GetDefaultGenerator()
if err != nil {
util.Fatal(err)
Expand Down
6 changes: 5 additions & 1 deletion validation/prestart_fail/prestart_fail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ func main() {
}
g.AddPreStartHook(prestart)
g.SetProcessArgs([]string{"sh", "-c", fmt.Sprintf("touch %s", "/output")})
containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()

config := util.LifecycleConfig{
Config: g,
Expand Down
6 changes: 5 additions & 1 deletion validation/start/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ func main() {
}
defer os.RemoveAll(bundleDir)

containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()

r, err := util.NewRuntime(util.RuntimeCommand, bundleDir)
if err != nil {
Expand Down
6 changes: 5 additions & 1 deletion validation/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ func main() {
util.Fatal(err)
}
g.SetProcessArgs([]string{"true"})
containerID := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
util.Fatal(err)
}
containerID := uid.String()

cases := []struct {
id string
Expand Down
6 changes: 5 additions & 1 deletion validation/util/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ func (r *Runtime) Create() (err error) {
args = append(args, r.ID)
}
cmd := exec.Command(r.RuntimeCommand, args...)
id := uuid.NewV4().String()
uid, err := uuid.NewV4()
if err != nil {
return err
}
id := uid.String()
r.stdout, err = os.OpenFile(filepath.Join(r.bundleDir(), fmt.Sprintf("stdout-%s", id)), os.O_CREATE|os.O_EXCL|os.O_RDWR, 0600)
if err != nil {
return err
Expand Down
12 changes: 10 additions & 2 deletions validation/util/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,11 @@ func RuntimeInsideValidate(g *generate.Generator, t *tap.T, f PreFunc) (err erro
return err
}

r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
return err
}
r.SetID(uid.String())
err = r.Create()
if err != nil {
os.Stderr.WriteString("failed to create the container\n")
Expand Down Expand Up @@ -281,7 +285,11 @@ func RuntimeOutsideValidate(g *generate.Generator, t *tap.T, f AfterFunc) error
return err
}

r.SetID(uuid.NewV4().String())
uid, err := uuid.NewV4()
if err != nil {
return err
}
r.SetID(uid.String())
err = r.Create()
if err != nil {
os.Stderr.WriteString("failed to create the container\n")
Expand Down
24 changes: 24 additions & 0 deletions vendor/github.com/blang/semver/.travis.yml
View file
Open in desktop

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

Loading