Skip to content

Commit 6966f6d

Browse files
committed
fix verify, improve message output
1 parent 4a23c35 commit 6966f6d

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

airbyte_cdk/utils/docker.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,14 @@ def build_connector_image(
280280
new_tags=[base_tag],
281281
)
282282
if not no_verify:
283-
if verify_connector_image(base_tag):
283+
success, error_message = verify_connector_image(base_tag)
284+
if success:
284285
click.echo(f"Build and verification completed successfully: {base_tag}")
285286
return base_tag
286287

287-
click.echo(f"Built image failed verification: {base_tag}", err=True)
288+
click.echo(
289+
f"Built image failed verification: {base_tag}\nError was:{error_message}", err=True
290+
)
288291
sys.exit(1)
289292

290293
click.echo(f"Build completed successfully: {base_tag}")
@@ -502,7 +505,7 @@ def verify_docker_installation() -> bool:
502505

503506
def verify_connector_image(
504507
image_name: str,
505-
) -> bool:
508+
) -> tuple[bool, str]:
506509
"""Verify the built image by running the spec command.
507510
508511
Args:
@@ -517,20 +520,23 @@ def verify_connector_image(
517520
result = run_docker_airbyte_command(
518521
["docker", "run", "--rm", image_name, "spec"],
519522
)
520-
if not result.errors:
521-
logger.error(result.get_formatted_error_message())
522-
return False
523+
if result.errors:
524+
err_msg = result.get_formatted_error_message()
525+
logger.error(err_msg)
526+
return False, err_msg
523527

524528
spec_messages = result.spec_messages
525529
if not spec_messages:
526-
logger.error(
530+
err_msg = (
527531
"The container failed to produce valid output for the `spec` command.\nLog output:\n"
528532
+ str(result.logs)
529533
)
530-
return False
534+
logger.error(err_msg)
535+
return False, err_msg
531536

532537
except Exception as ex:
533-
logger.error(f"Unexpected error during image verification: {ex}")
534-
return False
538+
err_msg = f"Unexpected error during image verification: {ex}"
539+
logger.error(err_msg)
540+
return False, err_msg
535541

536-
return True
542+
return True, ""

0 commit comments

Comments
 (0)