Merge pull request #649 from 99designs/android-dns-fix

Work around DNS resolution issues on Android
99designs · Sep 14, 2020 · 5428442 · 5428442
2 parents fbc4ab1 + d4887ce
commit 5428442
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ install: aws-vault
 	cp -a ./aws-vault $(INSTALL_DIR)
 	codesign --options runtime --timestamp --sign "$(CERT_ID)" $(INSTALL_DIR)/aws-vault || true
 
-binaries: aws-vault-linux-amd64 aws-vault-linux-arm64 aws-vault-linux-ppc64le aws-vault-linux-arm7 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-amd64
+binaries: aws-vault-linux-amd64 aws-vault-linux-arm64 aws-vault-linux-ppc64le aws-vault-linux-arm7 aws-vault-android-amd64 aws-vault-darwin-amd64 aws-vault-windows-386.exe aws-vault-freebsd-amd64
 
 clean:
 	rm -f ./aws-vault ./aws-vault-*-* ./SHA256SUMS
@@ -40,11 +40,14 @@ aws-vault-linux-ppc64le: $(SRC)
 aws-vault-linux-arm7: $(SRC)
 	GOOS=linux GOARCH=arm GOARM=7 go build $(BUILD_FLAGS) -o $@ .
 
+aws-vault-android-arm64: $(SRC)
+	GOOS=linux GOARCH=arm64 go build -tags='androiddnsfix' $(BUILD_FLAGS) -o $@ .
+
 aws-vault-windows-386.exe: $(SRC)
 	GOOS=windows GOARCH=386 go build $(BUILD_FLAGS) -o $@ .
 
 aws-vault-darwin-amd64.dmg: aws-vault-darwin-amd64
 	./bin/create-dmg aws-vault-darwin-amd64 $@
 
 SHA256SUMS: binaries aws-vault-darwin-amd64.dmg
-	shasum -a 256 aws-vault-freebsd-amd64 aws-vault-linux-amd64 aws-vault-linux-arm64 aws-vault-linux-ppc64le aws-vault-linux-arm7 aws-vault-windows-386.exe aws-vault-darwin-amd64.dmg > $@
+	shasum -a 256 aws-vault-freebsd-amd64 aws-vault-linux-amd64 aws-vault-linux-arm64 aws-vault-linux-ppc64le aws-vault-linux-arm7 aws-vault-android-arm64 aws-vault-windows-386.exe aws-vault-darwin-amd64.dmg > $@
diff --git a/go.mod b/go.mod
@@ -12,6 +12,7 @@ require (
 	github.com/google/go-cmp v0.5.2
 	github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d // indirect
 	github.com/mitchellh/go-homedir v1.1.0
+	github.com/mtibben/androiddnsfix v0.0.0-20200907095054-ff0280446354
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a

diff --git a/go.sum b/go.sum
@@ -44,6 +44,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mtibben/androiddnsfix v0.0.0-20200903112207-1169bfc0deaa h1:jyhyxLoqYdxnIBeBeOXqLgrHySVirAgKKP5GBk1dsPA=
+github.com/mtibben/androiddnsfix v0.0.0-20200903112207-1169bfc0deaa/go.mod h1:Cu3Rcze2YUpuTWfggCBafY8U9/ckCksdAiONQ7XDvB8=
+github.com/mtibben/androiddnsfix v0.0.0-20200907095054-ff0280446354 h1:aS4S9U7xE7bwYB6gn/X0BteBAasVEfQwPV5k8trGXW4=
+github.com/mtibben/androiddnsfix v0.0.0-20200907095054-ff0280446354/go.mod h1:Cu3Rcze2YUpuTWfggCBafY8U9/ckCksdAiONQ7XDvB8=
 github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
 github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/main.go b/main.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/99designs/aws-vault/v6/cli"
 	"github.com/alecthomas/kingpin"
+	_ "github.com/mtibben/androiddnsfix"
 )
 
 // Version is provided at compile time