From f2879b58e2b8ceff1c865f17ebd53d89242e3d84 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 11 Dec 2024 11:28:29 -0500 Subject: Quote destination path --- src/lib/core/artifactory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/core/artifactory.c b/src/lib/core/artifactory.c index 0cd3b18..eedaf43 100644 --- a/src/lib/core/artifactory.c +++ b/src/lib/core/artifactory.c @@ -325,7 +325,7 @@ int jfrog_cli_rt_download(struct JFRT_Auth *auth, struct JFRT_Download *ctx, cha return -1; } - snprintf(cmd, sizeof(cmd) - 1, "%s '%s' %s", args, repo_path, dest ? dest : ""); + snprintf(cmd, sizeof(cmd) - 1, "%s '%s' '%s'", args, repo_path, dest ? dest : ""); guard_free(args); guard_strlist_free(&arg_map); -- cgit From 34ec75d49d084c15a572dcd9c20abb6b859af9f9 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 11 Dec 2024 11:29:11 -0500 Subject: Initialize authentication context * Argument generator may fail otherwise --- src/lib/delivery/delivery_artifactory.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/delivery/delivery_artifactory.c b/src/lib/delivery/delivery_artifactory.c index 9ad5829..e979b9a 100644 --- a/src/lib/delivery/delivery_artifactory.c +++ b/src/lib/delivery/delivery_artifactory.c @@ -188,6 +188,11 @@ int delivery_mission_render_files(struct Delivery *ctx) { int delivery_series_sync(struct Delivery *ctx) { struct JFRT_Download dl = {0}; + if (jfrt_auth_init(&ctx->deploy.jfrog_auth)) { + fprintf(stderr, "Failed to initialize Artifactory authentication context\n"); + return -1; // error + } + char *remote_dir = NULL; if (asprintf(&remote_dir, "%s/%s/%s/(*)", globals.jfrog.repo, ctx->meta.mission, ctx->info.build_name) < 0) { SYSERROR("%s", "Unable to allocate bytes for remote directory path"); -- cgit From 3c88d1ff55c1fd8eba6dd431d1220e7d8ff4796b Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 11 Dec 2024 11:29:38 -0500 Subject: Fix redundant linkage to stasis_core.a --- src/cli/stasis/CMakeLists.txt | 1 - src/cli/stasis_indexer/CMakeLists.txt | 1 - tests/CMakeLists.txt | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/cli/stasis/CMakeLists.txt b/src/cli/stasis/CMakeLists.txt index 1996c4c..d5bc6a6 100644 --- a/src/cli/stasis/CMakeLists.txt +++ b/src/cli/stasis/CMakeLists.txt @@ -6,7 +6,6 @@ add_executable(stasis tpl.c ) target_link_libraries(stasis PRIVATE - stasis_core stasis_delivery ) target_include_directories(stasis PRIVATE diff --git a/src/cli/stasis_indexer/CMakeLists.txt b/src/cli/stasis_indexer/CMakeLists.txt index 8c00ce4..68e4ae1 100644 --- a/src/cli/stasis_indexer/CMakeLists.txt +++ b/src/cli/stasis_indexer/CMakeLists.txt @@ -13,7 +13,6 @@ target_include_directories(stasis_indexer PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include ) target_link_libraries(stasis_indexer PRIVATE - stasis_core stasis_delivery ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 07ba39c..bcc05ce 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -36,7 +36,6 @@ foreach(source_file ${source_files}) ${CMAKE_CURRENT_SOURCE_DIR}/include ) target_link_libraries(${test_executable} PRIVATE - stasis_core stasis_delivery ) add_test(${test_executable} ${test_executable}) @@ -48,4 +47,4 @@ foreach(source_file ${source_files}) SKIP_RETURN_CODE 127) set_property(TEST ${test_executable} PROPERTY ENVIRONMENT "STASIS_SYSCONFDIR=${CMAKE_SOURCE_DIR}") -endforeach() \ No newline at end of file +endforeach() -- cgit