fix: Use project and location instead of API key when deploying to agent engine

Deploying using API key has been leading to "Deploy failed: 'NoneType' object has no attribute 'before_request'" errors because creating cloud resources requires ADC credentials (project id and region)

Co-authored-by: Kathy Wu <wukathy@google.com>
PiperOrigin-RevId: 910821145

Author: wukath

src/google/adk/cli/cli_deploy.py

@@ -1096,36 +1096,18 @@ def to_agent_engine(
 
     from ..utils._google_client_headers import get_tracking_headers
 
-    if project and region:
-      click.echo('Initializing Vertex AI...')
-      client = vertexai.Client(
-          project=project,
-          location=region,
-          http_options={'headers': get_tracking_headers()},
-      )
-    elif api_key:
-      click.echo('Initializing Vertex AI in Express Mode with API key...')
-      client = vertexai.Client(
-          api_key=api_key, http_options={'headers': get_tracking_headers()}
-      )
-    else:
-      click.echo(
-          'No project/region or api_key provided. Starting onboarding flow...'
-      )
+    if not project or not region:
+      click.echo('No project/region provided. Starting onboarding flow...')
       auth_info = _onboarding.handle_login_with_google()
-      if isinstance(auth_info, _onboarding.VertexAIAuth):
-        click.echo('Initializing Vertex AI...')
-        client = vertexai.Client(
-            project=auth_info.project_id,
-            location=auth_info.region,
-            http_options={'headers': get_tracking_headers()},
-        )
-      elif isinstance(auth_info, _onboarding.ExpressModeAuth):
-        click.echo('Initializing Vertex AI in Express Mode with API key...')
-        client = vertexai.Client(
-            api_key=auth_info.api_key,
-            http_options={'headers': get_tracking_headers()},
-        )
+      project = auth_info.project_id
+      region = auth_info.region
+
+    click.echo('Initializing Vertex AI...')
+    client = vertexai.Client(
+        project=project,
+        location=region,
+        http_options={'headers': get_tracking_headers()},
+    )
     click.echo('Vertex AI initialized.')
 
     is_config_agent = False

tests/unittests/cli/utils/test_cli_deploy.py

@@ -702,14 +702,13 @@ def test_to_agent_engine_triggers_onboarding(
     agent_dir: Callable[[bool, bool], Path],
 ) -> None:
   """It should trigger onboarding when credentials are missing."""
-  onboarding_recorder = _Recorder()
-
-  def mock_handle_login():
-    onboarding_recorder()
-    return cli_deploy._onboarding.ExpressModeAuth(
-        api_key="fake_api_key", project_id="fake_project", region="fake_region"
-    )
-
+  mock_handle_login = mock.Mock(
+      return_value=cli_deploy._onboarding.ExpressModeAuth(
+          api_key="fake_api_key",
+          project_id="fake_project",
+          region="fake_region",
+      )
+  )
   monkeypatch.setattr(
       cli_deploy._onboarding, "handle_login_with_google", mock_handle_login
   )
@@ -722,23 +721,18 @@ def mock_handle_login():
   )
 
   fake_vertexai = types.ModuleType("vertexai")
+  mock_client = mock.Mock()
+  fake_vertexai.Client = mock.Mock(return_value=mock_client)
 
-  class _FakeAgentEngines:
+  mock_agent_engines = mock.Mock()
+  mock_client.agent_engines = mock_agent_engines
 
-    def create(self, *, config: Dict[str, Any]) -> Any:
-      _ = config
-      return types.SimpleNamespace(
-          api_resource=types.SimpleNamespace(
-              name="projects/p/locations/l/reasoningEngines/e"
-          )
+  mock_agent_engines.create.return_value = types.SimpleNamespace(
+      api_resource=types.SimpleNamespace(
+          name="projects/p/locations/l/reasoningEngines/e"
       )
+  )
 
-  class _FakeVertexClient:
-
-    def __init__(self, *_args: Any, **_kwargs: Any) -> None:
-      self.agent_engines = _FakeAgentEngines()
-
-  fake_vertexai.Client = _FakeVertexClient
   monkeypatch.setitem(sys.modules, "vertexai", fake_vertexai)
 
   src_dir = agent_dir(False, False)
@@ -749,4 +743,11 @@ def __init__(self, *_args: Any, **_kwargs: Any) -> None:
       trace_to_cloud=True,
   )
 
-  assert len(onboarding_recorder.calls) == 1
+  mock_handle_login.assert_called_once()
+
+  # Verify vertexai.Client was initialized with correct args
+  fake_vertexai.Client.assert_called_once()
+  kwargs = fake_vertexai.Client.call_args.kwargs
+  assert kwargs.get("project") == "fake_project"
+  assert kwargs.get("location") == "fake_region"
+  assert "api_key" not in kwargs or kwargs.get("api_key") is None