From 761cc67f110606877f335d506ac6f03112f107e7 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 2 Dec 2025 13:40:08 +0100 Subject: [PATCH] server/forge: rename var to be more descriptive and test value (#5806) --- server/api/repo.go | 3 +-- server/forge/bitbucket/bitbucket.go | 6 +++--- server/forge/bitbucket/bitbucket_test.go | 4 ++-- server/forge/bitbucketdatacenter/bitbucketdatacenter.go | 6 +++--- .../forge/bitbucketdatacenter/bitbucketdatacenter_test.go | 3 ++- server/forge/forgejo/forgejo_test.go | 8 ++++---- server/forge/gitea/gitea_test.go | 8 ++++---- server/forge/github/github_test.go | 8 ++++---- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/server/api/repo.go b/server/api/repo.go index 0126f2acf..be109a043 100644 --- a/server/api/repo.go +++ b/server/api/repo.go @@ -78,7 +78,6 @@ func PostRepo(c *gin.Context) { c.String(http.StatusInternalServerError, "Could not fetch repository from forge.") return } - from.ForgeID = user.ForgeID if !from.Perm.Admin { c.String(http.StatusForbidden, "User has to be a admin of this repository") return @@ -88,6 +87,7 @@ func PostRepo(c *gin.Context) { return } + from.ForgeID = user.ForgeID if enabledOnce { repo.Update(from) } else { @@ -96,7 +96,6 @@ func PostRepo(c *gin.Context) { repo.AllowPull = server.Config.Pipeline.DefaultAllowPullRequests repo.AllowDeploy = false repo.CancelPreviousPipelineEvents = server.Config.Pipeline.DefaultCancelPreviousPipelineEvents - repo.ForgeID = user.ForgeID // TODO: allow to use other connected forges of the user } repo.IsActive = true repo.UserID = user.ID diff --git a/server/forge/bitbucket/bitbucket.go b/server/forge/bitbucket/bitbucket.go index f7fe72936..6cd4713e8 100644 --- a/server/forge/bitbucket/bitbucket.go +++ b/server/forge/bitbucket/bitbucket.go @@ -50,7 +50,7 @@ type Opts struct { } type config struct { - id int64 + forgeID int64 api string url string oAuthClientID string @@ -61,7 +61,7 @@ type config struct { // repository hosting service at https://bitbucket.org func New(id int64, opts *Opts) (forge.Forge, error) { return &config{ - id: id, + forgeID: id, api: DefaultAPI, url: DefaultURL, oAuthClientID: opts.OAuthClientID, @@ -407,7 +407,7 @@ func (c *config) Hook(ctx context.Context, req *http.Request) (*model.Repo, *mod return nil, nil, err } - u, err := common.RepoUserForgeID(ctx, c.id, repo.ForgeRemoteID) + u, err := common.RepoUserForgeID(ctx, c.forgeID, repo.ForgeRemoteID) if err != nil { return nil, nil, err } diff --git a/server/forge/bitbucket/bitbucket_test.go b/server/forge/bitbucket/bitbucket_test.go index 28921b9d4..772d01a6d 100644 --- a/server/forge/bitbucket/bitbucket_test.go +++ b/server/forge/bitbucket/bitbucket_test.go @@ -34,7 +34,7 @@ import ( ) func TestNew(t *testing.T) { - forge, _ := New(0, &Opts{OAuthClientID: "4vyW6b49Z", OAuthClientSecret: "a5012f6c6"}) + forge, _ := New(1, &Opts{OAuthClientID: "4vyW6b49Z", OAuthClientSecret: "a5012f6c6"}) f, _ := forge.(*config) assert.Equal(t, DefaultURL, f.url) @@ -52,7 +52,7 @@ func TestBitbucket(t *testing.T) { ctx := t.Context() - forge, _ := New(0, &Opts{}) + forge, _ := New(1, &Opts{}) netrc, _ := forge.Netrc(fakeUser, fakeRepo) assert.Equal(t, "bitbucket.org", netrc.Machine) assert.Equal(t, "x-token-auth", netrc.Login) diff --git a/server/forge/bitbucketdatacenter/bitbucketdatacenter.go b/server/forge/bitbucketdatacenter/bitbucketdatacenter.go index 737ac1028..d530ea2b8 100644 --- a/server/forge/bitbucketdatacenter/bitbucketdatacenter.go +++ b/server/forge/bitbucketdatacenter/bitbucketdatacenter.go @@ -54,7 +54,7 @@ type Opts struct { } type client struct { - id int64 + forgeID int64 url string urlAPI string clientID string @@ -69,7 +69,7 @@ type client struct { // the on-premise edition of Bitbucket Cloud, formerly known as Stash. func New(id int64, opts Opts) (forge.Forge, error) { config := &client{ - id: id, + forgeID: id, url: opts.URL, urlAPI: fmt.Sprintf("%s/rest", opts.URL), clientID: opts.OAuthClientID, @@ -543,7 +543,7 @@ func (c *client) getUserAndRepo(ctx context.Context, r *model.Repo) (*model.User return nil, nil, fmt.Errorf("unable to get store from context") } - repo, err := _store.GetRepoForgeID(c.id, r.ForgeRemoteID) + repo, err := _store.GetRepoForgeID(c.forgeID, r.ForgeRemoteID) if err != nil { return nil, nil, fmt.Errorf("unable to get repo: %w", err) } diff --git a/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go b/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go index 3e4ad948e..23a4a0762 100644 --- a/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go +++ b/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go @@ -27,7 +27,7 @@ import ( ) func TestNew(t *testing.T) { - forge, err := New(0, Opts{ + forge, err := New(1, Opts{ URL: "http://localhost:8080", Username: "0ZXh0IjoiI", Password: "I1NiIsInR5", @@ -39,6 +39,7 @@ func TestNew(t *testing.T) { cl, ok := forge.(*client) assert.True(t, ok) assert.Equal(t, &client{ + forgeID: 1, url: "http://localhost:8080", urlAPI: "http://localhost:8080/rest", username: "0ZXh0IjoiI", diff --git a/server/forge/forgejo/forgejo_test.go b/server/forge/forgejo/forgejo_test.go index 85a424d85..d31fa8b50 100644 --- a/server/forge/forgejo/forgejo_test.go +++ b/server/forge/forgejo/forgejo_test.go @@ -31,7 +31,7 @@ import ( ) func TestNew(t *testing.T) { - forge, _ := New(0, Opts{ + forge, _ := New(1, Opts{ URL: "http://localhost:8080", SkipVerify: true, }) @@ -46,7 +46,7 @@ func Test_forgejo(t *testing.T) { s := httptest.NewServer(fixtures.Handler()) defer s.Close() - c, _ := New(0, Opts{ + c, _ := New(1, Opts{ URL: s.URL, SkipVerify: true, }) @@ -55,7 +55,7 @@ func Test_forgejo(t *testing.T) { ctx := store.InjectToContext(t.Context(), mockStore) t.Run("netrc with user token", func(t *testing.T) { - forge, _ := New(0, Opts{}) + forge, _ := New(1, Opts{}) netrc, _ := forge.Netrc(fakeUser, fakeRepo) assert.Equal(t, "forgejo.org", netrc.Machine) assert.Equal(t, fakeUser.Login, netrc.Login) @@ -63,7 +63,7 @@ func Test_forgejo(t *testing.T) { assert.Equal(t, model.ForgeTypeForgejo, netrc.Type) }) t.Run("netrc with machine account", func(t *testing.T) { - forge, _ := New(0, Opts{}) + forge, _ := New(1, Opts{}) netrc, _ := forge.Netrc(nil, fakeRepo) assert.Equal(t, "forgejo.org", netrc.Machine) assert.Empty(t, netrc.Login) diff --git a/server/forge/gitea/gitea_test.go b/server/forge/gitea/gitea_test.go index db6eccd50..073541937 100644 --- a/server/forge/gitea/gitea_test.go +++ b/server/forge/gitea/gitea_test.go @@ -32,7 +32,7 @@ import ( ) func TestNew(t *testing.T) { - forge, _ := New(0, Opts{ + forge, _ := New(1, Opts{ URL: "http://localhost:8080", SkipVerify: true, }) @@ -47,7 +47,7 @@ func Test_gitea(t *testing.T) { s := httptest.NewServer(fixtures.Handler()) defer s.Close() - c, _ := New(0, Opts{ + c, _ := New(1, Opts{ URL: s.URL, SkipVerify: true, }) @@ -56,7 +56,7 @@ func Test_gitea(t *testing.T) { ctx := store.InjectToContext(t.Context(), mockStore) t.Run("netrc with user token", func(t *testing.T) { - forge, _ := New(0, Opts{}) + forge, _ := New(1, Opts{}) netrc, _ := forge.Netrc(fakeUser, fakeRepo) assert.Equal(t, "gitea.com", netrc.Machine) assert.Equal(t, fakeUser.Login, netrc.Login) @@ -64,7 +64,7 @@ func Test_gitea(t *testing.T) { assert.Equal(t, model.ForgeTypeGitea, netrc.Type) }) t.Run("netrc with machine account", func(t *testing.T) { - forge, _ := New(0, Opts{}) + forge, _ := New(1, Opts{}) netrc, _ := forge.Netrc(nil, fakeRepo) assert.Equal(t, "gitea.com", netrc.Machine) assert.Empty(t, netrc.Login) diff --git a/server/forge/github/github_test.go b/server/forge/github/github_test.go index 01900f4c6..136250b72 100644 --- a/server/forge/github/github_test.go +++ b/server/forge/github/github_test.go @@ -34,7 +34,7 @@ import ( ) func TestNew(t *testing.T) { - forge, _ := New(0, Opts{ + forge, _ := New(1, Opts{ URL: "http://localhost:8080/", OAuthClientID: "0ZXh0IjoiI", OAuthClientSecret: "I1NiIsInR5", @@ -52,7 +52,7 @@ func Test_github(t *testing.T) { gin.SetMode(gin.TestMode) s := httptest.NewServer(fixtures.Handler()) - c, _ := New(0, Opts{ + c, _ := New(1, Opts{ URL: s.URL, SkipVerify: true, }) @@ -62,7 +62,7 @@ func Test_github(t *testing.T) { ctx := t.Context() t.Run("netrc with user token", func(t *testing.T) { - forge, _ := New(0, Opts{}) + forge, _ := New(1, Opts{}) netrc, _ := forge.Netrc(fakeUser, fakeRepo) assert.Equal(t, "github.com", netrc.Machine) assert.Equal(t, fakeUser.AccessToken, netrc.Login) @@ -70,7 +70,7 @@ func Test_github(t *testing.T) { assert.Equal(t, model.ForgeTypeGithub, netrc.Type) }) t.Run("netrc with machine account", func(t *testing.T) { - forge, _ := New(0, Opts{}) + forge, _ := New(1, Opts{}) netrc, _ := forge.Netrc(nil, fakeRepo) assert.Equal(t, "github.com", netrc.Machine) assert.Empty(t, netrc.Login)