Merge branch 'main' of https://github.com/loxilb-io/loxicmd into main

loxilb-io · Sep 6, 2024 · 36f1910 · 36f1910
2 parents 6f5a7c5 + aa3d917
commit 36f1910
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/cmd/get/get_firewall.go b/cmd/get/get_firewall.go
@@ -141,15 +141,15 @@ func FWAPICall(restOptions *api.RESTOptions) (*http.Response, error) {
 
 func FWdump(restOptions *api.RESTOptions, path string) (string, error) {
 	// File Open
-	fileP := []string{"FWconfig_", ".txt"}
+	fileP := []string{"/tmp/FWconfig_", ".txt"}
 	t := time.Now()
 	file := strings.Join(fileP, t.Local().Format("2006-01-02_15:04:05"))
 	f, err := os.Create(file)
 	if err != nil {
 		fmt.Printf("Can't create dump file\n")
 		os.Exit(1)
 	}
-	defer f.Close()
+	defer os.Remove(f.Name())
 
 	// API Call
 	client := api.NewLoxiClient(restOptions)

diff --git a/cmd/get/get_loadbalancer.go b/cmd/get/get_loadbalancer.go
@@ -225,15 +225,15 @@ func Lbdump(restOptions *api.RESTOptions, path string) (string, error) {
 	lbresp := api.LbRuleModGet{}
 	dresp := api.LbRuleModGet{}
 	// File Open
-	fileP := []string{"lbconfig_", ".txt"}
+	fileP := []string{"/tmp/lbconfig_", ".txt"}
 	t := time.Now()
 	file := strings.Join(fileP, t.Local().Format("2006-01-02_15:04:05"))
 	f, err := os.Create(file)
 	if err != nil {
 		fmt.Printf("Can't create dump file\n")
 		os.Exit(1)
 	}
-	defer f.Close()
+	defer os.Remove(f.Name())
 
 	// API Call
 	client := api.NewLoxiClient(restOptions)

diff --git a/cmd/get/get_netlink.go b/cmd/get/get_netlink.go
@@ -514,7 +514,7 @@ func GetBonds() {
 func Nlpdump(dpath string) (string, error) {
 	var ret int
 	var err error
-	fileP := []string{"ipconfig_", ".txt"}
+	fileP := []string{"/tmp/ipconfig_", ".txt"}
 	t := time.Now()
 	file := strings.Join(fileP, t.Local().Format("2006-01-02_15:04:05"))
 	f, err = os.Create(file)
@@ -523,9 +523,9 @@ func Nlpdump(dpath string) (string, error) {
 		os.Exit(1)
 	}
 
-	defer f.Close()
+	defer os.Remove(f.Name())
 
-	path = "ipconfig_" + t.Local().Format("2006-01-02_15:04:05") + "/"
+	path = "/tmp/" + "ipconfig_" + t.Local().Format("2006-01-02_15:04:05") + "/"
 	//fmt.Printf("Creating intf config dir : %s\n", path)
 	if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
 		err := os.Mkdir(path, os.ModePerm)
@@ -534,6 +534,8 @@ func Nlpdump(dpath string) (string, error) {
 		}
 	}
 
+	defer os.RemoveAll(path)
+
 	/*Get bridge info first */
 	GetBridges()
 	GetBonds()