From a9c16cbf4daa9a770f9654b55957dda2f537195e Mon Sep 17 00:00:00 2001 From: Sergey Dolin Date: Tue, 4 Jul 2023 18:29:58 +0200 Subject: [PATCH] Rename ActionCache to ActionsCache --- __tests__/classes/state-mock.ts | 2 +- dist/index.js | 14 +++++++------- src/classes/actions-cache/download.ts | 2 +- src/classes/state/state-cache-storage.ts | 6 +++--- src/classes/state/state.spec.ts | 2 +- src/classes/state/state.ts | 2 +- src/interfaces/state/state.ts | 2 +- src/main.ts | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/__tests__/classes/state-mock.ts b/__tests__/classes/state-mock.ts index 6d3cd139..b63691cf 100644 --- a/__tests__/classes/state-mock.ts +++ b/__tests__/classes/state-mock.ts @@ -14,7 +14,7 @@ export class StateMock implements IState { return Promise.resolve(undefined); } - rehydrate(): Promise { + restore(): Promise { return Promise.resolve(undefined); } diff --git a/dist/index.js b/dist/index.js index 53c7a213..aaa7559c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -39,7 +39,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.downloadFileFromActionCache = void 0; +exports.downloadFileFromActionsCache = void 0; const http_client_1 = __nccwpck_require__(8661); const retry_1 = __nccwpck_require__(3910); const http_responses_1 = __nccwpck_require__(7233); @@ -67,7 +67,7 @@ const getCacheArchiveUrl = (httpClient, cacheKey, cacheVersion) => __awaiter(voi } return cacheDownloadUrl; }); -const downloadFileFromActionCache = (destFileName, cacheKey, cacheVersion) => __awaiter(void 0, void 0, void 0, function* () { +const downloadFileFromActionsCache = (destFileName, cacheKey, cacheVersion) => __awaiter(void 0, void 0, void 0, function* () { const httpClient = (0, http_client_1.createHttpClient)(); const archiveUrl = yield getCacheArchiveUrl(httpClient, cacheKey, cacheVersion); if (!archiveUrl) { @@ -75,7 +75,7 @@ const downloadFileFromActionCache = (destFileName, cacheKey, cacheVersion) => __ } yield (0, downloadUtils_1.downloadCacheHttpClient)(archiveUrl, destFileName); }); -exports.downloadFileFromActionCache = downloadFileFromActionCache; +exports.downloadFileFromActionsCache = downloadFileFromActionsCache; /***/ }), @@ -2041,9 +2041,9 @@ class StateCacheStorage { const tmpDir = fs_1.default.mkdtempSync('state-'); const fileName = path_1.default.join(tmpDir, STATE_FILE); try { - yield (0, download_1.downloadFileFromActionCache)(fileName, CACHE_KEY, CACHE_VERSION); + yield (0, download_1.downloadFileFromActionsCache)(fileName, CACHE_KEY, CACHE_VERSION); if (!fs_1.default.existsSync(fileName)) { - core.info('There is no state persisted, probably because of the very first run or previous run failed'); + core.info('The stored state has not been found, probably because of the very first run or the previous run failed'); return ''; } return fs_1.default.readFileSync(path_1.default.join(tmpDir, STATE_FILE), { @@ -2143,7 +2143,7 @@ class State { return this.stateStorage.save(this.serialized); }); } - rehydrate() { + restore() { return __awaiter(this, void 0, void 0, function* () { this.reset(); const serialized = yield this.stateStorage.restore(); @@ -2848,7 +2848,7 @@ function _run() { try { const args = _getAndValidateArgs(); const state = (0, state_service_1.getStateInstance)(args); - yield state.rehydrate(); + yield state.restore(); const issueProcessor = new issues_processor_1.IssuesProcessor(args, state); yield issueProcessor.processIssues(); yield state.persist(); diff --git a/src/classes/actions-cache/download.ts b/src/classes/actions-cache/download.ts index 2868531c..30c13d3e 100644 --- a/src/classes/actions-cache/download.ts +++ b/src/classes/actions-cache/download.ts @@ -45,7 +45,7 @@ const getCacheArchiveUrl = async ( return cacheDownloadUrl; }; -export const downloadFileFromActionCache = async ( +export const downloadFileFromActionsCache = async ( destFileName: string, cacheKey: string, cacheVersion: string diff --git a/src/classes/state/state-cache-storage.ts b/src/classes/state/state-cache-storage.ts index fe95aa7e..7877a9df 100644 --- a/src/classes/state/state-cache-storage.ts +++ b/src/classes/state/state-cache-storage.ts @@ -4,7 +4,7 @@ import path from 'path'; import os from 'os'; import * as core from '@actions/core'; import {uploadFileToActionsCache} from '../actions-cache/upload'; -import {downloadFileFromActionCache} from '../actions-cache/download'; +import {downloadFileFromActionsCache} from '../actions-cache/download'; const CACHE_KEY = '_state'; const CACHE_VERSION = '1'; @@ -30,10 +30,10 @@ export class StateCacheStorage implements IStateStorage { const tmpDir = fs.mkdtempSync('state-'); const fileName = path.join(tmpDir, STATE_FILE); try { - await downloadFileFromActionCache(fileName, CACHE_KEY, CACHE_VERSION); + await downloadFileFromActionsCache(fileName, CACHE_KEY, CACHE_VERSION); if (!fs.existsSync(fileName)) { core.info( - 'There is no state persisted, probably because of the very first run or previous run failed' + 'The stored state has not been found, probably because of the very first run or the previous run failed' ); return ''; } diff --git a/src/classes/state/state.spec.ts b/src/classes/state/state.spec.ts index e5be5cb7..f8b90fa5 100644 --- a/src/classes/state/state.spec.ts +++ b/src/classes/state/state.spec.ts @@ -114,7 +114,7 @@ describe('State', () => { mockStorage, {} as unknown as IIssuesProcessorOptions ); - await state.rehydrate(); + await state.restore(); const processedIssuesIDs = ( state as unknown as {processedIssuesIDs: Set} ).processedIssuesIDs; diff --git a/src/classes/state/state.ts b/src/classes/state/state.ts index ce16eb29..a8ea29bd 100644 --- a/src/classes/state/state.ts +++ b/src/classes/state/state.ts @@ -60,7 +60,7 @@ export class State implements IState { return this.stateStorage.save(this.serialized); } - async rehydrate(): Promise { + async restore(): Promise { this.reset(); const serialized = await this.stateStorage.restore(); this.deserialize(serialized); diff --git a/src/interfaces/state/state.ts b/src/interfaces/state/state.ts index 42930810..082499bd 100644 --- a/src/interfaces/state/state.ts +++ b/src/interfaces/state/state.ts @@ -5,5 +5,5 @@ export interface IState { addIssueToProcessed(issue: IIssue): void; reset(): void; persist(): Promise; - rehydrate(): Promise; + restore(): Promise; } diff --git a/src/main.ts b/src/main.ts index 88907fc4..76870041 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,7 +10,7 @@ async function _run(): Promise { const args = _getAndValidateArgs(); const state = getStateInstance(args); - await state.rehydrate(); + await state.restore(); const issueProcessor: IssuesProcessor = new IssuesProcessor(args, state); await issueProcessor.processIssues();