Git dev deployments

admin/server/repos.go

@@ -81,18 +81,15 @@ func (s *Server) GetRepoMeta(ctx context.Context, req *adminv1.GetRepoMetaReques
 	ep.Password = token
 	gitURL := ep.String()
 
-	var editBranch string
-	if depl != nil {
-		editBranch = depl.Branch
-	}
-
 	return &adminv1.GetRepoMetaResponse{
-		ExpiresOn:     timestamppb.New(expiresAt),
-		LastUpdatedOn: timestamppb.New(proj.UpdatedOn),
-		GitUrl:        gitURL,
-		GitSubpath:    proj.Subpath,
-		GitBranch:     depl.Branch,
-		GitEditBranch: editBranch,
+		ExpiresOn:      timestamppb.New(expiresAt),
+		LastUpdatedOn:  timestamppb.New(proj.UpdatedOn),
+		GitUrl:         gitURL,
+		GitSubpath:     proj.Subpath,
+		GitBranch:      depl.Branch,
+		Editable:       depl.Editable,
+		PrimaryBranch:  proj.PrimaryBranch,
+		ManagedGitRepo: proj.ManagedGitRepoID != nil,
 	}, nil
 }
 

cli/pkg/cmdutil/helper.go

@@ -42,6 +42,7 @@ type Helper struct {
 	*printer.Printer
 	Version            version.Version
 	DotRill            dotrill.DotRill
+	HomeDir            string
 	Interactive        bool
 	Org                string
 	AdminURLDefault    string
@@ -63,6 +64,7 @@ func NewHelper(ver version.Version, homeDir string) (*Helper, error) {
 	ch := &Helper{
 		Printer:     printer.NewPrinter(printer.FormatHuman),
 		DotRill:     dotrill.New(homeDir),
+		HomeDir:     homeDir,
 		Version:     ver,
 		Interactive: true,
 	}
@@ -612,8 +614,8 @@ func (h *Helper) CommitAndSafePush(ctx context.Context, root string, config *git
 		}
 		return gitutil.CommitAndPush(ctx, root, config, commitMsg, author)
 	case "2":
-		// Instead of a force push, we do a merge with favourLocal=true to ensure we don't loose history.
-		// This is not euivalent to a force push but is safer for users.
+		// Instead of a force push, we do a merge with favourLocal=true to ensure we don't lose history.
+		// This is not equivalent to a force push but is safer for users.
 		if config.Subpath != "" {
 			// force pushing in a monorepo can overwrite other subpaths
 			// we can check for changes in other subpaths but it is tricky and error prone

cli/pkg/local/app.go

@@ -249,7 +249,12 @@ func NewApp(ctx context.Context, opts *AppOptions) (*App, error) {
 	connectors = append(connectors, olapConnector)
 
 	// The repo connector is the local project directory
-	repoConfig, err := structpb.NewStruct(map[string]any{"dsn": projectPath})
+	repoConfig, err := structpb.NewStruct(map[string]any{
+		"dsn":                   projectPath,
+		"admin_url_override":    opts.Ch.AdminURLOverride,
+		"access_token_override": opts.Ch.AdminTokenOverride,
+		"home_dir":              opts.Ch.HomeDir,
+	})
 	if err != nil {
 		return nil, err
 	}

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

@@ -5244,11 +5244,15 @@ definitions:
       gitBranch:
         type: string
         description: The branch to use for the deployment.
-      gitEditBranch:
+      editable:
+        type: boolean
+        description: Whether editing is allowed. Set to true for dev deployments.
+      primaryBranch:
         type: string
-        description: |-
-          A unique branch name generated for temporary/ephemeral use in edit mode where files may be mutated.
-          This enables checkpointing progress across hibernations and also more easily pinning to a specific commit of the base branch to delay conflict resolution.
+        description: Primary branch of the project.
+      managedGitRepo:
+        type: boolean
+        description: Whether the git repo is managed by Rill.
       archiveDownloadUrl:
         type: string
         description: Signed URL for downloading a tarball of project files. If this is set, the git_* fields will be empty (and vice versa).

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

@@ -825,18 +825,16 @@ components:
                 archiveId:
                     description: A stable ID for the archive returned from archive_download_url.
                     type: string
+                editable:
+                    description: Whether editing is allowed. Set to true for dev deployments.
+                    type: boolean
                 expiresOn:
                     description: How long the returned config is valid for. Clients should call GetRepoMeta again after this time.
                     format: date-time
                     type: string
                 gitBranch:
                     description: The branch to use for the deployment.
                     type: string
-                gitEditBranch:
-                    description: |-
-                        A unique branch name generated for temporary/ephemeral use in edit mode where files may be mutated.
-                        This enables checkpointing progress across hibernations and also more easily pinning to a specific commit of the base branch to delay conflict resolution.
-                    type: string
                 gitSubpath:
                     description: Optional subpath within the Git repository to use as the project root.
                     type: string
@@ -849,6 +847,12 @@ components:
                     description: When the returned config was last modified. This covers all fields in the response except the ephemeral credentials embedded in git_url and archive_download_url.
                     format: date-time
                     type: string
+                managedGitRepo:
+                    description: Whether the git repo is managed by Rill.
+                    type: boolean
+                primaryBranch:
+                    description: Primary branch of the project.
+                    type: string
             type: object
         v1GetReportMetaResponse:
             properties:

proto/gen/rill/admin/v1/public.openapi.yaml

@@ -825,18 +825,16 @@ components:
                 archiveId:
                     description: A stable ID for the archive returned from archive_download_url.
                     type: string
+                editable:
+                    description: Whether editing is allowed. Set to true for dev deployments.
+                    type: boolean
                 expiresOn:
                     description: How long the returned config is valid for. Clients should call GetRepoMeta again after this time.
                     format: date-time
                     type: string
                 gitBranch:
                     description: The branch to use for the deployment.
                     type: string
-                gitEditBranch:
-                    description: |-
-                        A unique branch name generated for temporary/ephemeral use in edit mode where files may be mutated.
-                        This enables checkpointing progress across hibernations and also more easily pinning to a specific commit of the base branch to delay conflict resolution.
-                    type: string
                 gitSubpath:
                     description: Optional subpath within the Git repository to use as the project root.
                     type: string
@@ -849,6 +847,12 @@ components:
                     description: When the returned config was last modified. This covers all fields in the response except the ephemeral credentials embedded in git_url and archive_download_url.
                     format: date-time
                     type: string
+                managedGitRepo:
+                    description: Whether the git repo is managed by Rill.
+                    type: boolean
+                primaryBranch:
+                    description: Primary branch of the project.
+                    type: string
             type: object
         v1GetReportMetaResponse:
             properties: