api support for repos (#1887)

* support for repos url and migrations

Author: motatoes

backend/bootstrap/main.go

@@ -206,20 +206,6 @@ func Bootstrap(templates embed.FS, diggerController controllers.DiggerController
 	admin.POST("/tokens/issue-access-token", controllers.IssueAccessTokenForOrg)
 
 	r.Use(middleware.CORSMiddleware())
-	projectsApiGroup := r.Group("/api/projects")
-	projectsApiGroup.Use(middleware.GetApiMiddleware())
-	projectsApiGroup.GET("/", controllers.FindProjectsForOrg)
-	projectsApiGroup.GET("/:project_id", controllers.ProjectDetails)
-	projectsApiGroup.GET("/:project_id/runs", controllers.RunsForProject)
-
-	activityApiGroup := r.Group("/api/activity")
-	activityApiGroup.Use(middleware.GetApiMiddleware())
-	activityApiGroup.GET("/", controllers.GetActivity)
-
-	runsApiGroup := r.Group("/api/runs")
-	runsApiGroup.Use(middleware.CORSMiddleware(), middleware.GetApiMiddleware())
-	runsApiGroup.GET("/:run_id", controllers.RunDetails)
-	runsApiGroup.POST("/:run_id/approve", controllers.ApproveRun)
 
 	// internal endpoints not meant to be exposed to public and protected behind webhook secret
 	if enableInternal := os.Getenv("DIGGER_ENABLE_INTERNAL_ENDPOINTS"); enableInternal == "true" {
@@ -228,6 +214,17 @@ func Bootstrap(templates embed.FS, diggerController controllers.DiggerController
 		r.POST("_internal/api/upsert_org", middleware.InternalApiAuth(), diggerController.UpsertOrgInternal)
 	}
 
+	if enableApi := os.Getenv("DIGGER_ENABLE_API_ENDPOINTS"); enableApi == "true" {
+		apiGroup := r.Group("/api")
+		apiGroup.Use(middleware.HeadersApiAuth())
+
+		reposApiGroup := apiGroup.Group("/repos")
+		reposApiGroup.GET("/", controllers.ListReposApi)
+
+		githubApiGroup := apiGroup.Group("/github")
+		githubApiGroup.POST("/link", controllers.LinkGithubInstallationToOrgApi)
+	}
+
 	fronteggWebhookProcessor.POST("/create-org-from-frontegg", controllers.CreateFronteggOrgFromWebhook)
 
 	return r

backend/controllers/github_api.go

@@ -0,0 +1,80 @@
+package controllers
+
+import (
+	"errors"
+	"github.com/diggerhq/digger/backend/middleware"
+	"github.com/diggerhq/digger/backend/models"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+	"log"
+	"net/http"
+	"strconv"
+)
+
+func LinkGithubInstallationToOrgApi(c *gin.Context) {
+	type LinkInstallationRequest struct {
+		InstallationId string `json:"installation_id"`
+	}
+
+	var request LinkInstallationRequest
+	err := c.BindJSON(&request)
+	if err != nil {
+		log.Printf("Error binding JSON: %v", err)
+		c.JSON(http.StatusBadRequest, gin.H{"status": "Invalid request format"})
+		return
+	}
+
+	organisationId := c.GetString(middleware.ORGANISATION_ID_KEY)
+	organisationSource := c.GetString(middleware.ORGANISATION_SOURCE_KEY)
+
+	var org models.Organisation
+	err = models.DB.GormDB.Where("external_id = ? AND external_source = ?", organisationId, organisationSource).First(&org).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			log.Printf("could not find organisation: %v", err)
+			c.JSON(http.StatusNotFound, gin.H{"status": "Could not find organisation: " + organisationId})
+		} else {
+			log.Printf("database error while finding organisation: %v", err)
+			c.JSON(http.StatusInternalServerError, gin.H{"status": "Internal server error"})
+		}
+		return
+	}
+
+	installationId, err := strconv.ParseInt(request.InstallationId, 10, 64)
+	if err != nil {
+		log.Printf("Failed to convert InstallationId to int64: %v", err)
+		c.JSON(http.StatusBadRequest, gin.H{"status": "installationID should be a valid integer"})
+		return
+	}
+
+	link, err := models.DB.GetGithubAppInstallationLink(installationId)
+
+	if err != nil {
+		log.Printf("could not get installation link: %v", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"status": "Could not get installation link"})
+		return
+	}
+
+	// if there is an existing link it should already belong to existing org id
+	if link != nil {
+		if link.OrganisationId == org.ID {
+			c.JSON(200, gin.H{"status": "already linked to this org"})
+			return
+		} else {
+			log.Printf("installation id %v is already linked to %v", installationId, org.ExternalId)
+			c.JSON(http.StatusBadRequest, gin.H{"status": "installationID already linked to another org and cant be linked to this one unless the app is uninstalled"})
+			return
+		}
+	}
+
+	_, err = models.DB.CreateGithubInstallationLink(&org, installationId)
+	if err != nil {
+		log.Printf("failed to create installation link: %v", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"status": "failed to create installation link"})
+		return
+	}
+
+	// Return status 200
+	c.JSON(http.StatusOK, gin.H{"status": "Successfully created Github installation link"})
+	return
+}

