|
25 | 25 |
|
26 | 26 | var globalDefaultStdout = os.Stdout |
27 | 27 | var globalDefaultStderr = os.Stderr |
28 | | -var globalDefaultMsg = "deploykit: service %s update image to %s" |
| 28 | +var globalDefaultMsgFmt = "deploykit: service %s update image to %s" |
29 | 29 |
|
30 | 30 | func main() { |
31 | 31 | os.Exit(run()) |
@@ -131,24 +131,26 @@ func runDeployKustomize(cmd *cobra.Command, _ []string) error { |
131 | 131 | repository, _ := cmd.Flags().GetString("repository") |
132 | 132 | service, _ := cmd.Flags().GetString("service") |
133 | 133 | image, _ := cmd.Flags().GetString("image") |
134 | | - message, _ := cmd.Flags().GetString("message") |
135 | 134 | skipPush, _ := cmd.Flags().GetBool("skip-push") |
136 | 135 | serviceDirectory, _ := cmd.Flags().GetString("service-directory") |
137 | 136 | retryAttempts, _ := cmd.Flags().GetInt("attempts") |
138 | 137 | backoffMethod, _ := cmd.Flags().GetString("backoff-method") |
| 138 | + message, _ := cmd.Flags().GetString("message") |
139 | 139 |
|
140 | 140 | // Check for environment variables - non empty flag values take priority |
141 | 141 | // non empty flag value > env variable > default |
142 | 142 | directory = pickOneString("", os.Getenv("DK_DIRECTORY"), directory) |
143 | 143 | repository = pickOneString("", os.Getenv("DK_REPOSITORY"), repository) |
144 | 144 | service = pickOneString("", os.Getenv("DK_SERVICE"), service) |
145 | 145 | image = pickOneString("", os.Getenv("DK_IMAGE"), image) |
146 | | - message = pickOneString(globalDefaultMsg, os.Getenv("DK_MESSAGE"), message) |
147 | 146 | serviceDirectory = pickOneString("", os.Getenv("DK_SERVICE_DIRECTORY"), serviceDirectory) |
148 | 147 | backoffMethod = pickOneString("random", os.Getenv("DK_BACKOFF_METHOD"), backoffMethod) |
149 | 148 |
|
| 149 | + defaultMessage := fmt.Sprintf(globalDefaultMsgFmt, serviceDirectory, image) |
| 150 | + message = pickOneString(defaultMessage, os.Getenv("DK_MESSAGE"), message) |
| 151 | + |
150 | 152 | if message == "" { |
151 | | - message = fmt.Sprintf(globalDefaultMsg, service, image) |
| 153 | + message = fmt.Sprintf(defaultMessage, service, image) |
152 | 154 | } |
153 | 155 |
|
154 | 156 | retryAttemptsEnv, err := strconv.ParseInt(os.Getenv("DK_RETRY_ATTEMPTS"), 10, 64) |
|
0 commit comments