in v1.7 we allowed for two different implementations of the sandbox operations.. one in the sbserver path the other here https://github.com/containerd/containerd/blob/release/1.7/pkg/cri/server/sandbox_stop.go#L110-L114

I forgot about that, I can add

Do we need to fix this issue in main first? Also, I suggest squashing the commits into a single commit.

Do we need to fix this issue in main first? Also, I suggest squashing the commits into a single commit.

Which issue are you referring to? We can squash, however its not uniform with main, 2.2. We should have and stil can for 1.7 and 2.1.

cherry pick for #12922

In description, it's cherry-pick for 12922 but it's closed. So I am thinking we should fix that issue you mention in main first.

cherry pick for #12922

In description, it's cherry-pick for 12922 but it's closed. So I am thinking we should fix that issue you mention in main first.

The issue is really the linter is different from main, 2.2 and different for 2.1 which is a little odd

OK. It turns out you use wrong link in description 😂 it's #12923. please squash commits. Basically, we use merge instead of squash-and-rebasing. Not a fan to have [address comment](https://github.com/containerd/containerd/pull/12923/changes/1092b85a8ce13fb0ec72b1e232b6a781ccef9214) commit like this.

OK. It turns out you use wrong link in description 😂 it's #12923. please squash commits. Basically, we use merge instead of squash-and-rebasing. Not a fan to have [address comment](https://github.com/containerd/containerd/pull/12923/changes/1092b85a8ce13fb0ec72b1e232b6a781ccef9214) commit like this.

I’ll fix that as well. Will squash in the morning. I’m with you on using squash/rebase!