Yes he should. His "investigation" was a sham. As you say, Armitage called him and told him on day one.
And, furthermore, CIA confirmed her employment to Novak over the phone. If you're undercover, they don't out you over the phone to someone calling in just asking.
I would like to see a movie about the Plame/Wilson episode, if it includes the fact that it was Armitage who did it, and admitted it, and Fitz who ran a phony investigation for the next year and a half just to railroad a guy who had nothing to do with it. That would make a great movie.