Add short git sha

pkg/deployments/deployments.go

@@ -17,6 +17,7 @@ package deployments
 import (
 	"fmt"
 	"path"
+	"strings"
 
 	"github.com/Yelp/paasta-tools-go/pkg/config"
 )
@@ -117,6 +118,30 @@ func (provider *DefaultImageProvider) getImageForDeployGroup(deploymentGroup str
 	return deployment.DockerImage, nil
 }
 
+func GetPaastaGitShaFromDockerURL(dockerUrl string) (string, error) {
+	image := strings.Split(dockerUrl, "/")
+	if len(image) != 2 {
+		return "", fmt.Errorf(
+			"Failed to extract paasta git sha from url: %s",
+			dockerUrl,
+		)
+	}
+	gitShaStrings := strings.Split(image[1], "-")
+	if len(gitShaStrings) != 2 {
+		return "", fmt.Errorf(
+			"Failed to extract paasta git sha from url: %s",
+			dockerUrl,
+		)
+	}
+	if len(gitShaStrings[1]) < 8 {
+		return "", fmt.Errorf(
+			"%s doesn't look like a git sha, not long enough",
+			gitShaStrings[1],
+		)
+	}
+	return "git" + gitShaStrings[1][:8], nil
+}
+
 // DeploymentAnnotations returns a map of annotations for the relevant service
 // deployment group
 func DeploymentAnnotations(

pkg/deployments/deployments_test.go

@@ -27,22 +27,6 @@ func (fakereader FakeRegistryReader) Read(content interface{}) error {
 	return nil
 }
 
-type StaticImageProvider struct {
-	DockerRegistry string
-	Image          string
-}
-
-func NewStaticImageProvider(dockerRegistry, image string) *StaticImageProvider {
-	return &StaticImageProvider{
-		DockerRegistry: dockerRegistry,
-		Image:          image,
-	}
-}
-
-func (provider StaticImageProvider) DockerImageURLForService(serviceName, deploymentGroup string) (string, error) {
-	return fmt.Sprintf("%s/%s", provider.DockerRegistry, provider.Image), nil
-}
-
 func TestDefaultProviderGetDeployment(test *testing.T) {
 	fakeDeployments := Deployments{
 		V2: V2DeploymentsConfig{
@@ -102,6 +86,64 @@ func TestMakeControlGroup(test *testing.T) {
 	}
 }
 
+func TestDockerImageURLForDeployGroup(test *testing.T) {
+	fakeDeployments := Deployments{
+		V2: V2DeploymentsConfig{
+			Deployments: map[string]V2DeploymentGroup{
+				"dev.every": V2DeploymentGroup{
+					DockerImage: "busybox:latest",
+					GitSHA:      "03d6f783c99695af0e716588abb9ba83ac957be2",
+				},
+				"test.every": V2DeploymentGroup{
+					DockerImage: "ubuntu:latest",
+					GitSHA:      "f3d6f783c99695af0e716588abb9ba83ac957be3",
+				},
+			},
+		},
+	}
+	registry := DockerRegistry{
+		Registry: "fakeregistry.yelp.com",
+	}
+	imageReader := &FakeDeploymentsReader{data: fakeDeployments}
+	registryReader := &FakeRegistryReader{registry: registry}
+	imageProvider := DefaultImageProvider{
+		RegistryURLReader: registryReader,
+		ImageReader:       imageReader,
+	}
+	actual, err := imageProvider.DockerImageURLForDeployGroup("dev.every")
+	if err != nil {
+		test.Errorf("Failed to imageProvider.DockerImageURLForDeployGroup")
+	}
+	expected := "fakeregistry.yelp.com/busybox:latest"
+	if actual != expected {
+		test.Errorf("Expected '%+v', got '%+v'", expected, actual)
+	}
+}
+
+func TestGetPaastaGitShaFromDockerURL(test *testing.T) {
+	expected := "gitabc12345"
+	actual, err := GetPaastaGitShaFromDockerURL("docker.thing/paasta-abc12345abcabcabacbacbacb")
+	if err != nil {
+		test.Errorf("Failed to GetPaastaGitShaFromDockerURL: %s", err)
+	}
+	if actual != expected {
+		test.Errorf("Expected '%+v', got '%+v'", expected, actual)
+	}
+
+	actual, err = GetPaastaGitShaFromDockerURL("docker.thing")
+	if err == nil {
+		test.Errorf("Expected failure for invalid docker URL")
+	}
+	actual, err = GetPaastaGitShaFromDockerURL("docker.thing/abc12345abcabcabacbacbacb")
+	if err == nil {
+		test.Errorf("Expected failure for invalid docker URL")
+	}
+	actual, err = GetPaastaGitShaFromDockerURL("docker.thing/paasta-abc12")
+	if err == nil {
+		test.Errorf("Expected failure for invalid docker URL")
+	}
+}
+
 func TestDeploymentAnnotationsForControlGroup(test *testing.T) {
 	fakeDeployments := &Deployments{
 		V2: V2DeploymentsConfig{