unexport insights time layout

coder · mafredri · Jul 21, 2023 · Jul 14, 2023 · Jul 18, 2023 · Jul 19, 2023
commit bffc673151f1f5c59c99cb4b85fa81b5ff6059e8
diff --git a/coderd/insights.go b/coderd/insights.go
@@ -16,6 +16,9 @@ import (
 	"github.com/coder/coder/codersdk"
 )
 
+// Duplicated in codersdk.
+const insightsTimeLayout = time.RFC3339
+
 // @Summary Get deployment DAUs
 // @ID get-deployment-daus
 // @Security CoderSessionToken
@@ -324,14 +327,14 @@ func parseInsightsStartAndEndTime(ctx context.Context, rw http.ResponseWriter, s
 		{"start_time", startTimeString, &startTime},
 		{"end_time", endTimeString, &endTime},
 	} {
-		t, err := time.Parse(codersdk.InsightsTimeLayout, qp.value)
+		t, err := time.Parse(insightsTimeLayout, qp.value)
 		if err != nil {
 			httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 				Message: "Query parameter has invalid value.",
 				Validations: []codersdk.ValidationError{
 					{
 						Field:  qp.name,
-						Detail: fmt.Sprintf("Query param %q must be a valid date format (%s): %s", qp.name, codersdk.InsightsTimeLayout, err.Error()),
+						Detail: fmt.Sprintf("Query param %q must be a valid date format (%s): %s", qp.name, insightsTimeLayout, err.Error()),
 					},
 				},
 			})

diff --git a/coderd/insights_internal_test.go b/coderd/insights_internal_test.go
@@ -8,14 +8,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/coder/coder/codersdk"
 )
 
 func Test_parseInsightsStartAndEndTime(t *testing.T) {
 	t.Parallel()
 
-	layout := codersdk.InsightsTimeLayout
+	layout := insightsTimeLayout
 	now := time.Now().UTC()
 	y, m, d := now.Date()
 	today := time.Date(y, m, d, 0, 0, 0, 0, time.UTC)
@@ -135,11 +133,11 @@ func Test_parseInsightsStartAndEndTime(t *testing.T) {
 
 			// assert.Equal is unable to test location equality, so we
 			// use assert.WithinDuration.
+			assert.Equal(t, tt.wantOk, gotOk)
 			assert.WithinDuration(t, tt.wantStartTime, gotStartTime, 0)
 			assert.True(t, tt.wantStartTime.Equal(gotStartTime))
 			assert.WithinDuration(t, tt.wantEndTime, gotEndTime, 0)
 			assert.True(t, tt.wantEndTime.Equal(gotEndTime))
-			assert.Equal(t, tt.wantOk, gotOk)
 		})
 	}
 }
diff --git a/codersdk/insights.go b/codersdk/insights.go
@@ -12,7 +12,8 @@ import (
 	"golang.org/x/xerrors"
 )
 
-const InsightsTimeLayout = time.RFC3339
+// Duplicated in coderd.
+const insightsTimeLayout = time.RFC3339
 
 // InsightsReportInterval is the interval of time over which to generate a
 // smaller insights report within a time range.
@@ -61,8 +62,8 @@ type UserLatencyInsightsRequest struct {
 
 func (c *Client) UserLatencyInsights(ctx context.Context, req UserLatencyInsightsRequest) (UserLatencyInsightsResponse, error) {
 	var qp []string
-	qp = append(qp, fmt.Sprintf("start_time=%s", req.StartTime.Format(InsightsTimeLayout)))
-	qp = append(qp, fmt.Sprintf("end_time=%s", req.EndTime.Format(InsightsTimeLayout)))
+	qp = append(qp, fmt.Sprintf("start_time=%s", req.StartTime.Format(insightsTimeLayout)))
+	qp = append(qp, fmt.Sprintf("end_time=%s", req.EndTime.Format(insightsTimeLayout)))
 	if len(req.TemplateIDs) > 0 {
 		var templateIDs []string
 		for _, id := range req.TemplateIDs {
@@ -161,8 +162,8 @@ type TemplateInsightsRequest struct {
 
 func (c *Client) TemplateInsights(ctx context.Context, req TemplateInsightsRequest) (TemplateInsightsResponse, error) {
 	var qp []string
-	qp = append(qp, fmt.Sprintf("start_time=%s", req.StartTime.Format(InsightsTimeLayout)))
-	qp = append(qp, fmt.Sprintf("end_time=%s", req.EndTime.Format(InsightsTimeLayout)))
+	qp = append(qp, fmt.Sprintf("start_time=%s", req.StartTime.Format(insightsTimeLayout)))
+	qp = append(qp, fmt.Sprintf("end_time=%s", req.EndTime.Format(insightsTimeLayout)))
 	if len(req.TemplateIDs) > 0 {
 		var templateIDs []string
 		for _, id := range req.TemplateIDs {