github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: correct stickler-ci errors and remove unused code

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-08-31 18:44:00 -04:00
parent 2b65def123
commit b8b6d64f75
3 changed files with 18 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/app-json/appjson.go
View File

@@ -13,7 +13,7 @@ import (
shellquote "github.com/kballard/go-shellquote"
)
type AppJson struct {
type AppJSON struct {
Scripts struct {
Dokku struct {
Predeploy string `json:"predeploy"`
@@ -74,19 +74,19 @@ func constructScript(command string, shell string, isHerokuishImage bool, hasEnt
// getPhaseScript extracts app.json from app image and returns the appropriate json key/value
func getPhaseScript(appName string, image string, phase string) (string, error) {
appJsonFile, err := ioutil.TempFile(os.TempDir(), fmt.Sprintf("dokku-%s-%s", common.MustGetEnv("DOKKU_PID"), "getPhaseScript"))
appJSONFile, err := ioutil.TempFile(os.TempDir(), fmt.Sprintf("dokku-%s-%s", common.MustGetEnv("DOKKU_PID"), "getPhaseScript"))
if err != nil {
return "", fmt.Errorf("Cannot create temporary file: %v", err)
}
defer os.Remove(appJsonFile.Name())
defer os.Remove(appJSONFile.Name())
common.CopyFromImage(appName, image, "app.json", appJsonFile.Name())
if !common.FileExists(appJsonFile.Name()) {
common.CopyFromImage(appName, image, "app.json", appJSONFile.Name())
if !common.FileExists(appJSONFile.Name()) {
return "", nil
}
b, err := ioutil.ReadFile(appJsonFile.Name())
b, err := ioutil.ReadFile(appJSONFile.Name())
if err != nil {
return "", fmt.Errorf("Cannot read app.json file: %v", err)
}
@@ -95,16 +95,16 @@ func getPhaseScript(appName string, image string, phase string) (string, error)
return "", nil
}
var appJson AppJson
if err = json.Unmarshal(b, &appJson); err != nil {
var appJSON AppJSON
if err = json.Unmarshal(b, &appJSON); err != nil {
return "", fmt.Errorf("Cannot parse app.json: %v", err)
}
if phase == "predeploy" {
return appJson.Scripts.Dokku.Predeploy, nil
return appJSON.Scripts.Dokku.Predeploy, nil
}
return appJson.Scripts.Dokku.Postdeploy, nil
return appJSON.Scripts.Dokku.Postdeploy, nil
}
// getReleaseCommand extracts the release command from a given app's procfile

2
plugins/app-json/triggers.go
View File

@@ -1,5 +1,6 @@
package appjson
// TriggerPostDeploy is a trigger to execute the postdeploy deployment task
func TriggerPostDeploy(appName string, imageTag string) error {
if err := executeScript(appName, imageTag, "postdeploy"); err != nil {
return err
@@ -7,6 +8,7 @@ func TriggerPostDeploy(appName string, imageTag string) error {
return nil
}
// TriggerPreDeploy is a trigger to execute predeploy and release deployment tasks
func TriggerPreDeploy(appName string, imageTag string) error {
if err := executeScript(appName, imageTag, "predeploy"); err != nil {
return err