From ff65e614e701606fc6c4184ce321ad788acab17c Mon Sep 17 00:00:00 2001
From: anngo-nk <anguohui@bytedance.com>
Date: Tue, 30 Jun 2026 11:07:14 +0800
Subject: [PATCH] fix(plugin): rename files to apps_ prefix and handle Close()
 errors (#1655)

- Rename plugin_install/list/uninstall .go files to apps_plugin_ prefix
  for consistency with other files in the package
- Handle f.Close() errors in pluginExtractTGZ to avoid silent data loss
---
 .../apps/{plugin_install.go => apps_plugin_install.go}    | 0
 ...plugin_install_test.go => apps_plugin_install_test.go} | 0
 shortcuts/apps/{plugin_list.go => apps_plugin_list.go}    | 0
 .../{plugin_list_test.go => apps_plugin_list_test.go}     | 0
 .../{plugin_uninstall.go => apps_plugin_uninstall.go}     | 0
 ...in_uninstall_test.go => apps_plugin_uninstall_test.go} | 0
 shortcuts/apps/plugin_common.go                           | 8 ++++++--
 7 files changed, 6 insertions(+), 2 deletions(-)
 rename shortcuts/apps/{plugin_install.go => apps_plugin_install.go} (100%)
 rename shortcuts/apps/{plugin_install_test.go => apps_plugin_install_test.go} (100%)
 rename shortcuts/apps/{plugin_list.go => apps_plugin_list.go} (100%)
 rename shortcuts/apps/{plugin_list_test.go => apps_plugin_list_test.go} (100%)
 rename shortcuts/apps/{plugin_uninstall.go => apps_plugin_uninstall.go} (100%)
 rename shortcuts/apps/{plugin_uninstall_test.go => apps_plugin_uninstall_test.go} (100%)

diff --git a/shortcuts/apps/plugin_install.go b/shortcuts/apps/apps_plugin_install.go
similarity index 100%
rename from shortcuts/apps/plugin_install.go
rename to shortcuts/apps/apps_plugin_install.go
diff --git a/shortcuts/apps/plugin_install_test.go b/shortcuts/apps/apps_plugin_install_test.go
similarity index 100%
rename from shortcuts/apps/plugin_install_test.go
rename to shortcuts/apps/apps_plugin_install_test.go
diff --git a/shortcuts/apps/plugin_list.go b/shortcuts/apps/apps_plugin_list.go
similarity index 100%
rename from shortcuts/apps/plugin_list.go
rename to shortcuts/apps/apps_plugin_list.go
diff --git a/shortcuts/apps/plugin_list_test.go b/shortcuts/apps/apps_plugin_list_test.go
similarity index 100%
rename from shortcuts/apps/plugin_list_test.go
rename to shortcuts/apps/apps_plugin_list_test.go
diff --git a/shortcuts/apps/plugin_uninstall.go b/shortcuts/apps/apps_plugin_uninstall.go
similarity index 100%
rename from shortcuts/apps/plugin_uninstall.go
rename to shortcuts/apps/apps_plugin_uninstall.go
diff --git a/shortcuts/apps/plugin_uninstall_test.go b/shortcuts/apps/apps_plugin_uninstall_test.go
similarity index 100%
rename from shortcuts/apps/plugin_uninstall_test.go
rename to shortcuts/apps/apps_plugin_uninstall_test.go
diff --git a/shortcuts/apps/plugin_common.go b/shortcuts/apps/plugin_common.go
index 849fa7f94..d191ed27a 100644
--- a/shortcuts/apps/plugin_common.go
+++ b/shortcuts/apps/plugin_common.go
@@ -373,10 +373,14 @@ func pluginExtractTGZ(r io.Reader, destDir string) error {
 				return err
 			}
 			if _, err := io.Copy(f, tr); err != nil { //nolint:gosec // bounded by tar entry size
-				f.Close()
+				if cerr := f.Close(); cerr != nil {
+					return fmt.Errorf("copy tar entry: %w; close file: %v", err, cerr)
+				}
+				return err
+			}
+			if err := f.Close(); err != nil {
 				return err
 			}
-			f.Close()
 		}
 	}
 	return nil