From f2c3122e9c6470c052318497899b290a5afc74a5 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Mon, 2 Aug 2021 09:48:34 +0200
Subject: [PATCH] platforms: Format(): use path.Join() instead of
 joinNotEmpty()

path.Join() also skips empty components, making it the equivalent of
this function.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 platforms/platforms.go      | 16 ++--------------
 platforms/platforms_test.go | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/platforms/platforms.go b/platforms/platforms.go
index 088bdea05086..2c1b58ec5065 100644
--- a/platforms/platforms.go
+++ b/platforms/platforms.go
@@ -107,6 +107,7 @@
 package platforms
 
 import (
+	"path"
 	"regexp"
 	"runtime"
 	"strconv"
@@ -246,20 +247,7 @@ func Format(platform specs.Platform) string {
 		return "unknown"
 	}
 
-	return joinNotEmpty(platform.OS, platform.Architecture, platform.Variant)
-}
-
-func joinNotEmpty(s ...string) string {
-	var ss []string
-	for _, s := range s {
-		if s == "" {
-			continue
-		}
-
-		ss = append(ss, s)
-	}
-
-	return strings.Join(ss, "/")
+	return path.Join(platform.OS, platform.Architecture, platform.Variant)
 }
 
 // Normalize validates and translate the platform to the canonical value.
diff --git a/platforms/platforms_test.go b/platforms/platforms_test.go
index 66abc062d85e..c070ddae1cc9 100644
--- a/platforms/platforms_test.go
+++ b/platforms/platforms_test.go
@@ -17,6 +17,7 @@
 package platforms
 
 import (
+	"path"
 	"reflect"
 	"runtime"
 	"testing"
@@ -204,7 +205,7 @@ func TestParseSelector(t *testing.T) {
 				OS:           defaultOS,
 				Architecture: "arm",
 			},
-			formatted: joinNotEmpty(defaultOS, "arm"),
+			formatted: path.Join(defaultOS, "arm"),
 		},
 		{
 			input: "armel",
@@ -213,7 +214,7 @@ func TestParseSelector(t *testing.T) {
 				Architecture: "arm",
 				Variant:      "v6",
 			},
-			formatted: joinNotEmpty(defaultOS, "arm/v6"),
+			formatted: path.Join(defaultOS, "arm/v6"),
 		},
 		{
 			input: "armhf",
@@ -221,7 +222,7 @@ func TestParseSelector(t *testing.T) {
 				OS:           defaultOS,
 				Architecture: "arm",
 			},
-			formatted: joinNotEmpty(defaultOS, "arm"),
+			formatted: path.Join(defaultOS, "arm"),
 		},
 		{
 			input: "Aarch64",
@@ -229,7 +230,7 @@ func TestParseSelector(t *testing.T) {
 				OS:           defaultOS,
 				Architecture: "arm64",
 			},
-			formatted: joinNotEmpty(defaultOS, "arm64"),
+			formatted: path.Join(defaultOS, "arm64"),
 		},
 		{
 			input: "x86_64",
@@ -237,7 +238,7 @@ func TestParseSelector(t *testing.T) {
 				OS:           defaultOS,
 				Architecture: "amd64",
 			},
-			formatted: joinNotEmpty(defaultOS, "amd64"),
+			formatted: path.Join(defaultOS, "amd64"),
 		},
 		{
 			input: "Linux/x86_64",
@@ -253,7 +254,7 @@ func TestParseSelector(t *testing.T) {
 				OS:           defaultOS,
 				Architecture: "386",
 			},
-			formatted: joinNotEmpty(defaultOS, "386"),
+			formatted: path.Join(defaultOS, "386"),
 		},
 		{
 			input: "linux",
@@ -262,7 +263,7 @@ func TestParseSelector(t *testing.T) {
 				Architecture: defaultArch,
 				Variant:      defaultVariant,
 			},
-			formatted: joinNotEmpty("linux", defaultArch, defaultVariant),
+			formatted: path.Join("linux", defaultArch, defaultVariant),
 		},
 		{
 			input: "s390x",
@@ -270,7 +271,7 @@ func TestParseSelector(t *testing.T) {
 				OS:           defaultOS,
 				Architecture: "s390x",
 			},
-			formatted: joinNotEmpty(defaultOS, "s390x"),
+			formatted: path.Join(defaultOS, "s390x"),
 		},
 		{
 			input: "linux/s390x",
@@ -287,7 +288,7 @@ func TestParseSelector(t *testing.T) {
 				Architecture: defaultArch,
 				Variant:      defaultVariant,
 			},
-			formatted: joinNotEmpty("darwin", defaultArch, defaultVariant),
+			formatted: path.Join("darwin", defaultArch, defaultVariant),
 		},
 	} {
 		t.Run(testcase.input, func(t *testing.T) {