Rosti/node-api
3
0
Fork 0
Code Issues 2 Pull Requests Actions Projects Releases 12 Wiki Activity

Fix cases where /opt/techs doesn't exist
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone Build is passing
Details

Browse Source
This commit is contained in:
Adam Štrauch 2022-04-20 14:06:16 +02:00
parent fea1a46a11
commit 29866d0e75
Signed by: cx
GPG Key ID: 018304FFA8988F8D
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
containers/types.go
View File

@ -2,6 +2,7 @@ package containers
import ( import (
"errors" "errors"
"fmt"
"log" "log"
"path" "path"
"strings" "strings"
@ -340,7 +341,18 @@ func (c *Container) GetTechs() (apps.AppTechs, error) {
driver := c.getDriver() driver := c.getDriver()
stdouterr, err := driver.Exec(c.App.Name, []string{"ls", "/opt/techs"}, "", []string{}, true) stdouterr, err := driver.Exec(c.App.Name, []string{"ls", "/opt"}, "", []string{}, true)
if err != nil {
// in case there is an error just return empty response
return techs, nil
}
// Check if /opt/techs exists
if !strings.Contains(string(*stdouterr), "techs") {
return techs, nil
}
stdouterr, err = driver.Exec(c.App.Name, []string{"ls", "/opt/techs"}, "", []string{}, true)
if err != nil { if err != nil {
// in case there is an error just return empty response // in case there is an error just return empty response
return techs, nil return techs, nil
@ -360,7 +372,7 @@ func (c *Container) GetTechs() (apps.AppTechs, error) {
Version: techParts[1], Version: techParts[1],
}) })
} else { } else {
return techs, errors.New("one of the tech has wrong number of parts") return techs, fmt.Errorf("one of the tech has wrong number of parts (%s)", techRaw)
} }
} }