288
trigger_config={"webhook_url": "https://example.com/webhook"},
289
)
290
291
+ # No extra lookup when an explicit connection is pinned.
292
+ mock_client.connected_accounts.list.assert_not_called()
293
mock_client.trigger_instances.upsert.assert_called_once()
294
call_kwargs = mock_client.trigger_instances.upsert.call_args.kwargs
295
assert call_kwargs["slug"] == "GITHUB_COMMIT_EVENT"
298
"webhook_url": "https://example.com/webhook"
299
}
300
assert call_kwargs["toolkit_versions"] is None
301
+ # No user_id supplied → empty extra_body.
302
+ assert call_kwargs["extra_body"] == {}
303
assert result == mock_response
304
301
- def test_create_with_user_id(self, triggers, mock_client, mock_trigger_type):
302
- """Test create trigger with user_id."""
305
+ def test_create_with_user_id(self, triggers, mock_client):
306
+ """Test create trigger with user_id only.
307
+
308
+ The backend resolves the connection from ``user_id``, so the SDK passes
309
+ it through (via ``extra_body``) and no longer lists connected accounts.
310
+ """
311
mock_response = Mock()
312
mock_response.trigger_id = "trigger-123"
313
mock_client.trigger_instances.upsert.return_value = mock_response
306
- mock_client.triggers_types.retrieve.return_value = mock_trigger_type
307
-
308
- # Mock connected accounts list
309
- mock_accounts = Mock()
310
- mock_account = Mock()
311
- mock_account.id = "conn-456"
312
- mock_account.created_at = "2024-01-01T00:00:00Z"
313
- mock_accounts.items = [mock_account]
314
- mock_client.connected_accounts.list.return_value = mock_accounts
314
315
result = triggers.create(
316
slug="GITHUB_COMMIT_EVENT",
318
trigger_config={"webhook_url": "https://example.com/webhook"},
319
)
320
322
- # Verify get_type was called to get toolkit
323
- # Note: toolkit_versions=None gets converted to omit
324
- call_kwargs = mock_client.triggers_types.retrieve.call_args.kwargs
325
- assert call_kwargs["slug"] == "GITHUB_COMMIT_EVENT"
326
- assert call_kwargs["toolkit_versions"] is omit
327
-
328
- # Verify connected accounts were fetched
329
- mock_client.connected_accounts.list.assert_called_once_with(
330
- toolkit_slugs=["github"],
331
- user_ids=["user-123"],
332
- )
321
+ # The SDK no longer makes an extra round-trip to find a connection.
322
+ mock_client.connected_accounts.list.assert_not_called()
323
+ mock_client.triggers_types.retrieve.assert_not_called()
324
334
- # Verify trigger was created with found connected account
325
mock_client.trigger_instances.upsert.assert_called_once()
326
call_kwargs = mock_client.trigger_instances.upsert.call_args.kwargs
337
- assert call_kwargs["connected_account_id"] == "conn-456"
338
- assert call_kwargs["toolkit_versions"] is None
339
- # user_id forwarded for trigger 2FA ownership verification
327
+ assert call_kwargs["slug"] == "GITHUB_COMMIT_EVENT"
328
+ # No explicit connection pinned → omitted; user_id rides in extra_body.
329
+ assert call_kwargs["connected_account_id"] is omit
330
assert call_kwargs["extra_body"] == {"user_id": "user-123"}
331
+ assert call_kwargs["body_trigger_config_1"] == {
332
+ "webhook_url": "https://example.com/webhook"
333
+ }
334
+ assert call_kwargs["toolkit_versions"] is None
335
assert result == mock_response
336
337
def test_create_with_custom_toolkit_versions(
369
trigger_config={"webhook_url": "https://example.com/webhook"},
370
)
371
378
- assert "please provide valid `connected_account` or `user_id`" in str(
372
+ assert "please provide valid `connected_account_id` or `user_id`" in str(
373
exc_info.value
374
)
375
382
- def test_create_with_user_id_no_connected_accounts_raises_error(
383
- self, triggers, mock_client, mock_trigger_type
384
- ):
385
- """Test create trigger with user_id but no connected accounts raises error."""
386
- mock_client.triggers_types.retrieve.return_value = mock_trigger_type
387
-
388
- # Mock empty connected accounts list
389
- mock_accounts = Mock()
390
- mock_accounts.items = []
391
- mock_client.connected_accounts.list.return_value = mock_accounts
392
-
393
- with pytest.raises(exceptions.NoItemsFound) as exc_info:
394
- triggers.create(
395
- slug="GITHUB_COMMIT_EVENT",
396
- user_id="user-123",
397
- )
398
-
399
- assert "No connected accounts found" in str(exc_info.value)
400
-
401
- def test_get_connected_account_for_user(
402
- self, triggers, mock_client, mock_trigger_type
403
- ):
404
- """Test _get_connected_account_for_user method."""
405
- mock_client.triggers_types.retrieve.return_value = mock_trigger_type
406
-
407
- # Mock connected accounts
408
- mock_accounts = Mock()
409
- mock_account1 = Mock()
410
- mock_account1.id = "conn-old"
411
- mock_account1.created_at = "2024-01-01T00:00:00Z"
412
- mock_account2 = Mock()
413
- mock_account2.id = "conn-new"
414
- mock_account2.created_at = "2024-01-02T00:00:00Z"
415
- mock_accounts.items = [mock_account1, mock_account2]
416
- mock_client.connected_accounts.list.return_value = mock_accounts
417
-
418
- result = triggers._get_connected_account_for_user(
419
- trigger="GITHUB_COMMIT_EVENT",
420
- user_id="user-123",
421
- )
422
-
423
- # Should return the most recent account
424
- assert result == "conn-new"
425
-
426
- def test_get_connected_account_for_user_no_accounts(
427
- self, triggers, mock_client, mock_trigger_type
428
- ):
429
- """Test _get_connected_account_for_user with no accounts raises error."""
430
- mock_client.triggers_types.retrieve.return_value = mock_trigger_type
431
-
432
- # Mock empty connected accounts
433
- mock_accounts = Mock()
434
- mock_accounts.items = []
435
- mock_client.connected_accounts.list.return_value = mock_accounts
436
-
437
- with pytest.raises(exceptions.NoItemsFound) as exc_info:
438
- triggers._get_connected_account_for_user(
439
- trigger="GITHUB_COMMIT_EVENT",
440
- user_id="user-123",
441
- )
442
-
443
- assert "No connected accounts found" in str(exc_info.value)
444
-
376
def test_enable_trigger(self, triggers, mock_client):
377
"""Test enable trigger."""
378
mock_response = Mock()