Add git server token usage to deploy route
This commit is contained in:
@@ -19,11 +19,21 @@ import (
|
||||
type DeploySiteHandler struct {
|
||||
EnvCfg *envconfig.EnvConfig
|
||||
SiteRepo repository.SiteRepository
|
||||
GitServerRepo repository.GitServerRepository
|
||||
DeploymentRepo repository.DeploymentRepository
|
||||
}
|
||||
|
||||
func NewDeploySiteHandler(envCfg *envconfig.EnvConfig, siteRepo repository.SiteRepository, deploymentRepo repository.DeploymentRepository) *DeploySiteHandler {
|
||||
return &DeploySiteHandler{EnvCfg: envCfg, SiteRepo: siteRepo, DeploymentRepo: deploymentRepo}
|
||||
func NewDeploySiteHandler(
|
||||
envCfg *envconfig.EnvConfig,
|
||||
siteRepo repository.SiteRepository,
|
||||
gitServerRepo repository.GitServerRepository,
|
||||
deploymentRepo repository.DeploymentRepository) *DeploySiteHandler {
|
||||
return &DeploySiteHandler{
|
||||
EnvCfg: envCfg,
|
||||
SiteRepo: siteRepo,
|
||||
GitServerRepo: gitServerRepo,
|
||||
DeploymentRepo: deploymentRepo,
|
||||
}
|
||||
}
|
||||
|
||||
func (h *DeploySiteHandler) PostDeploy(c fiber.Ctx) error {
|
||||
@@ -54,6 +64,26 @@ func (h *DeploySiteHandler) PostDeploy(c fiber.Ctx) error {
|
||||
})
|
||||
}
|
||||
|
||||
gitServer, err := h.GitServerRepo.GetGitServer(site.GitServer)
|
||||
|
||||
if err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return c.Status(fiber.StatusNotFound).JSON(&models.APIError{
|
||||
Message: "Git server not found",
|
||||
})
|
||||
}
|
||||
log.Println("Error getting git server: ", err)
|
||||
return c.Status(fiber.StatusInternalServerError).JSON(&models.APIError{
|
||||
Message: "Unexpected error while getting git server",
|
||||
})
|
||||
}
|
||||
|
||||
if gitServer == nil {
|
||||
return c.Status(fiber.StatusNotFound).JSON(&models.APIError{
|
||||
Message: "Git server not found",
|
||||
})
|
||||
}
|
||||
|
||||
deployToken := site.DeployToken
|
||||
if deployToken == "" {
|
||||
log.Println("No deploy token configured for site " + siteId)
|
||||
@@ -103,7 +133,7 @@ func (h *DeploySiteHandler) PostDeploy(c fiber.Ctx) error {
|
||||
site.Owner,
|
||||
site.Repository,
|
||||
site.Branch,
|
||||
h.EnvCfg.GithubPat,
|
||||
gitServer.AuthToken,
|
||||
sitePath,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user