Connect Uploader to CLI

cmd/insights/commands/commands_test.go

@@ -104,3 +104,37 @@ func TestConsent(t *testing.T) {
 		)
 	}
 }
+
+func TestUpload(t *testing.T) {
+	t.Parallel()
+	tests := map[string]struct {
+		lFiles map[string]testutils.ReportType
+		uFiles map[string]testutils.ReportType
+		source string
+		dummy  bool
+
+		serverResponse int
+		serverOffline  bool
+		url            string
+		rmLocal        bool
+		noPerms        bool
+
+		consent string
+		minAge  int64
+		dryRun  bool
+		force   bool
+
+		wantErr          bool
+		skipContentCheck bool
+	}{
+		"No Permissions": {lFiles: map[string]testutils.ReportType{"1.json": testutils.Normal}, consent: "true", noPerms: true, wantErr: runtime.GOOS != "windows", skipContentCheck: true},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
+		})
+
+	}
+}

cmd/insights/commands/upload.go

@@ -1,10 +1,13 @@
 package commands
 
 import (
+	"fmt"
 	"log/slog"
 
 	"github.com/spf13/cobra"
+	"github.com/ubuntu/ubuntu-insights/internal/consent"
 	"github.com/ubuntu/ubuntu-insights/internal/constants"
+	"github.com/ubuntu/ubuntu-insights/internal/uploader"
 )
 
 type uploadConfig struct {
@@ -36,6 +39,9 @@ func installUploadCmd(app *App) {
 			app.uploadConfig.sources = args
 
 			slog.Info("Running upload command")
+			if err := app.uploadRun(); err != nil {
+				return fmt.Errorf("failed to run upload command: %v", err)
+			}
 
 			return nil
 		},
@@ -48,3 +54,21 @@ func installUploadCmd(app *App) {
 
 	app.cmd.AddCommand(uploadCmd)
 }
+
+func (a App) uploadRun() error {
+	cm := consent.New(a.rootConfig.ConsentDir)
+	opts := uploader.WithCachePath(a.rootConfig.InsightsDir)
+
+	for _, source := range a.uploadConfig.sources {
+		u, err := uploader.New(cm, source, a.uploadConfig.minAge, a.uploadConfig.dryRun, opts)
+		if err != nil {
+			return fmt.Errorf("failed to create uploader for source %s: %v", source, err)
+		}
+
+		if err := u.Upload(a.uploadConfig.force); err != nil {
+			return fmt.Errorf("failed to upload reports for source %s: %v", source, err)
+		}
+	}
+
+	return nil
+}

internal/uploader/export_test.go

@@ -10,12 +10,7 @@ func (m MockTimeProvider) Now() time.Time {
 	return time.Unix(m.CurrentTime, 0)
 }
 
-// WithCachePath sets the cache path for the uploader.
-func WithCachePath(path string) Options {
-	return func(o *options) {
-		o.cachePath = path
-	}
-}
+
 
 // WithBaseServerURL sets the base server URL for the uploader.
 func WithBaseServerURL(url string) Options {

internal/uploader/upload.go

@@ -23,6 +23,13 @@ var (
 	ErrReportNotMature = errors.New("report is not mature enough to be uploaded")
 )
 
+// WithCachePath sets the cache path for the uploader.
+func WithCachePath(path string) Options {
+	return func(o *options) {
+		o.cachePath = path
+	}
+}
+
 // Upload uploads the reports corresponding to the source to the configured server.
 //
 // It will only upload reports that are mature enough, and have not been uploaded before.