The correct solution to avoid being at the wim of such friendly countries as Russia, Saudi, and China would be for Japan, Europe, the US, to massively invest in increasing internal free (renewable) energy sources, and diversifying strategic imports like silicon chips.
From 2015-2017 in the US renewable production increased from 558TWh to 710TWh, a 13% increase per year. Staying at that rate for the next 5 years would have put US renewable at 1,300TWh today or 31% - 500TWh more than today, leaving 500TWh of gas and oil to be used elsewhere and reducing the power of Russia and Saudi over the global economy. By 2030 the US would have hit 3,500TWh, up to wards 100% of current electric generation, and by 2040 at the latest to include the extra electric load from things like battery cars.
But instead the US didn't.