move aws_vpc to aws_vpc_id to match other modules