Merge pull request #793 from stacklok/repo-extra-data

repositories: Add clone URL to data we track
mindersec · Aug 31, 2023 · d234435 · d234435
2 parents 0b17fd2 + 5aa218d
commit d234435
Show file tree

Hide file tree

Showing 10 changed files with 1,730 additions and 1,670 deletions.
diff --git a/database/migrations/000001_init.up.sql b/database/migrations/000001_init.up.sql
@@ -124,6 +124,7 @@ CREATE TABLE repositories (
     webhook_id INTEGER,
     webhook_url TEXT NOT NULL,
     deploy_url TEXT NOT NULL,
+    clone_url TEXT NOT NULL,
     created_at TIMESTAMP NOT NULL DEFAULT NOW(),
     updated_at TIMESTAMP NOT NULL DEFAULT NOW()
 );

diff --git a/database/query/repositories.sql b/database/query/repositories.sql
@@ -9,7 +9,8 @@ INSERT INTO repositories (
     is_fork,
     webhook_id,
     webhook_url,
-    deploy_url) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING *;
+    deploy_url,
+    clone_url) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING *;
 
 -- name: GetRepositoryByID :one
 SELECT * FROM repositories WHERE id = $1;
@@ -59,6 +60,7 @@ webhook_id = $8,
 webhook_url = $9,
 deploy_url = $10, 
 provider = $11,
+clone_url = $12,
 updated_at = NOW() 
 WHERE id = $1 RETURNING *;
 
@@ -73,6 +75,7 @@ webhook_id = $7,
 webhook_url = $8,
 deploy_url = $9, 
 provider = $10,
+clone_url = $11,
 updated_at = NOW() 
 WHERE repo_id = $1 RETURNING *;
 

diff --git a/docs/docs/protodocs/proto.md b/docs/docs/protodocs/proto.md
diff --git a/internal/gh/queries/sync_repo_db.go b/internal/gh/queries/sync_repo_db.go
@@ -72,6 +72,7 @@ func SyncRepositoriesWithDB(ctx context.Context,
 					RepoID:    int32(*repo.ID),
 					IsPrivate: bool(*repo.Private), // Needs a value from GraphQL data
 					IsFork:    bool(*repo.Fork),
+					CloneUrl:  string(*repo.CloneURL),
 				})
 				if err != nil {
 					fmt.Println("failed to create repository for repo ID: with repo Name: ", *repo.ID, *repo.Name)
@@ -97,6 +98,7 @@ func SyncRepositoriesWithDB(ctx context.Context,
 					IsPrivate: bool(*repo.Private), // Needs a value from GraphQL data
 					IsFork:    bool(*repo.Fork),
 					ID:        existingRepo.ID,
+					CloneUrl:  string(*repo.CloneURL),
 				})
 				if err != nil {
 					return fmt.Errorf("failed to update repository: %w", err)

diff --git a/pkg/controlplane/handlers_repositories.go b/pkg/controlplane/handlers_repositories.go
@@ -241,6 +241,7 @@ func (s *Server) ListRepositories(ctx context.Context,
 				IsFork:    repo.IsFork,
 				HookUrl:   repo.WebhookUrl,
 				DeployUrl: repo.DeployUrl,
+				CloneUrl:  repo.CloneUrl,
 				CreatedAt: timestamppb.New(repo.CreatedAt),
 				UpdatedAt: timestamppb.New(repo.UpdatedAt),
 			})
@@ -286,6 +287,7 @@ func (s *Server) GetRepositoryById(ctx context.Context,
 		IsFork:    repo.IsFork,
 		HookUrl:   repo.WebhookUrl,
 		DeployUrl: repo.DeployUrl,
+		CloneUrl:  repo.CloneUrl,
 		CreatedAt: createdAt,
 		UpdatedAt: updatedat,
 	}}, nil
@@ -334,6 +336,7 @@ func (s *Server) GetRepositoryByName(ctx context.Context,
 		IsFork:    repo.IsFork,
 		HookUrl:   repo.WebhookUrl,
 		DeployUrl: repo.DeployUrl,
+		CloneUrl:  repo.CloneUrl,
 		CreatedAt: createdAt,
 		UpdatedAt: updatedat,
 	}}, nil

diff --git a/pkg/db/models.go b/pkg/db/models.go
diff --git a/pkg/db/repositories.sql.go b/pkg/db/repositories.sql.go
diff --git a/pkg/generated/openapi/mediator/v1/mediator.swagger.json b/pkg/generated/openapi/mediator/v1/mediator.swagger.json