Extract cache key generation into common function

src/cache-gradle-user-home.ts

@@ -4,11 +4,10 @@ import os from 'os'
 
 import * as core from '@actions/core'
 import * as cache from '@actions/cache'
-import * as github from '@actions/github'
 import {
+    generateCacheKey,
     isCacheReadEnabled,
-    isCacheSaveEnabled,
+    isCacheSaveEnabled
-    truncateArgs
 } from './cache-utils'
 
 const CACHE_NAME = 'gradle-user-home'
@@ -28,21 +27,15 @@ export async function restore(): Promise<void> {
         return
     }
 
-    const cacheKeySeed = process.env[`CACHE_KEY_SEED`] || ''
+    const cacheKey = generateCacheKey('gradle')
-    const runnerOs = process.env[`RUNNER_OS`] || ''
-    const cacheKeyPrefix = `${cacheKeySeed}${runnerOs}|gradle|`
 
-    const args = truncateArgs(core.getInput('arguments'))
+    core.saveState(CACHE_KEY, cacheKey.key)
-    const cacheKeyWithArgs = `${cacheKeyPrefix}${args}|`
 
-    const cacheKey = `${cacheKeyWithArgs}${github.context.sha}`
+    const cacheResult = await cache.restoreCache(
-
+        CACHE_PATH,
-    core.saveState(CACHE_KEY, cacheKey)
+        cacheKey.key,
-
+        cacheKey.restoreKeys
-    const cacheResult = await cache.restoreCache(CACHE_PATH, cacheKey, [
+    )
-        cacheKeyWithArgs,
-        cacheKeyPrefix
-    ])
 
     if (!cacheResult) {
         core.info(

src/cache-project-dot-gradle.ts

@@ -3,11 +3,10 @@ import fs from 'fs'
 
 import * as core from '@actions/core'
 import * as cache from '@actions/cache'
-import * as github from '@actions/github'
 import {
+    generateCacheKey,
     isCacheReadEnabled,
-    isCacheSaveEnabled,
+    isCacheSaveEnabled
-    truncateArgs
 } from './cache-utils'
 
 const CACHE_NAME = 'project-dot-gradle'
@@ -27,21 +26,14 @@ export async function restore(rootDir: string): Promise<void> {
         return
     }
 
-    const cacheKeySeed = process.env[`CACHE_KEY_SEED`] || ''
+    const cacheKey = generateCacheKey('project')
-    const runnerOs = process.env[`RUNNER_OS`] || ''
-    const cacheKeyPrefix = `${cacheKeySeed}${runnerOs}|project|`
 
-    const args = truncateArgs(core.getInput('arguments'))
+    core.saveState(CACHE_KEY, cacheKey.key)
-    const cacheKeyWithArgs = `${cacheKeyPrefix}${args}|`
-
-    const cacheKey = `${cacheKeyWithArgs}${github.context.sha}`
-
-    core.saveState(CACHE_KEY, cacheKey)
 
     const cacheResult = await cache.restoreCache(
         getCachePath(rootDir),
-        cacheKey,
+        cacheKey.key,
-        [cacheKeyWithArgs, cacheKeyPrefix]
+        cacheKey.restoreKeys
     )
 
     if (!cacheResult) {

src/cache-utils.ts

@@ -1,8 +1,5 @@
 import * as core from '@actions/core'
-
+import * as github from '@actions/github'
-export function truncateArgs(args: string): string {
-    return args.trim().replace(/\s+/g, ' ').substr(0, 400)
-}
 
 export function isCacheReadEnabled(cacheName: string): boolean {
     const configValue = getCacheEnabledValue(cacheName)
@@ -26,3 +23,29 @@ function getCacheEnabledValue(cacheName: string): string {
         `Invalid cache-enabled parameter '${configValue}'. Valid values are ['true', 'false', 'read-only']`
     )
 }
+
+export function generateCacheKey(cacheName: string): CacheKey {
+    const cacheKeySeed = process.env[`CACHE_KEY_SEED`] || ''
+    const runnerOs = process.env[`RUNNER_OS`] || ''
+    const cacheKeyPrefix = `${cacheKeySeed}${runnerOs}|${cacheName}|`
+
+    const args = truncateArgs(core.getInput('arguments'))
+    const cacheKeyWithArgs = `${cacheKeyPrefix}${args}|`
+
+    const cacheKey = `${cacheKeyWithArgs}${github.context.sha}`
+    return new CacheKey(cacheKey, [cacheKeyWithArgs, cacheKeyPrefix])
+}
+
+function truncateArgs(args: string): string {
+    return args.trim().replace(/\s+/g, ' ').substr(0, 400)
+}
+
+export class CacheKey {
+    key: string
+    restoreKeys: string[]
+
+    constructor(key: string, restoreKeys: string[]) {
+        this.key = key
+        this.restoreKeys = restoreKeys
+    }
+}