Skip to content
This repository was archived by the owner on Apr 21, 2021. It is now read-only.

Commit 209e9f8

Browse files
authored
Merge pull request opencontainers#585 from q384566678/setconfig-fix
validation: Add error judgment to SetConfig
2 parents 5939d7b + b456bda commit 209e9f8

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

validation/hooks.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ func main() {
8181
return err
8282
}
8383
g.SetProcessArgs([]string{"true"})
84-
r.SetConfig(g)
85-
return nil
84+
return r.SetConfig(g)
8685
},
8786
PreDelete: func(r *util.Runtime) error {
8887
util.WaitingForStatus(*r, util.LifecycleStatusStopped, time.Second*10, time.Second)

validation/poststart.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ func main() {
3737
return err
3838
}
3939
g.SetProcessArgs([]string{"sh", "-c", fmt.Sprintf("echo 'process called' >> %s", "/output")})
40-
r.SetConfig(g)
41-
return nil
40+
return r.SetConfig(g)
4241
},
4342
PostCreate: func(r *util.Runtime) error {
4443
outputData, err := ioutil.ReadFile(output)

validation/poststop.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ func main() {
3838
return err
3939
}
4040
g.SetProcessArgs([]string{"sh", "-c", fmt.Sprintf("echo 'process called' >> %s", "/output")})
41-
r.SetConfig(g)
42-
return nil
41+
return r.SetConfig(g)
4342
},
4443
PostCreate: func(r *util.Runtime) error {
4544
outputData, err := ioutil.ReadFile(output)

validation/prestart.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ func main() {
3636
return err
3737
}
3838
g.SetProcessArgs([]string{"sh", "-c", fmt.Sprintf("echo 'process called' >> %s", "/output")})
39-
r.SetConfig(g)
40-
return nil
39+
return r.SetConfig(g)
4140
},
4241
PostCreate: func(r *util.Runtime) error {
4342
outputData, err := ioutil.ReadFile(output)

validation/start.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ func main() {
3232
}
3333
g := util.GetDefaultGenerator()
3434
g.SetProcessArgs([]string{"sh", "-c", fmt.Sprintf("echo 'process called' >> %s", "/output")})
35-
r.SetConfig(g)
35+
err = r.SetConfig(g)
36+
if err != nil {
37+
util.Fatal(err)
38+
}
3639
output := filepath.Join(bundleDir, g.Spec().Root.Path, "output")
3740

3841
// start without id
@@ -84,7 +87,10 @@ func main() {
8487
}
8588

8689
g.Spec().Process = nil
87-
r.SetConfig(g)
90+
err = r.SetConfig(g)
91+
if err != nil {
92+
util.Fatal(err)
93+
}
8894
err = r.Create()
8995
if err != nil {
9096
util.Fatal(err)

0 commit comments

Comments
 (0)