Merge pull request #249 from jrasell/panic-fix-0.2.5-release

jrasell · web-flow · commit 0514741514e7 · 2018-10-25T15:18:12.000+02:00
Fix panic in deployment due to unsafe count checking on taskgroups
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.5 (25 October 2018)
+
+BUG FIXES:
+ * Fix panic in deployment where count is not specified due to unsafe count checking on task groups [GH-249](https://github.com/jrasell/levant/pull/249)
+
 ## 0.2.4 (24 October 2018)
 
 BUG FIXES:
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:latest
 LABEL maintainer James Rasell<(jamesrasell@gmail.com)> (@jrasell)
 LABEL vendor "jrasell"
 
-ENV LEVANT_VERSION 0.2.4
+ENV LEVANT_VERSION 0.2.5
 
 WORKDIR /usr/bin/
 
diff --git a/levant/deploy.go b/levant/deploy.go
@@ -492,7 +492,9 @@ func (l *levantDeployment) dynamicGroupCountUpdater() error {
 
 func (l *levantDeployment) isJobZeroCount() bool {
 	for _, tg := range l.config.Template.Job.TaskGroups {
-		if *tg.Count > 0 {
+		if tg.Count == nil {
+			return false
+		} else if *tg.Count > 0 {
 			return false
 		}
 	}
diff --git a/version/version.go b/version/version.go
@@ -3,7 +3,7 @@ package version
 import "fmt"
 
 // Version is the main version number that is being run at the moment.
-const Version = "0.2.4"
+const Version = "0.2.5"
 
 // VersionPrerelease is a pre-release marker for the version. If this is ""
 // (empty string) then it means that it is a final release. Otherwise, this is

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,9 @@ func (l *levantDeployment) dynamicGroupCountUpdater() error {`
`492`	`492`
`493`	`493`	`func (l *levantDeployment) isJobZeroCount() bool {`
`494`	`494`	`for _, tg := range l.config.Template.Job.TaskGroups {`
`495`		`- if *tg.Count > 0 {`
	`495`	`+ if tg.Count == nil {`
	`496`	`+ return false`
	`497`	`+ } else if *tg.Count > 0 {`
`496`	`498`	`return false`
`497`	`499`	`}`
`498`	`500`	`}`