add branch listing suggestions

mms-gianni · mms-gianni · commit e759e4ff3608 · 2022-12-02T13:49:54.000+01:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,6 +3,8 @@
 All contributions are welcome. For simple typos, just open a PR.
 For bigger ideas it might be better to open a issue first before you put a lot of work into it.
 
+Want to contribute, but dont know where to start? Have a look into the Roadmap.
+
 ## Development setup
 ### Requirements
 - docker
diff --git a/client/src/components/apps/new.vue b/client/src/components/apps/new.vue
@@ -58,7 +58,6 @@
           <v-text-field
             v-model="pipelineData.git.repository.ssh_url"
             :rules="repositoryRules"
-            :counter="60"
             label="Repository"
             required
             disabled
@@ -71,13 +70,12 @@
           cols="12"
           md="6"
         >
-          <v-text-field
+          <v-combobox
             v-model="branch"
-            :rules="branchRules"
-            :counter="60"
+            :items="branchesList"
             label="Branch"
             required
-          ></v-text-field>
+          ></v-combobox>
         </v-col>
       </v-row>
       <v-row
@@ -116,7 +114,6 @@
         >
           <v-text-field
             v-model="docker.tag"
-            :rules="branchRules"
             :counter="60"
             label="Tag"
             required
@@ -507,6 +504,7 @@ export default {
         ssh_url: 'git@github.com:kubero-dev/template-nodeapp.git',
       },
       branch: 'main',
+      branchesList: [],
       docker: {
         image: 'ghcr.io/kubero-dev/template-nodeapp',
         tag: 'main',
@@ -563,11 +561,6 @@ export default {
         //    ((git|ssh|http(s)?)|(git@[\w\.]+))(:(//)?)([\w\.@\:/\-~]+)(\.git)(/)?
         v => /((git|ssh|http(s)?)|(git@[\w.]+))(:(\/\/)?)([\w.@:/\-~]+)(\.git)(\/)?/.test(v) || 'Format "owner/repository"',
       ],
-      branchRules: [
-        //v => !!v || 'Branch is required',
-        v => v.length <= 60 || 'Name must be less than 60 characters',
-        v => /^[a-zA-Z0-9][a-zA-Z0-9_-]*$/.test(v) || 'Allowed characters : [a-zA-Z0-9_-]',
-      ],
       domainRules: [
         v => !!v || 'Domain is required',
         v => v.length <= 60 || 'Name must be less than 60 characters',
@@ -605,6 +598,8 @@ export default {
           this.buildpack = this.pipelineData.buildpack;
 
           this.gitrepo.ssh_url = this.pipelineData.git.repository.ssh_url;
+
+          this.loadBranches();
 /*
           if (this.app == 'new') {
             switch (this.pipelineData.github.repository.language) {
@@ -623,6 +618,23 @@ export default {
 */
         });
       },
