Refactor debuginfo package

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

cmd/debug-info/main.go

@@ -67,11 +67,7 @@ func main() {
 	kongCtx := kong.Parse(&flags)
 
 	logger := logger.NewLogger(flags.LogLevel, logger.LogFormatLogfmt, "")
-
-	var (
-		g               run.Group
-		debugInfoClient = debuginfo.NewNoopClient()
-	)
+	debugInfoClient := debuginfo.NewNoopClient()
 
 	if len(flags.Upload.StoreAddress) > 0 {
 		level.Debug(logger).Log("msg", "configuration", "bearertoken", flags.Upload.BearerToken, "insecure", flags.Upload.Insecure)
@@ -86,7 +82,9 @@ func main() {
 	}
 
 	die := debuginfo.NewExtractor(logger, debugInfoClient, flags.TempDir)
+	diu := debuginfo.NewUploader(logger, debugInfoClient)
 
+	var g run.Group
 	ctx, cancel := context.WithCancel(context.Background())
 	switch kongCtx.Command() {
 	case "upload <path>":
@@ -105,7 +103,17 @@ func main() {
 				return errors.New("failed to find actionable files")
 			}
 
-			return die.Upload(ctx, buildIDFiles)
+			debugInfoFiles, err := die.ExtractAll(ctx, buildIDFiles)
+			if err != nil {
+				return fmt.Errorf("failed to extract debug information: %w", err)
+			}
+			defer func() {
+				for _, f := range debugInfoFiles {
+					os.Remove(f)
+				}
+			}()
+
+			return diu.UploadAll(ctx, debugInfoFiles)
 		}, func(error) {
 			cancel()
 		})
@@ -131,7 +139,7 @@ func main() {
 				return errors.New("failed to find actionable files")
 			}
 
-			files, err := die.Extract(ctx, buildIDFiles)
+			files, err := die.ExtractAll(ctx, buildIDFiles)
 			if err != nil {
 				return err
 			}

go.mod

@@ -81,6 +81,8 @@ require (
 	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.3 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect

go.sum

@@ -1063,6 +1063,7 @@ github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPA
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
@@ -1077,6 +1078,7 @@ github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP
 github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=