@@ -20,7 +20,7 @@ import (
2020var WaitDuration = 60 * time .Second
2121var TickDuration = 2 * time .Second
2222
23- var devModeFlag = flag .Bool ("dev" , false , "keep test environmnet after finishing" )
23+ var devModeFlag = flag .Bool ("dev" , false , "keep test environment after finishing" )
2424var devMode bool
2525
2626type Test struct {
@@ -37,10 +37,13 @@ func NewTest() (test Test, err error) {
3737 test = Test {}
3838 // Namespace
3939 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 )
4141 }
4242 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+ }
4447 // TearDownFuncs
4548 test .tearDownFuncs = []TearDownFunc {func () error {
4649 deleteNamespace (test .namespace , false )
@@ -49,7 +52,7 @@ func NewTest() (test Test, err error) {
4952 // TemplateDir
5053 test .templateDir , err = ioutil .TempDir ("/tmp/" , "haproxy-ic-test-tmpl" )
5154 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 )
5356 }
5457 return test , nil
5558}
@@ -61,7 +64,7 @@ func (t *Test) GetNS() string {
6164func (t * Test ) DeployYaml (path string , namespace string ) error {
6265 yaml , err := ioutil .ReadFile (path )
6366 if err != nil {
64- return fmt .Errorf ("error reading yaml file: %s " , err )
67+ return fmt .Errorf ("error reading yaml file: %w " , err )
6568 }
6669 // kubectl -n $NS apply -f -
6770 out , err := t .execute (string (yaml ), "kubectl" , "-n" , namespace , "apply" , "-f" , "-" )
@@ -74,18 +77,18 @@ func (t *Test) DeployYaml(path string, namespace string) error {
7477func (t * Test ) DeployYamlTemplate (path string , namespace string , data interface {}) error {
7578 file , err := ioutil .ReadFile (path )
7679 if err != nil {
77- return fmt .Errorf ("error reading yaml template: %s " , err )
80+ return fmt .Errorf ("error reading yaml template: %w " , err )
7881 }
7982 var result bytes.Buffer
8083 tmpl := template .Must (template .New ("" ).Parse (string (file )))
8184 err = tmpl .Execute (& result , data )
8285 if err != nil {
83- return fmt .Errorf ("error parsing yaml template: %s " , err )
86+ return fmt .Errorf ("error parsing yaml template: %w " , err )
8487 }
8588 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 )
8790 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 )
8992 }
9093 return t .DeployYaml (yaml , namespace )
9194}
@@ -124,7 +127,6 @@ func (t *Test) GetK8sVersion() (major, minor int, err error) {
124127 major , _ = strconv .Atoi (version .Major )
125128 minor , _ = strconv .Atoi (version .Minor )
126129 return major , minor , nil
127-
128130}
129131
130132func (t * Test ) execute (entry , command string , args ... string ) (string , error ) {
@@ -141,7 +143,7 @@ func deleteNamespace(namespace string, newSetup bool) {
141143 return
142144 }
143145 deleteCmd := exec .Command ("kubectl" , "delete" , "namespace" , namespace )
144- deleteCmd .Run ()
146+ _ = deleteCmd .Run ()
145147}
146148
147149func setupNamespace () (string , error ) {
0 commit comments