From a4c30c2ba908f7231245fd6c83047009880365f3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 8 Apr 2019 16:36:30 -0400 Subject: [PATCH] chore: standardize variable naming --- plugins/network/network.go | 20 ++++++------- .../network-compute-ports.go | 4 +-- .../network-get-ipaddr/network-get-ipaddr.go | 4 +-- .../network-get-port/network-get-port.go | 4 +-- .../network-write-ipaddr.go | 4 +-- .../network-write-port/network-write-port.go | 4 +-- plugins/resource/resource.go | 10 +++---- .../docker-args-process-deploy.go | 4 +-- .../resource-get-property.go | 8 +++--- plugins/resource/subcommands.go | 28 +++++++++---------- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/plugins/network/network.go b/plugins/network/network.go index af44450d3..55a32c629 100644 --- a/plugins/network/network.go +++ b/plugins/network/network.go @@ -52,7 +52,7 @@ func BuildConfig(appName string) { if len(procParts) != 2 { continue } - procType := procParts[0] + processType := procParts[0] procCount, err := strconv.Atoi(procParts[1]) if err != nil { continue @@ -62,25 +62,25 @@ func BuildConfig(appName string) { for containerIndex < procCount { containerIndex++ containerIndexString := strconv.Itoa(containerIndex) - containerIDFile := fmt.Sprintf("%v/CONTAINER.%v.%v", appRoot, procType, containerIndex) + containerIDFile := fmt.Sprintf("%v/CONTAINER.%v.%v", appRoot, processType, containerIndex) containerID := common.ReadFirstLine(containerIDFile) if containerID == "" || !common.ContainerIsRunning(containerID) { continue } - ipAddress := GetContainerIpaddress(appName, procType, containerID) - port := GetContainerPort(appName, procType, isHerokuishContainer, containerID) + ipAddress := GetContainerIpaddress(appName, processType, containerID) + port := GetContainerPort(appName, processType, isHerokuishContainer, containerID) if ipAddress != "" { - _, err := sh.Command("plugn", "trigger", "network-write-ipaddr", appName, procType, containerIndexString, ipAddress).Output() + _, err := sh.Command("plugn", "trigger", "network-write-ipaddr", appName, processType, containerIndexString, ipAddress).Output() if err != nil { common.LogWarn(err.Error()) } } if port != "" { - _, err := sh.Command("plugn", "trigger", "network-write-port", appName, procType, containerIndexString, port).Output() + _, err := sh.Command("plugn", "trigger", "network-write-port", appName, processType, containerIndexString, port).Output() if err != nil { common.LogWarn(err.Error()) } @@ -90,8 +90,8 @@ func BuildConfig(appName string) { } // GetContainerIpaddress returns the ipaddr for a given app container -func GetContainerIpaddress(appName, procType, containerID string) (ipAddr string) { - if procType != "web" { +func GetContainerIpaddress(appName, processType, containerID string) (ipAddr string) { + if processType != "web" { return } @@ -109,8 +109,8 @@ func GetContainerIpaddress(appName, procType, containerID string) (ipAddr string } // GetContainerPort returns the port for a given app container -func GetContainerPort(appName, procType string, isHerokuishContainer bool, containerID string) (port string) { - if procType != "web" { +func GetContainerPort(appName, processType string, isHerokuishContainer bool, containerID string) (port string) { + if processType != "web" { return } diff --git a/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go b/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go index e83fc3620..b981c59b0 100644 --- a/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go +++ b/plugins/network/src/triggers/network-compute-ports/network-compute-ports.go @@ -15,10 +15,10 @@ import ( func main() { flag.Parse() appName := flag.Arg(0) - procType := flag.Arg(1) + processType := flag.Arg(1) isHerokuishContainer := common.ToBool(flag.Arg(2)) - if procType != "web" { + if processType != "web" { return } diff --git a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go index cfdb3bbfd..237526b64 100644 --- a/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go +++ b/plugins/network/src/triggers/network-get-ipaddr/network-get-ipaddr.go @@ -12,9 +12,9 @@ import ( func main() { flag.Parse() appName := flag.Arg(0) - procType := flag.Arg(1) + processType := flag.Arg(1) containerID := flag.Arg(2) - ipAddress := network.GetContainerIpaddress(appName, procType, containerID) + ipAddress := network.GetContainerIpaddress(appName, processType, containerID) fmt.Fprintln(os.Stdout, ipAddress) } diff --git a/plugins/network/src/triggers/network-get-port/network-get-port.go b/plugins/network/src/triggers/network-get-port/network-get-port.go index 801bc88ff..389265da7 100644 --- a/plugins/network/src/triggers/network-get-port/network-get-port.go +++ b/plugins/network/src/triggers/network-get-port/network-get-port.go @@ -13,10 +13,10 @@ import ( func main() { flag.Parse() appName := flag.Arg(0) - procType := flag.Arg(1) + processType := flag.Arg(1) isHerokuishContainer := common.ToBool(flag.Arg(2)) containerID := flag.Arg(3) - port := network.GetContainerPort(appName, procType, isHerokuishContainer, containerID) + port := network.GetContainerPort(appName, processType, isHerokuishContainer, containerID) fmt.Fprintln(os.Stdout, port) } diff --git a/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go b/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go index b76ceb3af..3cf618120 100644 --- a/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go +++ b/plugins/network/src/triggers/network-write-ipaddr/network-write-ipaddr.go @@ -13,7 +13,7 @@ import ( func main() { flag.Parse() appName := flag.Arg(0) - procType := flag.Arg(1) + processType := flag.Arg(1) containerIndex := flag.Arg(2) ip := flag.Arg(3) @@ -26,7 +26,7 @@ func main() { } appRoot := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName}, "/") - filename := fmt.Sprintf("%v/IP.%v.%v", appRoot, procType, containerIndex) + filename := fmt.Sprintf("%v/IP.%v.%v", appRoot, processType, containerIndex) f, err := os.Create(filename) if err != nil { common.LogFail(err.Error()) diff --git a/plugins/network/src/triggers/network-write-port/network-write-port.go b/plugins/network/src/triggers/network-write-port/network-write-port.go index 2a8d45dff..e263cd786 100644 --- a/plugins/network/src/triggers/network-write-port/network-write-port.go +++ b/plugins/network/src/triggers/network-write-port/network-write-port.go @@ -13,7 +13,7 @@ import ( func main() { flag.Parse() appName := flag.Arg(0) - procType := flag.Arg(1) + processType := flag.Arg(1) containerIndex := flag.Arg(2) port := flag.Arg(3) @@ -26,7 +26,7 @@ func main() { } appRoot := strings.Join([]string{common.MustGetEnv("DOKKU_ROOT"), appName}, "/") - filename := fmt.Sprintf("%v/PORT.%v.%v", appRoot, procType, containerIndex) + filename := fmt.Sprintf("%v/PORT.%v.%v", appRoot, processType, containerIndex) f, err := os.Create(filename) if err != nil { common.LogFail(err.Error()) diff --git a/plugins/resource/resource.go b/plugins/resource/resource.go index fc6e17372..bd299e58c 100644 --- a/plugins/resource/resource.go +++ b/plugins/resource/resource.go @@ -68,7 +68,7 @@ func ReportSingleApp(appName, infoFlag string) { } // GetResourceValue fetches a single value for a given app/process/request/key combination -func GetResourceValue(appName string, processType string, requestType string, key string) (string, error) { +func GetResourceValue(appName string, processType string, resourceType string, key string) (string, error) { resources, err := common.PropertyGetAll("resource", appName) if err != nil { return "", err @@ -76,10 +76,10 @@ func GetResourceValue(appName string, processType string, requestType string, ke defaultValue := "" for key, value := range resources { - if key == propertyKey("_default_", requestType, key) { + if key == propertyKey("_default_", resourceType, key) { defaultValue = value } - if key == propertyKey(processType, requestType, key) { + if key == propertyKey(processType, resourceType, key) { return value, nil } } @@ -99,8 +99,8 @@ func Right(str string, length int, pad string) string { return str + times(pad, length-len(str)) } -func propertyKey(processType string, requestType string, key string) string { - return fmt.Sprintf("%v.%v.%v", processType, requestType, key) +func propertyKey(processType string, resourceType string, key string) string { + return fmt.Sprintf("%v.%v.%v", processType, resourceType, key) } func getAppName(args []string) (string, error) { diff --git a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go index 5b92d85df..76dec47e6 100644 --- a/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go +++ b/plugins/resource/src/triggers/docker-args-process-deploy/docker-args-process-deploy.go @@ -19,7 +19,7 @@ func main() { flag.Parse() appName := flag.Arg(0) - procType := flag.Arg(3) + processType := flag.Arg(3) resources, err := common.PropertyGetAll("resource", appName) if err != nil { @@ -38,7 +38,7 @@ func main() { validReservations := map[string]bool{ "memory": true, } - validPrefixes := []string{"_default_.", fmt.Sprintf("%s.", procType)} + validPrefixes := []string{"_default_.", fmt.Sprintf("%s.", processType)} for _, validPrefix := range validPrefixes { for key, value := range resources { if !strings.HasPrefix(key, validPrefix) { diff --git a/plugins/resource/src/triggers/resource-get-property/resource-get-property.go b/plugins/resource/src/triggers/resource-get-property/resource-get-property.go index d8b0759ba..53d22effc 100644 --- a/plugins/resource/src/triggers/resource-get-property/resource-get-property.go +++ b/plugins/resource/src/triggers/resource-get-property/resource-get-property.go @@ -9,15 +9,15 @@ import ( "github.com/dokku/dokku/plugins/resource" ) -// writes the resource property to stdout for a given app container +// writes the resource key to stdout for a given app container func main() { flag.Parse() appName := flag.Arg(0) - procType := flag.Arg(1) + processType := flag.Arg(1) resourceType := flag.Arg(1) - property := flag.Arg(1) + key := flag.Arg(1) - value, err := resource.GetResourceValue(appName, procType, resourceType, property) + value, err := resource.GetResourceValue(appName, processType, resourceType, key) if err != nil { common.LogFail(err.Error()) } diff --git a/plugins/resource/subcommands.go b/plugins/resource/subcommands.go index 82134fdbc..f93a4672a 100644 --- a/plugins/resource/subcommands.go +++ b/plugins/resource/subcommands.go @@ -12,7 +12,7 @@ func CommandLimit(args []string, processType string, r Resource) error { return err } - return setRequestType(appName, processType, r, "limit") + return setResourceType(appName, processType, r, "limit") } // CommandLimitClear implements resource:limit-clear @@ -22,7 +22,7 @@ func CommandLimitClear(args []string, processType string) error { return err } - clearByRequestType(appName, processType, "limit") + clearByResourceType(appName, processType, "limit") return nil } @@ -33,7 +33,7 @@ func CommandReserve(args []string, processType string, r Resource) error { return err } - return setRequestType(appName, processType, r, "reserve") + return setResourceType(appName, processType, r, "reserve") } // CommandReserveClear implements resource:reserve-clear @@ -43,13 +43,13 @@ func CommandReserveClear(args []string, processType string) error { return err } - clearByRequestType(appName, processType, "reserve") + clearByResourceType(appName, processType, "reserve") return nil } -func clearByRequestType(appName string, processType string, requestType string) { +func clearByResourceType(appName string, processType string, resourceType string) { noun := "limits" - if requestType == "reserve" { + if resourceType == "reserve" { noun = "reservation" } @@ -78,13 +78,13 @@ func clearByRequestType(appName string, processType string, requestType string) } for _, key := range resources { - property := propertyKey(processType, requestType, key) + property := propertyKey(processType, resourceType, key) common.PropertyDelete("resource", appName, property) } } } -func setRequestType(appName string, processType string, r Resource, requestType string) error { +func setResourceType(appName string, processType string, r Resource, resourceType string) error { if len(processType) == 0 { processType = "_default_" } @@ -106,12 +106,12 @@ func setRequestType(appName string, processType string, r Resource, requestType } if !hasValues { - reportRequestType(appName, processType, requestType) + reportResourceType(appName, processType, resourceType) return nil } noun := "limits" - if requestType == "reserve" { + if resourceType == "reserve" { noun = "reservation" } message := fmt.Sprintf("Setting resource %v for %v", noun, appName) @@ -125,7 +125,7 @@ func setRequestType(appName string, processType string, r Resource, requestType common.LogVerbose(fmt.Sprintf("%v: %v", key, value)) } - property := propertyKey(processType, requestType, key) + property := propertyKey(processType, resourceType, key) err := common.PropertyWrite("resource", appName, property, value) if err != nil { return err @@ -135,9 +135,9 @@ func setRequestType(appName string, processType string, r Resource, requestType return nil } -func reportRequestType(appName string, processType string, requestType string) { +func reportResourceType(appName string, processType string, resourceType string) { noun := "limits" - if requestType == "reserve" { + if resourceType == "reserve" { noun = "reservation" } @@ -157,7 +157,7 @@ func reportRequestType(appName string, processType string, requestType string) { } for _, key := range resources { - property := propertyKey(processType, requestType, key) + property := propertyKey(processType, resourceType, key) value := common.PropertyGet("resource", appName, property) common.LogVerbose(fmt.Sprintf("%v: %v", key, value)) }