Addresses review feedback on #8640. fn-archive-max-size, fn-archive-max-files, fn-git-deploy-branch, and fn-git-keep-git-dir are renamed with `computed` in the function name so the names match the resolved-with-default semantic they implement, and every caller is updated in lockstep. logs:report renames the misordered --logs-vector-global-image and --logs-vector-global-networks to --logs-global-vector-image and --logs-global-vector-networks, makes the global getters return the raw stored value, and adds --logs-computed-vector-image, --logs-computed-vector-networks, and --logs-computed-vector-sink. network:report --global gains the computed-* keys for attach-post-create, attach-post-deploy, initial-network, and tld so external tooling can read the resolved value at global scope. The --quiet flag is dropped from every :report --format json | jq invocation across the PR's bats files; the report's --format json output is the only stdout and the flag is redundant.
159 lines
5.1 KiB
Go
159 lines
5.1 KiB
Go
package network
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/dokku/dokku/plugins/common"
|
|
)
|
|
|
|
// ReportSingleApp is an internal function that displays the network report for one or more apps
|
|
func ReportSingleApp(appName string, format string, infoFlag string) error {
|
|
if appName != "--global" {
|
|
if err := common.VerifyAppName(appName); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
var flags map[string]common.ReportFunc
|
|
if appName == "--global" {
|
|
flags = map[string]common.ReportFunc{
|
|
"--network-computed-attach-post-create": reportComputedAttachPostCreate,
|
|
"--network-computed-attach-post-deploy": reportComputedAttachPostDeploy,
|
|
"--network-computed-bind-all-interfaces": reportComputedBindAllInterfaces,
|
|
"--network-computed-initial-network": reportComputedInitialNetwork,
|
|
"--network-computed-tld": reportComputedTld,
|
|
"--network-global-attach-post-create": reportGlobalAttachPostCreate,
|
|
"--network-global-attach-post-deploy": reportGlobalAttachPostDeploy,
|
|
"--network-global-bind-all-interfaces": reportGlobalBindAllInterfaces,
|
|
"--network-global-initial-network": reportGlobalInitialNetwork,
|
|
"--network-global-tld": reportGlobalTld,
|
|
}
|
|
} else {
|
|
flags = map[string]common.ReportFunc{
|
|
"--network-bind-all-interfaces": reportBindAllInterfaces,
|
|
"--network-attach-post-create": reportAttachPostCreate,
|
|
"--network-attach-post-deploy": reportAttachPostDeploy,
|
|
"--network-computed-attach-post-create": reportComputedAttachPostCreate,
|
|
"--network-computed-attach-post-deploy": reportComputedAttachPostDeploy,
|
|
"--network-computed-bind-all-interfaces": reportComputedBindAllInterfaces,
|
|
"--network-computed-initial-network": reportComputedInitialNetwork,
|
|
"--network-computed-tld": reportComputedTld,
|
|
"--network-global-attach-post-create": reportGlobalAttachPostCreate,
|
|
"--network-global-attach-post-deploy": reportGlobalAttachPostDeploy,
|
|
"--network-global-bind-all-interfaces": reportGlobalBindAllInterfaces,
|
|
"--network-global-initial-network": reportGlobalInitialNetwork,
|
|
"--network-global-tld": reportGlobalTld,
|
|
"--network-initial-network": reportInitialNetwork,
|
|
"--network-static-web-listener": reportStaticWebListener,
|
|
"--network-tld": reportTld,
|
|
"--network-web-listeners": reportWebListeners,
|
|
}
|
|
}
|
|
|
|
flagKeys := []string{}
|
|
for flagKey := range flags {
|
|
flagKeys = append(flagKeys, flagKey)
|
|
}
|
|
|
|
trimPrefix := false
|
|
uppercaseFirstCharacter := true
|
|
infoFlags := common.CollectReport(appName, infoFlag, flags)
|
|
return common.ReportSingleApp("network", appName, infoFlag, infoFlags, flagKeys, format, trimPrefix, uppercaseFirstCharacter)
|
|
}
|
|
|
|
func reportAttachPostCreate(appName string) string {
|
|
return common.PropertyGet("network", appName, "attach-post-create")
|
|
}
|
|
|
|
func reportAttachPostDeploy(appName string) string {
|
|
return common.PropertyGet("network", appName, "attach-post-deploy")
|
|
}
|
|
|
|
func reportBindAllInterfaces(appName string) string {
|
|
return common.PropertyGet("network", appName, "bind-all-interfaces")
|
|
}
|
|
|
|
func reportComputedAttachPostCreate(appName string) string {
|
|
value := reportAttachPostCreate(appName)
|
|
if value == "" {
|
|
value = reportGlobalAttachPostCreate(appName)
|
|
}
|
|
|
|
return value
|
|
}
|
|
|
|
func reportComputedAttachPostDeploy(appName string) string {
|
|
value := reportAttachPostDeploy(appName)
|
|
if value == "" {
|
|
value = reportGlobalAttachPostDeploy(appName)
|
|
}
|
|
|
|
return value
|
|
}
|
|
|
|
func reportComputedBindAllInterfaces(appName string) string {
|
|
value := reportBindAllInterfaces(appName)
|
|
if value == "" {
|
|
value = reportGlobalBindAllInterfaces(appName)
|
|
}
|
|
if value == "" {
|
|
value = "false"
|
|
}
|
|
|
|
return value
|
|
}
|
|
|
|
func reportComputedInitialNetwork(appName string) string {
|
|
value := reportInitialNetwork(appName)
|
|
if value == "" {
|
|
value = reportGlobalInitialNetwork(appName)
|
|
}
|
|
|
|
return value
|
|
}
|
|
|
|
func reportComputedTld(appName string) string {
|
|
value := reportTld(appName)
|
|
if value == "" {
|
|
value = reportGlobalTld(appName)
|
|
}
|
|
|
|
return value
|
|
}
|
|
|
|
func reportGlobalAttachPostCreate(appName string) string {
|
|
return common.PropertyGet("network", "--global", "attach-post-create")
|
|
}
|
|
|
|
func reportGlobalAttachPostDeploy(appName string) string {
|
|
return common.PropertyGet("network", "--global", "attach-post-deploy")
|
|
}
|
|
|
|
func reportGlobalBindAllInterfaces(appName string) string {
|
|
return common.PropertyGet("network", "--global", "bind-all-interfaces")
|
|
}
|
|
|
|
func reportGlobalInitialNetwork(appName string) string {
|
|
return common.PropertyGet("network", "--global", "initial-network")
|
|
}
|
|
|
|
func reportGlobalTld(appName string) string {
|
|
return common.PropertyGet("network", "--global", "tld")
|
|
}
|
|
|
|
func reportInitialNetwork(appName string) string {
|
|
return common.PropertyGet("network", appName, "initial-network")
|
|
}
|
|
|
|
func reportStaticWebListener(appName string) string {
|
|
return common.PropertyGet("network", appName, "static-web-listener")
|
|
}
|
|
|
|
func reportTld(appName string) string {
|
|
return common.PropertyGet("network", appName, "tld")
|
|
}
|
|
|
|
func reportWebListeners(appName string) string {
|
|
return strings.Join(GetListeners(appName, "web"), " ")
|
|
}
|