Add support for a Darwin M1 binary

* Update get.sh to download the specific darwin arm64
package for M1
* Build an M1 binary
* Print the build of the binary in the version command
* Update CI to Go 1.17 to support M1 builds

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

.github/workflows/build.yaml

@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/publish.yaml

@@ -9,7 +9,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:

Makefile

@@ -28,6 +28,7 @@ dist:
 	rm -rf bin/inlets*
 	CGO_ENABLED=0 GOOS=linux go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/inletsctl
 	CGO_ENABLED=0 GOOS=darwin go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/inletsctl-darwin
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/inletsctl-darwin-arm64
 	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/inletsctl.exe
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/inletsctl-armhf
 	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/inletsctl-arm64

README.md

@@ -110,10 +110,9 @@ type Provisioner interface {
 }
 ```
 
-### Community support
+### License
 
-You can seek out community support through the [OpenFaaS Slack](https://slack.openfaas.io/) in the `#inlets` channel
+inletsctl is distributed under the MIT license. inlets-pro, which inletsctl uses is licensed under the [inlets-pro End User License Agreement (EULA)](https://github.com/inlets/inlets-pro/blob/master/EULA.md).
 
-### License
+A valid inlets license or Gumroad subscription is required to create tunnel servers with inletsctl.
 
-MIT

ci/compress.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
+
 cd bin
-for f in inletsctl*; do tar -cvzf ../uploads/$f.tgz $f; done
+for f in inletsctl*; do tar -cvzf ../uploads/$f.tgz $f; done

cmd/inletsctl.go

@@ -6,6 +6,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"runtime"
 
 	"github.com/morikuni/aec"
 	"github.com/spf13/cobra"
@@ -57,8 +58,10 @@ func getVersion() string {
 func parseBaseCommand(_ *cobra.Command, _ []string) {
 	printLogo()
 
-	fmt.Println("Version:", getVersion())
-	fmt.Println("Git Commit:", GitCommit)
+	fmt.Printf("Version: %s\n", getVersion())
+	fmt.Printf("Git Commit: %s\n", GitCommit)
+	fmt.Printf("Build target: %s/%s\n", runtime.GOOS, runtime.GOARCH)
+
 	os.Exit(0)
 }
 

get.sh

@@ -30,11 +30,21 @@ hasCli() {
 getPackage() {
     uname=$(uname)
     userid=$(id -u)
+    arch=$(uname -m)
 
     suffix=""
     case $uname in
     "Darwin")
-    suffix="-darwin.tgz"
+        case $arch in
+        "x86_64")
+        suffix="-darwin.tgz"
+        ;;
+        esac
+        case $arch in
+        "arm64")
+        suffix="-darwin-arm64.tgz"
+        ;;
+        esac
     ;;
     "Linux")
         arch=$(uname -m)

go.mod

@@ -1,16 +1,16 @@
 module github.com/inlets/inletsctl
 
-go 1.13
+go 1.16
 
 require (
-	github.com/alexellis/go-execute v0.0.0-20191029181357-d17947259f74
-	github.com/golang/mock v1.3.1
-	github.com/inlets/cloud-provision v0.5.3
+	github.com/alexellis/go-execute v0.5.0
+	github.com/golang/mock v1.6.0
+	github.com/inlets/cloud-provision v0.5.5
 	github.com/linode/linodego v0.19.0
 	github.com/morikuni/aec v1.0.0
 	github.com/pkg/errors v0.9.1
 	github.com/sethvargo/go-password v0.2.0
-	github.com/spf13/cobra v0.0.5
+	github.com/spf13/cobra v1.3.0
 	github.com/spf13/pflag v1.0.5
 
 )