这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: trim whitespace on registry property values #5905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2023
Merged

fix: trim whitespace on registry property values #5905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions plugins/registry/functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func getRegistryServerForApp(appName string) string {
if value == "" {
value = common.PropertyGet("registry", "--global", "server")
}
value = strings.TrimSpace(value)

value = strings.TrimSuffix(value, "/")
if value == "hub.docker.com" || value == "docker.io" {
Expand All @@ -39,6 +40,7 @@ func incrementTagVersion(appName string) (int, error) {
tag = "0"
}

tag = strings.TrimSpace(tag)
version, err := strconv.Atoi(tag)
if err != nil {
return 0, fmt.Errorf("Unable to convert existing tag version (%s) to integer: %v", tag, err)
Expand Down
10 changes: 8 additions & 2 deletions plugins/registry/report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package registry

import (
"strings"

"github.com/dokku/dokku/plugins/common"
)

Expand Down Expand Up @@ -35,6 +37,7 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {

func reportComputedImageRepo(appName string) string {
imageRepo := reportImageRepo(appName)
imageRepo = strings.TrimSpace(imageRepo)
if imageRepo == "" {
imageRepo = common.GetAppImageRepo(appName)
}
Expand All @@ -48,6 +51,7 @@ func reportImageRepo(appName string) string {

func reportComputedPushOnRelease(appName string) string {
value := reportPushOnRelease(appName)
value = strings.TrimSpace(value)
if value == "" {
value = reportGlobalPushOnRelease(appName)
}
Expand All @@ -68,7 +72,8 @@ func reportPushOnRelease(appName string) string {
}

func reportComputedServer(appName string) string {
return getRegistryServerForApp(appName)
server := getRegistryServerForApp(appName)
return strings.TrimSpace(server)
}

func reportGlobalServer(appName string) string {
Expand All @@ -80,5 +85,6 @@ func reportServer(appName string) string {
}

func reportTagVersion(appName string) string {
return common.PropertyGet("registry", appName, "tag-version")
tagVersion := common.PropertyGet("registry", appName, "tag-version")
return strings.TrimSpace(tagVersion)
}
2 changes: 2 additions & 0 deletions plugins/registry/triggers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
// TriggerDeployedAppImageRepo outputs the associated image repo to stdout
func TriggerDeployedAppImageRepo(appName string) error {
imageRepo := common.PropertyGet("registry", appName, "image-repo")
imageRepo = strings.TrimSpace(imageRepo)
if imageRepo == "" {
imageRepo = common.GetAppImageRepo(appName)
}
Expand All @@ -26,6 +27,7 @@ func TriggerDeployedAppImageTag(appName string) error {
}

tagVersion := common.PropertyGet("registry", appName, "tag-version")
tagVersion = strings.TrimSpace(tagVersion)
if tagVersion == "" {
tagVersion = "1"
}
Expand Down