From 9dbafb83da0bc54b77838ea55fa6da8be74e5333 Mon Sep 17 00:00:00 2001 From: Nishtha Gupta Date: Thu, 29 Dec 2022 15:51:31 +0530 Subject: [PATCH] Remove repo param support & logs --- __tests__/delete.test.ts | 1 - dist/index.js | 12 ------------ src/delete.ts | 4 ---- src/input.ts | 5 ----- src/main.ts | 2 -- src/version/delete-version.ts | 3 --- src/version/get-versions.ts | 3 --- 7 files changed, 30 deletions(-) diff --git a/__tests__/delete.test.ts b/__tests__/delete.test.ts index 7dd83c7..f237471 100644 --- a/__tests__/delete.test.ts +++ b/__tests__/delete.test.ts @@ -89,7 +89,6 @@ describe.skip('index tests -- call graphql', () => { const defaultInput: InputParams = { packageVersionIds: [], owner: 'namratajha', - repo: 'only-pkg', packageName: 'only-pkg', numOldVersionsToDelete: 1, minVersionsToKeep: -1, diff --git a/dist/index.js b/dist/index.js index dc185be..188675f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -36,13 +36,10 @@ function finalIds(input) { return getVersionIds(input.owner, input.packageName, input.packageType, RATE_LIMIT, 1, input.token).pipe( // This code block executes on all versions of a package starting from oldest operators_2.map(value => { - console.log('If block'); - console.log(`value: ${JSON.stringify(value)}`); // we need to delete oldest versions first value.sort((a, b) => { return (new Date(a.created_at).getTime() - new Date(b.created_at).getTime()); }); - console.log(`sorted value: ${JSON.stringify(value)}`); /* Here first filter out the versions that are to be ignored. Then update input.numOldeVersionsToDelete to the no of versions deleted from the next 100 versions batch. @@ -55,7 +52,6 @@ function finalIds(input) { else { toDelete = Math.min(value.length - input.minVersionsToKeep, RATE_LIMIT); } - console.log(`toDelete is ${toDelete}`); if (toDelete < 0) return []; return value.map(info => info.id.toString()).slice(0, toDelete); @@ -93,7 +89,6 @@ exports.Input = void 0; const defaultParams = { packageVersionIds: [], owner: '', - repo: '', packageName: '', packageType: '', numOldVersionsToDelete: 0, @@ -107,7 +102,6 @@ class Input { const validatedParams = Object.assign(Object.assign({}, defaultParams), params); this.packageVersionIds = validatedParams.packageVersionIds; this.owner = validatedParams.owner; - this.repo = validatedParams.repo; this.packageName = validatedParams.packageName; this.packageType = validatedParams.packageType; this.numOldVersionsToDelete = validatedParams.numOldVersionsToDelete; @@ -119,7 +113,6 @@ class Input { } hasOldestVersionQueryInfo() { return !!(this.owner && - this.repo && this.packageName && this.numOldVersionsToDelete >= 0 && this.token); @@ -181,8 +174,6 @@ function deletePackageVersion(packageVersionId, owner, packageName, packageType, } exports.deletePackageVersion = deletePackageVersion; function deletePackageVersions(packageVersionIds, owner, packageName, packageType, token) { - console.log(`Total versions to delete: ${packageVersionIds.length}`); - console.log(`Versions to delete: ${packageVersionIds}`); if (packageVersionIds.length === 0) { return rxjs_1.of(true); } @@ -239,7 +230,6 @@ function getOldestVersions(owner, packageName, packageType, numVersions, page, t paginate: response.data.length === numVersions, totalCount: response.data.length }; - console.log(`Response from getOldestVersions method: ${JSON.stringify(resp)}`); return resp; })); } @@ -43910,13 +43900,11 @@ const rxjs_1 = __nccwpck_require__(5805); const delete_1 = __nccwpck_require__(9645); const operators_1 = __nccwpck_require__(7801); function getActionInput() { - console.log('this is deletion using rest APIs'); return new input_1.Input({ packageVersionIds: core_1.getInput('package-version-ids') ? core_1.getInput('package-version-ids').split(',') : [], owner: core_1.getInput('owner') ? core_1.getInput('owner') : github_1.context.repo.owner, - repo: core_1.getInput('repo') ? core_1.getInput('repo') : github_1.context.repo.repo, packageName: core_1.getInput('package-name'), packageType: core_1.getInput('package-type'), numOldVersionsToDelete: Number(core_1.getInput('num-old-versions-to-delete')), diff --git a/src/delete.ts b/src/delete.ts index 7a76bad..64a11f7 100644 --- a/src/delete.ts +++ b/src/delete.ts @@ -61,15 +61,12 @@ export function finalIds(input: Input): Observable { ).pipe( // This code block executes on all versions of a package starting from oldest map(value => { - console.log('If block') - console.log(`value: ${JSON.stringify(value)}`) // we need to delete oldest versions first value.sort((a, b) => { return ( new Date(a.created_at).getTime() - new Date(b.created_at).getTime() ) }) - console.log(`sorted value: ${JSON.stringify(value)}`) /* Here first filter out the versions that are to be ignored. Then update input.numOldeVersionsToDelete to the no of versions deleted from the next 100 versions batch. @@ -87,7 +84,6 @@ export function finalIds(input: Input): Observable { RATE_LIMIT ) } - console.log(`toDelete is ${toDelete}`) if (toDelete < 0) return [] return value.map(info => info.id.toString()).slice(0, toDelete) }) diff --git a/src/input.ts b/src/input.ts index 5af4bd9..f0af8bf 100644 --- a/src/input.ts +++ b/src/input.ts @@ -1,7 +1,6 @@ export interface InputParams { packageVersionIds?: string[] owner?: string - repo?: string packageName?: string packageType?: string numOldVersionsToDelete?: number @@ -14,7 +13,6 @@ export interface InputParams { const defaultParams = { packageVersionIds: [], owner: '', - repo: '', packageName: '', packageType: '', numOldVersionsToDelete: 0, @@ -27,7 +25,6 @@ const defaultParams = { export class Input { packageVersionIds: string[] owner: string - repo: string packageName: string packageType: string numOldVersionsToDelete: number @@ -42,7 +39,6 @@ export class Input { this.packageVersionIds = validatedParams.packageVersionIds this.owner = validatedParams.owner - this.repo = validatedParams.repo this.packageName = validatedParams.packageName this.packageType = validatedParams.packageType this.numOldVersionsToDelete = validatedParams.numOldVersionsToDelete @@ -56,7 +52,6 @@ export class Input { hasOldestVersionQueryInfo(): boolean { return !!( this.owner && - this.repo && this.packageName && this.numOldVersionsToDelete >= 0 && this.token diff --git a/src/main.ts b/src/main.ts index ab7e08e..152799f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,13 +7,11 @@ import {deleteVersions} from './delete' import {catchError} from 'rxjs/operators' function getActionInput(): Input { - console.log('this is deletion using rest APIs') return new Input({ packageVersionIds: getInput('package-version-ids') ? getInput('package-version-ids').split(',') : [], owner: getInput('owner') ? getInput('owner') : context.repo.owner, - repo: getInput('repo') ? getInput('repo') : context.repo.repo, packageName: getInput('package-name'), packageType: getInput('package-type'), numOldVersionsToDelete: Number(getInput('num-old-versions-to-delete')), diff --git a/src/version/delete-version.ts b/src/version/delete-version.ts index 192e81a..1df5721 100644 --- a/src/version/delete-version.ts +++ b/src/version/delete-version.ts @@ -48,9 +48,6 @@ export function deletePackageVersions( packageType: string, token: string ): Observable { - console.log(`Total versions to delete: ${packageVersionIds.length}`) - console.log(`Versions to delete: ${packageVersionIds}`) - if (packageVersionIds.length === 0) { return of(true) } diff --git a/src/version/get-versions.ts b/src/version/get-versions.ts index 9ea1c2f..be31bfc 100644 --- a/src/version/get-versions.ts +++ b/src/version/get-versions.ts @@ -63,9 +63,6 @@ export function getOldestVersions( paginate: response.data.length === numVersions, totalCount: response.data.length } - console.log( - `Response from getOldestVersions method: ${JSON.stringify(resp)}` - ) return resp }) )