Skip to content
Snippets Groups Projects

Replace calls to old repo-updater store and types by the new store

Closed Administrator requested to merge cloud/use-new-repo-updater-store into main

Created by: asdine

This PR removes the repo-updater Store type and replaces all calls to that store by the new one. Services outside of repo-updater now use the internal/db stores instead of relying on repo-updater. All repo-updater Repo and ExternalService types have been removed, and their logic transfered to types.Repo and types.ExternalService.

Fixes #14710 #14711 #14712

Merge request reports

Approval is optional

Closed by avatar (Jul 8, 2025 10:49pm UTC)

Merge details

  • The changes were not merged into main.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Created by: sourcegraph-bot

    Notifying subscribers in CODENOTIFY files for diff 1d13ec83860a311fbd8ca60a2dbb8b441e9641c4...b0009093e72e5722aa03d94e3bffbc5aaf7a579e.

    Notify File(s)
    @LawnGnome enterprise/cmd/frontend/internal/campaigns/init.go
    enterprise/internal/campaigns/background/background.go
    enterprise/internal/campaigns/reconciler.go
    enterprise/internal/campaigns/reconciler_test.go
    enterprise/internal/campaigns/resolvers/campaign_connection_test.go
    enterprise/internal/campaigns/resolvers/campaign_spec_test.go
    enterprise/internal/campaigns/resolvers/changeset_connection_test.go
    enterprise/internal/campaigns/resolvers/changeset_counts_test.go
    enterprise/internal/campaigns/resolvers/changeset_event_connection_test.go
    enterprise/internal/campaigns/resolvers/changeset_spec_connection_test.go
    enterprise/internal/campaigns/resolvers/changeset_spec_test.go
    enterprise/internal/campaigns/resolvers/changeset_test.go
    enterprise/internal/campaigns/resolvers/main_test.go
    enterprise/internal/campaigns/resolvers/permissions_test.go
    enterprise/internal/campaigns/resolvers/resolver_test.go
    enterprise/internal/campaigns/service.go
    enterprise/internal/campaigns/service_apply_campaign.go
    enterprise/internal/campaigns/service_test.go
    enterprise/internal/campaigns/store_campaign_specs_test.go
    enterprise/internal/campaigns/store_campaigns_test.go
    enterprise/internal/campaigns/store_changeset_events_test.go
    enterprise/internal/campaigns/store_changeset_specs_test.go
    enterprise/internal/campaigns/store_changesets_test.go
    enterprise/internal/campaigns/store_codehost_test.go
    enterprise/internal/campaigns/store_test.go
    enterprise/internal/campaigns/syncer.go
    enterprise/internal/campaigns/syncer_test.go
    enterprise/internal/campaigns/testing/changeset_source.go
    enterprise/internal/campaigns/testing/repos.go
    enterprise/internal/campaigns/webhooks.go
    enterprise/internal/campaigns/webhooks_gitlab.go
    enterprise/internal/campaigns/webhooks_gitlab_test.go
    enterprise/internal/campaigns/webhooks_test.go
    internal/db/external_services.go
    internal/db/repos.go
    internal/db/repos_db_test.go
    @eseliger enterprise/cmd/frontend/internal/campaigns/init.go
    enterprise/internal/campaigns/background/background.go
    enterprise/internal/campaigns/reconciler.go
    enterprise/internal/campaigns/reconciler_test.go
    enterprise/internal/campaigns/resolvers/campaign_connection_test.go
    enterprise/internal/campaigns/resolvers/campaign_spec_test.go
    enterprise/internal/campaigns/resolvers/changeset_connection_test.go
    enterprise/internal/campaigns/resolvers/changeset_counts_test.go
    enterprise/internal/campaigns/resolvers/changeset_event_connection_test.go
    enterprise/internal/campaigns/resolvers/changeset_spec_connection_test.go
    enterprise/internal/campaigns/resolvers/changeset_spec_test.go
    enterprise/internal/campaigns/resolvers/changeset_test.go
    enterprise/internal/campaigns/resolvers/main_test.go
    enterprise/internal/campaigns/resolvers/permissions_test.go
    enterprise/internal/campaigns/resolvers/resolver_test.go
    enterprise/internal/campaigns/service.go
    enterprise/internal/campaigns/service_apply_campaign.go
    enterprise/internal/campaigns/service_test.go
    enterprise/internal/campaigns/store_campaign_specs_test.go
    enterprise/internal/campaigns/store_campaigns_test.go
    enterprise/internal/campaigns/store_changeset_events_test.go
    enterprise/internal/campaigns/store_changeset_specs_test.go
    enterprise/internal/campaigns/store_changesets_test.go
    enterprise/internal/campaigns/store_codehost_test.go
    enterprise/internal/campaigns/store_test.go
    enterprise/internal/campaigns/syncer.go
    enterprise/internal/campaigns/syncer_test.go
    enterprise/internal/campaigns/testing/changeset_source.go
    enterprise/internal/campaigns/testing/repos.go
    enterprise/internal/campaigns/webhooks.go
    enterprise/internal/campaigns/webhooks_gitlab.go
    enterprise/internal/campaigns/webhooks_gitlab_test.go
    enterprise/internal/campaigns/webhooks_test.go
    @keegancsmith cmd/frontend/graphqlbackend/search_results_test.go
    @unknwon enterprise/cmd/repo-updater/authz/integration_test.go
    enterprise/cmd/repo-updater/authz/perms_syncer.go
    enterprise/cmd/repo-updater/authz/perms_syncer_test.go
    enterprise/cmd/repo-updater/main.go
  • Created by: unknwon

    @asdine I pushed one commit to fix the failing tests of campaigns repo perms, but there are failings elsewhere (looks like missing mock in tests, "nil pointer derefrerence").

  • Created by: asdine

    Thanks @unknwon ! These tests started failing when I merged with main this morning, I'll handle the rest of the tests :)

  • Created by: codecov[bot]

    Codecov Report

    Merging #15530 (b000909) into main (1d13ec8) will decrease coverage by 0.65%. The diff coverage is 88.74%.

    @@            Coverage Diff             @@
    ##             main   #15530      +/-   ##
    ==========================================
    - Coverage   52.35%   51.70%   -0.66%     
    ==========================================
      Files        1633     1630       -3     
      Lines       81534    80197    -1337     
      Branches     7247     7291      +44     
    ==========================================
    - Hits        42687    41464    -1223     
    + Misses      35052    35007      -45     
    + Partials     3795     3726      -69     
    Flag Coverage Δ
    go 51.38% <88.74%> (-0.93%) :arrow_down:
    integration 28.36% <ø> (ø)
    storybook 27.34% <ø> (ø)
    typescript 52.47% <ø> (ø)
    unit 34.93% <ø> (ø)
    Impacted Files Coverage Δ
    cmd/frontend/internal/httpapi/httpapi.go 21.90% <0.00%> (ø)
    cmd/repo-updater/repos/observability.go 22.15% <ø> (-67.39%) :arrow_down:
    cmd/repo-updater/repos/scheduler.go 64.19% <ø> (ø)
    ...prise/internal/campaigns/service_apply_campaign.go 79.88% <ø> (-0.23%) :arrow_down:
    internal/db/external_services.go 66.76% <ø> (ø)
    cmd/repo-updater/repos/syncer.go 76.16% <82.35%> (+0.28%) :arrow_up:
    enterprise/cmd/repo-updater/authz/perms_syncer.go 41.68% <83.33%> (-0.12%) :arrow_down:
    enterprise/internal/campaigns/syncer.go 72.54% <83.33%> (+0.18%) :arrow_up:
    cmd/repo-updater/repos/gitolite.go 38.63% <84.61%> (+1.42%) :arrow_up:
    cmd/repo-updater/repos/testing.go 69.56% <84.61%> (-10.67%) :arrow_down:
    ... and 21 more
  • Created by: asdine

    Did you manually test this (i.e. create a campaign and see that nothing blows up)?

    @mrnugget No I did not yet, I will do a complete QA before merging

    This close to a release cut I'm scared to run into issues due to our database layer changing significantly.

    Perhaps we should wait for the release? There is no rush in merging this, we'll only need to deal with conflicts, cc @tsenart

  • Created by: tsenart

    Perhaps we should wait for the release? There is no rush in merging this, we'll only need to deal with conflicts, cc @tsenart

    Yep, that makes sense!

  • Created by: asdine

    This PR has been split into multiple small PRs and is no longer necessary

Please register or sign in to reply
Loading