Fix getmesh fetchistioctl darwin arm64

internal/istioctl/istioctl.go

@@ -40,10 +40,8 @@ import (
 const IstioVersionNoPodRunningMsg = "no running Istio pods in \"istio-system\""
 
 var (
-	istioDirSuffix                       = "istio"
-	istioctlPathFormat                   = filepath.Join(istioDirSuffix, "%s/bin/istioctl")
-	istioctlDownloadURLFormatWithArch    = "https://istio.tetratelabs.io/getmesh/files/istio-%s-%s-%s.tar.gz"
-	istioctlDownloadURLFormatWithoutArch = "https://istio.tetratelabs.io/getmesh/files/istio-%s-%s.tar.gz"
+	istioDirSuffix     = "istio"
+	istioctlPathFormat = filepath.Join(istioDirSuffix, "%s/bin/istioctl")
 )
 
 func GetIstioctlPath(homeDir string, distribution *manifest.IstioDistribution) string {
@@ -238,12 +236,7 @@ func fetchIstioctl(homeDir string, targetDistribution *manifest.IstioDistributio
 	}
 
 	// Construct URL from GOOS,GOARCH
-	var url string
-	if runtime.GOOS == "darwin" {
-		url = fmt.Sprintf(istioctlDownloadURLFormatWithoutArch, targetDistribution.String(), "osx")
-	} else {
-		url = fmt.Sprintf(istioctlDownloadURLFormatWithArch, targetDistribution.String(), runtime.GOOS, runtime.GOARCH)
-	}
+	url := fetchIstioctlURL(targetDistribution, runtime.GOOS, runtime.GOARCH)
 
 	// Download
 	resp, err := http.Get(url)
@@ -286,3 +279,19 @@ func fetchIstioctl(homeDir string, targetDistribution *manifest.IstioDistributio
 	}
 	return nil
 }
+
+func fetchIstioctlURL(targetDistribution *manifest.IstioDistribution, runtimeGOOS string, runtimeGOARCH string) string {
+	const (
+		istioctlDownloadURLFormatWithArch    = "https://istio.tetratelabs.io/getmesh/files/istio-%s-%s-%s.tar.gz"
+		istioctlDownloadURLFormatWithoutArch = "https://istio.tetratelabs.io/getmesh/files/istio-%s-%s.tar.gz"
+	)
+
+	if runtimeGOOS != "darwin" {
+		return fmt.Sprintf(istioctlDownloadURLFormatWithArch, targetDistribution.String(), runtimeGOOS, runtimeGOARCH)
+	}
+
+	if runtimeGOARCH == "arm64" {
+		return fmt.Sprintf(istioctlDownloadURLFormatWithArch, targetDistribution.String(), "osx", runtimeGOARCH)
+	}
+	return fmt.Sprintf(istioctlDownloadURLFormatWithoutArch, targetDistribution.String(), "osx")
+}

internal/istioctl/istioctl_test.go

@@ -377,6 +377,16 @@ func TestFetch(t *testing.T) {
 	defer os.RemoveAll(dir)
 	ms := &manifest.Manifest{
 		IstioDistributions: []*manifest.IstioDistribution{
+			{
+				Version:       "1.10.3",
+				Flavor:        manifest.IstioDistributionFlavorTetrate,
+				FlavorVersion: 0,
+			},
+			{
+				Version:       "1.10.3",
+				Flavor:        manifest.IstioDistributionFlavorTetrateFIPS,
+				FlavorVersion: 0,
+			},
 			{
 				Version:       "1.7.6",
 				Flavor:        manifest.IstioDistributionFlavorTetrate,
@@ -407,8 +417,8 @@ func TestFetch(t *testing.T) {
 
 	t.Run("supported", func(t *testing.T) {
 		for _, c := range []*manifest.IstioDistribution{
-			{Version: "1.7.5", Flavor: manifest.IstioDistributionFlavorTetrate, FlavorVersion: 0},
-			{Version: "1.7.6", Flavor: manifest.IstioDistributionFlavorTetrate, FlavorVersion: 0},
+			{Version: "1.10.3", Flavor: manifest.IstioDistributionFlavorTetrate, FlavorVersion: 0},
+			{Version: "1.10.3", Flavor: manifest.IstioDistributionFlavorTetrateFIPS, FlavorVersion: 0},
 		} {
 			require.Error(t, checkExist(dir, c))
 			err = Fetch(dir, c, ms)
@@ -461,3 +471,55 @@ func TestFetch(t *testing.T) {
 		}
 	})
 }
+
+func TestFetchIstioctlURL(t *testing.T) {
+	istioDistribution := &manifest.IstioDistribution{
+		Version:       "1.7.6",
+		Flavor:        manifest.IstioDistributionFlavorTetrate,
+		FlavorVersion: 0,
+	}
+
+	tests := map[string]struct {
+		istioDistribution *manifest.IstioDistribution
+		goos              string
+		goarch            string
+		want              string
+	}{
+		"linux-amd64": {
+			istioDistribution: istioDistribution,
+			goos:              "linux",
+			goarch:            "amd64",
+			want:              "https://istio.tetratelabs.io/getmesh/files/istio-1.7.6-tetrate-v0-linux-amd64.tar.gz",
+		},
+		"linux-arm64": {
+			istioDistribution: istioDistribution,
+			goos:              "linux",
+			goarch:            "arm64",
+			want:              "https://istio.tetratelabs.io/getmesh/files/istio-1.7.6-tetrate-v0-linux-arm64.tar.gz",
+		},
+		"darwin-arm64": {
+			istioDistribution: istioDistribution,
+			goos:              "darwin",
+			goarch:            "arm64",
+			want:              "https://istio.tetratelabs.io/getmesh/files/istio-1.7.6-tetrate-v0-osx-arm64.tar.gz",
+		},
+		"darwin-amd64": {
+			istioDistribution: istioDistribution,
+			goos:              "darwin",
+			goarch:            "amd64",
+			want:              "https://istio.tetratelabs.io/getmesh/files/istio-1.7.6-tetrate-v0-osx.tar.gz", // No arch
+		},
+		"madeupoos-madeuparch": { //  Check that follows os-arch convention
+			istioDistribution: istioDistribution,
+			goos:              "madeupoos",
+			goarch:            "madeuparch",
+			want:              "https://istio.tetratelabs.io/getmesh/files/istio-1.7.6-tetrate-v0-madeupoos-madeuparch.tar.gz",
+		},
+	}
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			got := fetchIstioctlURL(tc.istioDistribution, tc.goos, tc.goarch)
+			require.Equal(t, tc.want, got)
+		})
+	}
+}