backend/controllers/repos.go

@@ -0,0 +1,50 @@
+package controllers
+
+import (
+	"errors"
+	"github.com/diggerhq/digger/backend/middleware"
+	"github.com/diggerhq/digger/backend/models"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+	"net/http"
+)
+
+func ListReposApi(c *gin.Context) {
+	// assume all exists as validated in middleware
+	organisationId := c.GetString(middleware.ORGANISATION_ID_KEY)
+	organisationSource := c.GetString(middleware.ORGANISATION_SOURCE_KEY)
+
+	var org models.Organisation
+	err := models.DB.GormDB.Where("external_id = ? AND external_source = ?", organisationId, organisationSource).First(&org).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			c.String(http.StatusNotFound, "Could not find organisation: "+organisationId)
+		}
+		return
+	}
+
+	var repos []models.Repo
+
+	err = models.DB.GormDB.Preload("Organisation").
+		Joins("LEFT JOIN organisations ON repos.organisation_id = organisations.id").
+		Where("repos.organisation_id = ?", org.ID).
+		Order("name").
+		Find(&repos).Error
+
+	if err != nil {
+		c.String(http.StatusInternalServerError, "Unknown error occurred while fetching database")
+		return
+	}
+
+	marshalledRepos := make([]interface{}, 0)
+
+	for _, r := range repos {
+		marshalled := r.MapToJsonStruct()
+		marshalledRepos = append(marshalledRepos, marshalled)
+	}
+
+	response := make(map[string]interface{})
+	response["result"] = marshalledRepos
+
+	c.JSON(http.StatusOK, response)
+}

backend/middleware/headers.go

@@ -0,0 +1,38 @@
+package middleware
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func HeadersApiAuth() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		orgId := c.Request.Header.Get("DIGGER_ORG_ID")
+		orgSource := c.Request.Header.Get("DIGGER_ORG_SOURCE")
+		userId := c.Request.Header.Get("DIGGER_USER_ID")
+
+		if orgId == "" {
+			c.String(http.StatusBadRequest, "Missing parameter: DIGGER_ORG_ID")
+			c.Abort()
+			return
+		}
+
+		if orgSource == "" {
+			c.String(http.StatusBadRequest, "Missing parameter: DIGGER_ORG_SOURCE")
+			c.Abort()
+			return
+		}
+
+		if userId == "" {
+			c.String(http.StatusBadRequest, "Missing parameter: DIGGER_USER_ID")
+			c.Abort()
+			return
+		}
+
+		c.Set(ORGANISATION_ID_KEY, orgId)
+		c.Set(ORGANISATION_SOURCE_KEY, orgSource)
+		c.Set(USER_ID_KEY, userId)
+
+		c.Next()
+	}
+}

