Replace usages of raw get_upstream with get_upstream_resource()

Replace usages of raw get_upstream with get_upstream_resource() #4188