feat(log-viewer-webui): Add support for loading IR/JSON streams from S3. (#673)

Co-authored-by: Devin Gibson <gibber9809@users.noreply.github.com>
Co-authored-by: kirkrodrigues <2454684+kirkrodrigues@users.noreply.github.com>
Co-authored-by: Junhao Liao <junhao@junhao.ca>

Author: 4 people

components/clp-package-utils/clp_package_utils/scripts/start_clp.py

@@ -930,11 +930,33 @@ def start_log_viewer_webui(
         "StreamTargetUncompressedSize": container_clp_config.stream_output.target_uncompressed_size,
         "LogViewerDir": str(container_log_viewer_webui_dir / "yscope-log-viewer"),
     }
+
+    container_cmd_extra_opts = []
+
+    stream_storage = clp_config.stream_output.storage
+    if StorageType.S3 == stream_storage.type:
+        s3_config = stream_storage.s3_config
+
+        settings_json_updates["StreamFilesS3Region"] = s3_config.region_code
+        settings_json_updates["StreamFilesS3PathPrefix"] = (
+            f"{s3_config.bucket}/{s3_config.key_prefix}"
+        )
+
+        access_key_id, secret_access_key = s3_config.get_credentials()
+        if access_key_id is not None and secret_access_key is not None:
+            container_cmd_extra_opts.extend(
+                [
+                    "-e",
+                    f"AWS_ACCESS_KEY_ID={access_key_id}",
+                    "-e",
+                    f"AWS_SECRET_ACCESS_KEY={secret_access_key}",
+                ]
+            )
+
     settings_json = read_and_update_settings_json(settings_json_path, settings_json_updates)
     with open(settings_json_path, "w") as settings_json_file:
         settings_json_file.write(json.dumps(settings_json))
 
-    # Start container
     # fmt: off
     container_cmd = [
         "docker", "run",
@@ -951,6 +973,8 @@ def start_log_viewer_webui(
         "-u", f"{os.getuid()}:{os.getgid()}",
     ]
     # fmt: on
+    container_cmd.extend(container_cmd_extra_opts)
+
     necessary_mounts = [
         mounts.clp_home,
         mounts.stream_output_dir,

components/log-viewer-webui/client/src/ui/QueryStatus.jsx

@@ -87,7 +87,7 @@ const QueryStatus = () => {
                 setQueryState(QUERY_LOADING_STATES.LOADING);
 
                 const innerLogEventNum = logEventIdx - data.begin_msg_ix + 1;
-                window.location = `/log-viewer/index.html?filePath=/streams/${data.path}` +
+                window.location = `/log-viewer/index.html?filePath=${data.path}` +
                     `#logEventNum=${innerLogEventNum}`;
             })
             .catch((e) => {