Fix/deployment key recreation must allways recreate keys

kubero-dev · Dec 13, 2022 · 63d91b3 · 63d91b3
1 parent 6392805
commit 63d91b3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 62 deletions.
diff --git a/src/git/gitea.ts b/src/git/gitea.ts
@@ -143,7 +143,7 @@ export class GiteaApi extends Repo {
 
         const keyPair = this.createDeployKeyPair();
 
-        const title: string = "bot@kubero";
+        const title: string = "bot@kubero."+crypto.randomBytes(4).toString('hex');
 
         let ret: IDeploykeyR = {
             status: 500,
@@ -159,25 +159,6 @@ export class GiteaApi extends Repo {
                 priv: keyPair.privKeyBase64
             }
         }
-        //https://try.gitea.io/api/swagger#/repository/repoListKeys
-        const keysList = await this.gitea.repos.repoListKeys(owner, repo)
-        .catch((error: any) => {
-            console.log(error)
-            return ret;
-        })
-
-        // try to find the key
-        for (let key of keysList.data) {
-            if (key.title === title &&
-                key.read_only === true) {
-                ret = {
-                    status: 200,
-                    statusText: 'found',
-                    data: key,
-                }
-                return ret;
-            }
-        }
 
         try {
             //https://try.gitea.io/api/swagger#/repository/repoCreateKey

diff --git a/src/git/gitlab.ts b/src/git/gitlab.ts
@@ -159,7 +159,7 @@ export class GitlabApi extends Repo {
 
         const keyPair = this.createDeployKeyPair();
 
-        const title: string = "bot@kubero";
+        const title: string = "bot@kubero."+Date.now();
 
         let ret: IDeploykeyR = {
             status: 500,
@@ -175,26 +175,6 @@ export class GitlabApi extends Repo {
                 priv: keyPair.privKeyBase64
             }
         }
-        // https://docs.gitlab.com/ee/api/deploy_keys.html#list-deploy-keys-for-project
-        const keysList:any = await this.gitlab.get(`projects/${owner}%2F${repo}/deploy_keys`)
-        .catch((error: any) => {
-            console.log(error)
-            return ret;
-        })
-
-        // try to find the key
-        for (let key of keysList) {
-            if (key.title === title &&
-                key.read_only === true) {
-                ret = {
-                    status: 422,
-                    statusText: 'found',
-                    data: key,
-                }
-                return ret;
-            }
-        }
-
         try {
             // https://docs.gitlab.com/ee/api/deploy_keys.html#add-deploy-key
             let res:any = await this.gitlab.post(`projects/${owner}%2F${repo}/deploy_keys`, JSON.stringify({

diff --git a/src/git/gogs.ts b/src/git/gogs.ts
@@ -143,7 +143,7 @@ export class GogsApi extends Repo {
 
         const keyPair = this.createDeployKeyPair();
 
-        const title: string = "bot@kubero";
+        const title: string = "bot@kubero."+crypto.randomBytes(4).toString('hex');
 
         let ret: IDeploykeyR = {
             status: 500,
@@ -159,26 +159,6 @@ export class GogsApi extends Repo {
                 priv: keyPair.privKeyBase64
             }
         }
-        //https://try.gitea.io/api/swagger#/repository/repoListKeys
-        const keysList = await this.gitea.repos.repoListKeys(owner, repo)
-        .catch((error: any) => {
-            console.log(error)
-            return ret;
-        })
-
-        // try to find the key
-        for (let key of keysList.data) {
-            if (key.title === title &&
-                key.read_only === true) {
-                ret = {
-                    status: 422,
-                    statusText: 'found',
-                    data: key,
-                }
-                return ret;
-            }
-        }
-
         try {
             //https://try.gitea.io/api/swagger#/repository/repoCreateKey
             let res = await this.gitea.repos.repoCreateKey(owner, repo, {