Fix AWS Networking Fingerprint tests failing when actually on AWS

hashicorp · Oct 8, 2015 · ae6829c · ae6829c
1 parent ae87aaf
commit ae6829c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/client/fingerprint/env_aws.go b/client/fingerprint/env_aws.go
@@ -176,6 +176,11 @@ func isAWS() bool {
 	}
 	defer resp.Body.Close()
 
+	if resp.StatusCode >= 400 {
+		// URL not found, which indicates that this isn't AWS
+		return false
+	}
+
 	instanceID, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		log.Printf("[ERR] fingerprint.env_aws: Error reading AWS Instance ID, skipping")

diff --git a/client/fingerprint/env_aws_test.go b/client/fingerprint/env_aws_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestEnvAWSFingerprint_nonAws(t *testing.T) {
+	os.Setenv("AWS_ENV_URL", "http://127.0.0.1/latest/meta-data/")
 	f := NewEnvAWSFingerprint(testLogger())
 	node := &structs.Node{
 		Attributes: make(map[string]string),
@@ -199,6 +200,7 @@ func TestNetworkFingerprint_AWS(t *testing.T) {
 }
 
 func TestNetworkFingerprint_notAWS(t *testing.T) {
+	os.Setenv("AWS_ENV_URL", "http://127.0.0.1/latest/meta-data/")
 	f := NewEnvAWSFingerprint(testLogger())
 	node := &structs.Node{
 		Attributes: make(map[string]string),