feat: Add and edit github connection

admin/server/projects.go

@@ -519,6 +519,7 @@ func (s *Server) UpdateProject(ctx context.Context, req *adminv1.UpdateProjectRe
 		return nil, fmt.Errorf("cannot set both github_url and archive_asset_id")
 	}
 	githubURL := proj.GithubURL
+	githubInstID := proj.GithubInstallationID
 	archiveAssetID := proj.ArchiveAssetID
 	if req.GithubUrl != nil {
 		// If changing the Github URL, check github app is installed and caller has access on the repo
@@ -528,7 +529,9 @@ func (s *Server) UpdateProject(ctx context.Context, req *adminv1.UpdateProjectRe
 				return nil, status.Error(codes.Unauthenticated, "not authenticated as a user")
 			}
 
-			_, err = s.getAndCheckGithubInstallationID(ctx, *req.GithubUrl, claims.OwnerID())
+			instID, err := s.getAndCheckGithubInstallationID(ctx, *req.GithubUrl, claims.OwnerID())
+			// github installation ID might change, so make sure it is updated
+			githubInstID = &instID
 			if err != nil {
 				return nil, err
 			}
@@ -562,7 +565,7 @@ func (s *Server) UpdateProject(ctx context.Context, req *adminv1.UpdateProjectRe
 		Public:               valOrDefault(req.Public, proj.Public),
 		ArchiveAssetID:       archiveAssetID,
 		GithubURL:            githubURL,
-		GithubInstallationID: proj.GithubInstallationID,
+		GithubInstallationID: githubInstID,
 		Subpath:              valOrDefault(req.Subpath, proj.Subpath),
 		ProdVersion:          valOrDefault(req.ProdVersion, proj.ProdVersion),
 		ProdBranch:           valOrDefault(req.ProdBranch, proj.ProdBranch),

proto/gen/rill/admin/v1/admin.swagger.yaml

@@ -785,6 +785,46 @@ paths:
           type: string
       tags:
         - AdminService
+  /v1/organizations/{organization}/projects/{project}/connect-to-github:
+    post:
+      summary: |-
+        Connects a rill managed project to github.
+        Replaces the contents of the remote repo with the contents of the project.
+      operationId: AdminService_ConnectProjectToGithub
+      responses:
+        "200":
+          description: A successful response.
+          schema:
+            $ref: '#/definitions/v1ConnectProjectToGithubResponse'
+        default:
+          description: An unexpected error response.
+          schema:
+            $ref: '#/definitions/rpcStatus'
+      parameters:
+        - name: organization
+          in: path
+          required: true
+          type: string
+        - name: project
+          in: path
+          required: true
+          type: string
+        - name: body
+          in: body
+          required: true
+          schema:
+            type: object
+            properties:
+              repo:
+                type: string
+              branch:
+                type: string
+              subpath:
+                type: string
+              force:
+                type: boolean
+      tags:
+        - AdminService
   /v1/organizations/{organization}/projects/{project}/credentials:
     post:
       summary: GetDeploymentCredentials returns runtime info and access token on behalf of a specific user, or alternatively for a raw set of JWT attributes
@@ -3216,6 +3256,8 @@ definitions:
         type: string
       url:
         type: string
+      defaultBranch:
+        type: string
   protobufAny:
     type: object
     properties:
@@ -3387,6 +3429,8 @@ definitions:
         items:
           type: object
           $ref: '#/definitions/v1Expression'
+  v1ConnectProjectToGithubResponse:
+    type: object
   v1CreateAlertResponse:
     type: object
     properties: