add oauth2 option to the config, merge both gcs flavors together.