Include forge type in netrc (#4908)

server/forge/bitbucket/bitbucket.go

@@ -349,6 +349,7 @@ func (c *config) Netrc(u *model.User, _ *model.Repo) (*model.Netrc, error) {
 		Machine:  "bitbucket.org",
 		Login:    "x-token-auth",
 		Password: u.AccessToken,
+		Type:     model.ForgeTypeBitbucket,
 	}, nil
 }
 

server/forge/bitbucket/bitbucket_test.go

@@ -55,6 +55,7 @@ func TestBitbucket(t *testing.T) {
 	assert.Equal(t, "bitbucket.org", netrc.Machine)
 	assert.Equal(t, "x-token-auth", netrc.Login)
 	assert.Equal(t, fakeUser.AccessToken, netrc.Password)
+	assert.Equal(t, model.ForgeTypeBitbucket, netrc.Type)
 
 	user, _, err := c.Login(ctx, &types.OAuthRequest{})
 	assert.NoError(t, err)

server/forge/bitbucketdatacenter/bitbucketdatacenter.go

@@ -331,6 +331,7 @@ func (c *client) Netrc(_ *model.User, r *model.Repo) (*model.Netrc, error) {
 		Login:    c.username,
 		Password: c.password,
 		Machine:  host,
+		Type:     model.ForgeTypeBitbucketDatacenter,
 	}, nil
 }
 

server/forge/forgejo/forgejo.go

@@ -350,6 +350,7 @@ func (c *Forgejo) Netrc(u *model.User, r *model.Repo) (*model.Netrc, error) {
 		Login:    login,
 		Password: token,
 		Machine:  host,
+		Type:     model.ForgeTypeForgejo,
 	}, nil
 }
 

server/forge/forgejo/forgejo_test.go

@@ -61,6 +61,7 @@ func Test_forgejo(t *testing.T) {
 		assert.Equal(t, "forgejo.org", netrc.Machine)
 		assert.Equal(t, fakeUser.Login, netrc.Login)
 		assert.Equal(t, fakeUser.AccessToken, netrc.Password)
+		assert.Equal(t, model.ForgeTypeForgejo, netrc.Type)
 	})
 	t.Run("netrc with machine account", func(t *testing.T) {
 		forge, _ := New(Opts{})

server/forge/gitea/gitea.go

@@ -352,6 +352,7 @@ func (c *Gitea) Netrc(u *model.User, r *model.Repo) (*model.Netrc, error) {
 		Login:    login,
 		Password: token,
 		Machine:  host,
+		Type:     model.ForgeTypeGitea,
 	}, nil
 }
 

server/forge/gitea/gitea_test.go

@@ -62,6 +62,7 @@ func Test_gitea(t *testing.T) {
 		assert.Equal(t, "gitea.com", netrc.Machine)
 		assert.Equal(t, fakeUser.Login, netrc.Login)
 		assert.Equal(t, fakeUser.AccessToken, netrc.Password)
+		assert.Equal(t, model.ForgeTypeGitea, netrc.Type)
 	})
 	t.Run("netrc with machine account", func(t *testing.T) {
 		forge, _ := New(Opts{})

server/forge/github/github.go

@@ -360,6 +360,7 @@ func (c *client) Netrc(u *model.User, r *model.Repo) (*model.Netrc, error) {
 		Login:    login,
 		Password: token,
 		Machine:  host,
+		Type:     model.ForgeTypeGithub,
 	}, nil
 }
 

server/forge/github/github_test.go

@@ -61,6 +61,7 @@ func Test_github(t *testing.T) {
 		assert.Equal(t, "github.com", netrc.Machine)
 		assert.Equal(t, fakeUser.AccessToken, netrc.Login)
 		assert.Equal(t, "x-oauth-basic", netrc.Password)
+		assert.Equal(t, model.ForgeTypeGithub, netrc.Type)
 	})
 	t.Run("netrc with machine account", func(t *testing.T) {
 		forge, _ := New(Opts{})

server/forge/gitlab/gitlab.go

@@ -476,6 +476,7 @@ func (g *GitLab) Netrc(u *model.User, r *model.Repo) (*model.Netrc, error) {
 		Login:    login,
 		Password: token,
 		Machine:  host,
+		Type:     model.ForgeTypeGitlab,
 	}, nil
 }
 

server/model/netrc.go

@@ -15,7 +15,8 @@
 package model
 
 type Netrc struct {
-	Machine  string `json:"machine"`
+	Machine  string    `json:"machine"`
-	Login    string `json:"login"`
+	Login    string    `json:"login"`
-	Password string `json:"password"`
+	Password string    `json:"password"`
+	Type     ForgeType `json:"type"`
 }