remove excess logs

This commit is contained in:
Namrata Jha
2021-12-23 09:46:46 +00:00
committed by GitHub
parent f556b07dce
commit cfbae0ac37
3 changed files with 10 additions and 52 deletions
+5 -21
View File
@@ -32,7 +32,7 @@ let totalCount = 0;
function getVersionIds(owner, repo, packageName, numVersions, cursor, token) { function getVersionIds(owner, repo, packageName, numVersions, cursor, token) {
return version_1.getOldestVersions(owner, repo, packageName, numVersions, cursor, token).pipe(operators_1.expand(value => value.paginate return version_1.getOldestVersions(owner, repo, packageName, numVersions, cursor, token).pipe(operators_1.expand(value => value.paginate
? version_1.getOldestVersions(owner, repo, packageName, numVersions, value.cursor, token) ? version_1.getOldestVersions(owner, repo, packageName, numVersions, value.cursor, token)
: rxjs_1.EMPTY), operators_1.tap(value => console.log(`total3: ${totalCount}, value total3: ${value.totalCount}`)), operators_1.tap(value => (totalCount = totalCount === 0 ? value.totalCount : totalCount)), operators_1.map(value => value.versions)); : rxjs_1.EMPTY), operators_1.tap(value => (totalCount = totalCount === 0 ? value.totalCount : totalCount)), operators_1.map(value => value.versions));
} }
exports.getVersionIds = getVersionIds; exports.getVersionIds = getVersionIds;
function finalIds(input) { function finalIds(input) {
@@ -47,20 +47,17 @@ function finalIds(input) {
: RATE_LIMIT; : RATE_LIMIT;
console.log(`input.numOldVersionsToDelete: ${input.numOldVersionsToDelete}`); console.log(`input.numOldVersionsToDelete: ${input.numOldVersionsToDelete}`);
return getVersionIds(input.owner, input.repo, input.packageName, input.numOldVersionsToDelete, '', input.token).pipe(operators_1.map(value => { return getVersionIds(input.owner, input.repo, input.packageName, input.numOldVersionsToDelete, '', input.token).pipe(operators_1.map(value => {
console.log(`totalCount in numVersions: ${totalCount}`);
value = value.filter(info => !input.ignoreVersions.test(info.version)); value = value.filter(info => !input.ignoreVersions.test(info.version));
const temp = input.numOldVersionsToDelete; const temp = input.numOldVersionsToDelete;
input.numOldVersionsToDelete = input.numOldVersionsToDelete =
input.numOldVersionsToDelete - value.length <= 0 input.numOldVersionsToDelete - value.length <= 0
? 0 ? 0
: input.numOldVersionsToDelete - value.length; : input.numOldVersionsToDelete - value.length;
console.log(`temp: ${temp}, numOldeVersions: ${input.numOldVersionsToDelete}`);
return value.map(info => info.id).slice(0, temp); return value.map(info => info.id).slice(0, temp);
})); }));
} }
else { else {
return getVersionIds(input.owner, input.repo, input.packageName, RATE_LIMIT, '', input.token).pipe(operators_1.map(value => { return getVersionIds(input.owner, input.repo, input.packageName, RATE_LIMIT, '', input.token).pipe(operators_1.map(value => {
console.log(`total count: ${totalCount}`);
totalCount = totalCount =
totalCount - totalCount -
value.filter(info => input.ignoreVersions.test(info.version)).length; value.filter(info => input.ignoreVersions.test(info.version)).length;
@@ -80,11 +77,6 @@ function finalIds(input) {
} }
else else
return []; return [];
/*
if (toDelete > 0) {
input.numDeleted += toDelete
return value.map(info => info.id).slice(0, toDelete)
} else return []*/
})); }));
} }
} }
@@ -103,10 +95,7 @@ function deleteVersions(input) {
return rxjs_1.of(true); return rxjs_1.of(true);
} }
const result = finalIds(input); const result = finalIds(input);
return result.pipe(operators_1.tap(() => { return result.pipe(operators_1.concatMap(ids => version_1.deletePackageVersions(ids, input.token)));
if (input.numDeleted > 0)
console.log(`${input.numDeleted} versions will be deleted`);
}), operators_1.concatMap(ids => version_1.deletePackageVersions(ids, input.token)));
} }
exports.deleteVersions = deleteVersions; exports.deleteVersions = deleteVersions;
@@ -191,21 +180,17 @@ const mutation = `
} }
}`; }`;
function deletePackageVersion(packageVersionId, token) { function deletePackageVersion(packageVersionId, token) {
if (deleted === 100) {
console.log(`reaching rate limit`);
operators_1.delay(5000);
}
deleted += 1; deleted += 1;
return rxjs_1.from(graphql_1.graphql(token, mutation, { return rxjs_1.from(graphql_1.graphql(token, mutation, {
packageVersionId, packageVersionId,
headers: { headers: {
Accept: 'application/vnd.github.package-deletes-preview+json' Accept: 'application/vnd.github.package-deletes-preview+json'
} }
})).pipe(operators_1.catchError((err) => { })).pipe(operators_1.catchError(err => {
const msg = 'delete version mutation failed.'; const msg = 'delete version mutation failed.';
return rxjs_1.throwError(err.errors && err.errors.length > 0 return rxjs_1.throwError(err.errors && err.errors.length > 0
? `${msg} ${err.errors[0].message}` ? `${msg} ${err.errors[0].message}`
: `${msg} verify input parameters are correct// error123: ${err}`); : `${msg} ${err.message}`);
}), operators_1.map(response => response.deletePackageVersion.success)); }), operators_1.map(response => response.deletePackageVersion.success));
} }
exports.deletePackageVersion = deletePackageVersion; exports.deletePackageVersion = deletePackageVersion;
@@ -214,7 +199,6 @@ function deletePackageVersions(packageVersionIds, token) {
return rxjs_1.of(true); return rxjs_1.of(true);
} }
const deletes = packageVersionIds.map(id => deletePackageVersion(id, token).pipe(operators_1.tap(result => { const deletes = packageVersionIds.map(id => deletePackageVersion(id, token).pipe(operators_1.tap(result => {
console.log(`versions Deleted 0 : ${deleted}`);
if (result) { if (result) {
console.log(`version with id: ${id}, deleted`); console.log(`version with id: ${id}, deleted`);
} }
@@ -222,7 +206,7 @@ function deletePackageVersions(packageVersionIds, token) {
console.log(`version with id: ${id}, not deleted`); console.log(`version with id: ${id}, not deleted`);
} }
}))); })));
console.log(`Versions Deleted Final2: ${deleted}`); console.log(`Versions Deleted: ${deleted}`);
return rxjs_1.merge(...deletes); return rxjs_1.merge(...deletes);
} }
exports.deletePackageVersions = deletePackageVersions; exports.deletePackageVersions = deletePackageVersions;
+1 -21
View File
@@ -34,9 +34,6 @@ export function getVersionIds(
) )
: EMPTY : EMPTY
), ),
tap(value =>
console.log(`total3: ${totalCount}, value total3: ${value.totalCount}`)
),
tap( tap(
value => (totalCount = totalCount === 0 ? value.totalCount : totalCount) value => (totalCount = totalCount === 0 ? value.totalCount : totalCount)
), ),
@@ -66,16 +63,12 @@ export function finalIds(input: Input): Observable<string[]> {
input.token input.token
).pipe( ).pipe(
map(value => { map(value => {
console.log(`totalCount in numVersions: ${totalCount}`)
value = value.filter(info => !input.ignoreVersions.test(info.version)) value = value.filter(info => !input.ignoreVersions.test(info.version))
const temp = input.numOldVersionsToDelete const temp = input.numOldVersionsToDelete
input.numOldVersionsToDelete = input.numOldVersionsToDelete =
input.numOldVersionsToDelete - value.length <= 0 input.numOldVersionsToDelete - value.length <= 0
? 0 ? 0
: input.numOldVersionsToDelete - value.length : input.numOldVersionsToDelete - value.length
console.log(
`temp: ${temp}, numOldeVersions: ${input.numOldVersionsToDelete}`
)
return value.map(info => info.id).slice(0, temp) return value.map(info => info.id).slice(0, temp)
}) })
) )
@@ -89,7 +82,6 @@ export function finalIds(input: Input): Observable<string[]> {
input.token input.token
).pipe( ).pipe(
map(value => { map(value => {
console.log(`total count: ${totalCount}`)
totalCount = totalCount =
totalCount - totalCount -
value.filter(info => input.ignoreVersions.test(info.version)).length value.filter(info => input.ignoreVersions.test(info.version)).length
@@ -106,16 +98,10 @@ export function finalIds(input: Input): Observable<string[]> {
} }
return value.map(info => info.id).slice(0, toDelete) return value.map(info => info.id).slice(0, toDelete)
} else return [] } else return []
/*
if (toDelete > 0) {
input.numDeleted += toDelete
return value.map(info => info.id).slice(0, toDelete)
} else return []*/
}) })
) )
} }
} }
return throwError( return throwError(
"Could not get packageVersionIds. Explicitly specify using the 'package-version-ids' input" "Could not get packageVersionIds. Explicitly specify using the 'package-version-ids' input"
) )
@@ -139,11 +125,5 @@ export function deleteVersions(input: Input): Observable<boolean> {
const result = finalIds(input) const result = finalIds(input)
return result.pipe( return result.pipe(concatMap(ids => deletePackageVersions(ids, input.token)))
tap(() => {
if (input.numDeleted > 0)
console.log(`${input.numDeleted} versions will be deleted`)
}),
concatMap(ids => deletePackageVersions(ids, input.token))
)
} }
+4 -10
View File
@@ -1,6 +1,5 @@
import {from, Observable, merge, throwError, of} from 'rxjs' import {from, Observable, merge, throwError, of} from 'rxjs'
import {catchError, delay, map, tap} from 'rxjs/operators' import {catchError, map, tap} from 'rxjs/operators'
import {GraphQlQueryResponse} from '@octokit/graphql/dist-types/types'
import {graphql} from './graphql' import {graphql} from './graphql'
let deleted = 0 let deleted = 0
@@ -22,10 +21,6 @@ export function deletePackageVersion(
packageVersionId: string, packageVersionId: string,
token: string token: string
): Observable<boolean> { ): Observable<boolean> {
if (deleted === 100) {
console.log(`reaching rate limit`)
delay(5000)
}
deleted += 1 deleted += 1
return from( return from(
graphql(token, mutation, { graphql(token, mutation, {
@@ -35,12 +30,12 @@ export function deletePackageVersion(
} }
}) as Promise<DeletePackageVersionMutationResponse> }) as Promise<DeletePackageVersionMutationResponse>
).pipe( ).pipe(
catchError((err: GraphQlQueryResponse) => { catchError(err => {
const msg = 'delete version mutation failed.' const msg = 'delete version mutation failed.'
return throwError( return throwError(
err.errors && err.errors.length > 0 err.errors && err.errors.length > 0
? `${msg} ${err.errors[0].message}` ? `${msg} ${err.errors[0].message}`
: `${msg} verify input parameters are correct// error123: ${err}` : `${msg} ${err.message}`
) )
}), }),
map(response => response.deletePackageVersion.success) map(response => response.deletePackageVersion.success)
@@ -58,7 +53,6 @@ export function deletePackageVersions(
const deletes = packageVersionIds.map(id => const deletes = packageVersionIds.map(id =>
deletePackageVersion(id, token).pipe( deletePackageVersion(id, token).pipe(
tap(result => { tap(result => {
console.log(`versions Deleted 0 : ${deleted}`)
if (result) { if (result) {
console.log(`version with id: ${id}, deleted`) console.log(`version with id: ${id}, deleted`)
} else { } else {
@@ -67,6 +61,6 @@ export function deletePackageVersions(
}) })
) )
) )
console.log(`Versions Deleted Final2: ${deleted}`) console.log(`Versions Deleted: ${deleted}`)
return merge(...deletes) return merge(...deletes)
} }