fix route table for Amazon FSx for NetApp ONTAP routes and tag

aws/data_source_aws_route_table.go

@@ -228,7 +228,7 @@ func dataSourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error
 		return fmt.Errorf("error setting tags: %w", err)
 	}
 
-	if err := d.Set("routes", dataSourceRoutesRead(rt.Routes)); err != nil {
+	if err := d.Set("routes", dataSourceRoutesRead(rt.Routes, meta)); err != nil {
 		return err
 	}
 
@@ -239,7 +239,7 @@ func dataSourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error
 	return nil
 }
 
-func dataSourceRoutesRead(ec2Routes []*ec2.Route) []map[string]interface{} {
+func dataSourceRoutesRead(ec2Routes []*ec2.Route, meta interface{}) []map[string]interface{} {
 	routes := make([]map[string]interface{}, 0, len(ec2Routes))
 	// Loop through the routes and add them to the set
 	for _, r := range ec2Routes {
@@ -257,6 +257,48 @@ func dataSourceRoutesRead(ec2Routes []*ec2.Route) []map[string]interface{} {
 			continue
 		}
 
+		if r.NetworkInterfaceId != nil {
+
+			conn := meta.(*AWSClient).ec2conn
+
+			describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{
+				NetworkInterfaceIds: []*string{r.NetworkInterfaceId},
+			}
+
+			describeResp, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request)
+
+			if err != nil {
+				if isAWSErr(err, "InvalidNetworkInterfaceID.NotFound", "") {
+					log.Printf("Network Interface %s not found", err)
+				} else {
+					log.Printf("Error occured checking network inteface for route: %s", err)
+				}
+			}
+
+			if len(describeResp.NetworkInterfaces) != 1 {
+				log.Printf("Unable to find ENI: %s", describeResp.NetworkInterfaces)
+			} else {
+
+				eni := describeResp.NetworkInterfaces[0]
+
+				if eni.Attachment != nil {
+
+					owner := aws.StringValue(eni.OwnerId)
+					iowner := aws.StringValue(eni.Attachment.InstanceOwnerId)
+
+					log.Printf("[DEBUG] ENI owner: %s, ENI Instane Owner %s", owner, iowner)
+
+					if iowner != "" && iowner != owner {
+						//Skipping cross account ENI for AWS services
+						log.Printf("Found Cross Account ENI: %s. Skipping", aws.StringValue(describeResp.NetworkInterfaces[0].NetworkInterfaceId))
+						log.Printf("[DEBUG] Cross Account ENI Details: \n %s", describeResp.NetworkInterfaces[0])
+						continue
+					}
+				}
+			}
+
+		}
+
 		m := make(map[string]interface{})
 
 		if r.DestinationCidrBlock != nil {

aws/resource_aws_route_table.go

@@ -242,11 +242,17 @@ func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error {
 		return fmt.Errorf("error setting propagating_vgws: %w", err)
 	}
 
-	if err := d.Set("route", flattenEc2Routes(routeTable.Routes)); err != nil {
+	if err := d.Set("route", flattenEc2Routes(routeTable.Routes,meta)); err != nil {
 		return fmt.Errorf("error setting route: %w", err)
 	}
 
-	tags := keyvaluetags.Ec2KeyValueTags(routeTable.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig)
+	//Ignore the FSx service tag
+	var mtag map[string]string
+	mtag =  make(map[string]string)
+	mtag["AmazonFSx"] = "ManagedByAmazonFSx"
+	fsxtag := keyvaluetags.New(mtag)
+
+	tags := keyvaluetags.Ec2KeyValueTags(routeTable.Tags).IgnoreAws().IgnoreConfig(ignoreTagsConfig).Ignore(fsxtag)
 
 	//lintignore:AWSR002
 	if err := d.Set("tags", tags.RemoveDefaultConfig(defaultTagsConfig).Map()); err != nil {
@@ -851,7 +857,7 @@ func flattenEc2Route(apiObject *ec2.Route) map[string]interface{} {
 	return tfMap
 }
 
-func flattenEc2Routes(apiObjects []*ec2.Route) []interface{} {
+func flattenEc2Routes(apiObjects []*ec2.Route,meta interface{}) []interface{} {
 	if len(apiObjects) == 0 {
 		return nil
 	}
@@ -877,6 +883,48 @@ func flattenEc2Routes(apiObjects []*ec2.Route) []interface{} {
 			continue
 		}
 
+		if apiObject.NetworkInterfaceId != nil {
+
+			conn := meta.(*AWSClient).ec2conn
+
+			describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesInput{
+				NetworkInterfaceIds: []*string{apiObject.NetworkInterfaceId},
+			}
+
+			describeResp, err := conn.DescribeNetworkInterfaces(describe_network_interfaces_request)
+
+			if err != nil {
+				if isAWSErr(err, "InvalidNetworkInterfaceID.NotFound", "") {
+					log.Printf("Network Interface %s not found" , err)
+				} else {
+					log.Printf("Error occured checking network inteface for route: %s", err)
+				}
+ 			}
+
+			if len(describeResp.NetworkInterfaces) != 1 {
+				log.Printf("Unable to find ENI: %s", describeResp.NetworkInterfaces)
+			} else {
+
+				eni := describeResp.NetworkInterfaces[0]
+
+				if eni.Attachment != nil {
+
+					owner := aws.StringValue(eni.OwnerId)
+					iowner := aws.StringValue(eni.Attachment.InstanceOwnerId)
+
+					log.Printf("[DEBUG] ENI owner: %s, ENI Instane Owner %s",owner,iowner)
+
+					if iowner != "" && iowner != owner {
+					//Skipping cross account ENI for AWS services
+					log.Printf("Found Cross Account ENI: %s. Skipping",aws.StringValue(describeResp.NetworkInterfaces[0].NetworkInterfaceId))
+					log.Printf("[DEBUG] Cross Account ENI Details: \n %s",describeResp.NetworkInterfaces[0])
+					continue
+					}
+				}
+			}
+
+		}
+
 		tfList = append(tfList, flattenEc2Route(apiObject))
 	}