fixup! tests: Add tests for EC2 Metadata immitation cases

hashicorp · Mar 26, 2020 · 6199e96 · 6199e96
1 parent 0c1dd0e
commit 6199e96
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/client/fingerprint/env_aws.go b/client/fingerprint/env_aws.go
@@ -101,7 +101,7 @@ func (f *EnvAWSFingerprint) Fingerprint(request *FingerprintRequest, response *F
 
 	for k, unique := range keys {
 		resp, err := ec2meta.GetMetadata(k)
-		v := strings.TrimSpace(strings.Trim(resp, "\n"))
+		v := strings.TrimSpace(resp)
 		if v == "" {
 			f.logger.Debug("read an empty value", "attribute", k)
 			continue
@@ -219,5 +219,6 @@ func ec2MetaClient(endpoint string, timeout time.Duration) (*ec2metadata.EC2Meta
 
 func isAWS(ec2meta *ec2metadata.EC2Metadata) bool {
 	v, err := ec2meta.GetMetadata("ami-id")
+	v = strings.TrimSpace(v)
 	return err == nil && v != ""
 }