Merge pull request #834 from StrongMonkey/fix-panic

Don't assume revision has fixed length
rancher · Nov 19, 2019 · 23956ab · 23956ab
2 parents f99a89d + dacbc28
commit 23956ab
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/modules/build/controllers/service/service.go b/modules/build/controllers/service/service.go
@@ -358,7 +358,12 @@ func ImageName(rev string, namespace, name string, build *riov1.ImageBuildSpec)
 		imageName = build.ImageName
 	}
 
-	return fmt.Sprintf("%s/%s:%s", registry, imageName, rev[:5])
+	suffix := rev
+	if len(rev) > 5 {
+		suffix = rev[:5]
+	}
+
+	return fmt.Sprintf("%s/%s:%s", registry, imageName, suffix)
 }
 
 func PullImageName(rev string, namespace, name string, build *riov1.ImageBuildSpec) string {
@@ -371,5 +376,10 @@ func PullImageName(rev string, namespace, name string, build *riov1.ImageBuildSp
 		imageName = build.ImageName
 	}
 
-	return fmt.Sprintf("%s/%s:%s", registry, imageName, rev[:5])
+	suffix := rev
+	if len(rev) > 5 {
+		suffix = rev[:5]
+	}
+
+	return fmt.Sprintf("%s/%s:%s", registry, imageName, suffix)
 }