Merge pull request #52 from actions/keep-min-packages

keep min package versions from deletion

.github/workflows/test.yml

@@ -30,4 +30,5 @@ jobs:
       name: Smoke Test Delete Package Versions Action
       with:
         package-name: 'com.github.actions.test-package'
-        num-old-versions-to-delete: 0
+        num-old-versions-to-delete: 0
+        min-versions-to-keep: 0

__tests__/delete.test.ts

@@ -7,7 +7,7 @@ describe.skip('index tests -- call graphql', () => {
 
     getVersionIds(getInput({numOldVersionsToDelete: numVersions})).subscribe(
       ids => {
-        expect(ids.length).toBe(numVersions)
+        expect(ids.length).toBeLessThanOrEqual(numVersions)
         done()
       }
     )
@@ -18,7 +18,7 @@ describe.skip('index tests -- call graphql', () => {
 
     getVersionIds(getInput({numOldVersionsToDelete: numVersions})).subscribe(
       ids => {
-        expect(ids.length).toBe(numVersions)
+        expect(ids.length).toBeLessThanOrEqual(numVersions)
         done()
       }
     )
@@ -57,31 +57,39 @@ describe.skip('index tests -- call graphql', () => {
     })
   })
 
-  it('deleteVersions test -- delete oldest version', done => {
-    deleteVersions(getInput({numOldVersionsToDelete: 1})).subscribe(
-      isSuccess => {
-        expect(isSuccess).toBe(true)
-        done()
-      }
-    )
+  it.skip('deleteVersions test -- delete oldest version', done => {
+    deleteVersions(
+      getInput({numOldVersionsToDelete: 2, minVersionsToKeep: 1})
+    ).subscribe(isSuccess => {
+      expect(isSuccess).toBe(true)
+      done()
+    })
   })
 
-  it('deleteVersions test -- delete 3 oldest versions', done => {
-    deleteVersions(getInput({numOldVersionsToDelete: 3})).subscribe(
-      isSuccess => {
-        expect(isSuccess).toBe(true)
-        done()
-      }
-    )
+  it.skip('deleteVersions test -- delete 3 oldest versions', done => {
+    deleteVersions(
+      getInput({numOldVersionsToDelete: 3, minVersionsToKeep: 1})
+    ).subscribe(isSuccess => {
+      expect(isSuccess).toBe(true)
+      done()
+    })
+  })
+
+  it('deleteVersions test -- keep 5 versions', done => {
+    deleteVersions(getInput({minVersionsToKeep: 5})).subscribe(isSuccess => {
+      expect(isSuccess).toBe(true)
+      done()
+    })
   })
 })
 
 const defaultInput: InputParams = {
   packageVersionIds: [],
-  owner: 'trent-j',
-  repo: 'actions-testing',
-  packageName: 'com.github.trent-j.actions-test',
+  owner: 'namratajha',
+  repo: 'only-pkg',
+  packageName: 'onlypkg.maven',
   numOldVersionsToDelete: 1,
+  minVersionsToKeep: 1,
   token: process.env.GITHUB_TOKEN as string
 }
 

__tests__/version/get-version.test.ts

@@ -49,9 +49,9 @@ interface Params {
 }
 
 const defaultParams = {
-  owner: 'trent-j',
-  repo: 'actions-testing',
-  packageName: 'com.github.trent-j.actions-test',
+  owner: 'namratajha',
+  repo: 'only-pkg',
+  packageName: 'onlypkg.maven',
   numVersions: 3,
   token: process.env.GITHUB_TOKEN as string
 }

action.yml

@@ -34,6 +34,28 @@ inputs:
     required: false
     default: "1"
 
+  min-versions-to-keep:
+    description: >
+      Number of versions to keep starting with the latest version
+      Defaults to 0.
+    required: false
+    default: "0"
+
+  ignore-versions:
+    description: >
+      Regex pattern for package versions to ignore.
+      Defaults to delete all versions.
+    required: false
+    default: "^$"
+
+  delete-only-pre-release-versions:
+    description: >
+      Deletes only pre-release versions upto. The number of pre-release versions to keep can be specified by min-versions-to-keep.
+      When this is set num-old-versions-to-delete and ignore-versions will not be taken into account.
+      By default this is set to false
+    required: false
+    default: "false"
+
   token:
     description: >
       Token with the necessary scopes to delete package versions.

package.json

@@ -32,7 +32,7 @@
     "@types/jest": "^24.0.23",
     "@types/node": "^12.7.12",
     "@typescript-eslint/parser": "^2.8.0",
-    "@zeit/ncc": "^0.20.5",
+    "@vercel/ncc": "^0.31.1",
     "eslint": "^5.16.0",
     "eslint-plugin-github": "^2.0.0",
     "eslint-plugin-jest": "^22.21.0",

src/delete.ts

@@ -13,9 +13,30 @@ export function getVersionIds(input: Input): Observable<string[]> {
       input.owner,
       input.repo,
       input.packageName,
-      input.numOldVersionsToDelete,
+      input.numOldVersionsToDelete + input.minVersionsToKeep,
       input.token
-    ).pipe(map(versionInfo => versionInfo.map(info => info.id)))
+    ).pipe(
+      map(versionInfo => {
+        const numberVersionsToDelete =
+          versionInfo.length - input.minVersionsToKeep
+
+        if (input.minVersionsToKeep > 0) {
+          return numberVersionsToDelete <= 0
+            ? []
+            : versionInfo
+                .filter(info => !input.ignoreVersions.test(info.version))
+                .map(info => info.id)
+                .slice(0, -input.minVersionsToKeep)
+        } else {
+          return numberVersionsToDelete <= 0
+            ? []
+            : versionInfo
+                .filter(info => !input.ignoreVersions.test(info.version))
+                .map(info => info.id)
+                .slice(0, numberVersionsToDelete)
+        }
+      })
+    )
   }
 
   return throwError(

src/input.ts

@@ -4,7 +4,10 @@ export interface InputParams {
   repo?: string
   packageName?: string
   numOldVersionsToDelete?: number
+  minVersionsToKeep?: number
+  ignoreVersions?: RegExp
   token?: string
+  deletePreReleaseVersions?: string
 }
 
 const defaultParams = {
@@ -13,6 +16,9 @@ const defaultParams = {
   repo: '',
   packageName: '',
   numOldVersionsToDelete: 0,
+  minVersionsToKeep: 0,
+  ignoreVersions: new RegExp(''),
+  deletePreReleaseVersions: '',
   token: ''
 }
 
@@ -22,6 +28,9 @@ export class Input {
   repo: string
   packageName: string
   numOldVersionsToDelete: number
+  minVersionsToKeep: number
+  ignoreVersions: RegExp
+  deletePreReleaseVersions: string
   token: string
 
   constructor(params?: InputParams) {
@@ -32,7 +41,19 @@ export class Input {
     this.repo = validatedParams.repo
     this.packageName = validatedParams.packageName
     this.numOldVersionsToDelete = validatedParams.numOldVersionsToDelete
+    this.minVersionsToKeep = validatedParams.minVersionsToKeep
+    this.ignoreVersions = validatedParams.ignoreVersions
+    this.deletePreReleaseVersions = validatedParams.deletePreReleaseVersions
     this.token = validatedParams.token
+
+    if (this.minVersionsToKeep > 0) {
+      this.numOldVersionsToDelete = 100 - this.minVersionsToKeep
+    }
+
+    if (this.deletePreReleaseVersions == 'true') {
+      this.numOldVersionsToDelete = 100 - this.minVersionsToKeep
+      this.ignoreVersions = new RegExp('^(0|[1-9]\\d*)((\\.(0|[1-9]\\d*))*)$')
+    }
   }
 
   hasOldestVersionQueryInfo(): boolean {
@@ -41,6 +62,7 @@ export class Input {
       this.repo &&
       this.packageName &&
       this.numOldVersionsToDelete > 0 &&
+      this.minVersionsToKeep >= 0 &&
       this.token
     )
   }

src/main.ts

@@ -14,6 +14,11 @@ function getActionInput(): Input {
     repo: getInput('repo') ? getInput('repo') : context.repo.repo,
     packageName: getInput('package-name'),
     numOldVersionsToDelete: Number(getInput('num-old-versions-to-delete')),
+    minVersionsToKeep: Number(getInput('min-versions-to-keep')),
+    ignoreVersions: RegExp(getInput('ignore-versions')),
+    deletePreReleaseVersions: getInput(
+      'delete-only-pre-release-versions'
+    ).toLowerCase(),
     token: getInput('token')
   })
 }

src/version/get-versions.ts

@@ -89,9 +89,10 @@ export function getOldestVersions(
   ).pipe(
     map(result => {
       if (result.repository.packages.edges.length < 1) {
-        throwError(
+        console.log(
           `package: ${packageName} not found for owner: ${owner} in repo: ${repo}`
         )
+        return []
       }
 
       const versions = result.repository.packages.edges[0].node.versions.edges