Skip to content

Commit 1216162

Browse files
committed
feat: print supportpkg file when successfully collected
1 parent eb8fd57 commit 1216162

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

cmd/kic-supportpkg.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,18 @@ func Execute() {
2828
fmt.Printf("Running job %s...", job.Name)
2929
err = job.Collect(collector)
3030
if err != nil {
31-
fmt.Printf("Error: %s", err)
31+
fmt.Printf("Error: %s\n", err)
3232
} else {
3333
fmt.Print(" OK\n")
3434
}
3535
}
3636

37-
err = collector.WrapUp()
37+
tarFile, err := collector.WrapUp()
3838
if err != nil {
3939
fmt.Println(fmt.Errorf("error when wrapping up: %s", err))
4040
os.Exit(1)
41+
} else {
42+
fmt.Printf("Supportpkg successfully generated: %s\n", tarFile)
4143
}
4244
},
4345
}

pkg/data_collector/data_collector.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ func NewDataCollector(namespaces ...string) (*DataCollector, error) {
6363
return &dc, nil
6464
}
6565

66-
func (c *DataCollector) WrapUp() error {
66+
func (c *DataCollector) WrapUp() (string, error) {
6767

6868
unixTime := time.Now().Unix()
6969
unixTimeString := strconv.FormatInt(unixTime, 10)
7070
tarballName := fmt.Sprintf("kic-supportpkg-%s.tar.gz", unixTimeString)
7171

7272
file, err := os.Create(tarballName)
7373
if err != nil {
74-
return err
74+
return "",err
7575
}
7676
defer file.Close()
7777

@@ -119,5 +119,5 @@ func (c *DataCollector) WrapUp() error {
119119
return nil
120120
})
121121
_ = os.RemoveAll(c.BaseDir)
122-
return nil
122+
return tarballName, nil
123123
}

0 commit comments

Comments
 (0)