The latter seems to be the primary category, with 1,795,300 jobs vs 147,400 computer programmers.
And combining the -11% of 147K and +25% of 1.8M, BLS is projecting a net increase of over 400K jobs in the two categories.
But that includes QA and testers.
[0] https://www.bls.gov/ooh/computer-and-information-technology/...