Bushi (武士) refers to a samurai or warrior in feudal Japan, while a shogun (将軍) is the military leader who held supreme political power, often commanding the bushi.