diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2024-12-11 11:30:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-11 11:30:59 -0500 |
| commit | 6c0355d9802b83938de388b444021f34cf9b9506 (patch) | |
| tree | 5bb79c36bf53415877f2991a5a66e1425a21a59e | |
| parent | 3078519379ffcdc45811431336547d7df31a24ee (diff) | |
| parent | 3c88d1ff55c1fd8eba6dd431d1220e7d8ff4796b (diff) | |
| download | stasis-6c0355d9802b83938de388b444021f34cf9b9506.tar.gz | |
Merge pull request #76 from jhunkeler/fix-download-auth
Fix artifactory download authentication context
| -rw-r--r-- | src/cli/stasis/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/cli/stasis_indexer/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/lib/core/artifactory.c | 2 | ||||
| -rw-r--r-- | src/lib/delivery/delivery_artifactory.c | 5 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 3 |
5 files changed, 7 insertions, 5 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/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); 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"); 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() |