@@ -20,7 +20,7 @@ import (
20
20
var WaitDuration = 60 * time .Second
21
21
var TickDuration = 2 * time .Second
22
22
23
- var devModeFlag = flag .Bool ("dev" , false , "keep test environmnet after finishing" )
23
+ var devModeFlag = flag .Bool ("dev" , false , "keep test environment after finishing" )
24
24
var devMode bool
25
25
26
26
type Test struct {
@@ -37,10 +37,13 @@ func NewTest() (test Test, err error) {
37
37
test = Test {}
38
38
// Namespace
39
39
if test .namespace , err = setupNamespace (); err != nil {
40
- return test , fmt .Errorf ("error setting test namespace %s: " , err )
40
+ return test , fmt .Errorf ("error setting test namespace: %w " , err )
41
41
}
42
42
deleteNamespace (test .namespace , true )
43
- test .execute ("" , "kubectl" , "create" , "ns" , test .namespace )
43
+ _ , err = test .execute ("" , "kubectl" , "create" , "ns" , test .namespace )
44
+ if err != nil {
45
+ return test , fmt .Errorf ("error creating test namespace : %w " , err )
46
+ }
44
47
// TearDownFuncs
45
48
test .tearDownFuncs = []TearDownFunc {func () error {
46
49
deleteNamespace (test .namespace , false )
@@ -49,7 +52,7 @@ func NewTest() (test Test, err error) {
49
52
// TemplateDir
50
53
test .templateDir , err = ioutil .TempDir ("/tmp/" , "haproxy-ic-test-tmpl" )
51
54
if err != nil {
52
- return test , fmt .Errorf ("error creating template dir: %s " , err . Error () )
55
+ return test , fmt .Errorf ("error creating template dir: %w " , err )
53
56
}
54
57
return test , nil
55
58
}
@@ -61,7 +64,7 @@ func (t *Test) GetNS() string {
61
64
func (t * Test ) DeployYaml (path string , namespace string ) error {
62
65
yaml , err := ioutil .ReadFile (path )
63
66
if err != nil {
64
- return fmt .Errorf ("error reading yaml file: %s " , err )
67
+ return fmt .Errorf ("error reading yaml file: %w " , err )
65
68
}
66
69
// kubectl -n $NS apply -f -
67
70
out , err := t .execute (string (yaml ), "kubectl" , "-n" , namespace , "apply" , "-f" , "-" )
@@ -74,18 +77,18 @@ func (t *Test) DeployYaml(path string, namespace string) error {
74
77
func (t * Test ) DeployYamlTemplate (path string , namespace string , data interface {}) error {
75
78
file , err := ioutil .ReadFile (path )
76
79
if err != nil {
77
- return fmt .Errorf ("error reading yaml template: %s " , err )
80
+ return fmt .Errorf ("error reading yaml template: %w " , err )
78
81
}
79
82
var result bytes.Buffer
80
83
tmpl := template .Must (template .New ("" ).Parse (string (file )))
81
84
err = tmpl .Execute (& result , data )
82
85
if err != nil {
83
- return fmt .Errorf ("error parsing yaml template: %s " , err )
86
+ return fmt .Errorf ("error parsing yaml template: %w " , err )
84
87
}
85
88
yaml := filepath .Join (t .templateDir , t .namespace + time .Now ().Format ("2006-01-02-1504051111" )+ ".yaml" )
86
- err = ioutil .WriteFile (yaml , result .Bytes (), 0644 )
89
+ err = ioutil .WriteFile (yaml , result .Bytes (), 0600 )
87
90
if err != nil {
88
- return fmt .Errorf ("error writing generated yaml template: %s " , err )
91
+ return fmt .Errorf ("error writing generated yaml template: %w " , err )
89
92
}
90
93
return t .DeployYaml (yaml , namespace )
91
94
}
@@ -124,7 +127,6 @@ func (t *Test) GetK8sVersion() (major, minor int, err error) {
124
127
major , _ = strconv .Atoi (version .Major )
125
128
minor , _ = strconv .Atoi (version .Minor )
126
129
return major , minor , nil
127
-
128
130
}
129
131
130
132
func (t * Test ) execute (entry , command string , args ... string ) (string , error ) {
@@ -141,7 +143,7 @@ func deleteNamespace(namespace string, newSetup bool) {
141
143
return
142
144
}
143
145
deleteCmd := exec .Command ("kubectl" , "delete" , "namespace" , namespace )
144
- deleteCmd .Run ()
146
+ _ = deleteCmd .Run ()
145
147
}
146
148
147
149
func setupNamespace () (string , error ) {
0 commit comments