Rename remote to forge (#1357)

As of #745

Co-authored-by: Anbraten <anton@ju60.de>

server/api/cron.go

@@ -62,7 +62,7 @@ func RunCron(c *gin.Context) {
 		return
 	}
 
-	repo, newPipeline, err := cronScheduler.CreatePipeline(c, _store, server.Config.Services.Remote, cron)
+	repo, newPipeline, err := cronScheduler.CreatePipeline(c, _store, server.Config.Services.Forge, cron)
 	if err != nil {
 		c.String(http.StatusInternalServerError, "Error creating pipeline for cron %q. %s", id, err)
 		return
@@ -82,7 +82,7 @@ func PostCron(c *gin.Context) {
 	repo := session.Repo(c)
 	user := session.User(c)
 	store := store.FromContext(c)
-	remote := server.Config.Services.Remote
+	forge := server.Config.Services.Forge
 
 	in := new(model.Cron)
 	if err := c.Bind(in); err != nil {
@@ -109,8 +109,8 @@ func PostCron(c *gin.Context) {
 	cron.NextExec = nextExec.Unix()
 
 	if in.Branch != "" {
-		// check if branch exists on remote
-		_, err := remote.BranchHead(c, user, repo, in.Branch)
+		// check if branch exists on forge
+		_, err := forge.BranchHead(c, user, repo, in.Branch)
 		if err != nil {
 			c.String(400, "Error inserting cron. branch not resolved: %s", err)
 			return
@@ -129,7 +129,7 @@ func PatchCron(c *gin.Context) {
 	repo := session.Repo(c)
 	user := session.User(c)
 	store := store.FromContext(c)
-	remote := server.Config.Services.Remote
+	forge := server.Config.Services.Forge
 
 	id, err := strconv.ParseInt(c.Param("cron"), 10, 64)
 	if err != nil {
@@ -150,8 +150,8 @@ func PatchCron(c *gin.Context) {
 		return
 	}
 	if in.Branch != "" {
-		// check if branch exists on remote
-		_, err := remote.BranchHead(c, user, repo, in.Branch)
+		// check if branch exists on forge
+		_, err := forge.BranchHead(c, user, repo, in.Branch)
 		if err != nil {
 			c.String(400, "Error inserting cron. branch not resolved: %s", err)
 			return

server/api/helper.go

@@ -21,9 +21,9 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/forge"
 	"github.com/woodpecker-ci/woodpecker/server/model"
 	"github.com/woodpecker-ci/woodpecker/server/pipeline"
-	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
@@ -39,12 +39,12 @@ func handlePipelineErr(c *gin.Context, err error) {
 	}
 }
 
-// if the remote has a refresh token, the current access token may be stale.
+// if the forge has a refresh token, the current access token may be stale.
 // Therefore, we should refresh prior to dispatching the job.
 func refreshUserToken(c *gin.Context, user *model.User) {
-	_remote := server.Config.Services.Remote
+	_forge := server.Config.Services.Forge
 	_store := store.FromContext(c)
-	if refresher, ok := _remote.(remote.Refresher); ok {
+	if refresher, ok := _forge.(forge.Refresher); ok {
 		ok, err := refresher.Refresh(c, user)
 		if err != nil {
 			log.Error().Err(err).Msgf("refresh oauth token of user '%s' failed", user.Login)

server/api/hook.go

@@ -70,9 +70,9 @@ func BlockTilQueueHasRunningItem(c *gin.Context) {
 // PostHook start a pipeline triggered by a forges post webhook
 func PostHook(c *gin.Context) {
 	_store := store.FromContext(c)
-	remote := server.Config.Services.Remote
+	forge := server.Config.Services.Forge
 
-	tmpRepo, tmpBuild, err := remote.Hook(c, c.Request)
+	tmpRepo, tmpBuild, err := forge.Hook(c, c.Request)
 	if err != nil {
 		msg := "failure to parse hook"
 		log.Debug().Err(err).Msg(msg)
@@ -102,7 +102,7 @@ func PostHook(c *gin.Context) {
 		return
 	}
 
-	repo, err := _store.GetRepoNameFallback(tmpRepo.RemoteID, tmpRepo.FullName)
+	repo, err := _store.GetRepoNameFallback(tmpRepo.ForgeID, tmpRepo.FullName)
 	if err != nil {
 		msg := fmt.Sprintf("failure to get repo %s from store", tmpRepo.FullName)
 		log.Error().Err(err).Msg(msg)

server/api/login.go

@@ -49,13 +49,13 @@ func HandleAuth(c *gin.Context) {
 	// cannot, however, remember why, so need to revisit this line.
 	c.Writer.Header().Del("Content-Type")
 
-	tmpuser, err := server.Config.Services.Remote.Login(c, c.Writer, c.Request)
+	tmpuser, err := server.Config.Services.Forge.Login(c, c.Writer, c.Request)
 	if err != nil {
 		log.Error().Msgf("cannot authenticate user. %s", err)
 		c.Redirect(303, "/login?error=oauth_error")
 		return
 	}
-	// this will happen when the user is redirected by the remote provider as
+	// this will happen when the user is redirected by the forge as
 	// part of the authorization workflow.
 	if tmpuser == nil {
 		return
@@ -75,7 +75,7 @@ func HandleAuth(c *gin.Context) {
 		// if self-registration is enabled for whitelisted organizations we need to
 		// check the user's organization membership.
 		if len(config.Orgs) != 0 {
-			teams, terr := server.Config.Services.Remote.Teams(c, tmpuser)
+			teams, terr := server.Config.Services.Forge.Teams(c, tmpuser)
 			if terr != nil || !config.IsMember(teams) {
 				log.Error().Msgf("cannot verify team membership for %s.", u.Login)
 				c.Redirect(303, "/login?error=access_denied")
@@ -112,7 +112,7 @@ func HandleAuth(c *gin.Context) {
 	// if self-registration is enabled for whitelisted organizations we need to
 	// check the user's organization membership.
 	if len(config.Orgs) != 0 {
-		teams, terr := server.Config.Services.Remote.Teams(c, u)
+		teams, terr := server.Config.Services.Forge.Teams(c, u)
 		if terr != nil || !config.IsMember(teams) {
 			log.Error().Msgf("cannot verify team membership for %s.", u.Login)
 			c.Redirect(303, "/login?error=access_denied")
@@ -155,7 +155,7 @@ func GetLoginToken(c *gin.Context) {
 		return
 	}
 
-	login, err := server.Config.Services.Remote.Auth(c, in.Access, in.Refresh)
+	login, err := server.Config.Services.Forge.Auth(c, in.Access, in.Refresh)
 	if err != nil {
 		_ = c.AbortWithError(http.StatusUnauthorized, err)
 		return

server/api/pipeline.go

@@ -54,7 +54,7 @@ func CreatePipeline(c *gin.Context) {
 
 	user := session.User(c)
 
-	lastCommit, _ := server.Config.Services.Remote.BranchHead(c, user, repo, p.Branch)
+	lastCommit, _ := server.Config.Services.Forge.BranchHead(c, user, repo, p.Branch)
 
 	tmpBuild := createTmpPipeline(model.EventManual, lastCommit, repo, user, &p)
 

server/api/repo.go

@@ -39,7 +39,7 @@ const (
 )
 
 func PostRepo(c *gin.Context) {
-	remote := server.Config.Services.Remote
+	forge := server.Config.Services.Forge
 	_store := store.FromContext(c)
 	user := session.User(c)
 	repo := session.Repo(c)
@@ -87,7 +87,7 @@ func PostRepo(c *gin.Context) {
 		sig,
 	)
 
-	from, err := remote.Repo(c, user, repo.RemoteID, repo.Owner, repo.Name)
+	from, err := forge.Repo(c, user, repo.ForgeID, repo.Owner, repo.Name)
 	if err == nil {
 		if repo.FullName != from.FullName {
 			// create a redirection
@@ -100,7 +100,7 @@ func PostRepo(c *gin.Context) {
 		repo.Update(from)
 	}
 
-	err = remote.Activate(c, user, repo, link)
+	err = forge.Activate(c, user, repo, link)
 	if err != nil {
 		c.String(http.StatusInternalServerError, err.Error())
 		return
@@ -198,9 +198,9 @@ func GetRepoPermissions(c *gin.Context) {
 func GetRepoBranches(c *gin.Context) {
 	repo := session.Repo(c)
 	user := session.User(c)
-	r := server.Config.Services.Remote
+	f := server.Config.Services.Forge
 
-	branches, err := r.Branches(c, user, repo)
+	branches, err := f.Branches(c, user, repo)
 	if err != nil {
 		_ = c.AbortWithError(http.StatusInternalServerError, err)
 		return
@@ -231,7 +231,7 @@ func DeleteRepo(c *gin.Context) {
 		}
 	}
 
-	if err := server.Config.Services.Remote.Deactivate(c, user, repo, server.Config.Server.Host); err != nil {
+	if err := server.Config.Services.Forge.Deactivate(c, user, repo, server.Config.Server.Host); err != nil {
 		_ = c.AbortWithError(http.StatusInternalServerError, err)
 		return
 	}
@@ -239,7 +239,7 @@ func DeleteRepo(c *gin.Context) {
 }
 
 func RepairRepo(c *gin.Context) {
-	remote := server.Config.Services.Remote
+	forge := server.Config.Services.Forge
 	_store := store.FromContext(c)
 	repo := session.Repo(c)
 	user := session.User(c)
@@ -260,9 +260,9 @@ func RepairRepo(c *gin.Context) {
 		sig,
 	)
 
-	from, err := remote.Repo(c, user, repo.RemoteID, repo.Owner, repo.Name)
+	from, err := forge.Repo(c, user, repo.ForgeID, repo.Owner, repo.Name)
 	if err != nil {
-		log.Error().Err(err).Msgf("get repo '%s/%s' from remote", repo.Owner, repo.Name)
+		log.Error().Err(err).Msgf("get repo '%s/%s' from forge", repo.Owner, repo.Name)
 		c.AbortWithStatus(http.StatusInternalServerError)
 		return
 	}
@@ -282,10 +282,10 @@ func RepairRepo(c *gin.Context) {
 		return
 	}
 
-	if err := remote.Deactivate(c, user, repo, host); err != nil {
+	if err := forge.Deactivate(c, user, repo, host); err != nil {
 		log.Trace().Err(err).Msgf("deactivate repo '%s' to repair failed", repo.FullName)
 	}
-	if err := remote.Activate(c, user, repo, link); err != nil {
+	if err := forge.Activate(c, user, repo, link); err != nil {
 		c.String(500, err.Error())
 		return
 	}
@@ -294,7 +294,7 @@ func RepairRepo(c *gin.Context) {
 }
 
 func MoveRepo(c *gin.Context) {
-	remote := server.Config.Services.Remote
+	forge := server.Config.Services.Forge
 	_store := store.FromContext(c)
 	repo := session.Repo(c)
 	user := session.User(c)
@@ -312,7 +312,7 @@ func MoveRepo(c *gin.Context) {
 		return
 	}
 
-	from, err := remote.Repo(c, user, "", owner, name)
+	from, err := forge.Repo(c, user, "", owner, name)
 	if err != nil {
 		_ = c.AbortWithError(http.StatusInternalServerError, err)
 		return
@@ -352,10 +352,10 @@ func MoveRepo(c *gin.Context) {
 		sig,
 	)
 
-	if err := remote.Deactivate(c, user, repo, host); err != nil {
+	if err := forge.Deactivate(c, user, repo, host); err != nil {
 		log.Trace().Err(err).Msgf("deactivate repo '%s' for move to activate later, got an error", repo.FullName)
 	}
-	if err := remote.Activate(c, user, repo, link); err != nil {
+	if err := forge.Activate(c, user, repo, link); err != nil {
 		c.String(500, err.Error())
 		return
 	}

server/api/user.go

@@ -38,7 +38,7 @@ func GetSelf(c *gin.Context) {
 
 func GetFeed(c *gin.Context) {
 	_store := store.FromContext(c)
-	remote := server.Config.Services.Remote
+	forge := server.Config.Services.Forge
 
 	user := session.User(c)
 	latest, _ := strconv.ParseBool(c.Query("latest"))
@@ -55,10 +55,10 @@ func GetFeed(c *gin.Context) {
 		config := ToConfig(c)
 
 		sync := shared.Syncer{
-			Remote: remote,
-			Store:  _store,
-			Perms:  _store,
-			Match:  shared.NamespaceFilter(config.OwnersWhitelist),
+			Forge: forge,
+			Store: _store,
+			Perms: _store,
+			Match: shared.NamespaceFilter(config.OwnersWhitelist),
 		}
 		if err := sync.Sync(c, user, server.Config.FlatPermissions); err != nil {
 			log.Debug().Msgf("sync error: %s: %s", user.Login, err)
@@ -87,7 +87,7 @@ func GetFeed(c *gin.Context) {
 
 func GetRepos(c *gin.Context) {
 	_store := store.FromContext(c)
-	remote := server.Config.Services.Remote
+	forge := server.Config.Services.Forge
 
 	user := session.User(c)
 	all, _ := strconv.ParseBool(c.Query("all"))
@@ -104,10 +104,10 @@ func GetRepos(c *gin.Context) {
 		config := ToConfig(c)
 
 		sync := shared.Syncer{
-			Remote: remote,
-			Store:  _store,
-			Perms:  _store,
-			Match:  shared.NamespaceFilter(config.OwnersWhitelist),
+			Forge: forge,
+			Store: _store,
+			Perms: _store,
+			Match: shared.NamespaceFilter(config.OwnersWhitelist),
 		}
 
 		if err := sync.Sync(c, user, server.Config.FlatPermissions); err != nil {