autofill platform if not present

resolves tetratelabs/func-e#23

Signed-off-by: Liam White <liam@tetrate.io>

pkg/manifest/locate.go

@@ -24,12 +24,15 @@ import (
 
 // NewKey creates a manifest key based on the reference it is given
 func NewKey(reference string) (*Key, error) {
-	r := regexp.MustCompile(`^(.+):(.+)/(.+)$`)
+	r := regexp.MustCompile(`^([\w\d-\._]+):([\w\d-\._]+)/?([\w\d-\._]+)?$`)
 	matches := r.FindStringSubmatch(reference)
 	if len(matches) != 4 {
 		return nil, fmt.Errorf("reference %v is not of valid format <flavor>:<version>/<platform>", reference)
 	}
-
+	// If platform is empty, fill it in.
+	if len(matches[3]) == 0 {
+		matches[3] = platform()
+	}
 	return &Key{strings.ToLower(matches[1]), strings.ToLower(matches[2]), platformToEnum(matches[3])}, nil
 }
 

pkg/manifest/locate_test.go

@@ -15,6 +15,7 @@
 package manifest
 
 import (
+	"fmt"
 	"net/http"
 	"testing"
 
@@ -36,6 +37,12 @@ func TestLocate(t *testing.T) {
 			want:               "standard:1.11.0/linux-glibc",
 			responseStatusCode: http.StatusOK,
 		},
+		{
+			name:               "standard 1.11.0 matches",
+			reference:          "standard:1.11.0",
+			want:               fmt.Sprintf("standard:1.11.0/%v", platform()),
+			responseStatusCode: http.StatusOK,
+		},
 		{
 			name:               "standard-fips1402:1.10.0/linux-glibc matches",
 			reference:          "standard-fips1402:1.10.0/linux-glibc",
@@ -92,11 +99,13 @@ func TestNewKey(t *testing.T) {
 		want      *Key
 		wantErr   bool
 	}{
+		{"flavor:version/platform/platform", nil, true},
 		{"flavor:version/platform", &Key{Flavor: "flavor", Version: "version", Platform: "PLATFORM"}, false},
 		{"flavor:version/platform-glibc", &Key{Flavor: "flavor", Version: "version", Platform: "PLATFORM_GLIBC"}, false},
 		{"fLaVoR:VeRsIoN/pLaTfOrM", &Key{Flavor: "flavor", Version: "version", Platform: "PLATFORM"}, false},
-		{"flavor:version/", nil, true},
-		{"flavor:version", nil, true},
+		{"flavor:version/", &Key{Flavor: "flavor", Version: "version", Platform: platformToEnum(platform())}, false},
+		{"flavor:version", &Key{Flavor: "flavor", Version: "version", Platform: platformToEnum(platform())}, false},
+		{"fLaVoR:VeRsIoN", &Key{Flavor: "flavor", Version: "version", Platform: platformToEnum(platform())}, false},
 		{"flavor:", nil, true},
 		{"flavor", nil, true},
 	}

pkg/manifest/platform_darwin.go

@@ -0,0 +1,5 @@
+package manifest
+
+func platform() string {
+	return "darwin"
+}

pkg/manifest/platform_linux.go

@@ -0,0 +1,5 @@
+package manifest
+
+func platform() string {
+	return "linux-glibc"
+}