Merge branch 'udenG-5706-ubuntu-insights-uploader' into consent-cli

internal/report/report.go

@@ -129,24 +129,23 @@ func getReportTime(path string) (int64, error) {
 }
 
 // GetPeriodStart returns the start of the period window for a given period in seconds.
-func GetPeriodStart(period int) (int64, error) {
+func GetPeriodStart(period int, t time.Time) (int64, error) {
 	if period <= 0 {
 		return 0, ErrInvalidPeriod
 	}
-	utcTime := time.Now().UTC().Unix()
-	return utcTime - (utcTime % int64(period)), nil
+	return t.Unix() - (t.Unix() % int64(period)), nil
 }
 
 // GetForPeriod returns the most recent report within a period window for a given directory.
 // Not inclusive of the period end (periodStart + period).
 //
 // For example, given reports 1 and 7, with time 2 and period 7, the function will return the path for report 1.
-func GetForPeriod(dir string, time time.Time, period int) (Report, error) {
+func GetForPeriod(dir string, t time.Time, period int) (Report, error) {
 	if period <= 0 {
 		return Report{}, ErrInvalidPeriod
 	}
 
-	periodStart := time.Unix() - (time.Unix() % int64(period))
+	periodStart := t.Unix() - (t.Unix() % int64(period))
 	periodEnd := periodStart + int64(period)
 
 	// Reports names are utc timestamps. Get the most recent report within the period window.

internal/report/report_test.go

@@ -17,10 +17,12 @@ func TestGetPeriodStart(t *testing.T) {
 
 	tests := map[string]struct {
 		period int
+		time   int64
 
 		wantErr error
 	}{
-		"Valid Period": {period: 500},
+		"Valid Period":   {period: 500, time: 100000},
+		"Negative Time:": {period: 500, time: -100000},
 
 		"Invalid Negative Period": {period: -500, wantErr: report.ErrInvalidPeriod},
 		"Invalid Zero Period":     {period: 0, wantErr: report.ErrInvalidPeriod},
@@ -30,14 +32,16 @@ func TestGetPeriodStart(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			got, err := report.GetPeriodStart(tc.period)
+			got, err := report.GetPeriodStart(tc.period, time.Unix(tc.time, 0))
 			if tc.wantErr != nil {
 				require.ErrorIs(t, err, tc.wantErr)
 				return
 			}
 			require.NoError(t, err, "got an unexpected error")
 
 			require.IsType(t, int64(0), got)
+			want := testutils.LoadWithUpdateFromGoldenYAML(t, got)
+			require.Equal(t, want, got, "GetPeriodStart should return the expect start of the period window")
 		})
 	}
 }
@@ -233,7 +237,7 @@ func TestGetAll(t *testing.T) {
 			}
 			require.NoError(t, err, "got an unexpected error")
 
-			got := make([]report.Report, len(reports))
+			got := make([]report.Report, 0, len(reports))
 			for _, r := range reports {
 				got = append(got, sanitizeReportPath(t, r, dir))
 			}

internal/report/testdata/TestGetAll/golden/files_in_subdir

@@ -1,9 +1,3 @@
-- path: ""
-  name: ""
-  timestamp: 0
-- path: ""
-  name: ""
-  timestamp: 0
 - path: 1.json
   name: 1.json
   timestamp: 1

internal/report/testdata/TestGetAll/golden/mix_of_valid_and_invalid

@@ -1,12 +1,3 @@
-- path: ""
-  name: ""
-  timestamp: 0
-- path: ""
-  name: ""
-  timestamp: 0
-- path: ""
-  name: ""
-  timestamp: 0
 - path: 1.json
   name: 1.json
   timestamp: 1

internal/report/testdata/TestGetPeriodStart/golden/negative_time

@@ -0,0 +1 @@
+-100000

internal/report/testdata/TestGetPeriodStart/golden/valid_period

@@ -0,0 +1 @@
+100000