pgmoneta#1067 fix: s3 ls command to work with pfix

Signed-off-by: Amr-Shams <amr.shams2015.as@gmail.com>

Author: Amr-Shams

src/cli.c

@@ -122,7 +122,7 @@ static void display_helper(char* command);
 
 static int backup(SSL* ssl, int socket, char* server, uint8_t compression, uint8_t encryption, char* incremental, int32_t output_format);
 static int list_backup(SSL* ssl, int socket, char* server, char* sort_order, uint8_t compression, uint8_t encryption, int32_t output_format);
-static int list_s3_objects(SSL* ssl, int socket, char* server, uint8_t compression, uint8_t encryption, int32_t output_format);
+static int list_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format);
 static int delete_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format);
 static int restore_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format);
 static int restore(SSL* ssl, int socket, char* server, char* backup_id, char* position, char* directory, uint8_t compression, uint8_t encryption, int32_t output_format);
@@ -932,7 +932,7 @@ main(int argc, char** argv)
    }
    else if (parsed.cmd->action == MANAGEMENT_S3_LS)
    {
-      exit_code = list_s3_objects(s_ssl, socket, parsed.args[0], compression, encryption, output_format);
+      exit_code = list_s3_objects(s_ssl, socket, parsed.args[0], parsed.args[1], compression, encryption, output_format);
    }
    else if (parsed.cmd->action == MANAGEMENT_S3_DELETE)
    {
@@ -1426,9 +1426,9 @@ list_backup(SSL* ssl, int socket, char* server, char* sort_order, uint8_t compre
    return 1;
 }
 static int
-list_s3_objects(SSL* ssl, int socket, char* server, uint8_t compression, uint8_t encryption, int32_t output_format)
+list_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format)
 {
-   if (pgmoneta_management_request_list_s3_objects(ssl, socket, server, compression, encryption, output_format))
+   if (pgmoneta_management_request_list_s3_objects(ssl, socket, server, prefix, compression, encryption, output_format))
    {
       goto error;
    }

src/include/management.h

@@ -496,7 +496,7 @@ pgmoneta_management_request_list_backup(SSL* ssl, int socket, char* server, char
  * @return 0 upon success, otherwise 1
  */
 int
-pgmoneta_management_request_list_s3_objects(SSL* ssl, int socket, char* server, uint8_t compression, uint8_t encryption, int32_t output_format);
+pgmoneta_management_request_list_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format);
 
 /**
  * Create a delete s3 objects request

src/libpgmoneta/management.c

@@ -124,7 +124,7 @@ pgmoneta_management_request_list_backup(SSL* ssl, int socket, char* server, char
    return 1;
 }
 int
-pgmoneta_management_request_list_s3_objects(SSL* ssl, int socket, char* server, uint8_t compression, uint8_t encryption, int32_t output_format)
+pgmoneta_management_request_list_s3_objects(SSL* ssl, int socket, char* server, char* prefix, uint8_t compression, uint8_t encryption, int32_t output_format)
 {
    struct json* j = NULL;
    struct json* request = NULL;
@@ -140,6 +140,10 @@ pgmoneta_management_request_list_s3_objects(SSL* ssl, int socket, char* server,
    }
 
    pgmoneta_json_put(request, MANAGEMENT_ARGUMENT_SERVER, (uintptr_t)server, ValueString);
+   if (prefix != NULL)
+   {
+      pgmoneta_json_put(request, MANAGEMENT_ARGUMENT_S3_PREFIX, (uintptr_t)prefix, ValueString);
+   }
 
    if (pgmoneta_management_write_json(ssl, socket, compression, encryption, j))
    {

src/libpgmoneta/s3.c

@@ -68,6 +68,7 @@ pgmoneta_list_s3_objects(int client_fd, int server, uint8_t compression, uint8_t
 {
    char* elapsed = NULL;
    char* en = NULL;
+   char* prefix = NULL;
    int ec = -1;
    struct timespec start_t;
    struct timespec end_t;
@@ -79,8 +80,11 @@ pgmoneta_list_s3_objects(int client_fd, int server, uint8_t compression, uint8_t
    struct art* nodes = NULL;
    struct workflow* workflow = NULL;
    struct main_configuration* config;
+   struct json* request = NULL;
 
    config = (struct main_configuration*)shmem;
+   request = (struct json*)pgmoneta_json_get(payload, MANAGEMENT_CATEGORY_REQUEST);
+   prefix = (char*)pgmoneta_json_get(request, MANAGEMENT_ARGUMENT_S3_PREFIX);
 
 #ifdef HAVE_FREEBSD
    clock_gettime(CLOCK_MONOTONIC_FAST, &start_t);
@@ -100,7 +104,7 @@ pgmoneta_list_s3_objects(int client_fd, int server, uint8_t compression, uint8_t
       goto error;
    }
 
-   if (pgmoneta_art_insert(nodes, NODE_LABEL, (uintptr_t)"", ValueString))
+   if (pgmoneta_art_insert(nodes, NODE_LABEL, (uintptr_t)(prefix != NULL ? prefix : ""), ValueString))
    {
       ec = MANAGEMENT_ERROR_LIST_S3_WORKFLOW;
       goto error;

src/libpgmoneta/se_s3.c

@@ -2321,10 +2321,13 @@ s3_get_basepath(int server, char* identifier)
       d = pgmoneta_append(d, "/");
    }
 
-   d = pgmoneta_append(d, effective_base_dir);
-   if (!pgmoneta_ends_with(effective_base_dir, "/"))
+   if (strlen(effective_base_dir) > 0)
    {
-      d = pgmoneta_append(d, "/");
+      d = pgmoneta_append(d, effective_base_dir);
+      if (!pgmoneta_ends_with(effective_base_dir, "/"))
+      {
+         d = pgmoneta_append(d, "/");
+      }
    }
 
    d = pgmoneta_append(d, config->common.servers[server].name);