Merge pull request #2417 from dmcgowan/update-arm64-normalize

crosbymichael · web-flow · commit f15c3be348ea · 2018-06-25T11:45:14.000-04:00
Normalize arm64 to an empty variant
diff --git a/platforms/database.go b/platforms/database.go
@@ -92,8 +92,8 @@ func normalizeArch(arch, variant string) (string, string) {
 	case "aarch64", "arm64":
 		arch = "arm64"
 		switch variant {
-		case "", "8":
-			variant = "v8"
+		case "8", "v8":
+			variant = ""
 		}
 	case "armhf":
 		arch = "arm"
@@ -112,15 +112,3 @@ func normalizeArch(arch, variant string) (string, string) {
 
 	return arch, variant
 }
-
-// defaultVariant detects default variants on normalized arch/variant
-func defaultVariant(arch, variant string) bool {
-	switch arch {
-	case "arm64":
-		return variant == "v8"
-	case "arm":
-		return variant == "v7"
-	default:
-		return true
-	}
-}
diff --git a/platforms/platforms.go b/platforms/platforms.go
@@ -197,7 +197,7 @@ func Parse(specifier string) (specs.Platform, error) {
 		}
 
 		p.Architecture, p.Variant = normalizeArch(parts[0], "")
-		if defaultVariant(p.Architecture, p.Variant) {
+		if p.Architecture == "arm" && p.Variant == "v7" {
 			p.Variant = ""
 		}
 		if isKnownArch(p.Architecture) {
@@ -211,7 +211,7 @@ func Parse(specifier string) (specs.Platform, error) {
 		// about whether or not we know of the platform.
 		p.OS = normalizeOS(parts[0])
 		p.Architecture, p.Variant = normalizeArch(parts[1], "")
-		if defaultVariant(p.Architecture, p.Variant) {
+		if p.Architecture == "arm" && p.Variant == "v7" {
 			p.Variant = ""
 		}
 
@@ -220,6 +220,9 @@ func Parse(specifier string) (specs.Platform, error) {
 		// we have a fully specified variant, this is rare
 		p.OS = normalizeOS(parts[0])
 		p.Architecture, p.Variant = normalizeArch(parts[1], parts[2])
+		if p.Architecture == "arm64" && p.Variant == "" {
+			p.Variant = "v8"
+		}
 
 		return p, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ func Parse(specifier string) (specs.Platform, error) {`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`p.Architecture, p.Variant = normalizeArch(parts[0], "")`
`200`		`- if defaultVariant(p.Architecture, p.Variant) {`
	`200`	`+ if p.Architecture == "arm" && p.Variant == "v7" {`
`201`	`201`	`p.Variant = ""`
`202`	`202`	`}`
`203`	`203`	`if isKnownArch(p.Architecture) {`
`@@ -211,7 +211,7 @@ func Parse(specifier string) (specs.Platform, error) {`
`211`	`211`	`// about whether or not we know of the platform.`
`212`	`212`	`p.OS = normalizeOS(parts[0])`
`213`	`213`	`p.Architecture, p.Variant = normalizeArch(parts[1], "")`
`214`		`- if defaultVariant(p.Architecture, p.Variant) {`
	`214`	`+ if p.Architecture == "arm" && p.Variant == "v7" {`
`215`	`215`	`p.Variant = ""`
`216`	`216`	`}`
`217`	`217`
`@@ -220,6 +220,9 @@ func Parse(specifier string) (specs.Platform, error) {`
`220`	`220`	`// we have a fully specified variant, this is rare`
`221`	`221`	`p.OS = normalizeOS(parts[0])`
`222`	`222`	`p.Architecture, p.Variant = normalizeArch(parts[1], parts[2])`
	`223`	`+ if p.Architecture == "arm64" && p.Variant == "" {`
	`224`	`+ p.Variant = "v8"`
	`225`	`+ }`
`223`	`226`
`224`	`227`	`return p, nil`
`225`	`228`	`}`