+      loadBranches() {
+
+        // encode string to base64 (for ssh url)
+        const gitrepoB64 = btoa(this.pipelineData.git.repository.ssh_url);
+        const gitprovider = this.pipelineData.git.provider;
+
+        axios.get('/api/repo/'+gitprovider+"/"+gitrepoB64+"/branches/list").then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.branchesList.push({
+              text: response.data[i],
+              value: response.data[i],
+            });
+          }
+        });
+      },
+
+
       loadPodsizeList() {
         axios.get('/api/config/podsize').then(response => {
           for (let i = 0; i < response.data.length; i++) {
diff --git a/client/src/components/pipelines/new.vue b/client/src/components/pipelines/new.vue
@@ -188,6 +188,7 @@ export default {
         keys: {},
         repository: {},
         webhooks: {},
+        provider: ""
       },
       repository_status: {
         error: false,
@@ -379,6 +380,7 @@ export default {
             this.repository_status.connected = false;
             this.repository_status.statusTxt = "Repository Not Connected";
           }
+          this.git.provider = this.repotab;
 
         }).catch(error => {
           console.log(error);
diff --git a/src/git/bitbucket.ts b/src/git/bitbucket.ts
@@ -285,4 +285,26 @@ export class BitbucketApi extends Repo {
         }
         return ret;
     }
+
+    public async getBranches(gitrepo: string): Promise<string[]> {
+        //https://bitbucketjs.netlify.app/#api-repositories-repositories_listBranches
+
+        let repo = "template-nodeapp"
+        let owner = "gicara"
+        try {
+            const branches = await this.bitbucket.repositories.listBranches({
+                repo_slug: repo,
+                workspace: owner,
+                sort: '-name'
+            })
+            if (branches.data.values != undefined) {
+                return branches.data.values.map((branch: any) => branch.name);
+            }
+        } catch (error) {
+            debug.log(error)
+        }
+
+        return [];
+
+    }
 }
diff --git a/src/git/gitea.ts b/src/git/gitea.ts
@@ -171,7 +171,7 @@ export class GiteaApi extends Repo {
             if (key.title === title &&
                 key.read_only === true) {
                 ret = {
-                    status: 422,
+                    status: 200,
                     statusText: 'found',
                     data: key,
                 }
@@ -274,4 +274,24 @@ export class GiteaApi extends Repo {
         }
         return ret;
     }
+
+    public async getBranches(gitrepo: string): Promise<string[]>{
+        // https://try.gitea.io/api/swagger#/repository/repoListBranches
+        let ret: string[] = [];
+
+        //let repo = "template-nodeapp"
+        //let owner = "gicara"
+
+        let {repo, owner} = this.parseRepo(gitrepo)
+        try {
+            const branches = await this.gitea.repos.repoListBranches(owner, repo)
+            for (let branch of branches.data) {
+                ret.push(branch.name)
+            }
+        } catch (error) {
+            console.log(error)
+        }
+
+        return ret;
+    }
 }
diff --git a/src/git/github.ts b/src/git/github.ts
@@ -30,7 +30,7 @@ export class GithubApi extends Repo {
             }
         }
 
-        // TODO : Improve matching here
+        // TODO : Improve matching here or use default function in Superclass
         let owner = gitrepo.match(/^git@github.com:(.*)\/.*$/)?.[1] as string;
         let repo = gitrepo.match(/^git@github.com:.*\/(.*).git$/)?.[1] as string;
 
@@ -84,12 +84,6 @@ export class GithubApi extends Repo {
     }
 
 /*
-    public async getRepositoryBranches(owner: string, repo: string) {
-        return await this.octokit.git.listBranches({
-            owner: owner,
-            repo: repo
-        });
-    }
 
     public async getRepositoryCommits(owner: string, repo: string, branch: string) {
         return await this.octokit.git.listCommits({
@@ -290,4 +284,26 @@ export class GithubApi extends Repo {
         }
         return ret;
     }
+
+    public async getBranches(gitrepo: string): Promise<string[]>{
+
+        let ret: string[] = [];
+
+        let repo = "template-nodeapp"
+        let owner = "kubero-dev"
+        try {
+            const branches = await this.octokit.request('GET /repos/{owner}/{repo}/branches', {
+                owner: owner,
+                repo: repo,
+            })
+            for (let branch of branches.data) {
+                ret.push(branch.name)
+            }
+        } catch (error) {
+            debug.log(error)
+        }
+
+        return ret;
+
+    }
 }
diff --git a/src/git/gitlab.ts b/src/git/gitlab.ts
@@ -307,4 +307,29 @@ export class GitlabApi extends Repo {
         return ret;
     }
 
+    public async getBranches(gitrepo: string): Promise<string[]>{
+        // https://docs.gitlab.com/ee/api/branches.html#list-repository-branches
+        // not implemented yet
+        let ret: string[] = [];
+
+        let repo = "template-nodeapp"
+        let owner = "gicara"
+        try {
+            const branches:any = await this.gitlab.get(`projects/${owner}%2F${repo}/repository/branches`)
+            .catch((error: any) => {
+                console.log(error)
+                return ret;
+            })
+
+            for (let branch of branches) {
+                ret.push(branch.name)
+            }
+        } catch (error) {
+            console.log(error)
+        }
+
+
+        return ret;
+    }
+
 }
diff --git a/src/git/gogs.ts b/src/git/gogs.ts
@@ -209,7 +209,6 @@ export class GogsApi extends Repo {
     }
 
     public getWebhook(event: string, delivery: string, signature: string, body: any): IWebhook | boolean {
-        //https://docs.github.com/en/developers/webhooks-and-events/webhooks/securing-your-webhooks
         let secret = process.env.KUBERO_WEBHOOK_SECRET as string;
         let hash = 'sha256='+crypto.createHmac('sha256', secret).update(JSON.stringify(body, null, '  ')).digest('hex')
 
@@ -274,4 +273,22 @@ export class GogsApi extends Repo {
         }
         return ret;
     }
+
+    public async getBranches(gitrepo: string): Promise<string[]>{
+        // https://try.gitea.io/api/swagger#/repository/repoListBranches
+        let ret: string[] = [];
+
+        let repo = "template-nodeapp"
+        let owner = "gicara"
+        try {
+            const branches = await this.gitea.repos.repoListBranches(owner, repo)
+            for (let branch of branches.data) {
+                ret.push(branch.name)
+            }
+        } catch (error) {
+            console.log(error)
+        }
+
+        return ret;
+    }
 }
diff --git a/src/git/repo.ts b/src/git/repo.ts
@@ -106,8 +106,15 @@ export abstract class Repo {
 
     }
 
+    protected parseRepo(gitrepo: string): {owner: string, repo: string} {
+        let owner = gitrepo.match(/^git@.*:(.*)\/.*$/)?.[1] as string;
+        let repo = gitrepo.match(/^git@.*:.*\/(.*).git$/)?.[1] as string;
+        return { owner: owner, repo: repo };
+    }
+
     protected abstract addDeployKey(owner: string, repo: string): Promise<IDeploykeyR>
     protected abstract getRepository(gitrepo: string): Promise<IRepository>;
     protected abstract addWebhook(owner: string, repo: string, url: string, secret: string): Promise<IWebhookR>;
     protected abstract getWebhook(event: string, delivery: string, signature: string, body: any): IWebhook | boolean;
+    protected abstract getBranches(repo: string): Promise<string[]> | undefined;
 }
diff --git a/src/kubero.ts b/src/kubero.ts
@@ -398,6 +398,38 @@ export class Kubero {
         }
     }
 
+    public async listRepoBranches(repoProvider: string, repoB64: string ): Promise<string[]> {
+        //return this.git.listRepoBranches(repo, repoProvider);
+        let branches: Promise<string[]> = new Promise((resolve, reject) => {
+            resolve([]);
+        });
+
+        const repo = Buffer.from(repoB64, 'base64').toString('ascii');
+
+        switch (repoProvider) {
+            case 'github':
+                branches = this.githubApi.getBranches(repo);
+                break;
+            case 'gitea':
+                branches = this.giteaApi.getBranches(repo);
+                break;
+            case 'gogs':
+                branches = this.gogsApi.getBranches(repo);
+                break;
+            case 'gitlab':
+                branches = this.gitlabApi.getBranches(repo);
+                break;
+            case 'bitbucket':
+                branches = this.bitbucketApi.getBranches(repo);
+                break;
+            case 'ondev':
+            default:
+                break;
+        }
+
+        return branches
+    }
+
     private async getAppsByBranch(branch: string) {
         debug.log('getAppsByBranch: '+branch);
         let apps: IApp[] = [];
diff --git a/src/routes/repo.ts b/src/routes/repo.ts
@@ -19,6 +19,12 @@ Router.post('/repo/:repoprovider/connect', async function (req: Request, res: Re
     res.send(con);
 });
 
+// connect pipeline with repository
+Router.get('/repo/:repoprovider/:gitrepob64/branches/list', async function (req: Request, res: Response) {
+    let branches = await req.app.locals.kubero.listRepoBranches(req.params.repoprovider, req.params.gitrepob64);
+    res.send(branches);
+});
+
 // get github webhook events
 Router.all('/repo/webhooks/:repoprovider', async function (req: Request, res: Response) {
 

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,15 @@ export abstract class Repo {`
`106`	`106`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ protected parseRepo(gitrepo: string): {owner: string, repo: string} {`
	`110`	`+ let owner = gitrepo.match(/^git@.:(.)\/.*$/)?.[1] as string;`
	`111`	`+ let repo = gitrepo.match(/^git@.:.\/(.*).git$/)?.[1] as string;`
	`112`	`+ return { owner: owner, repo: repo };`
	`113`	`+ }`
	`114`	`+`
`109`	`115`	`protected abstract addDeployKey(owner: string, repo: string): Promise<IDeploykeyR>`
`110`	`116`	`protected abstract getRepository(gitrepo: string): Promise<IRepository>;`
`111`	`117`	`protected abstract addWebhook(owner: string, repo: string, url: string, secret: string): Promise<IWebhookR>;`
`112`	`118`	`protected abstract getWebhook(event: string, delivery: string, signature: string, body: any): IWebhook \| boolean;`
	`119`	`+ protected abstract getBranches(repo: string): Promise<string[]> \| undefined;`
`113`	`120`	`}`