fix: refactor for review suggestions

influxdata · Dec 19, 2023 · caa2b35 · caa2b35
1 parent 2974e4e
commit caa2b35
Show file tree

Hide file tree

Showing 47 changed files with 238 additions and 279 deletions.
diff --git a/authorization/middleware_auth_test.go b/authorization/middleware_auth_test.go
@@ -177,16 +177,16 @@ func TestAuthorizationService_ReadAuthorization(t *testing.T) {
 
 			t.Run("find authorization by id", func(t *testing.T) {
 				_, err := s.FindAuthorizationByID(ctx, 10)
-				influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+				influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 			})
 			t.Run("find authorization by token", func(t *testing.T) {
 				_, err := s.FindAuthorizationByToken(ctx, "10")
-				influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+				influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 			})
 
 			t.Run("find authorizations", func(t *testing.T) {
 				as, _, err := s.FindAuthorizations(ctx, influxdb.AuthorizationFilter{})
-				influxdbtesting.ErrorsEqual(t, err, nil, false)
+				influxdbtesting.ErrorsEqual(t, err, nil)
 
 				if diff := cmp.Diff(as, tt.wants.authorizations, authorizationCmpOptions...); diff != "" {
 					t.Errorf("authorizations are different -got/+want\ndiff %s", diff)
@@ -323,12 +323,12 @@ func TestAuthorizationService_WriteAuthorization(t *testing.T) {
 
 			t.Run("update authorization", func(t *testing.T) {
 				_, err := s.UpdateAuthorization(ctx, 10, &influxdb.AuthorizationUpdate{Status: influxdb.Active.Ptr()})
-				influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+				influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 			})
 
 			t.Run("delete authorization", func(t *testing.T) {
 				err := s.DeleteAuthorization(ctx, 10)
-				influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+				influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 			})
 
 		})
@@ -461,7 +461,7 @@ func TestAuthorizationService_CreateAuthorization(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			err := s.CreateAuthorization(ctx, &influxdb.Authorization{OrgID: 1, UserID: 1})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
diff --git a/authorizer/auth_test.go b/authorizer/auth_test.go
@@ -165,16 +165,16 @@ func TestAuthorizationService_ReadAuthorization(t *testing.T) {
 
 			t.Run("find authorization by id", func(t *testing.T) {
 				_, err := s.FindAuthorizationByID(ctx, 10)
-				influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+				influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 			})
 			t.Run("find authorization by token", func(t *testing.T) {
 				_, err := s.FindAuthorizationByToken(ctx, "10")
-				influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+				influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 			})
 
 			t.Run("find authorizations", func(t *testing.T) {
 				as, _, err := s.FindAuthorizations(ctx, influxdb.AuthorizationFilter{})
-				influxdbtesting.ErrorsEqual(t, err, nil, false)
+				influxdbtesting.ErrorsEqual(t, err, nil)
 
 				if diff := cmp.Diff(as, tt.wants.authorizations, authorizationCmpOptions...); diff != "" {
 					t.Errorf("authorizations are different -got/+want\ndiff %s", diff)
@@ -304,12 +304,12 @@ func TestAuthorizationService_WriteAuthorization(t *testing.T) {
 
 			t.Run("update authorization", func(t *testing.T) {
 				_, err := s.UpdateAuthorization(ctx, 10, &influxdb.AuthorizationUpdate{Status: influxdb.Active.Ptr()})
-				influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+				influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 			})
 
 			t.Run("delete authorization", func(t *testing.T) {
 				err := s.DeleteAuthorization(ctx, 10)
-				influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+				influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 			})
 
 		})
@@ -434,7 +434,7 @@ func TestAuthorizationService_CreateAuthorization(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			err := s.CreateAuthorization(ctx, &influxdb.Authorization{OrgID: 1, UserID: 1})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
diff --git a/authorizer/bucket_test.go b/authorizer/bucket_test.go
@@ -112,7 +112,7 @@ func TestBucketService_FindBucketByID(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			_, err := s.FindBucketByID(ctx, tt.args.id)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -197,7 +197,7 @@ func TestBucketService_FindBucket(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			_, err := s.FindBucket(ctx, influxdb.BucketFilter{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -322,7 +322,7 @@ func TestBucketService_FindBuckets(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			buckets, _, err := s.FindBuckets(ctx, influxdb.BucketFilter{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 
 			if diff := cmp.Diff(buckets, tt.wants.buckets, bucketCmpOptions...); diff != "" {
 				t.Errorf("buckets are different -got/+want\ndiff %s", diff)
@@ -437,7 +437,7 @@ func TestBucketService_UpdateBucket(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			_, err := s.UpdateBucket(ctx, tt.args.id, influxdb.BucketUpdate{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -542,7 +542,7 @@ func TestBucketService_DeleteBucket(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			err := s.DeleteBucket(ctx, tt.args.id)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -624,7 +624,7 @@ func TestBucketService_CreateBucket(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			err := s.CreateBucket(ctx, &influxdb.Bucket{OrgID: tt.args.orgID})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
diff --git a/authorizer/check_test.go b/authorizer/check_test.go
@@ -117,7 +117,7 @@ func TestCheckService_FindCheckByID(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			_, err := s.FindCheckByID(ctx, tt.args.id)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -263,7 +263,7 @@ func TestCheckService_FindChecks(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			ts, _, err := s.FindChecks(ctx, influxdb.CheckFilter{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 
 			if diff := cmp.Diff(ts, tt.wants.checks, checkCmpOptions...); diff != "" {
 				t.Errorf("checks are different -got/+want\ndiff %s", diff)
@@ -391,7 +391,7 @@ func TestCheckService_UpdateCheck(t *testing.T) {
 			}
 
 			_, err := s.UpdateCheck(ctx, tt.args.id, cc)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -510,7 +510,7 @@ func TestCheckService_PatchCheck(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			_, err := s.PatchCheck(ctx, tt.args.id, influxdb.CheckUpdate{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -619,7 +619,7 @@ func TestCheckService_DeleteCheck(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			err := s.DeleteCheck(ctx, tt.args.id)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -711,7 +711,7 @@ func TestCheckService_CreateCheck(t *testing.T) {
 			}
 
 			err := s.CreateCheck(ctx, cc, 3)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
diff --git a/authorizer/dashboard_test.go b/authorizer/dashboard_test.go
@@ -112,7 +112,7 @@ func TestDashboardService_FindDashboardByID(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			_, err := s.FindDashboardByID(ctx, tt.args.id)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -237,7 +237,7 @@ func TestDashboardService_FindDashboards(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			dashboards, _, err := s.FindDashboards(ctx, influxdb.DashboardFilter{}, influxdb.FindOptions{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 
 			if diff := cmp.Diff(dashboards, tt.wants.dashboards, dashboardCmpOptions...); diff != "" {
 				t.Errorf("dashboards are different -got/+want\ndiff %s", diff)
@@ -352,7 +352,7 @@ func TestDashboardService_UpdateDashboard(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			_, err := s.UpdateDashboard(ctx, tt.args.id, influxdb.DashboardUpdate{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -457,7 +457,7 @@ func TestDashboardService_DeleteDashboard(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			err := s.DeleteDashboard(ctx, tt.args.id)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -539,7 +539,7 @@ func TestDashboardService_CreateDashboard(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			err := s.CreateDashboard(ctx, &influxdb.Dashboard{OrganizationID: tt.args.orgID})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -657,19 +657,19 @@ func TestDashboardService_WriteDashboardCell(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			err := s.AddDashboardCell(ctx, 1, &influxdb.Cell{}, influxdb.AddDashboardCellOptions{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 
 			err = s.RemoveDashboardCell(ctx, 1, 2)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 
 			_, err = s.UpdateDashboardCellView(ctx, 1, 2, influxdb.ViewUpdate{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 
 			_, err = s.UpdateDashboardCell(ctx, 1, 2, influxdb.CellUpdate{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 
 			err = s.ReplaceDashboardCells(ctx, 1, []*influxdb.Cell{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -763,7 +763,7 @@ func TestDashboardService_FindDashboardCellView(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			_, err := s.GetDashboardCellView(ctx, 1, 1)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
diff --git a/authorizer/label_test.go b/authorizer/label_test.go
@@ -125,7 +125,7 @@ func TestLabelService_FindLabelByID(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			_, err := s.FindLabelByID(ctx, tt.args.id)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -280,7 +280,7 @@ func TestLabelService_FindLabels(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			labels, err := s.FindLabels(ctx, influxdb.LabelFilter{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 
 			if diff := cmp.Diff(labels, tt.wants.labels, labelCmpOptions...); diff != "" {
 				t.Errorf("labels are different -got/+want\ndiff %s", diff)
@@ -388,7 +388,7 @@ func TestLabelService_UpdateLabel(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			_, err := s.UpdateLabel(ctx, tt.args.id, influxdb.LabelUpdate{})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -488,7 +488,7 @@ func TestLabelService_DeleteLabel(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			err := s.DeleteLabel(ctx, tt.args.id)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -592,7 +592,7 @@ func TestLabelService_CreateLabel(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, []influxdb.Permission{tt.args.permission}))
 
 			err := s.CreateLabel(ctx, &influxdb.Label{Name: "name", OrgID: orgOneInfluxID})
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -824,7 +824,7 @@ func TestLabelService_FindResourceLabels(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			labels, err := s.FindResourceLabels(ctx, tt.args.filter)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 
 			if diff := cmp.Diff(labels, tt.wants.labels, labelCmpOptions...); diff != "" {
 				t.Errorf("labels are different -got/+want\ndiff %s", diff)
@@ -976,7 +976,7 @@ func TestLabelService_CreateLabelMapping(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			err := s.CreateLabelMapping(ctx, &tt.args.mapping)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }
@@ -1124,7 +1124,7 @@ func TestLabelService_DeleteLabelMapping(t *testing.T) {
 			ctx = influxdbcontext.SetAuthorizer(ctx, mock.NewMockAuthorizer(false, tt.args.permissions))
 
 			err := s.DeleteLabelMapping(ctx, &tt.args.mapping)
-			influxdbtesting.ErrorsEqual(t, err, tt.wants.err, false)
+			influxdbtesting.ErrorsEqual(t, err, tt.wants.err)
 		})
 	}
 }