Merge branch 'main' of github.com:hashicorp/terraform-provider-aws in…

…to support_single_az_efs

aws/resource_aws_efs_file_system.go

@@ -302,15 +302,7 @@ func resourceAwsEfsFileSystemRead(d *schema.ResourceData, meta interface{}) erro
 		return nil
 	}
 
-	fsARN := arn.ARN{
-		AccountID: meta.(*AWSClient).accountid,
-		Partition: meta.(*AWSClient).partition,
-		Region:    meta.(*AWSClient).region,
-		Resource:  fmt.Sprintf("file-system/%s", aws.StringValue(fs.FileSystemId)),
-		Service:   "elasticfilesystem",
-	}.String()
-
-	d.Set("arn", fsARN)
+	d.Set("arn", fs.FileSystemArn)
 	d.Set("availability_zone_id", fs.AvailabilityZoneId)
 	d.Set("availability_zone_name", fs.AvailabilityZoneName)
 	d.Set("creation_token", fs.CreationToken)