Skip to content

Commit 42af21e

Browse files
fix: commit message format
1 parent 65d48bd commit 42af21e

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

main.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var (
2525

2626
var globalDefaultStdout = os.Stdout
2727
var globalDefaultStderr = os.Stderr
28-
var globalDefaultMsg = "deploykit: service %s update image to %s"
28+
var globalDefaultMsgFmt = "deploykit: service %s update image to %s"
2929

3030
func main() {
3131
os.Exit(run())
@@ -131,24 +131,26 @@ func runDeployKustomize(cmd *cobra.Command, _ []string) error {
131131
repository, _ := cmd.Flags().GetString("repository")
132132
service, _ := cmd.Flags().GetString("service")
133133
image, _ := cmd.Flags().GetString("image")
134-
message, _ := cmd.Flags().GetString("message")
135134
skipPush, _ := cmd.Flags().GetBool("skip-push")
136135
serviceDirectory, _ := cmd.Flags().GetString("service-directory")
137136
retryAttempts, _ := cmd.Flags().GetInt("attempts")
138137
backoffMethod, _ := cmd.Flags().GetString("backoff-method")
138+
message, _ := cmd.Flags().GetString("message")
139139

140140
// Check for environment variables - non empty flag values take priority
141141
// non empty flag value > env variable > default
142142
directory = pickOneString("", os.Getenv("DK_DIRECTORY"), directory)
143143
repository = pickOneString("", os.Getenv("DK_REPOSITORY"), repository)
144144
service = pickOneString("", os.Getenv("DK_SERVICE"), service)
145145
image = pickOneString("", os.Getenv("DK_IMAGE"), image)
146-
message = pickOneString(globalDefaultMsg, os.Getenv("DK_MESSAGE"), message)
147146
serviceDirectory = pickOneString("", os.Getenv("DK_SERVICE_DIRECTORY"), serviceDirectory)
148147
backoffMethod = pickOneString("random", os.Getenv("DK_BACKOFF_METHOD"), backoffMethod)
149148

149+
defaultMessage := fmt.Sprintf(globalDefaultMsgFmt, serviceDirectory, image)
150+
message = pickOneString(defaultMessage, os.Getenv("DK_MESSAGE"), message)
151+
150152
if message == "" {
151-
message = fmt.Sprintf(globalDefaultMsg, service, image)
153+
message = fmt.Sprintf(defaultMessage, service, image)
152154
}
153155

154156
retryAttemptsEnv, err := strconv.ParseInt(os.Getenv("DK_RETRY_ATTEMPTS"), 10, 64)

0 commit comments

Comments
 (0)