Merge pull request #29 from flanksource/moshloop

feat: Add ability to push to branches and open PR's

Author: moshloop

api/v1/gitopsapi_types.go

@@ -26,13 +26,16 @@ type GitopsAPISpec struct {
 	// The repository URL, can be a HTTP or SSH address.
 	// +kubebuilder:validation:Pattern="^(http|https|ssh)://"
 	// +required
-	GitRepository string   `json:"gitRepository,omitempty"`
-	GitUser       string   `json:"gitUser,omitempty"`
-	GitEmail      string   `json:"gitEmail,omitempty"`
-	Tags          []string `json:"gitTags,omitempty"`
-	Assignee      []string `json:"gitAssignee,omitempty"`
-	Branch        string   `json:"branch,omitempty"`
-	PullRequest   bool     `json:"pullRequest,omitempty"`
+	GitRepository string `json:"gitRepository,omitempty"`
+	GitUser       string `json:"gitUser,omitempty"`
+	GitEmail      string `json:"gitEmail,omitempty"`
+	// The branch to use as a baseline for the new branch, defaults to master
+	Base string `json:"base,omitempty"`
+	// The branch to push updates back to, defaults to master
+	Branch string `json:"branch,omitempty"`
+
+	// Open a new Pull request from the branch back to the base
+	PullRequest *PullRequestTemplate `json:"pullRequest,omitempty"`
 
 	// The secret name containing the Git credentials.
 	// For SSH repositories the secret must contain SSH_PRIVATE_KEY, SSH_PRIVATE_KEY_PASSORD
@@ -58,6 +61,14 @@ type GitopsAPISpec struct {
 	Path string `json:"path,omitempty"`
 }
 
+type PullRequestTemplate struct {
+	Body      string   `json:"body,omitempty"`
+	Title     string   `json:"title,omitempty"`
+	Reviewers []string `json:"reviewers,omitempty"`
+	Assignees []string `json:"assignees,omitempty"`
+	Tags      []string `json:"tags,omitempty"`
+}
+
 // GitopsAPIStatus defines the observed state of GitopsAPI
 type GitopsAPIStatus struct {
 }

api/v1/gitpullrequest_types.go

@@ -33,6 +33,8 @@ type GitPullRequestSpec struct {
 
 	// Update to add or remove reviewers from the pull request
 	Reviewers []string `json:"reviewers,omitempty"`
+	// Update to add or remove reviewers from the pull request
+	Assignees []string `json:"assignees,omitempty"`
 }
 
 // GitPullRequestStatus defines the observed state of GitPullRequest

api/v1/zz_generated.deepcopy.go

@@ -40,8 +40,6 @@ spec:
                 type: string
               repository:
                 type: string
-            required:
-            - branchName
             type: object
           status:
             description: GitBranchStatus defines the observed state of GitBranch

config/crd/bases/git.flanksource.com_gitbranches.yaml

@@ -37,21 +37,14 @@ spec:
             description: GitopsAPISpec defines the desired state of GitopsAPI
             properties:
               branch:
+                description: The branch to push updates back to, defaults to master
                 type: string
-              gitAssignee:
-                items:
-                  type: string
-                type: array
               gitEmail:
                 type: string
               gitRepository:
                 description: The repository URL, can be a HTTP or SSH address.
                 pattern: ^(http|https|ssh)://
                 type: string
-              gitTags:
-                items:
-                  type: string
-                type: array
               gitUser:
                 type: string
               kustomization:
@@ -64,7 +57,25 @@ spec:
                   e.g. `specs/clusters/{{.cluster}}/{{.name}}.yaml`
                 type: string
               pullRequest:
-                type: boolean
+                description: Open a new Pull request from the branch back to the base
+                properties:
+                  assignees:
+                    items:
+                      type: string
+                    type: array
+                  body:
+                    type: string
+                  reviewers:
+                    items:
+                      type: string
+                    type: array
+                  tags:
+                    items:
+                      type: string
+                    type: array
+                  title:
+                    type: string
+                type: object
               reviewers:
                 description: List of github users which should approve the namespace
                   request

config/crd/bases/git.flanksource.com_gitopsapis.yaml

@@ -36,6 +36,11 @@ spec:
           spec:
             description: GitPullRequestSpec defines the desired state of GitPullRequest
             properties:
+              assignees:
+                description: Update to add or remove reviewers from the pull request
+                items:
+                  type: string
+                type: array
               base:
                 type: string
               body:

config/crd/bases/git.flanksource.com_gitpullrequests.yaml

@@ -18,9 +18,10 @@ import (
 type Connector interface {
 	ReconcileBranches(ctx context.Context, repository *gitv1.GitRepository) error
 	ReconcilePullRequests(ctx context.Context, repository *gitv1.GitRepository) error
-	Clone(ctx context.Context, branch string) (billy.Filesystem, *git.Worktree, error)
-	Push(ctx context.Context) error
-	CreatePullRequest(ctx context.Context, pr PullRequest) error
+	Clone(ctx context.Context, branch, local string) (billy.Filesystem, *git.Worktree, error)
+	Push(ctx context.Context, branch string) error
+	OpenPullRequest(ctx context.Context, base string, head string, spec *gitv1.PullRequestTemplate) (int, error)
+	ClosePullRequest(ctx context.Context, id int) error
 }
 
 func NewConnector(ctx context.Context, crdClient client.Client, k8sClient *kubernetes.Clientset, log logr.Logger, namespace string, url string, secretRef *v1.LocalObjectReference) (Connector, error) {