"entrapment" is such a diluted phrase these days. What entrapment
really means is that a law enforcement officer encouraged someone to do something that they wouldn't have done otherwise. If an undercover cop asks a drug dealer for drugs, this is
not entrapment.
Entrapment would be like if an undercover officer put a gun to someone's head and told them to steal something, then arrested them for stealing. Or if an undercover officer became the leader of a peaceful activist movement, and then started preaching that they should get violent; then arrested all of the protesters that got violent.
It gets a little sticky in some cases, like the Portland bomber case. The undercover FBI agents kept asking him if he really wanted to do it. Looking at it one way you could say that they were discouraging him from doing it. On the other hand, he thought that they were terrorists, so even if he found himself in over his head, he would be unlikely to feel like he could back out at any time. Saying, "You can back out at any time," could just as easily be a ruse to test his resolve.