Merge pull request #114 from BenB196/staging

Staging to master
BenB196 · Oct 7, 2020 · ba04569 · ba04569
2 parents 5ed1b42 + 2ef8541
commit ba04569
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.0
+0.4.1
diff --git a/ffsEvent/ffsFetcher.go b/ffsEvent/ffsFetcher.go
@@ -223,8 +223,20 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 					}
 
 					//host ips
-					ips := ffsEvent.PrivateIpAddresses
-					ips = append(ips, ffsEvent.PublicIpAddress)
+
+					var ips []string
+
+					if ffsEvent.PrivateIpAddresses != nil && len(ffsEvent.PrivateIpAddresses) != 0 {
+						ips = append(ips, ffsEvent.PrivateIpAddresses...)
+					}
+
+					if ffsEvent.PublicIpAddress != "" {
+						ips = append(ips, ffsEvent.PublicIpAddress)
+					}
+
+					if ips != nil && len(ips) == 0 {
+						ips = nil
+					}
 
 					var geo *eventOutput.Geo
 					if location != nil {
@@ -708,6 +720,8 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 				panic(err)
 			}
 		}
+	} else {
+		enrichmentTime = time.Now()
 	}
 	outputTime := time.Now()