backend/middleware/jwt.go

@@ -308,5 +308,7 @@ func CORSMiddleware() gin.HandlerFunc {
 }
 
 const ORGANISATION_ID_KEY = "organisation_ID"
+const ORGANISATION_SOURCE_KEY = "organisation_Source"
+const USER_ID_KEY = "user_ID"
 const ACCESS_LEVEL_KEY = "access_level"
 const JOB_TOKEN_KEY = "job_token"

backend/migrations/20250224152926.sql

@@ -0,0 +1,2 @@
+-- Modify "repos" table
+ALTER TABLE "public"."repos" ADD COLUMN "vcs" text NULL DEFAULT 'github';

backend/migrations/atlas.sum

@@ -1,4 +1,4 @@
-h1:QQtQnP46bNFA5g3iD9R9tIJmWXQAue5yU7JTWucDhro=
+h1:5Ds30GVrcb/6GVoexZ0yD9I3TD4q/Udz6UfOgUkrpks=
 20231227132525.sql h1:43xn7XC0GoJsCnXIMczGXWis9d504FAWi4F1gViTIcw=
 20240115170600.sql h1:IW8fF/8vc40+eWqP/xDK+R4K9jHJ9QBSGO6rN9LtfSA=
 20240116123649.sql h1:R1JlUIgxxF6Cyob9HdtMqiKmx/BfnsctTl5rvOqssQw=
@@ -41,3 +41,4 @@ h1:QQtQnP46bNFA5g3iD9R9tIJmWXQAue5yU7JTWucDhro=
 20250220173053.sql h1:Ry/j04tOPQceff4o/uPM0I1r5ltMcP2vuJc6/SQBcac=
 20250220173439.sql h1:Dho4Gw361D8kuL5pB56hUj5hZM1NPTbMYVBjBW54DkE=
 20250221044813.sql h1:PPcVcoMaMY5DXyoptQYeBOEwofrzIfyKcWRd3S12I2U=
+20250224152926.sql h1:EjoFpfeoCpk/SjSo2i7sajKCR3t7YCn+1ZgGJrT0L9Y=

backend/models/orgs.go

@@ -1,8 +1,9 @@
 package models
 
 import (
-	"gorm.io/gorm"
 	"time"
+
+	"gorm.io/gorm"
 )
 
 type Organisation struct {
@@ -19,7 +20,8 @@ type Repo struct {
 	RepoOrganisation string
 	RepoName         string
 	RepoUrl          string
-	OrganisationID   uint `gorm:"uniqueIndex:idx_org_repo"`
+	VCS              DiggerVCSType `gorm:"default:'github'"`
+	OrganisationID   uint          `gorm:"uniqueIndex:idx_org_repo"`
 	Organisation     *Organisation
 	DiggerConfig     string
 }
@@ -122,7 +124,31 @@ func (p *Project) MapToJsonStruct() interface{} {
 		IsGenerated:           p.IsGenerated,
 		IsInMainBranch:        p.IsInMainBranch,
 	}
-
+}
+func (r *Repo) MapToJsonStruct() interface{} {
+	OrganisationName := func() string {
+		if r.Organisation == nil {
+			return ""
+		}
+		return r.Organisation.Name
+	}
+	return struct {
+		Id               uint   `json:"id"`
+		Name             string `json:"name"`
+		RepoFullName     string `json:"repo_full_name"`
+		RepoUrl          string `json:"repo_url"`
+		VCS              string `json:"vcs"`
+		OrganisationID   uint   `json:"organisation_id"`
+		OrganisationName string `json:"organisation_name"`
+	}{
+		Id:               r.ID,
+		Name:             r.RepoName,
+		RepoFullName:     r.RepoFullName,
+		RepoUrl:          r.RepoUrl,
+		VCS:              string(r.VCS),
+		OrganisationID:   r.OrganisationID,
+		OrganisationName: OrganisationName(),
+	}
 }
 
 type Token struct {