Merge pull request #14 from nuclearcat/add-tags

Fix github actions and add files tagging

Author: nuclearcat

.github/workflows/docker.yaml

@@ -34,10 +34,10 @@ jobs:
         run: echo "${{ github.actor }}" > github_username.txt
       - name: Set name of docker image on staging
         if: ${{ github.event.inputs.environment == 'staging' }}
-        run: echo "ghcr.io/${{ github.actor }}/kernelci-storage:staging" > image_name.txt
+        run: echo "ghcr.io/${{ github.repository_owner }}/kernelci-storage:staging" > image_name.txt
       - name: Set name of docker image on production
         if: ${{ github.event.inputs.environment == 'production' }}
-        run: echo "ghcr.io/${{ github.actor }}/kernelci-storage:latest" > image_name.txt
+        run: echo "ghcr.io/${{ github.repository_owner }}/kernelci-storage:latest" > image_name.txt
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io

src/azure.rs

@@ -71,7 +71,7 @@ fn calculate_checksum(filename: &String, data: &[u8]) {
 
 /// Write file to Azure blob storage
 /// TBD: Rework, do not keep whole file as Vec<u8> in memory!!!
-async fn write_file_to_blob(filename: String, data: Vec<u8>, cont_type: String) -> &'static str {
+async fn write_file_to_blob(filename: String, data: Vec<u8>, cont_type: String, owner_email: Option<String>) -> &'static str {
     let azure_cfg = Arc::new(get_azure_credentials("azure"));
 
     let storage_account = azure_cfg.account.as_str();
@@ -145,6 +145,20 @@ async fn write_file_to_blob(filename: String, data: Vec<u8>, cont_type: String)
                     eprintln!("Error getting blob URL: {:?}", e);
                 }
             }
+            
+            // Set owner tag if email is provided
+            if let Some(email) = owner_email {
+                let mut tags = Tags::new();
+                tags.insert("owner".to_string(), email);
+                match blob_client.set_tags(tags).await {
+                    Ok(_) => {
+                        debug_log!("Owner tag set successfully");
+                    }
+                    Err(e) => {
+                        eprintln!("Error setting owner tag: {:?}", e);
+                    }
+                }
+            }
         }
         Err(e) => {
             eprintln!("Error uploading block list: {:?}", e);
@@ -371,12 +385,12 @@ async fn azure_list_files(directory: String) -> Vec<String> {
 
 /// Implement Driver trait for AzureDriver
 impl super::Driver for AzureDriver {
-    fn write_file(&self, filename: String, data: Vec<u8>, cont_type: String) -> String {
+    fn write_file(&self, filename: String, data: Vec<u8>, cont_type: String, owner_email: Option<String>) -> String {
         let filenameret = filename.clone();
         /* Call async write_file_to_blob use tokio::task::block_in_place */
         tokio::task::block_in_place(|| {
             let rt = tokio::runtime::Runtime::new().unwrap();
-            rt.block_on(write_file_to_blob(filename, data, cont_type));
+            rt.block_on(write_file_to_blob(filename, data, cont_type, owner_email));
         });
         filenameret
     }

src/local.rs

@@ -101,7 +101,7 @@ fn calculate_checksum(filename: &str, data: &[u8]) {
 }
 
 /// Write file to local storage
-fn write_file_to_local(filename: String, data: Vec<u8>, cont_type: String) -> Result<String, String> {
+fn write_file_to_local(filename: String, data: Vec<u8>, cont_type: String, owner_email: Option<String>) -> Result<String, String> {
     let file_path = get_storage_file_path(&filename);
 
     // Ensure directory structure exists
@@ -122,11 +122,14 @@ fn write_file_to_local(filename: String, data: Vec<u8>, cont_type: String) -> Re
         }
     }
 
-    // Create and write metadata (headers)
+    // Create and write metadata (headers and owner tag)
     let metadata_path = get_metadata_file_path(&filename);
     if let Ok(mut metadata_file) = File::create(&metadata_path) {
-        let headers_content = format!("content-type:{}\n", cont_type);
-        let _ = metadata_file.write_all(headers_content.as_bytes());
+        let mut metadata_content = format!("content-type:{}\n", cont_type);
+        if let Some(email) = owner_email {
+            metadata_content.push_str(&format!("tag-owner:{}\n", email));
+        }
+        let _ = metadata_file.write_all(metadata_content.as_bytes());
     }
 
     debug_log!("File written to local storage: {}", file_path.display());
@@ -266,8 +269,8 @@ fn set_tags_for_local_file(filename: String, user_tags: Vec<(String, String)>) -
 
 /// Implement Driver trait for LocalDriver
 impl super::Driver for LocalDriver {
-    fn write_file(&self, filename: String, data: Vec<u8>, cont_type: String) -> String {
-        match write_file_to_local(filename.clone(), data, cont_type) {
+    fn write_file(&self, filename: String, data: Vec<u8>, cont_type: String, owner_email: Option<String>) -> String {
+        match write_file_to_local(filename.clone(), data, cont_type, owner_email) {
             Ok(_) => filename,
             Err(e) => {
                 eprintln!("Local storage write error: {}", e);

src/main.rs

@@ -104,7 +104,7 @@ struct ReceivedFile {
 }
 
 trait Driver {
-    fn write_file(&self, filename: String, data: Vec<u8>, cont_type: String) -> String;
+    fn write_file(&self, filename: String, data: Vec<u8>, cont_type: String, owner_email: Option<String>) -> String;
     fn get_file(&self, filename: String) -> ReceivedFile;
     fn tag_file(
         &self,
@@ -492,7 +492,7 @@ async fn ax_post_file(headers: HeaderMap, State(state): State<AppState>, mut mul
     };
 
     // TBD
-    let message = write_file_driver(full_path, file0, content_type.to_string());
+    let message = write_file_driver(full_path, file0, content_type.to_string(), Some(owner));
     if !message.is_empty() {
         return (StatusCode::CONFLICT, Vec::new());
     }
@@ -711,10 +711,10 @@ fn driver_get_file(filepath: String) -> ReceivedFile {
     driver.get_file(filepath)
 }
 
-fn write_file_driver(filename: String, data: Vec<u8>, cont_type: String) -> String {
+fn write_file_driver(filename: String, data: Vec<u8>, cont_type: String, owner_email: Option<String>) -> String {
     let driver_name = get_driver_type();
     let driver = init_driver(&driver_name);
-    driver.write_file(filename, data, cont_type);
+    driver.write_file(filename, data, cont_type, owner_email);
     "".to_string()
 }