diff --git a/cmd/frontend/auth/user.go b/cmd/frontend/auth/user.go index 137a87322c1..f63fd4b76e9 100644 --- a/cmd/frontend/auth/user.go +++ b/cmd/frontend/auth/user.go @@ -7,7 +7,7 @@ import ( sglog "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/database" @@ -67,7 +67,7 @@ func GetAndSaveUser(ctx context.Context, db database.DB, op GetAndSaveUserOp) (u logger := sglog.Scoped("authGetAndSaveUser", "get and save user authenticated by external providers") userID, userSaved, extAcctSaved, safeErrMsg, err := func() (int32, bool, bool, string, error) { - if actor := actor.FromContext(ctx); actor.IsAuthenticated() { + if actor := sgactor.FromContext(ctx); actor.IsAuthenticated() { return actor.UID, false, false, "", nil } @@ -106,7 +106,7 @@ func GetAndSaveUser(ctx context.Context, db database.DB, op GetAndSaveUserOp) (u return 0, false, false, "It looks like this is your first time signing in with this external identity. Sourcegraph couldn't link it to an existing user, because no verified email was provided. Ask your site admin to configure the auth provider to include the user's verified email on sign-in.", lookupByExternalErr } - act := &actor.Actor{ + act := &sgactor.Actor{ SourcegraphOperator: op.ExternalAccount.ServiceType == auth.SourcegraphOperatorProviderType, } @@ -116,7 +116,7 @@ func GetAndSaveUser(ctx context.Context, db database.DB, op GetAndSaveUserOp) (u // NOTE: It is important to propagate the correct context that carries the // information of the actor, especially whether the actor is a Sourcegraph // operator or not. - ctx = actor.WithActor(ctx, act) + ctx = sgactor.WithActor(ctx, act) userID, err := externalAccountsStore.CreateUserAndSave(ctx, op.UserProps, op.ExternalAccount, op.ExternalAccountData) switch { case database.IsUsernameExists(err): @@ -182,7 +182,7 @@ func GetAndSaveUser(ctx context.Context, db database.DB, op GetAndSaveUserOp) (u if err != nil { const eventName = "ExternalAuthSignupFailed" serviceTypeArg := json.RawMessage(fmt.Sprintf(`{"serviceType": %q}`, op.ExternalAccount.ServiceType)) - if logErr := usagestats.LogBackendEvent(db, actor.FromContext(ctx).UID, deviceid.FromContext(ctx), eventName, serviceTypeArg, serviceTypeArg, featureflag.GetEvaluatedFlagSet(ctx), nil); logErr != nil { + if logErr := usagestats.LogBackendEvent(db, sgactor.FromContext(ctx).UID, deviceid.FromContext(ctx), eventName, serviceTypeArg, serviceTypeArg, featureflag.GetEvaluatedFlagSet(ctx), nil); logErr != nil { logger.Error( "failed to log event", sglog.String("eventName", eventName), diff --git a/cmd/frontend/graphqlbackend/feature_flags.go b/cmd/frontend/graphqlbackend/feature_flags.go index 5acca007041..705e67f3e1a 100644 --- a/cmd/frontend/graphqlbackend/feature_flags.go +++ b/cmd/frontend/graphqlbackend/feature_flags.go @@ -6,7 +6,7 @@ import ( "github.com/graph-gophers/graphql-go" "github.com/graph-gophers/graphql-go/relay" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/featureflag" @@ -170,7 +170,7 @@ func (r *schemaResolver) OrganizationFeatureFlagValue(ctx context.Context, args } func (r *schemaResolver) OrganizationFeatureFlagOverrides(ctx context.Context) ([]*FeatureFlagOverrideResolver, error) { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if !actor.IsAuthenticated() { return nil, errors.New("no current user") diff --git a/cmd/frontend/graphqlbackend/highlight.go b/cmd/frontend/graphqlbackend/highlight.go index f359741fccd..bc2ba55bd57 100644 --- a/cmd/frontend/graphqlbackend/highlight.go +++ b/cmd/frontend/graphqlbackend/highlight.go @@ -8,11 +8,11 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/highlight" "github.com/sourcegraph/sourcegraph/internal/gosyntect" - "github.com/sourcegraph/sourcegraph/internal/search/result" + searchresult "github.com/sourcegraph/sourcegraph/internal/search/result" ) type highlightedRangeResolver struct { - inner result.HighlightedRange + inner searchresult.HighlightedRange } func (h highlightedRangeResolver) Line() int32 { return h.inner.Line } @@ -20,7 +20,7 @@ func (h highlightedRangeResolver) Character() int32 { return h.inner.Character } func (h highlightedRangeResolver) Length() int32 { return h.inner.Length } type highlightedStringResolver struct { - inner result.HighlightedString + inner searchresult.HighlightedString } func (s *highlightedStringResolver) Value() string { return s.inner.Value } diff --git a/cmd/frontend/graphqlbackend/org.go b/cmd/frontend/graphqlbackend/org.go index 280dceab460..4ee9789423c 100644 --- a/cmd/frontend/graphqlbackend/org.go +++ b/cmd/frontend/graphqlbackend/org.go @@ -11,7 +11,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/suspiciousnames" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/authz/permssync" @@ -35,7 +35,7 @@ func (r *schemaResolver) Organization(ctx context.Context, args struct{ Name str return nil } - if a := actor.FromContext(ctx); a.IsAuthenticated() { + if a := sgactor.FromContext(ctx); a.IsAuthenticated() { _, err = r.db.OrgInvitations().GetPending(ctx, org.ID, a.UID) if err == nil { return nil @@ -86,7 +86,7 @@ func orgByIDInt32WithForcedAccess(ctx context.Context, db database.DB, orgID int if err != nil { hasAccess := false // allow invited user to view org details - if a := actor.FromContext(ctx); a.IsAuthenticated() { + if a := sgactor.FromContext(ctx); a.IsAuthenticated() { _, err := db.OrgInvitations().GetPending(ctx, orgID, a.UID) if err == nil { hasAccess = true @@ -244,7 +244,7 @@ func (o *OrgResolver) SettingsCascade() *settingsCascade { func (o *OrgResolver) ConfigurationCascade() *settingsCascade { return o.SettingsCascade() } func (o *OrgResolver) ViewerPendingInvitation(ctx context.Context) (*organizationInvitationResolver, error) { - if actor := actor.FromContext(ctx); actor.IsAuthenticated() { + if actor := sgactor.FromContext(ctx); actor.IsAuthenticated() { orgInvitation, err := o.db.OrgInvitations().GetPending(ctx, o.org.ID, actor.UID) if errcode.IsNotFound(err) { return nil, nil @@ -272,7 +272,7 @@ func (o *OrgResolver) ViewerCanAdminister(ctx context.Context) (bool, error) { } func (o *OrgResolver) ViewerIsMember(ctx context.Context) (bool, error) { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if !actor.IsAuthenticated() { return false, nil } @@ -298,7 +298,7 @@ func (r *schemaResolver) CreateOrganization(ctx context.Context, args *struct { DisplayName *string StatsID *string }) (*OrgResolver, error) { - a := actor.FromContext(ctx) + a := sgactor.FromContext(ctx) if !a.IsAuthenticated() { return nil, errors.New("no current user") } diff --git a/cmd/frontend/graphqlbackend/org_invitations.go b/cmd/frontend/graphqlbackend/org_invitations.go index 7297d0ed1cf..720a5e80a80 100644 --- a/cmd/frontend/graphqlbackend/org_invitations.go +++ b/cmd/frontend/graphqlbackend/org_invitations.go @@ -16,7 +16,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/authz/permssync" "github.com/sourcegraph/sourcegraph/internal/conf" @@ -116,7 +116,7 @@ func checkEmail(ctx context.Context, db database.DB, inviteEmail string) (bool, func (r *schemaResolver) PendingInvitations(ctx context.Context, args *struct { Organization graphql.ID }) ([]*organizationInvitationResolver, error) { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if !actor.IsAuthenticated() { return nil, errors.New("no current user") } @@ -160,7 +160,7 @@ func newExpiryTime() time.Time { func (r *schemaResolver) InvitationByToken(ctx context.Context, args *struct { Token string }) (*organizationInvitationResolver, error) { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if !actor.IsAuthenticated() { return nil, errors.New("no current user") } @@ -291,7 +291,7 @@ func (r *schemaResolver) RespondToOrganizationInvitation(ctx context.Context, ar OrganizationInvitation graphql.ID ResponseType string }) (*EmptyResponse, error) { - a := actor.FromContext(ctx) + a := sgactor.FromContext(ctx) if !a.IsAuthenticated() { return nil, errors.New("no current user") } diff --git a/cmd/frontend/graphqlbackend/org_members.go b/cmd/frontend/graphqlbackend/org_members.go index 11e74c3e2be..8cf6f23d9f1 100644 --- a/cmd/frontend/graphqlbackend/org_members.go +++ b/cmd/frontend/graphqlbackend/org_members.go @@ -6,7 +6,7 @@ import ( "github.com/graph-gophers/graphql-go" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/gqlutil" @@ -35,7 +35,7 @@ func (r *schemaResolver) AutocompleteMembersSearch(ctx context.Context, args *st Organization graphql.ID Query string }) ([]*OrgMemberAutocompleteSearchItemResolver, error) { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if !actor.IsAuthenticated() { return nil, errors.New("no current user") } @@ -62,7 +62,7 @@ func (r *schemaResolver) AutocompleteMembersSearch(ctx context.Context, args *st func (r *schemaResolver) OrgMembersSummary(ctx context.Context, args *struct { Organization graphql.ID }) (*OrgMembersSummaryResolver, error) { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if !actor.IsAuthenticated() { return nil, errors.New("no current user") } diff --git a/cmd/frontend/graphqlbackend/preview_repository_comparison_test.go b/cmd/frontend/graphqlbackend/preview_repository_comparison_test.go index 35d0a25b4dd..f9c1c7ad77d 100644 --- a/cmd/frontend/graphqlbackend/preview_repository_comparison_test.go +++ b/cmd/frontend/graphqlbackend/preview_repository_comparison_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/internal/authz" @@ -556,7 +556,7 @@ index 373ae20..89ad131 100644 for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { - fileDiff, err := diff.ParseFileDiff([]byte(tc.patch)) + fileDiff, err := godiff.ParseFileDiff([]byte(tc.patch)) if err != nil { t.Fatal(err) } diff --git a/cmd/frontend/graphqlbackend/repository_comparison_test.go b/cmd/frontend/graphqlbackend/repository_comparison_test.go index ae1d0e2adbc..0261664d0f0 100644 --- a/cmd/frontend/graphqlbackend/repository_comparison_test.go +++ b/cmd/frontend/graphqlbackend/repository_comparison_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/externallink" @@ -454,7 +454,7 @@ func TestRepositoryComparison(t *testing.T) { func TestDiffHunk(t *testing.T) { ctx := context.Background() - dr := diff.NewMultiFileDiffReader(strings.NewReader(testDiff)) + dr := godiff.NewMultiFileDiffReader(strings.NewReader(testDiff)) // We only read the first file diff from testDiff fileDiff, err := dr.ReadFile() if err != nil && err != io.EOF { @@ -564,7 +564,7 @@ index 4d14577..10ef458 100644 +(c) Copyright Sourcegraph 2013-2021. \ No newline at end of file ` - dr := diff.NewMultiFileDiffReader(strings.NewReader(filediff)) + dr := godiff.NewMultiFileDiffReader(strings.NewReader(filediff)) // We only read the first file diff from testDiff fileDiff, err := dr.ReadFile() if err != nil && err != io.EOF { @@ -650,7 +650,7 @@ index 4d14577..9fe9a4f 100644 ` + "-" + ` See [the main README](https://github.com/dominikh/go-tools#installation) for installation instructions.` - dr := diff.NewMultiFileDiffReader(strings.NewReader(filediff)) + dr := godiff.NewMultiFileDiffReader(strings.NewReader(filediff)) // We only read the first file diff from testDiff fileDiff, err := dr.ReadFile() if err != nil && err != io.EOF { @@ -750,7 +750,7 @@ index d206c4c..bb06461 100644 -} ` - dr := diff.NewMultiFileDiffReader(strings.NewReader(filediff)) + dr := godiff.NewMultiFileDiffReader(strings.NewReader(filediff)) // We only read the first file diff from testDiff fileDiff, err := dr.ReadFile() if err != nil && err != io.EOF { diff --git a/cmd/frontend/graphqlbackend/site_users.go b/cmd/frontend/graphqlbackend/site_users.go index dfa777b0efc..f3853c3bed3 100644 --- a/cmd/frontend/graphqlbackend/site_users.go +++ b/cmd/frontend/graphqlbackend/site_users.go @@ -9,7 +9,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/userpasswd" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/conf" - "github.com/sourcegraph/sourcegraph/internal/users" + sgusers "github.com/sourcegraph/sourcegraph/internal/users" ) func (s *siteResolver) Users(ctx context.Context, args *struct { @@ -17,10 +17,10 @@ func (s *siteResolver) Users(ctx context.Context, args *struct { SiteAdmin *bool Username *string Email *string - CreatedAt *users.UsersStatsDateTimeRange - LastActiveAt *users.UsersStatsDateTimeRange - DeletedAt *users.UsersStatsDateTimeRange - EventsCount *users.UsersStatsNumberRange + CreatedAt *sgusers.UsersStatsDateTimeRange + LastActiveAt *sgusers.UsersStatsDateTimeRange + DeletedAt *sgusers.UsersStatsDateTimeRange + EventsCount *sgusers.UsersStatsNumberRange }, ) (*siteUsersResolver, error) { // 🚨 SECURITY: Only site admins can see users. @@ -29,7 +29,7 @@ func (s *siteResolver) Users(ctx context.Context, args *struct { } return &siteUsersResolver{ - &users.UsersStats{DB: s.db, Filters: users.UsersStatsFilters{ + &sgusers.UsersStats{DB: s.db, Filters: sgusers.UsersStatsFilters{ Query: args.Query, SiteAdmin: args.SiteAdmin, Username: args.Username, @@ -43,7 +43,7 @@ func (s *siteResolver) Users(ctx context.Context, args *struct { } type siteUsersResolver struct { - userStats *users.UsersStats + userStats *sgusers.UsersStats } func (s *siteUsersResolver) TotalCount(ctx context.Context) (float64, error) { @@ -57,7 +57,7 @@ func (s *siteUsersResolver) Nodes(ctx context.Context, args *struct { Offset *int32 }, ) ([]*siteUserResolver, error) { - users, err := s.userStats.ListUsers(ctx, &users.UsersStatsListUsersFilters{OrderBy: args.OrderBy, Descending: args.Descending, Limit: args.Limit, Offset: args.Offset}) + users, err := s.userStats.ListUsers(ctx, &sgusers.UsersStatsListUsersFilters{OrderBy: args.OrderBy, Descending: args.Descending, Limit: args.Limit, Offset: args.Offset}) if err != nil { return nil, err } @@ -72,7 +72,7 @@ func (s *siteUsersResolver) Nodes(ctx context.Context, args *struct { } type siteUserResolver struct { - user *users.UserStatItem + user *sgusers.UserStatItem lockoutStore userpasswd.LockoutStore } diff --git a/cmd/frontend/graphqlbackend/survey_response.go b/cmd/frontend/graphqlbackend/survey_response.go index c8eef5981de..18d5aa2ca7d 100644 --- a/cmd/frontend/graphqlbackend/survey_response.go +++ b/cmd/frontend/graphqlbackend/survey_response.go @@ -9,7 +9,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot/hubspotutil" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/siteid" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/errcode" @@ -99,7 +99,7 @@ func (r *schemaResolver) SubmitSurvey(ctx context.Context, args *struct { } // If user is authenticated, use their uid and overwrite the optional email field. - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if actor.IsAuthenticated() { uid = &actor.UID e, _, err := r.db.UserEmails().GetPrimaryEmail(ctx, actor.UID) @@ -164,7 +164,7 @@ func (r *schemaResolver) SubmitHappinessFeedback(ctx context.Context, args *stru // We include the username and email address of the user (if signed in). For signed-in users, // the UI indicates that the username and email address will be sent to Sourcegraph. - if actor := actor.FromContext(ctx); actor.IsAuthenticated() { + if actor := sgactor.FromContext(ctx); actor.IsAuthenticated() { currentUser, err := r.db.Users().GetByID(ctx, actor.UID) if err != nil { return nil, err diff --git a/cmd/frontend/graphqlbackend/user_session.go b/cmd/frontend/graphqlbackend/user_session.go index 5b5ad4a6460..8714f46e261 100644 --- a/cmd/frontend/graphqlbackend/user_session.go +++ b/cmd/frontend/graphqlbackend/user_session.go @@ -3,7 +3,7 @@ package graphqlbackend import ( "context" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -11,7 +11,7 @@ import ( func (r *UserResolver) Session(ctx context.Context) (*sessionResolver, error) { // 🚨 SECURITY: Only the user can view their session information, because it is retrieved from // the context of this request (and not persisted in a way that is queryable). - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if !actor.IsAuthenticated() || actor.UID != r.user.ID { return nil, errors.New("unable to view session for a user other than the currently authenticated user") } diff --git a/cmd/frontend/internal/app/jscontext/jscontext.go b/cmd/frontend/internal/app/jscontext/jscontext.go index 6732a931471..1d1641b1d5e 100644 --- a/cmd/frontend/internal/app/jscontext/jscontext.go +++ b/cmd/frontend/internal/app/jscontext/jscontext.go @@ -19,7 +19,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/userpasswd" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/siteid" "github.com/sourcegraph/sourcegraph/cmd/frontend/webhooks" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/conf/deploy" "github.com/sourcegraph/sourcegraph/internal/database" @@ -127,7 +127,7 @@ type JSContext struct { // NewJSContextFromRequest populates a JSContext struct from the HTTP // request. func NewJSContextFromRequest(req *http.Request, db database.DB) JSContext { - actor := actor.FromContext(req.Context()) + actor := sgactor.FromContext(req.Context()) headers := make(map[string]string) headers["x-sourcegraph-client"] = globals.ExternalURL().String() diff --git a/cmd/frontend/internal/auth/userpasswd/handlers.go b/cmd/frontend/internal/auth/userpasswd/handlers.go index 54f95dc4908..d04e3bd2db0 100644 --- a/cmd/frontend/internal/auth/userpasswd/handlers.go +++ b/cmd/frontend/internal/auth/userpasswd/handlers.go @@ -18,7 +18,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot/hubspotutil" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/suspiciousnames" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" iauth "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/conf" @@ -190,7 +190,7 @@ func handleSignUp(logger log.Logger, db database.DB, w http.ResponseWriter, r *h logger.Error("Error in user signup.", log.String("email", creds.Email), log.String("username", creds.Username), log.Error(err)) http.Error(w, message, statusCode) - if err = usagestats.LogBackendEvent(db, actor.FromContext(r.Context()).UID, deviceid.FromContext(r.Context()), "SignUpFailed", nil, nil, featureflag.GetEvaluatedFlagSet(r.Context()), nil); err != nil { + if err = usagestats.LogBackendEvent(db, sgactor.FromContext(r.Context()).UID, deviceid.FromContext(r.Context()), "SignUpFailed", nil, nil, featureflag.GetEvaluatedFlagSet(r.Context()), nil); err != nil { logger.Warn("Failed to log event SignUpFailed", log.Error(err)) } @@ -214,7 +214,7 @@ func handleSignUp(logger log.Logger, db database.DB, w http.ResponseWriter, r *h } // Write the session cookie - a := &actor.Actor{UID: usr.ID} + a := &sgactor.Actor{UID: usr.ID} if err := session.SetActor(w, r, a, 0, usr.CreatedAt); err != nil { httpLogError(logger.Error, w, "Could not create new user session", http.StatusInternalServerError, log.Error(err)) } @@ -224,7 +224,7 @@ func handleSignUp(logger log.Logger, db database.DB, w http.ResponseWriter, r *h go hubspotutil.SyncUser(creds.Email, hubspotutil.SignupEventID, &hubspot.ContactProperties{AnonymousUserID: creds.AnonymousUserID, FirstSourceURL: creds.FirstSourceURL, LastSourceURL: creds.LastSourceURL, DatabaseID: usr.ID}) } - if err = usagestats.LogBackendEvent(db, actor.FromContext(r.Context()).UID, deviceid.FromContext(r.Context()), "SignUpSucceeded", nil, nil, featureflag.GetEvaluatedFlagSet(r.Context()), nil); err != nil { + if err = usagestats.LogBackendEvent(db, sgactor.FromContext(r.Context()).UID, deviceid.FromContext(r.Context()), "SignUpSucceeded", nil, nil, featureflag.GetEvaluatedFlagSet(r.Context()), nil); err != nil { logger.Warn("Failed to log event SignUpSucceeded", log.Error(err)) } } @@ -328,7 +328,7 @@ func HandleSignIn(logger log.Logger, db database.DB, store LockoutStore) http.Ha } // Write the session cookie - actor := actor.Actor{ + actor := sgactor.Actor{ UID: user.ID, } if err := session.SetActor(w, r, &actor, 0, user.CreatedAt); err != nil { diff --git a/cmd/frontend/internal/handlerutil/error_reporting.go b/cmd/frontend/internal/handlerutil/error_reporting.go index a5bfbe2f5b1..8c291d5b9e8 100644 --- a/cmd/frontend/internal/handlerutil/error_reporting.go +++ b/cmd/frontend/internal/handlerutil/error_reporting.go @@ -12,7 +12,7 @@ import ( "github.com/getsentry/raven-go" "github.com/gorilla/mux" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/trace" @@ -83,7 +83,7 @@ func reportError(r *http.Request, status int, err error, panicked bool) { } // Add request context tags. - if actor := actor.FromContext(r.Context()); actor.IsAuthenticated() { + if actor := sgactor.FromContext(r.Context()); actor.IsAuthenticated() { addTag("Authed", "yes") addTag("Authed UID", actor.UIDString()) } else { diff --git a/cmd/frontend/internal/httpapi/auth_test.go b/cmd/frontend/internal/httpapi/auth_test.go index 657c187ed45..ae620f7dfed 100644 --- a/cmd/frontend/internal/httpapi/auth_test.go +++ b/cmd/frontend/internal/httpapi/auth_test.go @@ -12,7 +12,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/stretchr/testify/require" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/errcode" @@ -25,7 +25,7 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { db, logtest.NoOp(t), http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - actor := actor.FromContext(r.Context()) + actor := sgactor.FromContext(r.Context()) if actor.IsAuthenticated() { _, _ = fmt.Fprintf(w, "user %v", actor.UID) } else { @@ -56,7 +56,7 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { // auth middleware. t.Run("no header, actor present", func(t *testing.T) { req, _ := http.NewRequest("GET", "/", nil) - req = req.WithContext(actor.WithActor(context.Background(), &actor.Actor{UID: 123})) + req = req.WithContext(sgactor.WithActor(context.Background(), &sgactor.Actor{UID: 123})) checkHTTPResponse(t, db, req, http.StatusOK, "user 123") }) @@ -123,7 +123,7 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { t.Run("actor present, valid non-sudo token", func(t *testing.T) { req, _ := http.NewRequest("GET", "/", nil) req.Header.Set("Authorization", "token abcdef") - req = req.WithContext(actor.WithActor(context.Background(), &actor.Actor{UID: 456})) + req = req.WithContext(sgactor.WithActor(context.Background(), &sgactor.Actor{UID: 456})) accessTokens := database.NewMockAccessTokenStore() accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded, requiredScope string) (subjectUserID int32, err error) { @@ -156,7 +156,7 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { } else { req.SetBasicAuth("abcdef", "") } - req = req.WithContext(actor.WithActor(context.Background(), &actor.Actor{UID: 456})) + req = req.WithContext(sgactor.WithActor(context.Background(), &sgactor.Actor{UID: 456})) accessTokens := database.NewMockAccessTokenStore() accessTokens.LookupFunc.SetDefaultHook(func(_ context.Context, tokenHexEncoded, requiredScope string) (subjectUserID int32, err error) { @@ -256,7 +256,7 @@ func TestAccessTokenAuthMiddleware(t *testing.T) { securityEventLogsStore := database.NewMockSecurityEventLogsStore() securityEventLogsStore.LogEventFunc.SetDefaultHook(func(ctx context.Context, _ *database.SecurityEvent) { - require.True(t, actor.FromContext(ctx).SourcegraphOperator, "the actor should be a Sourcegraph operator") + require.True(t, sgactor.FromContext(ctx).SourcegraphOperator, "the actor should be a Sourcegraph operator") }) db.AccessTokensFunc.SetDefaultReturn(accessTokens) diff --git a/cmd/symbols/shared/sqlite.go b/cmd/symbols/shared/sqlite.go index 8ecf41ede59..7f06e5b2125 100644 --- a/cmd/symbols/shared/sqlite.go +++ b/cmd/symbols/shared/sqlite.go @@ -15,7 +15,7 @@ import ( sqlite "github.com/sourcegraph/sourcegraph/cmd/symbols/internal/database" "github.com/sourcegraph/sourcegraph/cmd/symbols/internal/database/janitor" "github.com/sourcegraph/sourcegraph/cmd/symbols/internal/database/writer" - "github.com/sourcegraph/sourcegraph/cmd/symbols/parser" + symbolparser "github.com/sourcegraph/sourcegraph/cmd/symbols/parser" "github.com/sourcegraph/sourcegraph/cmd/symbols/types" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/diskcache" @@ -43,9 +43,9 @@ func SetupSqlite(observationCtx *observation.Context, db database.DB, gitserverC sqlite.Init() parserFactory := func() (ctags.Parser, error) { - return parser.SpawnCtags(logger, config.Ctags) + return symbolparser.SpawnCtags(logger, config.Ctags) } - parserPool, err := parser.NewParserPool(parserFactory, config.NumCtagsProcesses) + parserPool, err := symbolparser.NewParserPool(parserFactory, config.NumCtagsProcesses) if err != nil { logger.Fatal("failed to create parser pool", log.Error(err)) } @@ -55,7 +55,7 @@ func SetupSqlite(observationCtx *observation.Context, db database.DB, gitserverC diskcache.WithobservationCtx(observationCtx), ) - parser := parser.NewParser(observationCtx, parserPool, repositoryFetcher, config.RequestBufferSize, config.NumCtagsProcesses) + parser := symbolparser.NewParser(observationCtx, parserPool, repositoryFetcher, config.RequestBufferSize, config.NumCtagsProcesses) databaseWriter := writer.NewDatabaseWriter(observationCtx, config.CacheDir, gitserverClient, parser, semaphore.NewWeighted(int64(config.MaxConcurrentlyIndexing))) cachedDatabaseWriter := writer.NewCachedDatabaseWriter(databaseWriter, cache) searchFunc := api.MakeSqliteSearchFunc(observationCtx, cachedDatabaseWriter, db) diff --git a/cmd/worker/shared/main.go b/cmd/worker/shared/main.go index 181fe7cbe6c..cda7d8383da 100644 --- a/cmd/worker/shared/main.go +++ b/cmd/worker/shared/main.go @@ -22,7 +22,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/worker/internal/repostatistics" "github.com/sourcegraph/sourcegraph/cmd/worker/internal/webhooks" "github.com/sourcegraph/sourcegraph/cmd/worker/internal/zoektrepos" - "github.com/sourcegraph/sourcegraph/cmd/worker/job" + workerjob "github.com/sourcegraph/sourcegraph/cmd/worker/job" workerdb "github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/db" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/encryption/keyring" @@ -45,12 +45,12 @@ type namedBackgroundRoutine struct { JobName string } -func LoadConfig(additionalJobs map[string]job.Job, registerEnterpriseMigrators oobmigration.RegisterMigratorsFunc) *Config { +func LoadConfig(additionalJobs map[string]workerjob.Job, registerEnterpriseMigrators oobmigration.RegisterMigratorsFunc) *Config { symbols.LoadConfig() registerMigrators := oobmigration.ComposeRegisterMigratorsFuncs(migrations.RegisterOSSMigrators, registerEnterpriseMigrators) - builtins := map[string]job.Job{ + builtins := map[string]workerjob.Job{ "webhook-log-janitor": webhooks.NewJanitor(), "out-of-band-migrations": workermigrations.NewMigrator(registerMigrators), "codeintel-crates-syncer": codeintel.NewCratesSyncerJob(), @@ -62,7 +62,7 @@ func LoadConfig(additionalJobs map[string]job.Job, registerEnterpriseMigrators o } var config Config - config.Jobs = map[string]job.Job{} + config.Jobs = map[string]workerjob.Job{} for name, job := range builtins { config.Jobs[name] = job @@ -148,7 +148,7 @@ func Start(ctx context.Context, observationCtx *observation.Context, ready servi // loadConfigs calls Load on the configs of each of the jobs registered in this binary. // All configs will be loaded regardless if they would later be validated - this is the // best place we have to manipulate the environment before the call to env.Lock. -func loadConfigs(jobs map[string]job.Job) { +func loadConfigs(jobs map[string]workerjob.Job) { // Load the worker config config.names = jobNames(jobs) config.Load() @@ -164,7 +164,7 @@ func loadConfigs(jobs map[string]job.Job) { // validateConfigs calls Validate on the configs of each of the jobs that will be run // by this instance of the worker. If any config has a validation error, an error is // returned. -func validateConfigs(jobs map[string]job.Job) error { +func validateConfigs(jobs map[string]workerjob.Job) error { validationErrors := map[string][]error{} if err := config.Validate(); err != nil { return errors.Wrap(err, "Failed to load configuration") @@ -206,7 +206,7 @@ func validateConfigs(jobs map[string]job.Job) error { // the jobs that will be run by this instance of the worker. Since these metrics are summed // over all instances (and we don't change the jobs that are registered to a running worker), // we only need to emit an initial count once. -func emitJobCountMetrics(jobs map[string]job.Job) { +func emitJobCountMetrics(jobs map[string]workerjob.Job) { gauge := prometheus.NewGaugeVec(prometheus.GaugeOpts{ Name: "src_worker_jobs", Help: "Total number of jobs running in the worker.", @@ -226,7 +226,7 @@ func emitJobCountMetrics(jobs map[string]job.Job) { // createBackgroundRoutines runs the Routines function of each of the given jobs concurrently. // If an error occurs from any of them, a fatal log message will be emitted. Otherwise, the set // of background routines from each job will be returned. -func createBackgroundRoutines(observationCtx *observation.Context, jobs map[string]job.Job) ([]namedBackgroundRoutine, error) { +func createBackgroundRoutines(observationCtx *observation.Context, jobs map[string]workerjob.Job) ([]namedBackgroundRoutine, error) { var ( allRoutinesWithJobNames []namedBackgroundRoutine descriptions []string @@ -257,7 +257,7 @@ type routinesResult struct { // runRoutinesConcurrently returns a channel that will be populated with the return value of // the Routines function from each given job. Each function is called concurrently. If an // error occurs in one function, the context passed to all its siblings will be canceled. -func runRoutinesConcurrently(observationCtx *observation.Context, jobs map[string]job.Job) chan routinesResult { +func runRoutinesConcurrently(observationCtx *observation.Context, jobs map[string]workerjob.Job) chan routinesResult { results := make(chan routinesResult, len(jobs)) defer close(results) @@ -303,7 +303,7 @@ func runRoutinesConcurrently(observationCtx *observation.Context, jobs map[strin } // jobNames returns an ordered slice of keys from the given map. -func jobNames(jobs map[string]job.Job) []string { +func jobNames(jobs map[string]workerjob.Job) []string { names := make([]string, 0, len(jobs)) for name := range jobs { names = append(names, name) diff --git a/dev/depgraph/lint.go b/dev/depgraph/lint.go index 1ddacf21e6d..c26d1c52215 100644 --- a/dev/depgraph/lint.go +++ b/dev/depgraph/lint.go @@ -6,7 +6,7 @@ import ( "github.com/peterbourgon/ff/v3/ffcli" - "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/graph" + depgraph "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/graph" "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/lints" ) @@ -29,7 +29,7 @@ func lint(ctx context.Context, args []string) error { return err } - graph, err := graph.Load(root) + graph, err := depgraph.Load(root) if err != nil { return err } diff --git a/dev/depgraph/summary.go b/dev/depgraph/summary.go index b3873fd2bf1..1e7f731e47d 100644 --- a/dev/depgraph/summary.go +++ b/dev/depgraph/summary.go @@ -11,7 +11,7 @@ import ( "github.com/sourcegraph/run" - "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/graph" + depgraph "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/graph" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -40,7 +40,7 @@ func summary(ctx context.Context, args []string) error { return err } - graph, err := graph.Load(root) + graph, err := depgraph.Load(root) if err != nil { return err } @@ -146,7 +146,7 @@ outer: } // isMain returns true if the given package declares "main" in the given package name map. -func isMain(graph *graph.DependencyGraph, pkg string) bool { +func isMain(graph *depgraph.DependencyGraph, pkg string) bool { for _, name := range graph.PackageNames[pkg] { if name == "main" { return true diff --git a/dev/depgraph/trace.go b/dev/depgraph/trace.go index f1523acee0a..8689c968aa2 100644 --- a/dev/depgraph/trace.go +++ b/dev/depgraph/trace.go @@ -8,7 +8,7 @@ import ( "github.com/peterbourgon/ff/v3/ffcli" - "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/graph" + depgraph "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/graph" "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/visualization" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -36,7 +36,7 @@ func trace(ctx context.Context, args []string) error { return err } - graph, err := graph.Load(root) + graph, err := depgraph.Load(root) if err != nil { return err } @@ -52,7 +52,7 @@ func trace(ctx context.Context, args []string) error { // traceWalkGraph traverses the given dependency graph in both directions and returns a // set of packages and edges (separated by traversal direction) forming the dependency // graph around the given blessed package. -func traceWalkGraph(graph *graph.DependencyGraph, pkg string, dependencyMaxDepth, dependentMaxDepth int) (packages []string, dependencyEdges, dependentEdges map[string][]string) { +func traceWalkGraph(graph *depgraph.DependencyGraph, pkg string, dependencyMaxDepth, dependentMaxDepth int) (packages []string, dependencyEdges, dependentEdges map[string][]string) { dependencyPackages, dependencyEdges := traceTraverse(pkg, graph.Dependencies, dependencyMaxDepth) dependentPackages, dependentEdges := traceTraverse(pkg, graph.Dependents, dependentMaxDepth) return append(dependencyPackages, dependentPackages...), dependencyEdges, dependentEdges diff --git a/dev/depgraph/trace_internal.go b/dev/depgraph/trace_internal.go index 4050e0cafdf..ea7538f20de 100644 --- a/dev/depgraph/trace_internal.go +++ b/dev/depgraph/trace_internal.go @@ -8,7 +8,7 @@ import ( "github.com/peterbourgon/ff/v3/ffcli" - "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/graph" + depgraph "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/graph" "github.com/sourcegraph/sourcegraph/dev/depgraph/internal/visualization" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -34,7 +34,7 @@ func traceInternal(ctx context.Context, args []string) error { return err } - graph, err := graph.Load(root) + graph, err := depgraph.Load(root) if err != nil { return err } @@ -47,7 +47,7 @@ func traceInternal(ctx context.Context, args []string) error { return nil } -func filterExternalReferences(graph *graph.DependencyGraph, prefix string) ([]string, map[string][]string) { +func filterExternalReferences(graph *depgraph.DependencyGraph, prefix string) ([]string, map[string][]string) { packages := make([]string, 0, len(graph.Packages)) for _, pkg := range graph.Packages { if strings.HasPrefix(pkg, prefix) { diff --git a/enterprise/cmd/frontend/internal/app/app_test.go b/enterprise/cmd/frontend/internal/app/app_test.go index aee80d249bb..af5bb23d1bd 100644 --- a/enterprise/cmd/frontend/internal/app/app_test.go +++ b/enterprise/cmd/frontend/internal/app/app_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - a "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" @@ -90,7 +90,7 @@ func TestNewGitHubAppSetupHandler(t *testing.T) { assert.Equal(t, `Invalid setup action "incorrect"`, resp.Body.String()) }) - ctx := a.WithActor(req.Context(), &a.Actor{UID: 1}) + ctx := sgactor.WithActor(req.Context(), &sgactor.Actor{UID: 1}) req = req.WithContext(ctx) t.Run("create new", func(t *testing.T) { diff --git a/enterprise/cmd/frontend/internal/auth/httpheader/middleware_test.go b/enterprise/cmd/frontend/internal/auth/httpheader/middleware_test.go index eb2429328d8..8d7758613a3 100644 --- a/enterprise/cmd/frontend/internal/auth/httpheader/middleware_test.go +++ b/enterprise/cmd/frontend/internal/auth/httpheader/middleware_test.go @@ -12,7 +12,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth/providers" "github.com/sourcegraph/sourcegraph/enterprise/internal/licensing" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -29,7 +29,7 @@ func TestMiddleware(t *testing.T) { db := database.NewDB(logger, dbtest.NewDB(logger, t)) handler := middleware(db)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - actor := actor.FromContext(r.Context()) + actor := sgactor.FromContext(r.Context()) if actor.IsAuthenticated() { fmt.Fprintf(w, "user %v", actor.UID) } else { @@ -61,7 +61,7 @@ func TestMiddleware(t *testing.T) { t.Run("not sent, actor present", func(t *testing.T) { rr := httptest.NewRecorder() req, _ := http.NewRequest("GET", "/", nil) - req = req.WithContext(actor.WithActor(context.Background(), &actor.Actor{UID: 123})) + req = req.WithContext(sgactor.WithActor(context.Background(), &sgactor.Actor{UID: 123})) handler.ServeHTTP(rr, req) if got, want := rr.Body.String(), "user 123"; got != want { t.Errorf("got %q, want %q", got, want) @@ -94,7 +94,7 @@ func TestMiddleware(t *testing.T) { rr := httptest.NewRecorder() req, _ := http.NewRequest("GET", "/", nil) req.Header.Set(headerName, "alice") - req = req.WithContext(actor.WithActor(context.Background(), &actor.Actor{UID: 123})) + req = req.WithContext(sgactor.WithActor(context.Background(), &sgactor.Actor{UID: 123})) handler.ServeHTTP(rr, req) if got, want := rr.Body.String(), "user 123"; got != want { t.Errorf("got %q, want %q", got, want) @@ -200,7 +200,7 @@ func TestMiddleware_stripPrefix(t *testing.T) { db := database.NewDB(logger, dbtest.NewDB(logger, t)) handler := middleware(db)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - actor := actor.FromContext(r.Context()) + actor := sgactor.FromContext(r.Context()) if actor.IsAuthenticated() { fmt.Fprintf(w, "user %v", actor.UID) } else { diff --git a/enterprise/cmd/frontend/internal/auth/openidconnect/middleware.go b/enterprise/cmd/frontend/internal/auth/openidconnect/middleware.go index adb24868839..93ee7e8edb1 100644 --- a/enterprise/cmd/frontend/internal/auth/openidconnect/middleware.go +++ b/enterprise/cmd/frontend/internal/auth/openidconnect/middleware.go @@ -18,7 +18,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth/providers" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/types" @@ -87,7 +87,7 @@ func handleOpenIDConnectAuth(db database.DB, w http.ResponseWriter, r *http.Requ // If the actor is authenticated and not performing an OpenID Connect flow, then proceed to // next. - if actor.FromContext(r.Context()).IsAuthenticated() { + if sgactor.FromContext(r.Context()).IsAuthenticated() { next.ServeHTTP(w, r) return } @@ -172,7 +172,7 @@ func authHandler(db database.DB) func(w http.ResponseWriter, r *http.Request) { // if !idToken.Expiry.IsZero() { // exp = time.Until(idToken.Expiry) // } - if err = session.SetActor(w, r, actor.FromUser(result.User.ID), exp, result.User.CreatedAt); err != nil { + if err = session.SetActor(w, r, sgactor.FromUser(result.User.ID), exp, result.User.CreatedAt); err != nil { log15.Error("Failed to authenticate with OpenID connect: could not initiate session.", "error", err) http.Error(w, "Authentication failed. Try signing in again (and clearing cookies for the current site). The error was: could not initiate session.", http.StatusInternalServerError) return diff --git a/enterprise/cmd/frontend/internal/auth/saml/middleware.go b/enterprise/cmd/frontend/internal/auth/saml/middleware.go index 2ff8f45a4b5..3785073e53e 100644 --- a/enterprise/cmd/frontend/internal/auth/saml/middleware.go +++ b/enterprise/cmd/frontend/internal/auth/saml/middleware.go @@ -14,7 +14,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth/providers" "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" ) @@ -52,7 +52,7 @@ func authHandler(db database.DB, w http.ResponseWriter, r *http.Request, next ht } // If the actor is authenticated and not performing a SAML operation, then proceed to next. - if actor.FromContext(r.Context()).IsAuthenticated() { + if sgactor.FromContext(r.Context()).IsAuthenticated() { next.ServeHTTP(w, r) return } diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go b/enterprise/cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go index 4caa8e78d4d..4658f9daee4 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go +++ b/enterprise/cmd/frontend/internal/batches/resolvers/batch_change_connection_test.go @@ -13,7 +13,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/batches/resolvers/apitest" bgql "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/graphql" - "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" + bstore "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" bt "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/testing" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/actor" @@ -33,7 +33,7 @@ func TestBatchChangeConnectionResolver(t *testing.T) { userID := bt.CreateTestUser(t, db, true).ID - bstore := store.New(db, &observation.TestContext, nil) + bstore := bstore.New(db, &observation.TestContext, nil) repoStore := database.ReposWith(logger, bstore) esStore := database.ExternalServicesWith(logger, bstore) @@ -189,7 +189,7 @@ func TestBatchChangesListing(t *testing.T) { orgID := bt.CreateTestOrg(t, db, "org").ID - store := store.New(db, &observation.TestContext, nil) + store := bstore.New(db, &observation.TestContext, nil) r := &Resolver{store: store} s, err := newSchema(db, r) diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec.go b/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec.go index 553b44d1029..c25b5b581ae 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec.go +++ b/enterprise/cmd/frontend/internal/batches/resolvers/batch_spec.go @@ -19,7 +19,7 @@ import ( "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/service" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/errcode" @@ -249,13 +249,13 @@ func (r *batchSpecResolver) SupersedingBatchSpec(ctx context.Context) (graphqlba return nil, err } - a := actor.FromContext(ctx) - if !a.IsAuthenticated() { + actor := sgactor.FromContext(ctx) + if !actor.IsAuthenticated() { return nil, errors.New("user is not authenticated") } svc := service.New(r.store) - newest, err := svc.GetNewestBatchSpec(ctx, r.store, r.batchSpec, a.UID) + newest, err := svc.GetNewestBatchSpec(ctx, r.store, r.batchSpec, actor.UID) if err != nil { return nil, err } @@ -282,7 +282,7 @@ func (r *batchSpecResolver) SupersedingBatchSpec(ctx context.Context) (graphqlba } func (r *batchSpecResolver) ViewerBatchChangesCodeHosts(ctx context.Context, args *graphqlbackend.ListViewerBatchChangesCodeHostsArgs) (graphqlbackend.BatchChangesCodeHostConnectionResolver, error) { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if !actor.IsAuthenticated() { return nil, auth.ErrNotAuthenticated } diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/changeset.go b/enterprise/cmd/frontend/internal/batches/resolvers/changeset.go index 2a1ed0e3358..1d90e951898 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/changeset.go +++ b/enterprise/cmd/frontend/internal/batches/resolvers/changeset.go @@ -18,7 +18,7 @@ import ( "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/syncer" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types/scheduler/config" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/gitserver" @@ -184,7 +184,7 @@ func (r *changesetResolver) BatchChanges(ctx context.Context, args *graphqlbacke isSiteAdmin := authErr != auth.ErrMustBeSiteAdmin if !isSiteAdmin { if args.ViewerCanAdminister != nil && *args.ViewerCanAdminister { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) opts.OnlyAdministeredByUserID = actor.UID } } diff --git a/enterprise/cmd/frontend/internal/batches/resolvers/resolver.go b/enterprise/cmd/frontend/internal/batches/resolvers/resolver.go index 8a527365ff0..ec7b47f1faa 100644 --- a/enterprise/cmd/frontend/internal/batches/resolvers/resolver.go +++ b/enterprise/cmd/frontend/internal/batches/resolvers/resolver.go @@ -17,7 +17,7 @@ import ( "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/enterprise/internal/licensing" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/database" @@ -52,7 +52,7 @@ func batchChangesCreateAccess(ctx context.Context, db database.DB) error { return err } - act := actor.FromContext(ctx) + act := sgactor.FromContext(ctx) if !act.IsAuthenticated() { return auth.ErrNotAuthenticated } @@ -80,7 +80,7 @@ type batchChangeEventArg struct { } func logBackendEvent(ctx context.Context, db database.DB, name string, args any, publicArgs any) error { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) jsonArg, err := json.Marshal(args) if err != nil { return err @@ -214,7 +214,7 @@ func (r *Resolver) ResolveWorkspacesForBatchSpec(ctx context.Context, args *grap } // Verify the user is authenticated. - act := actor.FromContext(ctx) + act := sgactor.FromContext(ctx) if !act.IsAuthenticated() { return nil, auth.ErrNotAuthenticated } @@ -609,7 +609,7 @@ func (r *Resolver) CreateChangesetSpec(ctx context.Context, args *graphqlbackend return nil, err } - act := actor.FromContext(ctx) + act := sgactor.FromContext(ctx) // Actor MUST be logged in at this stage, because batchChangesCreateAccess checks that already. // To be extra safe, we'll just do the cheap check again here so if anyone ever modifies // batchChangesCreateAccess, we still enforce it here. @@ -638,7 +638,7 @@ func (r *Resolver) CreateChangesetSpecs(ctx context.Context, args *graphqlbacken return nil, err } - act := actor.FromContext(ctx) + act := sgactor.FromContext(ctx) // Actor MUST be logged in at this stage, because batchChangesCreateAccess checks that already. // To be extra safe, we'll just do the cheap check again here so if anyone ever modifies // batchChangesCreateAccess, we still enforce it here. @@ -786,7 +786,7 @@ func (r *Resolver) BatchChanges(ctx context.Context, args *graphqlbackend.ListBa } isSiteAdmin := authErr != auth.ErrMustBeSiteAdmin if !isSiteAdmin { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) if args.ViewerCanAdminister != nil && *args.ViewerCanAdminister { opts.OnlyAdministeredByUserID = actor.UID } @@ -1543,7 +1543,7 @@ func (r *Resolver) BatchSpecs(ctx context.Context, args *graphqlbackend.ListBatc // BatchSpecs that were created with CreateBatchSpecFromRaw and not owned // by the user if err := auth.CheckCurrentUserIsSiteAdmin(ctx, r.store.DatabaseDB()); err != nil { - opts.ExcludeCreatedFromRawNotOwnedByUser = actor.FromContext(ctx).UID + opts.ExcludeCreatedFromRawNotOwnedByUser = sgactor.FromContext(ctx).UID } if args.After != nil { diff --git a/enterprise/cmd/frontend/internal/batches/webhooks/gitlab_test.go b/enterprise/cmd/frontend/internal/batches/webhooks/gitlab_test.go index f7067e824e0..61510cf5c7b 100644 --- a/enterprise/cmd/frontend/internal/batches/webhooks/gitlab_test.go +++ b/enterprise/cmd/frontend/internal/batches/webhooks/gitlab_test.go @@ -15,7 +15,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/stretchr/testify/require" - "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" + bstore "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" bt "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/testing" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/api" @@ -502,7 +502,7 @@ func testGitLabWebhook(db *sql.DB) func(*testing.T) { s := gitLabTestSetup(t, db) h := NewGitLabWebhook(s, gsClient, logger) db := database.NewDBWith(logger, basestore.NewWithHandle(&brokenDB{errors.New("foo")})) - h.Store = store.NewWithClock(db, &observation.TestContext, nil, s.Clock()) + h.Store = bstore.NewWithClock(db, &observation.TestContext, nil, s.Clock()) es, err := h.getExternalServiceFromRawID(ctx, "12345") if es != nil { @@ -559,7 +559,7 @@ func testGitLabWebhook(db *sql.DB) func(*testing.T) { // We can induce an error with a broken database connection. db := database.NewDBWith(logger, basestore.NewWithHandle(&brokenDB{errors.New("foo")})) - h.Store = store.NewWithClock(db, &observation.TestContext, nil, s.Clock()) + h.Store = bstore.NewWithClock(db, &observation.TestContext, nil, s.Clock()) err := h.handleEvent(ctx, db, gitLabURL, event) require.Error(t, err) @@ -576,7 +576,7 @@ func testGitLabWebhook(db *sql.DB) func(*testing.T) { // We can induce an error with a broken database connection. db := database.NewDBWith(logger, basestore.NewWithHandle(&brokenDB{errors.New("foo")})) - h.Store = store.NewWithClock(db, &observation.TestContext, nil, s.Clock()) + h.Store = bstore.NewWithClock(db, &observation.TestContext, nil, s.Clock()) err := h.handleEvent(ctx, db, gitLabURL, event) require.Error(t, err) @@ -682,7 +682,7 @@ func testGitLabWebhook(db *sql.DB) func(*testing.T) { // Again, we're going to set up a poisoned store database that will // error if a transaction is started. s := gitLabTestSetup(t, db) - store := store.NewWithClock(database.NewDBWith(logger, basestore.NewWithHandle(&noNestingTx{s.Handle()})), &observation.TestContext, nil, s.Clock()) + store := bstore.NewWithClock(database.NewDBWith(logger, basestore.NewWithHandle(&noNestingTx{s.Handle()})), &observation.TestContext, nil, s.Clock()) h := NewGitLabWebhook(store, gsClient, logger) t.Run("missing merge request", func(t *testing.T) { @@ -858,7 +858,7 @@ func (ntx *noNestingTx) Transact(context.Context) (basestore.TransactableHandle, // gitLabTestSetup instantiates the stores and a clock for use within tests. // Any changes made to the stores will be rolled back after the test is // complete. -func gitLabTestSetup(t *testing.T, sqlDB *sql.DB) *store.Store { +func gitLabTestSetup(t *testing.T, sqlDB *sql.DB) *bstore.Store { logger := logtest.Scoped(t) c := &bt.TestClock{Time: timeutil.Now()} tx := dbtest.NewTx(t, sqlDB) @@ -869,7 +869,7 @@ func gitLabTestSetup(t *testing.T, sqlDB *sql.DB) *store.Store { // Note that tx is wrapped in nestedTx to effectively neuter further use of // transactions within the test. - return store.NewWithClock(db, &observation.TestContext, nil, c.Now) + return bstore.NewWithClock(db, &observation.TestContext, nil, c.Now) } // assertBodyIncludes checks for a specific substring within the given response @@ -888,10 +888,10 @@ func assertBodyIncludes(t *testing.T, r io.Reader, want string) { // assertChangesetEventForChangeset checks that one (and only one) changeset // event has been created on the given changeset, and that it is of the given // kind. -func assertChangesetEventForChangeset(t *testing.T, ctx context.Context, tx *store.Store, changeset *btypes.Changeset, want btypes.ChangesetEventKind) { - ces, _, err := tx.ListChangesetEvents(ctx, store.ListChangesetEventsOpts{ +func assertChangesetEventForChangeset(t *testing.T, ctx context.Context, tx *bstore.Store, changeset *btypes.Changeset, want btypes.ChangesetEventKind) { + ces, _, err := tx.ListChangesetEvents(ctx, bstore.ListChangesetEventsOpts{ ChangesetIDs: []int64{changeset.ID}, - LimitOpts: store.LimitOpts{Limit: 100}, + LimitOpts: bstore.LimitOpts{Limit: 100}, }) if err != nil { t.Fatal(err) @@ -977,7 +977,7 @@ func createGitLabRepo(t *testing.T, ctx context.Context, rstore database.RepoSto } // createGitLabChangeset creates a mock GitLab changeset. -func createGitLabChangeset(t *testing.T, ctx context.Context, store *store.Store, repo *types.Repo) *btypes.Changeset { +func createGitLabChangeset(t *testing.T, ctx context.Context, store *bstore.Store, repo *types.Repo) *btypes.Changeset { c := &btypes.Changeset{ RepoID: repo.ID, ExternalID: "1", diff --git a/enterprise/cmd/frontend/internal/executorqueue/handler/handler_test.go b/enterprise/cmd/frontend/internal/executorqueue/handler/handler_test.go index 000acca2681..54f35643765 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/handler/handler_test.go +++ b/enterprise/cmd/frontend/internal/executorqueue/handler/handler_test.go @@ -11,9 +11,8 @@ import ( "github.com/sourcegraph/sourcegraph/internal/executor" metricsstore "github.com/sourcegraph/sourcegraph/internal/metrics/store" "github.com/sourcegraph/sourcegraph/internal/types" - "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store" - workerstore "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store" - workerstoremocks "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store/mocks" + dbworkerstore "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store" + dbworkerstoremocks "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store/mocks" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -28,7 +27,7 @@ func TestDequeue(t *testing.T) { }, } - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() store.DequeueFunc.SetDefaultReturn(testRecord{ID: 42, Payload: "secret"}, true, nil) recordTransformer := func(ctx context.Context, _ string, tr testRecord, _ ResourceMetadata) (apiclient.Job, error) { if tr.Payload != "secret" { @@ -62,7 +61,7 @@ func TestDequeueNoRecord(t *testing.T) { executorStore := database.NewMockExecutorStore() metricsStore := metricsstore.NewMockDistributedStore() - handler := NewHandler(executorStore, metricsStore, QueueOptions[testRecord]{Store: workerstoremocks.NewMockStore[testRecord]()}) + handler := NewHandler(executorStore, metricsStore, QueueOptions[testRecord]{Store: dbworkerstoremocks.NewMockStore[testRecord]()}) _, dequeued, err := handler.dequeue(context.Background(), executorMetadata{Name: "deadbeef"}) if err != nil { @@ -74,7 +73,7 @@ func TestDequeueNoRecord(t *testing.T) { } func TestAddExecutionLogEntry(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() store.DequeueFunc.SetDefaultReturn(testRecord{ID: 42}, true, nil) recordTransformer := func(ctx context.Context, _ string, record testRecord, _ ResourceMetadata) (apiclient.Job, error) { return apiclient.Job{ID: 42}, nil @@ -120,8 +119,8 @@ func TestAddExecutionLogEntry(t *testing.T) { } func TestAddExecutionLogEntryUnknownJob(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() - store.AddExecutionLogEntryFunc.SetDefaultReturn(0, workerstore.ErrExecutionLogEntryNotUpdated) + store := dbworkerstoremocks.NewMockStore[testRecord]() + store.AddExecutionLogEntryFunc.SetDefaultReturn(0, dbworkerstore.ErrExecutionLogEntryNotUpdated) executorStore := database.NewMockExecutorStore() metricsStore := metricsstore.NewMockDistributedStore() handler := NewHandler(executorStore, metricsStore, QueueOptions[testRecord]{Store: store}) @@ -136,7 +135,7 @@ func TestAddExecutionLogEntryUnknownJob(t *testing.T) { } func TestUpdateExecutionLogEntry(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() store.DequeueFunc.SetDefaultReturn(testRecord{ID: 42}, true, nil) recordTransformer := func(ctx context.Context, _ string, record testRecord, _ ResourceMetadata) (apiclient.Job, error) { return apiclient.Job{ID: 42}, nil @@ -180,8 +179,8 @@ func TestUpdateExecutionLogEntry(t *testing.T) { } func TestUpdateExecutionLogEntryUnknownJob(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() - store.UpdateExecutionLogEntryFunc.SetDefaultReturn(workerstore.ErrExecutionLogEntryNotUpdated) + store := dbworkerstoremocks.NewMockStore[testRecord]() + store.UpdateExecutionLogEntryFunc.SetDefaultReturn(dbworkerstore.ErrExecutionLogEntryNotUpdated) executorStore := database.NewMockExecutorStore() metricsStore := metricsstore.NewMockDistributedStore() handler := NewHandler(executorStore, metricsStore, QueueOptions[testRecord]{Store: store}) @@ -196,7 +195,7 @@ func TestUpdateExecutionLogEntryUnknownJob(t *testing.T) { } func TestMarkComplete(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() store.DequeueFunc.SetDefaultReturn(testRecord{ID: 42}, true, nil) store.MarkCompleteFunc.SetDefaultReturn(true, nil) recordTransformer := func(ctx context.Context, _ string, record testRecord, _ ResourceMetadata) (apiclient.Job, error) { @@ -230,7 +229,7 @@ func TestMarkComplete(t *testing.T) { } func TestMarkCompleteUnknownJob(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() store.MarkCompleteFunc.SetDefaultReturn(false, nil) executorStore := database.NewMockExecutorStore() metricsStore := metricsstore.NewMockDistributedStore() @@ -242,7 +241,7 @@ func TestMarkCompleteUnknownJob(t *testing.T) { } func TestMarkCompleteStoreError(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() internalErr := errors.New("something went wrong") store.MarkCompleteFunc.SetDefaultReturn(false, internalErr) executorStore := database.NewMockExecutorStore() @@ -255,7 +254,7 @@ func TestMarkCompleteStoreError(t *testing.T) { } func TestMarkErrored(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() store.DequeueFunc.SetDefaultReturn(testRecord{ID: 42}, true, nil) store.MarkErroredFunc.SetDefaultReturn(true, nil) recordTransformer := func(ctx context.Context, _ string, record testRecord, _ ResourceMetadata) (apiclient.Job, error) { @@ -292,7 +291,7 @@ func TestMarkErrored(t *testing.T) { } func TestMarkErroredUnknownJob(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() store.MarkErroredFunc.SetDefaultReturn(false, nil) executorStore := database.NewMockExecutorStore() metricsStore := metricsstore.NewMockDistributedStore() @@ -304,7 +303,7 @@ func TestMarkErroredUnknownJob(t *testing.T) { } func TestMarkErroredStoreError(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() storeErr := errors.New("something went wrong") store.MarkErroredFunc.SetDefaultReturn(false, storeErr) executorStore := database.NewMockExecutorStore() @@ -317,7 +316,7 @@ func TestMarkErroredStoreError(t *testing.T) { } func TestMarkFailed(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() store.DequeueFunc.SetDefaultReturn(testRecord{ID: 42}, true, nil) store.MarkFailedFunc.SetDefaultReturn(true, nil) recordTransformer := func(ctx context.Context, _ string, record testRecord, _ ResourceMetadata) (apiclient.Job, error) { @@ -354,7 +353,7 @@ func TestMarkFailed(t *testing.T) { } func TestMarkFailedUnknownJob(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() store.MarkFailedFunc.SetDefaultReturn(false, nil) executorStore := database.NewMockExecutorStore() metricsStore := metricsstore.NewMockDistributedStore() @@ -366,7 +365,7 @@ func TestMarkFailedUnknownJob(t *testing.T) { } func TestMarkFailedStoreError(t *testing.T) { - store := workerstoremocks.NewMockStore[testRecord]() + store := dbworkerstoremocks.NewMockStore[testRecord]() storeErr := errors.New("something went wrong") store.MarkFailedFunc.SetDefaultReturn(false, storeErr) executorStore := database.NewMockExecutorStore() @@ -379,12 +378,12 @@ func TestMarkFailedStoreError(t *testing.T) { } func TestHeartbeat(t *testing.T) { - s := workerstoremocks.NewMockStore[testRecord]() + s := dbworkerstoremocks.NewMockStore[testRecord]() recordTransformer := func(ctx context.Context, _ string, record testRecord, _ ResourceMetadata) (apiclient.Job, error) { return apiclient.Job{ID: record.RecordID()}, nil } testKnownID := 10 - s.HeartbeatFunc.SetDefaultHook(func(ctx context.Context, ids []int, options store.HeartbeatOptions) ([]int, []int, error) { + s.HeartbeatFunc.SetDefaultHook(func(ctx context.Context, ids []int, options dbworkerstore.HeartbeatOptions) ([]int, []int, error) { return []int{testKnownID}, []int{testKnownID}, nil }) diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/queue.go b/enterprise/cmd/frontend/internal/executorqueue/queues/batches/queue.go index 64b64b2a7d1..77a7a047ef3 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queues/batches/queue.go +++ b/enterprise/cmd/frontend/internal/executorqueue/queues/batches/queue.go @@ -6,7 +6,7 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/executorqueue/handler" - "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" + bstore "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" apiclient "github.com/sourcegraph/sourcegraph/enterprise/internal/executor" "github.com/sourcegraph/sourcegraph/internal/database" @@ -16,11 +16,11 @@ import ( func QueueOptions(observationCtx *observation.Context, db database.DB, _ func() string) handler.QueueOptions[*btypes.BatchSpecWorkspaceExecutionJob] { logger := log.Scoped("executor-queue.batches", "The executor queue handlers for the batches queue") recordTransformer := func(ctx context.Context, version string, record *btypes.BatchSpecWorkspaceExecutionJob, _ handler.ResourceMetadata) (apiclient.Job, error) { - batchesStore := store.New(db, observationCtx, nil) + batchesStore := bstore.New(db, observationCtx, nil) return transformRecord(ctx, logger, batchesStore, record, version) } - store := store.NewBatchSpecWorkspaceExecutionWorkerStore(observationCtx, db.Handle()) + store := bstore.NewBatchSpecWorkspaceExecutionWorkerStore(observationCtx, db.Handle()) return handler.QueueOptions[*btypes.BatchSpecWorkspaceExecutionJob]{ Name: "batches", Store: store, diff --git a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/queue.go b/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/queue.go index b6cc4af38b1..36cfbb71ad1 100644 --- a/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/queue.go +++ b/enterprise/cmd/frontend/internal/executorqueue/queues/codeintel/queue.go @@ -9,7 +9,7 @@ import ( apiclient "github.com/sourcegraph/sourcegraph/enterprise/internal/executor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/observation" - "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store" + dbworkerstore "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store" ) func QueueOptions(observationCtx *observation.Context, db database.DB, accessToken func() string) handler.QueueOptions[types.Index] { @@ -17,7 +17,7 @@ func QueueOptions(observationCtx *observation.Context, db database.DB, accessTok return transformRecord(ctx, db, record, resourceMetadata, accessToken()) } - store := store.New(observationCtx, db.Handle(), autoindexing.IndexWorkerStoreOptions) + store := dbworkerstore.New(observationCtx, db.Handle(), autoindexing.IndexWorkerStoreOptions) return handler.QueueOptions[types.Index]{ Name: "codeintel", diff --git a/enterprise/internal/batches/reconciler/reconciler_test.go b/enterprise/internal/batches/reconciler/reconciler_test.go index 43261a8ae96..e7eee2740eb 100644 --- a/enterprise/internal/batches/reconciler/reconciler_test.go +++ b/enterprise/internal/batches/reconciler/reconciler_test.go @@ -8,7 +8,7 @@ import ( "github.com/sourcegraph/log/logtest" stesting "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/sources/testing" - "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" + bstore "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" bt "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/testing" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/actor" @@ -30,7 +30,7 @@ func TestReconcilerProcess_IntegrationTest(t *testing.T) { logger := logtest.Scoped(t) db := database.NewDB(logger, dbtest.NewDB(logger, t)) - store := store.New(db, &observation.TestContext, nil) + store := bstore.New(db, &observation.TestContext, nil) admin := bt.CreateTestUser(t, db, true) diff --git a/enterprise/internal/batches/service/service.go b/enterprise/internal/batches/service/service.go index d61a64d2e03..39519e14b97 100644 --- a/enterprise/internal/batches/service/service.go +++ b/enterprise/internal/batches/service/service.go @@ -17,7 +17,7 @@ import ( "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/webhooks" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/database" @@ -185,7 +185,7 @@ func (s *Service) CreateEmptyBatchChange(ctx context.Context, opts CreateEmptyBa return nil, err } - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) // Actor is guaranteed to be set here, because CheckNamespaceAccess above enforces it. batchSpec := &btypes.BatchSpec{ @@ -269,7 +269,7 @@ func (s *Service) UpsertEmptyBatchChange(ctx context.Context, opts UpsertEmptyBa return nil, err } - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) // Actor is guaranteed to be set here, because CheckNamespaceAccess above enforces it. batchSpec := &btypes.BatchSpec{ @@ -338,7 +338,7 @@ func (s *Service) CreateBatchSpec(ctx context.Context, opts CreateBatchSpecOpts) } spec.NamespaceOrgID = opts.NamespaceOrgID spec.NamespaceUserID = opts.NamespaceUserID - a := actor.FromContext(ctx) + a := sgactor.FromContext(ctx) spec.UserID = a.UID if len(opts.ChangesetSpecRandIDs) == 0 { @@ -431,7 +431,7 @@ func (s *Service) CreateBatchSpecFromRaw(ctx context.Context, opts CreateBatchSp spec.NamespaceOrgID = opts.NamespaceOrgID spec.NamespaceUserID = opts.NamespaceUserID // Actor is guaranteed to be set here, because CheckNamespaceAccess above enforces it. - a := actor.FromContext(ctx) + a := sgactor.FromContext(ctx) spec.UserID = a.UID spec.BatchChangeID = opts.BatchChange @@ -726,7 +726,7 @@ func (s *Service) UpsertBatchSpecInput(ctx context.Context, opts UpsertBatchSpec spec.NamespaceOrgID = opts.NamespaceOrgID spec.NamespaceUserID = opts.NamespaceUserID // Actor is guaranteed to be set here, because CheckNamespaceAccess above enforces it. - a := actor.FromContext(ctx) + a := sgactor.FromContext(ctx) spec.UserID = a.UID // Start transaction. @@ -1298,7 +1298,7 @@ func (s *Service) CreateChangesetJobs(ctx context.Context, batchChangeID int64, } defer func() { err = tx.Done(err) }() - userID := actor.FromContext(ctx).UID + userID := sgactor.FromContext(ctx).UID changesetJobs := make([]*btypes.ChangesetJob, 0, len(cs)) for _, changeset := range cs { changesetJobs = append(changesetJobs, &btypes.ChangesetJob{ diff --git a/enterprise/internal/batches/service/service_apply_batch_change_test.go b/enterprise/internal/batches/service/service_apply_batch_change_test.go index d910a95be4b..9b83f045efd 100644 --- a/enterprise/internal/batches/service/service_apply_batch_change_test.go +++ b/enterprise/internal/batches/service/service_apply_batch_change_test.go @@ -11,7 +11,7 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/reconciler" - "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" + bstore "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/store" bt "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/testing" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/actor" @@ -41,7 +41,7 @@ func TestServiceApplyBatchChange(t *testing.T) { now := timeutil.Now() clock := func() time.Time { return now } - store := store.NewWithClock(db, &observation.TestContext, nil, clock) + store := bstore.NewWithClock(db, &observation.TestContext, nil, clock) svc := New(store) t.Run("BatchSpec without changesetSpecs", func(t *testing.T) { @@ -1215,7 +1215,7 @@ func applyAndListChangesets(ctx context.Context, t *testing.T, svc *Service, bat t.Fatalf("batch change ID is zero") } - changesets, _, err := svc.store.ListChangesets(ctx, store.ListChangesetsOpts{ + changesets, _, err := svc.store.ListChangesets(ctx, bstore.ListChangesetsOpts{ BatchChangeID: batchChange.ID, IncludeArchived: true, }) diff --git a/enterprise/internal/batches/store/batch_changes_test.go b/enterprise/internal/batches/store/batch_changes_test.go index 10d65aa167d..b70a1d097ed 100644 --- a/enterprise/internal/batches/store/batch_changes_test.go +++ b/enterprise/internal/batches/store/batch_changes_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/log/logtest" bt "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/testing" @@ -807,7 +807,7 @@ func testStoreBatchChanges(t *testing.T, ctx context.Context, s *Store, clock bt }) { - want := &diff.Stat{ + want := &godiff.Stat{ Added: testDiffStatCount, Deleted: testDiffStatCount, } @@ -825,7 +825,7 @@ func testStoreBatchChanges(t *testing.T, ctx context.Context, s *Store, clock bt // Now revoke repo access, and check that we don't see it in the diff stat anymore. bt.MockRepoPermissions(t, s.DatabaseDB(), 0, repo.ID) { - want := &diff.Stat{ + want := &godiff.Stat{ Added: 0, Changed: 0, Deleted: 0, @@ -885,25 +885,25 @@ func testStoreBatchChanges(t *testing.T, ctx context.Context, s *Store, clock bt { tcs := []struct { repoID api.RepoID - want *diff.Stat + want *godiff.Stat }{ { repoID: repo1.ID, - want: &diff.Stat{ + want: &godiff.Stat{ Added: testDiffStatCount1 + testDiffStatCount2, Deleted: testDiffStatCount1 + testDiffStatCount2, }, }, { repoID: repo2.ID, - want: &diff.Stat{ + want: &godiff.Stat{ Added: testDiffStatCount2, Deleted: testDiffStatCount2, }, }, { repoID: repo3.ID, - want: &diff.Stat{ + want: &godiff.Stat{ Added: 0, Deleted: 0, }, @@ -928,7 +928,7 @@ func testStoreBatchChanges(t *testing.T, ctx context.Context, s *Store, clock bt // Now revoke repo1 access, and check that we don't get a diff stat for it anymore. bt.MockRepoPermissions(t, s.DatabaseDB(), 0, repo1.ID) { - want := &diff.Stat{ + want := &godiff.Stat{ Added: 0, Changed: 0, Deleted: 0, diff --git a/enterprise/internal/batches/testing/changeset.go b/enterprise/internal/batches/testing/changeset.go index 4000eef112c..27aeb6045d3 100644 --- a/enterprise/internal/batches/testing/changeset.go +++ b/enterprise/internal/batches/testing/changeset.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" btypes "github.com/sourcegraph/sourcegraph/enterprise/internal/batches/types" "github.com/sourcegraph/sourcegraph/internal/api" @@ -145,7 +145,7 @@ type ChangesetAssertions struct { ExternalID string ExternalBranch string ExternalForkNamespace string - DiffStat *diff.Stat + DiffStat *godiff.Stat Closing bool Title string diff --git a/enterprise/internal/batches/types/changeset_spec.go b/enterprise/internal/batches/types/changeset_spec.go index 71eeba4ff06..6eb1020ac91 100644 --- a/enterprise/internal/batches/types/changeset_spec.go +++ b/enterprise/internal/batches/types/changeset_spec.go @@ -6,7 +6,7 @@ import ( "time" "github.com/graph-gophers/graphql-go" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/internal/api" @@ -130,8 +130,8 @@ func (cs *ChangesetSpec) computeDiffStat() error { return nil } - stats := diff.Stat{} - reader := diff.NewMultiFileDiffReader(bytes.NewReader(cs.Diff)) + stats := godiff.Stat{} + reader := godiff.NewMultiFileDiffReader(bytes.NewReader(cs.Diff)) for { fileDiff, err := reader.ReadFile() if err == io.EOF { @@ -164,8 +164,8 @@ func (cs *ChangesetSpec) computeForkNamespace() { } // DiffStat returns a *diff.Stat. -func (cs *ChangesetSpec) DiffStat() diff.Stat { - return diff.Stat{ +func (cs *ChangesetSpec) DiffStat() godiff.Stat { + return godiff.Stat{ Added: cs.DiffStatAdded, Deleted: cs.DiffStatDeleted, } diff --git a/enterprise/internal/codeintel/autoindexing/init.go b/enterprise/internal/codeintel/autoindexing/init.go index 79c083765f9..f63f8722967 100644 --- a/enterprise/internal/codeintel/autoindexing/init.go +++ b/enterprise/internal/codeintel/autoindexing/init.go @@ -5,7 +5,7 @@ import ( "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/autoindexing/internal/background" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/autoindexing/internal/inference" - "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/autoindexing/internal/store" + autoindexingstore "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/autoindexing/internal/store" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/goroutine" "github.com/sourcegraph/sourcegraph/internal/observation" @@ -29,7 +29,7 @@ func NewService( policiesSvc PoliciesService, gitserver GitserverClient, ) *Service { - store := store.New(scopedContext("store", observationCtx), db) + store := autoindexingstore.New(scopedContext("store", observationCtx), db) symbolsClient := symbols.DefaultClient repoUpdater := repoupdater.DefaultClient inferenceSvc := inference.NewService() diff --git a/enterprise/internal/codeintel/codenav/gittree_translator_test.go b/enterprise/internal/codeintel/codenav/gittree_translator_test.go index f4a84ff8819..9cad698d8fd 100644 --- a/enterprise/internal/codeintel/codenav/gittree_translator_test.go +++ b/enterprise/internal/codeintel/codenav/gittree_translator_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/sourcegraph/internal/api" @@ -389,7 +389,7 @@ func TestRawGetTargetCommitPositionFromSourcePosition(t *testing.T) { name := fmt.Sprintf("%s : %s", testCase.diffName, testCase.description) t.Run(name, func(t *testing.T) { - diff, err := diff.NewFileDiffReader(bytes.NewReader([]byte(testCase.diff))).Read() + diff, err := godiff.NewFileDiffReader(bytes.NewReader([]byte(testCase.diff))).Read() if err != nil { t.Fatalf("unexpected error reading file diff: %s", err) } diff --git a/enterprise/internal/codeintel/codenav/init.go b/enterprise/internal/codeintel/codenav/init.go index 78b9796f1b1..b25b7a16361 100644 --- a/enterprise/internal/codeintel/codenav/init.go +++ b/enterprise/internal/codeintel/codenav/init.go @@ -2,7 +2,7 @@ package codenav import ( "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/codenav/internal/lsifstore" - "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/codenav/internal/store" + codenavstore "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/codenav/internal/store" codeintelshared "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/shared" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/observation" @@ -15,7 +15,7 @@ func NewService( uploadSvc UploadService, gitserver GitserverClient, ) *Service { - store := store.New(scopedContext("store", observationCtx), db) + store := codenavstore.New(scopedContext("store", observationCtx), db) lsifStore := lsifstore.New(scopedContext("lsifstore", observationCtx), codeIntelDB) return newService( diff --git a/enterprise/internal/codeintel/codenav/service_ranges_test.go b/enterprise/internal/codeintel/codenav/service_ranges_test.go index 34901b5c83b..cc19c7b870a 100644 --- a/enterprise/internal/codeintel/codenav/service_ranges_test.go +++ b/enterprise/internal/codeintel/codenav/service_ranges_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/codenav/shared" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/shared/types" @@ -39,9 +39,9 @@ func TestRanges(t *testing.T) { mockUploadSvc := NewMockUploadService() mockGitserverClient := NewMockGitserverClient() mockGitServer := NewMockGitserverClient() - mockGitServer.DiffPathFunc.SetDefaultHook(func(ctx context.Context, srpc authz.SubRepoPermissionChecker, rn api.RepoName, sourceCommit, targetCommit, path string) ([]*diff.Hunk, error) { + mockGitServer.DiffPathFunc.SetDefaultHook(func(ctx context.Context, srpc authz.SubRepoPermissionChecker, rn api.RepoName, sourceCommit, targetCommit, path string) ([]*godiff.Hunk, error) { if path == "sub3/changed.go" { - fileDiff, err := diff.ParseFileDiff([]byte(rangesDiff)) + fileDiff, err := godiff.ParseFileDiff([]byte(rangesDiff)) if err != nil { return nil, err } diff --git a/enterprise/internal/codeintel/policies/init.go b/enterprise/internal/codeintel/policies/init.go index 333e6591ed3..8bc3830f885 100644 --- a/enterprise/internal/codeintel/policies/init.go +++ b/enterprise/internal/codeintel/policies/init.go @@ -2,7 +2,7 @@ package policies import ( "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/policies/internal/background" - "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/policies/internal/store" + policiesstore "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/policies/internal/store" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/goroutine" "github.com/sourcegraph/sourcegraph/internal/observation" @@ -14,7 +14,7 @@ func NewService( uploadSvc UploadService, gitserver GitserverClient, ) *Service { - store := store.New(scopedContext("store", observationCtx), db) + store := policiesstore.New(scopedContext("store", observationCtx), db) return newService( observationCtx, diff --git a/enterprise/internal/codeintel/uploads/init.go b/enterprise/internal/codeintel/uploads/init.go index b82906b30f7..ad1759d1e06 100644 --- a/enterprise/internal/codeintel/uploads/init.go +++ b/enterprise/internal/codeintel/uploads/init.go @@ -16,7 +16,7 @@ import ( codeintelshared "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/shared" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/uploads/internal/background" "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/uploads/internal/lsifstore" - "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/uploads/internal/store" + uploadsstore "github.com/sourcegraph/sourcegraph/enterprise/internal/codeintel/uploads/internal/store" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/locker" "github.com/sourcegraph/sourcegraph/internal/env" @@ -34,7 +34,7 @@ func NewService( codeIntelDB codeintelshared.CodeIntelDB, gsc GitserverClient, ) *Service { - store := store.New(scopedContext("store", observationCtx), db) + store := uploadsstore.New(scopedContext("uploadsstore", observationCtx), db) repoStore := backend.NewRepos(scopedContext("repos", observationCtx).Logger, db, gitserver.NewClient()) lsifStore := lsifstore.New(scopedContext("lsifstore", observationCtx), codeIntelDB) policyMatcher := policiesEnterprise.NewMatcher(gsc, policiesEnterprise.RetentionExtractor, true, false) @@ -97,7 +97,7 @@ func NewUploadProcessorJob( workerPollInterval time.Duration, maximumRuntimePerJob time.Duration, ) goroutine.BackgroundRoutine { - uploadsProcessorStore := dbworkerstore.New(observationCtx, db.Handle(), store.UploadWorkerStoreOptions) + uploadsProcessorStore := dbworkerstore.New(observationCtx, db.Handle(), uploadsstore.UploadWorkerStoreOptions) dbworker.InitPrometheusMetric(observationCtx, uploadsProcessorStore, "codeintel", "upload", nil) @@ -158,7 +158,7 @@ func NewReconciler(observationCtx *observation.Context, uploadSvc *Service) []go func NewResetters(observationCtx *observation.Context, db database.DB) []goroutine.BackgroundRoutine { metrics := background.NewResetterMetrics(observationCtx) - uploadsResetterStore := dbworkerstore.New(observationCtx, db.Handle(), store.UploadWorkerStoreOptions) + uploadsResetterStore := dbworkerstore.New(observationCtx, db.Handle(), uploadsstore.UploadWorkerStoreOptions) return []goroutine.BackgroundRoutine{ background.NewUploadResetter(observationCtx.Logger, uploadsResetterStore, ConfigJanitorInst.Interval, metrics), diff --git a/enterprise/internal/codemonitors/background/email.go b/enterprise/internal/codemonitors/background/email.go index 029d1b3d88f..c4a927e22e6 100644 --- a/enterprise/internal/codemonitors/background/email.go +++ b/enterprise/internal/codemonitors/background/email.go @@ -13,7 +13,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/api/internalapi" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/errcode" - "github.com/sourcegraph/sourcegraph/internal/search/result" + searchresult "github.com/sourcegraph/sourcegraph/internal/search/result" "github.com/sourcegraph/sourcegraph/internal/txemail" "github.com/sourcegraph/sourcegraph/internal/txemail/txtypes" "github.com/sourcegraph/sourcegraph/lib/errors" @@ -205,7 +205,7 @@ type DisplayResult struct { Content string } -func toDisplayResult(result *result.CommitMatch, externalURL *url.URL) *DisplayResult { +func toDisplayResult(result *searchresult.CommitMatch, externalURL *url.URL) *DisplayResult { resultType := "Message" if result.DiffPreview != nil { resultType = "Diff" diff --git a/enterprise/internal/codemonitors/background/slack.go b/enterprise/internal/codemonitors/background/slack.go index 807f5a55c8b..f09de3592e0 100644 --- a/enterprise/internal/codemonitors/background/slack.go +++ b/enterprise/internal/codemonitors/background/slack.go @@ -12,7 +12,7 @@ import ( "github.com/slack-go/slack" "github.com/sourcegraph/sourcegraph/internal/httpcli" - "github.com/sourcegraph/sourcegraph/internal/search/result" + searchresult "github.com/sourcegraph/sourcegraph/internal/search/result" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -97,9 +97,9 @@ func truncateString(input string) string { return strings.Join(splitLines, "") } -func truncateResults(results []*result.CommitMatch, maxResults int) (_ []*result.CommitMatch, totalCount, truncatedCount int) { +func truncateResults(results []*searchresult.CommitMatch, maxResults int) (_ []*searchresult.CommitMatch, totalCount, truncatedCount int) { // Convert to type result.Matches - matches := make(result.Matches, len(results)) + matches := make(searchresult.Matches, len(results)) for i, res := range results { matches[i] = res } @@ -109,9 +109,9 @@ func truncateResults(results []*result.CommitMatch, maxResults int) (_ []*result outputCount := matches.ResultCount() // Convert back type []*result.CommitMatch - output := make([]*result.CommitMatch, len(matches)) + output := make([]*searchresult.CommitMatch, len(matches)) for i, match := range matches { - output[i] = match.(*result.CommitMatch) + output[i] = match.(*searchresult.CommitMatch) } return output, totalCount, totalCount - outputCount diff --git a/enterprise/internal/compute/template.go b/enterprise/internal/compute/template.go index 0ac2035da18..f7d304baa15 100644 --- a/enterprise/internal/compute/template.go +++ b/enterprise/internal/compute/template.go @@ -13,7 +13,7 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/sourcegraph/sourcegraph/internal/search/result" + searchresult "github.com/sourcegraph/sourcegraph/internal/search/result" ) // Template is just a list of Atom, where an Atom is either a Variable or a Constant string. @@ -264,14 +264,14 @@ func substituteMetaVariables(pattern string, env *MetaEnvironment) (string, erro // NewMetaEnvironment maps results to a metavariable:value environment where // metavariables can be referenced and substituted for in an output template. -func NewMetaEnvironment(r result.Match, content string) *MetaEnvironment { +func NewMetaEnvironment(r searchresult.Match, content string) *MetaEnvironment { switch m := r.(type) { - case *result.RepoMatch: + case *searchresult.RepoMatch: return &MetaEnvironment{ Repo: string(m.Name), Content: string(m.Name), } - case *result.FileMatch: + case *searchresult.FileMatch: lang, _ := enry.GetLanguageByExtension(m.Path) return &MetaEnvironment{ Repo: string(m.Repo.Name), @@ -280,7 +280,7 @@ func NewMetaEnvironment(r result.Match, content string) *MetaEnvironment { Content: content, Lang: lang, } - case *result.CommitMatch: + case *searchresult.CommitMatch: return &MetaEnvironment{ Repo: string(m.Repo.Name), Commit: string(m.Commit.ID), @@ -289,7 +289,7 @@ func NewMetaEnvironment(r result.Match, content string) *MetaEnvironment { Email: m.Commit.Author.Email, Content: content, } - case *result.CommitDiffMatch: + case *searchresult.CommitDiffMatch: path := m.Path() lang, _ := enry.GetLanguageByExtension(path) return &MetaEnvironment{ diff --git a/enterprise/internal/insights/resolvers/admin_resolver.go b/enterprise/internal/insights/resolvers/admin_resolver.go index adce251f740..02af8769863 100644 --- a/enterprise/internal/insights/resolvers/admin_resolver.go +++ b/enterprise/internal/insights/resolvers/admin_resolver.go @@ -15,7 +15,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil" "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/background/queryrunner" "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/scheduler" - "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/store" + insightsstore "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/store" "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/types" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" @@ -43,7 +43,7 @@ func (r *Resolver) UpdateInsightSeries(ctx context.Context, args *graphqlbackend } } - series, err := r.dataSeriesStore.GetDataSeries(ctx, store.GetDataSeriesArgs{IncludeDeleted: true, SeriesID: args.Input.SeriesId}) + series, err := r.dataSeriesStore.GetDataSeries(ctx, insightsstore.GetDataSeriesArgs{IncludeDeleted: true, SeriesID: args.Input.SeriesId}) if err != nil { return nil, err } @@ -66,7 +66,7 @@ func (r *Resolver) InsightSeriesQueryStatus(ctx context.Context) ([]graphqlbacke } // need to do a manual join with metadata since this lives in a separate database. - seriesMetadata, err := r.dataSeriesStore.GetDataSeries(ctx, store.GetDataSeriesArgs{IncludeDeleted: true}) + seriesMetadata, err := r.dataSeriesStore.GetDataSeries(ctx, insightsstore.GetDataSeriesArgs{IncludeDeleted: true}) if err != nil { return nil, err } @@ -101,7 +101,7 @@ func (r *Resolver) InsightViewDebug(ctx context.Context, args graphqlbackend.Ins } // 🚨 SECURITY: This debug resolver is restricted to admins only so looking up the series does not check for the users authorization - viewSeries, err := r.insightStore.Get(ctx, store.InsightQueryArgs{UniqueID: viewId, WithoutAuthorization: true}) + viewSeries, err := r.insightStore.Get(ctx, insightsstore.InsightQueryArgs{UniqueID: viewId, WithoutAuthorization: true}) if err != nil { return nil, err } diff --git a/enterprise/internal/insights/scheduler/backfill_test.go b/enterprise/internal/insights/scheduler/backfill_test.go index cb02a71dac9..906c2ace950 100644 --- a/enterprise/internal/insights/scheduler/backfill_test.go +++ b/enterprise/internal/insights/scheduler/backfill_test.go @@ -13,7 +13,7 @@ import ( "github.com/sourcegraph/log/logtest" edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database" - "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/store" + insightsstore "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/store" "github.com/sourcegraph/sourcegraph/enterprise/internal/insights/types" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" ) @@ -22,7 +22,7 @@ func Test_NewBackfill(t *testing.T) { logger := logtest.Scoped(t) insightsDB := edb.NewInsightsDB(dbtest.NewInsightsDB(logger, t), logger) ctx := context.Background() - insightStore := store.NewInsightStore(insightsDB) + insightStore := insightsstore.NewInsightStore(insightsDB) now := time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC) clock := glock.NewMockClockAt(now) store := newBackfillStoreWithClock(insightsDB, clock) diff --git a/internal/codeintel/dependencies/init.go b/internal/codeintel/dependencies/init.go index 2d3045ddf7f..5cb8e5a97f2 100644 --- a/internal/codeintel/dependencies/init.go +++ b/internal/codeintel/dependencies/init.go @@ -2,19 +2,19 @@ package dependencies import ( "github.com/sourcegraph/sourcegraph/internal/codeintel/dependencies/internal/background" - "github.com/sourcegraph/sourcegraph/internal/codeintel/dependencies/internal/store" + dependenciesstore "github.com/sourcegraph/sourcegraph/internal/codeintel/dependencies/internal/store" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/goroutine" "github.com/sourcegraph/sourcegraph/internal/observation" ) func NewService(observationCtx *observation.Context, db database.DB) *Service { - return newService(scopedContext("service", observationCtx), store.New(scopedContext("store", observationCtx), db)) + return newService(scopedContext("service", observationCtx), dependenciesstore.New(scopedContext("store", observationCtx), db)) } // TestService creates a new dependencies service with noop observation contexts. func TestService(db database.DB, _ GitserverClient) *Service { - store := store.New(&observation.TestContext, db) + store := dependenciesstore.New(&observation.TestContext, db) return newService(&observation.TestContext, store) } diff --git a/internal/database/connections/live/store.go b/internal/database/connections/live/store.go index 7fefc974b7c..0b78fb19e1f 100644 --- a/internal/database/connections/live/store.go +++ b/internal/database/connections/live/store.go @@ -6,7 +6,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database/migration/runner" "github.com/sourcegraph/sourcegraph/internal/database/migration/schemas" - "github.com/sourcegraph/sourcegraph/internal/database/migration/store" + migrationstore "github.com/sourcegraph/sourcegraph/internal/database/migration/store" "github.com/sourcegraph/sourcegraph/internal/observation" "github.com/sourcegraph/sourcegraph/lib/errors" ) @@ -21,7 +21,7 @@ type StoreFactory func(db *sql.DB, migrationsTable string) Store func newStoreFactory(observationCtx *observation.Context) func(db *sql.DB, migrationsTable string) Store { return func(db *sql.DB, migrationsTable string) Store { - return NewStoreShim(store.NewWithDB(observationCtx, db, migrationsTable)) + return NewStoreShim(migrationstore.NewWithDB(observationCtx, db, migrationsTable)) } } @@ -48,10 +48,10 @@ func initStore(ctx context.Context, newStore StoreFactory, db *sql.DB, schema *s } type storeShim struct { - *store.Store + *migrationstore.Store } -func NewStoreShim(s *store.Store) Store { +func NewStoreShim(s *migrationstore.Store) Store { return &storeShim{s} } diff --git a/internal/database/event_logs.go b/internal/database/event_logs.go index 385abc6abe9..31bb9c65526 100644 --- a/internal/database/event_logs.go +++ b/internal/database/event_logs.go @@ -13,7 +13,7 @@ import ( "github.com/keegancsmith/sqlf" "github.com/lib/pq" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/database/batch" @@ -219,7 +219,7 @@ func (l *eventLogStore) BulkInsert(ctx context.Context, events []*Event) error { return *in } - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) rowValues := make(chan []any, len(events)) for _, event := range events { featureFlags, err := json.Marshal(event.EvaluatedFlagSet) diff --git a/internal/database/migration/cliutil/run_oobmigrations.go b/internal/database/migration/cliutil/run_oobmigrations.go index 68b8e998b40..a10f2f73b83 100644 --- a/internal/database/migration/cliutil/run_oobmigrations.go +++ b/internal/database/migration/cliutil/run_oobmigrations.go @@ -16,7 +16,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/database/migration/schemas" "github.com/sourcegraph/sourcegraph/internal/oobmigration" - "github.com/sourcegraph/sourcegraph/internal/oobmigration/migrations" + oobmigrations "github.com/sourcegraph/sourcegraph/internal/oobmigration/migrations" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/lib/output" ) @@ -25,7 +25,7 @@ func RunOutOfBandMigrations( commandName string, runnerFactory RunnerFactory, outFactory OutputFactory, - registerMigratorsWithStore func(storeFactory migrations.StoreFactory) oobmigration.RegisterMigratorsFunc, + registerMigratorsWithStore func(storeFactory oobmigrations.StoreFactory) oobmigration.RegisterMigratorsFunc, ) *cli.Command { idsFlag := &cli.IntSliceFlag{ Name: "id", diff --git a/internal/database/security_event_logs.go b/internal/database/security_event_logs.go index c6b89c4cbe2..8598f441731 100644 --- a/internal/database/security_event_logs.go +++ b/internal/database/security_event_logs.go @@ -9,7 +9,7 @@ import ( "github.com/keegancsmith/sqlf" "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/internal/actor" + sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/audit" "github.com/sourcegraph/sourcegraph/internal/database/basestore" "github.com/sourcegraph/sourcegraph/internal/jsonc" @@ -115,7 +115,7 @@ func (s *securityEventLogsStore) Insert(ctx context.Context, event *SecurityEven } func (s *securityEventLogsStore) InsertList(ctx context.Context, events []*SecurityEvent) error { - actor := actor.FromContext(ctx) + actor := sgactor.FromContext(ctx) vals := make([]*sqlf.Query, len(events)) for index, event := range events { // Add an attribution for Sourcegraph operator to be distinguished in our analytics pipelines diff --git a/internal/gitserver/commands_test.go b/internal/gitserver/commands_test.go index 7b03dd1b5f6..c88ec6122dc 100644 --- a/internal/gitserver/commands_test.go +++ b/internal/gitserver/commands_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" @@ -104,13 +104,13 @@ func TestDiffWithSubRepoFiltering(t *testing.T) { label string extraGitCommands []string expectedDiffFiles []string - expectedFileStat *diff.Stat + expectedFileStat *godiff.Stat rangeOverAllCommits bool }{ { label: "adding files", expectedDiffFiles: []string{"file1", "file3", "file3.3"}, - expectedFileStat: &diff.Stat{Added: 3}, + expectedFileStat: &godiff.Stat{Added: 3}, rangeOverAllCommits: true, }, { @@ -121,7 +121,7 @@ func TestDiffWithSubRepoFiltering(t *testing.T) { makeGitCommit("rename", 7), }, expectedDiffFiles: []string{"file_can_access"}, - expectedFileStat: &diff.Stat{Added: 1}, + expectedFileStat: &godiff.Stat{Added: 1}, }, { label: "file modified", @@ -133,7 +133,7 @@ func TestDiffWithSubRepoFiltering(t *testing.T) { makeGitCommit("edit_files", 7), }, expectedDiffFiles: []string{"file1"}, // file2 is updated but user doesn't have access - expectedFileStat: &diff.Stat{Changed: 1}, + expectedFileStat: &godiff.Stat{Changed: 1}, }, { label: "diff for commit w/ no access returns empty result", @@ -143,7 +143,7 @@ func TestDiffWithSubRepoFiltering(t *testing.T) { makeGitCommit("no_access", 7), }, expectedDiffFiles: []string{}, - expectedFileStat: &diff.Stat{}, + expectedFileStat: &godiff.Stat{}, }, } for _, tc := range testCases { @@ -166,7 +166,7 @@ func TestDiffWithSubRepoFiltering(t *testing.T) { } defer iter.Close() - stat := &diff.Stat{} + stat := &godiff.Stat{} fileNames := make([]string, 0, 3) for { file, err := iter.Next() diff --git a/internal/gitserver/search/lazy_commit.go b/internal/gitserver/search/lazy_commit.go index 5803cb10a80..265e97a2026 100644 --- a/internal/gitserver/search/lazy_commit.go +++ b/internal/gitserver/search/lazy_commit.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/sourcegraph/internal/api" ) @@ -18,7 +18,7 @@ type LazyCommit struct { *RawCommit // diff is the parsed output from the diff fetcher, cached here for performance - diff []*diff.FileDiff + diff []*godiff.FileDiff diffFetcher *DiffFetcher // LowerBuf is a re-usable buffer for doing case-transformations on the fields of LazyCommit @@ -49,7 +49,7 @@ func (l *LazyCommit) RawDiff() ([]byte, error) { } // Diff fetches the diff, then parses it with go-diff, caching the result -func (l *LazyCommit) Diff() ([]*diff.FileDiff, error) { +func (l *LazyCommit) Diff() ([]*godiff.FileDiff, error) { if l.diff != nil { return l.diff, nil } @@ -59,7 +59,7 @@ func (l *LazyCommit) Diff() ([]*diff.FileDiff, error) { return nil, err } - r := diff.NewMultiFileDiffReader(bytes.NewReader(rawDiff)) + r := godiff.NewMultiFileDiffReader(bytes.NewReader(rawDiff)) diff, err := r.ReadAllFiles() if err != nil { return nil, err diff --git a/internal/gitserver/search/search.go b/internal/gitserver/search/search.go index f67d350b6d3..f3a01094bb0 100644 --- a/internal/gitserver/search/search.go +++ b/internal/gitserver/search/search.go @@ -8,7 +8,7 @@ import ( "os/exec" "strings" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/log" "golang.org/x/sync/errgroup" @@ -437,12 +437,12 @@ func CreateCommitMatch(lc *LazyCommit, hc MatchedCommit, includeDiff bool, filte }, nil } -func filterRawDiff(rawDiff []*diff.FileDiff, filterFunc func(string) (bool, error)) []*diff.FileDiff { +func filterRawDiff(rawDiff []*godiff.FileDiff, filterFunc func(string) (bool, error)) []*godiff.FileDiff { logger := log.Scoped("filterRawDiff", "sub-repo filtering for raw diffs") if filterFunc == nil { return rawDiff } - filtered := make([]*diff.FileDiff, 0, len(rawDiff)) + filtered := make([]*godiff.FileDiff, 0, len(rawDiff)) for _, fileDiff := range rawDiff { if filterFunc != nil { if isAllowed, err := filterFunc(fileDiff.NewName); err != nil { diff --git a/internal/repos/sync_worker.go b/internal/repos/sync_worker.go index 716cc38745e..c4d14f12f20 100644 --- a/internal/repos/sync_worker.go +++ b/internal/repos/sync_worker.go @@ -15,7 +15,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/observation" "github.com/sourcegraph/sourcegraph/internal/workerutil" "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker" - workerstore "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store" + dbworkerstore "github.com/sourcegraph/sourcegraph/internal/workerutil/dbworker/store" ) type SyncWorkerOptions struct { @@ -53,11 +53,11 @@ func NewSyncWorker(ctx context.Context, observationCtx *observation.Context, dbH observationCtx = observation.ContextWithLogger(observationCtx.Logger.Scoped("repo.sync.workerstore.Store", ""), observationCtx) - store := workerstore.New(observationCtx, dbHandle, workerstore.Options[*SyncJob]{ + store := dbworkerstore.New(observationCtx, dbHandle, dbworkerstore.Options[*SyncJob]{ Name: "repo_sync_worker_store", TableName: "external_service_sync_jobs", ViewName: "external_service_sync_jobs_with_next_sync_at", - Scan: workerstore.BuildWorkerScan(scanJob), + Scan: dbworkerstore.BuildWorkerScan(scanJob), OrderByExpression: sqlf.Sprintf("next_sync_at"), ColumnExpressions: syncJobColumns, StalledMaxAge: 30 * time.Second, diff --git a/internal/service/svcmain/svcmain.go b/internal/service/svcmain/svcmain.go index dae9b249669..76c7542bdd8 100644 --- a/internal/service/svcmain/svcmain.go +++ b/internal/service/svcmain/svcmain.go @@ -15,7 +15,7 @@ import ( "github.com/sourcegraph/sourcegraph/internal/logging" "github.com/sourcegraph/sourcegraph/internal/observation" "github.com/sourcegraph/sourcegraph/internal/profiler" - "github.com/sourcegraph/sourcegraph/internal/service" + sgservice "github.com/sourcegraph/sourcegraph/internal/service" "github.com/sourcegraph/sourcegraph/internal/singleprogram" "github.com/sourcegraph/sourcegraph/internal/tracer" "github.com/sourcegraph/sourcegraph/internal/version" @@ -26,7 +26,7 @@ type Config struct { } // Main is called from the `main` function of the `sourcegraph-oss` and `sourcegraph` commands. -func Main(services []service.Service, config Config) { +func Main(services []sgservice.Service, config Config) { liblog := log.Init(log.Resource{ Name: env.MyName, Version: version.Version(), @@ -49,7 +49,7 @@ func Main(services []service.Service, config Config) { // // DEPRECATED: Building per-service commands (i.e., a separate binary for frontend, gitserver, etc.) // is deprecated. -func DeprecatedSingleServiceMain(svc service.Service, config Config, validateConfig, useConfPackage bool) { +func DeprecatedSingleServiceMain(svc sgservice.Service, config Config, validateConfig, useConfPackage bool) { liblog := log.Init(log.Resource{ Name: env.MyName, Version: version.Version(), @@ -63,13 +63,13 @@ func DeprecatedSingleServiceMain(svc service.Service, config Config, validateCon ), ) logger := log.Scoped("sourcegraph", "Sourcegraph") - run(liblog, logger, []service.Service{svc}, config, validateConfig, useConfPackage) + run(liblog, logger, []sgservice.Service{svc}, config, validateConfig, useConfPackage) } func run( liblog *log.PostInitCallbacks, logger log.Logger, - services []service.Service, + services []sgservice.Service, config Config, validateConfig bool, useConfPackage bool, diff --git a/lib/batches/changeset_specs.go b/lib/batches/changeset_specs.go index bc0d364788f..6dae34e353d 100644 --- a/lib/batches/changeset_specs.go +++ b/lib/batches/changeset_specs.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/sourcegraph/go-diff/diff" + godiff "github.com/sourcegraph/go-diff/diff" "github.com/sourcegraph/sourcegraph/lib/batches/execution" "github.com/sourcegraph/sourcegraph/lib/batches/git" @@ -240,7 +240,7 @@ func validateGroups(repoName, defaultBranch string, groups []Group) error { } func groupFileDiffs(completeDiff []byte, defaultBranch string, groups []Group) (map[string][]byte, error) { - fileDiffs, err := diff.ParseMultiFileDiff(completeDiff) + fileDiffs, err := godiff.ParseMultiFileDiff(completeDiff) if err != nil { return nil, err } @@ -255,8 +255,8 @@ func groupFileDiffs(completeDiff []byte, defaultBranch string, groups []Group) ( dirs = append(dirs, g.Directory) } - byBranch := make(map[string][]*diff.FileDiff, len(groups)) - byBranch[defaultBranch] = []*diff.FileDiff{} + byBranch := make(map[string][]*godiff.FileDiff, len(groups)) + byBranch[defaultBranch] = []*godiff.FileDiff{} // For each file diff... for _, f := range fileDiffs { @@ -292,7 +292,7 @@ func groupFileDiffs(completeDiff []byte, defaultBranch string, groups []Group) ( finalDiffsByBranch := make(map[string][]byte, len(byBranch)) for branch, diffs := range byBranch { - printed, err := diff.PrintMultiFileDiff(diffs) + printed, err := godiff.PrintMultiFileDiff(diffs) if err != nil { return nil, errors.Wrap(err, "printing multi file diff failed") }