added decode_aws to api.md plus other reviewer comments

Author: KalmanMeth

docs/api.md

@@ -25,6 +25,13 @@ Following is the supported API format for the netflow collector:
          hostName: the hostname to listen on
          port: the port number to listen on
 </pre>
+## Aws ingest API
+Following is the supported API format for Aws flow entries:
+
+<pre>
+ aws:
+         fields: list of aws flow log fields
+</pre>
 ## Transform Generic API
 Following is the supported API format for generic transformations:
 

pkg/api/api.go

@@ -26,6 +26,7 @@ const TagEnum = "enum"
 type API struct {
 	PromEncode       PromEncode       `yaml:"prom" doc:"## Prometheus encode API\nFollowing is the supported API format for prometheus encode:\n"`
 	IngestCollector  IngestCollector  `yaml:"collector" doc:"## Ingest collector API\nFollowing is the supported API format for the netflow collector:\n"`
+	EncodeAws        EncodeAws        `yaml:"aws" doc:"## Aws ingest API\nFollowing is the supported API format for Aws flow entries:\n"`
 	TransformGeneric TransformGeneric `yaml:"generic" doc:"## Transform Generic API\nFollowing is the supported API format for generic transformations:\n"`
 	TransformNetwork TransformNetwork `yaml:"network" doc:"## Transform Network API\nFollowing is the supported API format for network transformations:\n"`
 }

pkg/api/decode_aws.go

@@ -17,6 +17,6 @@
 
 package api
 
-type EncodeAwsStruct struct {
+type EncodeAws struct {
 	Fields []string `yaml:"fields" doc:"list of aws flow log fields"`
 }

pkg/pipeline/decode/decode_aws.go

@@ -53,16 +53,16 @@ func (c *decodeAws) Decode(in []interface{}) []config.GenericMap {
 	out := make([]config.GenericMap, 0)
 	nItems := len(in)
 	log.Debugf("nItems = %d", nItems)
-	for i, line := range in {
+	for lineNum, line := range in {
 		lineSlice := strings.Fields(line.(string))
 		nFields := len(lineSlice)
 		if nFields != len(c.keyTags) {
-			log.Errorf("decodeAws Decode: wrong number of fields in line %d", i+1)
+			log.Errorf("decodeAws Decode: wrong number of fields in line %d", lineNum+1)
 			continue
 		}
 		record := make(config.GenericMap)
-		for i := 0; i < nFields; i++ {
-			record[c.keyTags[i]] = lineSlice[i]
+		for fieldNum := 0; fieldNum < nFields; fieldNum++ {
+			record[c.keyTags[fieldNum]] = lineSlice[fieldNum]
 		}
 		log.Debugf("record = %v", record)
 		out = append(out, record)
@@ -78,7 +78,7 @@ func NewDecodeAws() (Decoder, error) {
 	fieldsString := config.Opt.PipeLine.Decode.Aws
 	log.Debugf("fieldsString = %v", fieldsString)
 	if fieldsString != "" {
-		var awsFields api.EncodeAwsStruct
+		var awsFields api.EncodeAws
 		err := json.Unmarshal([]byte(fieldsString), &awsFields)
 		if err != nil {
 			log.Errorf("NewDecodeAws: error in unmarshalling fields: %v", err)