Merge pull request #1971 from AviatrixSystems/shan/UserConnect-7.1

AVX-50899: fqdn_lan_interface is not needed for firenet fqdn association
AviatrixSystems · Mar 8, 2024 · 7d379ca · 7d379ca
2 parents c45242c + b8068c2
commit 7d379ca
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/aviatrix/data_source_aviatrix_gateway.go b/aviatrix/data_source_aviatrix_gateway.go
@@ -789,16 +789,13 @@ func dataSourceAviatrixGatewayRead(d *schema.ResourceData, meta interface{}) err
 			d.Set("renegotiation_interval", -1)
 		}
 
-		fqdnGatewayLanInterface := fmt.Sprintf("av-nic-%s_eth1", gw.GwName)
 		fqdnLanCidr, ok := gw.ArmFqdnLanCidr[gw.GwName]
 		if ok && goaviatrix.IsCloudType(gw.CloudType, goaviatrix.AzureArmRelatedCloudTypes) {
-			d.Set("fqdn_lan_interface", fqdnGatewayLanInterface)
 			d.Set("fqdn_lan_cidr", fqdnLanCidr)
 		} else if goaviatrix.IsCloudType(gw.CloudType, goaviatrix.GCPRelatedCloudTypes) {
 			d.Set("fqdn_lan_vpc_id", gw.BundleVpcInfo.LAN.VpcID)
 			d.Set("fqdn_lan_cidr", strings.Split(gw.BundleVpcInfo.LAN.Subnet, "~~")[0])
 		} else {
-			d.Set("fqdn_lan_interface", "")
 			d.Set("fqdn_lan_cidr", "")
 		}
 

diff --git a/aviatrix/resource_aviatrix_firewall_instance_association.go b/aviatrix/resource_aviatrix_firewall_instance_association.go
@@ -211,11 +211,7 @@ func resourceAviatrixFirewallInstanceAssociationRead(d *schema.ResourceData, met
 	if instanceInfo.VendorType == "Aviatrix FQDN Gateway" {
 		d.Set("vendor_type", "fqdn_gateway")
 		d.Set("firewall_name", "")
-		if strings.HasPrefix(instanceInfo.LanInterface, "eni-") || fireNetDetail.CloudType == strconv.Itoa(goaviatrix.GCP) {
-			d.Set("lan_interface", "")
-		} else {
-			d.Set("lan_interface", instanceInfo.LanInterface)
-		}
+		d.Set("lan_interface", "")
 		d.Set("management_interface", "")
 		d.Set("egress_interface", "")
 	} else {

diff --git a/aviatrix/resource_aviatrix_gateway.go b/aviatrix/resource_aviatrix_gateway.go
@@ -1481,16 +1481,13 @@ func resourceAviatrixGatewayRead(d *schema.ResourceData, meta interface{}) error
 		return fmt.Errorf("setting 'monitor_exclude_list' to state: %v", err)
 	}
 
-	fqdnGatewayLanInterface := fmt.Sprintf("av-nic-%s_eth1", gw.GwName)
 	fqdnLanCidr, ok := gw.ArmFqdnLanCidr[gw.GwName]
 	if ok && goaviatrix.IsCloudType(gw.CloudType, goaviatrix.AzureArmRelatedCloudTypes) {
-		d.Set("fqdn_lan_interface", fqdnGatewayLanInterface)
 		d.Set("fqdn_lan_cidr", fqdnLanCidr)
 	} else if goaviatrix.IsCloudType(gw.CloudType, goaviatrix.GCPRelatedCloudTypes) {
 		d.Set("fqdn_lan_vpc_id", gw.BundleVpcInfo.LAN.VpcID)
 		d.Set("fqdn_lan_cidr", strings.Split(gw.BundleVpcInfo.LAN.Subnet, "~~")[0])
 	} else {
-		d.Set("fqdn_lan_interface", "")
 		d.Set("fqdn_lan_cidr", "")
 	}