Update folder structure for cache

packages/cache/__tests__/cacheHttpClient.test.ts

@@ -1,10 +1,10 @@
 import {downloadCache} from '../src/internal/cacheHttpClient'
-import {getCacheVersion} from '../src/internal/cacheUtils'
-import {CompressionMethod} from '../src/internal/constants'
-import * as downloadUtils from '../src/internal/downloadUtils'
+import {getCacheVersion} from '../src/internal/shared/cacheUtils'
+import {CompressionMethod} from '../src/internal/shared/constants'
+import * as downloadUtils from '../src/internal/shared/downloadUtils'
 import {DownloadOptions, getDownloadOptions} from '../src/options'
 
-jest.mock('../src/internal/downloadUtils')
+jest.mock('../src/internal/shared/downloadUtils')
 
 test('getCacheVersion does not mutate arguments', async () => {
   const paths = ['node_modules']

packages/cache/__tests__/cacheUtils.test.ts

@@ -1,6 +1,6 @@
 import {promises as fs} from 'fs'
 import * as path from 'path'
-import * as cacheUtils from '../src/internal/cacheUtils'
+import * as cacheUtils from '../src/internal/shared/cacheUtils'
 
 beforeEach(() => {
   jest.resetModules()

packages/cache/__tests__/config.test.ts

@@ -1,4 +1,4 @@
-import * as config from '../src/internal/config'
+import * as config from '../src/internal/shared/config'
 
 beforeEach(() => {
   jest.resetModules()

packages/cache/__tests__/downloadUtils.test.ts

@@ -1,5 +1,5 @@
 import * as core from '@actions/core'
-import {DownloadProgress} from '../src/internal/downloadUtils'
+import {DownloadProgress} from '../src/internal/shared/downloadUtils'
 
 test('download progress tracked correctly', () => {
   const progress = new DownloadProgress(1000)

packages/cache/__tests__/requestUtils.test.ts

@@ -1,6 +1,6 @@
-import {retry, retryTypedResponse} from '../src/internal/requestUtils'
+import {retry, retryTypedResponse} from '../src/internal/shared/requestUtils'
 import {HttpClientError} from '@actions/http-client'
-import * as requestUtils from '../src/internal/requestUtils'
+import * as requestUtils from '../src/internal/shared/requestUtils'
 
 interface ITestResponse {
   statusCode: number

packages/cache/__tests__/restoreCache.test.ts

@@ -2,13 +2,16 @@ import * as core from '@actions/core'
 import * as path from 'path'
 import {restoreCache} from '../src/cache'
 import * as cacheHttpClient from '../src/internal/cacheHttpClient'
-import * as cacheUtils from '../src/internal/cacheUtils'
-import {CacheFilename, CompressionMethod} from '../src/internal/constants'
+import * as cacheUtils from '../src/internal/shared/cacheUtils'
+import {
+  CacheFilename,
+  CompressionMethod
+} from '../src/internal/shared/constants'
 import {ArtifactCacheEntry} from '../src/internal/contracts'
 import * as tar from '../src/internal/tar'
 
 jest.mock('../src/internal/cacheHttpClient')
-jest.mock('../src/internal/cacheUtils')
+jest.mock('../src/internal/shared/cacheUtils')
 jest.mock('../src/internal/tar')
 
 beforeAll(() => {
@@ -19,7 +22,7 @@ beforeAll(() => {
   jest.spyOn(core, 'error').mockImplementation(() => {})
 
   jest.spyOn(cacheUtils, 'getCacheFileName').mockImplementation(cm => {
-    const actualUtils = jest.requireActual('../src/internal/cacheUtils')
+    const actualUtils = jest.requireActual('../src/internal/shared/cacheUtils')
     return actualUtils.getCacheFileName(cm)
   })
 })

packages/cache/__tests__/restoreCacheV2.test.ts

@@ -1,17 +1,20 @@
 import * as core from '@actions/core'
 import * as path from 'path'
 import * as tar from '../src/internal/tar'
-import * as config from '../src/internal/config'
-import * as cacheUtils from '../src/internal/cacheUtils'
+import * as config from '../src/internal/shared/config'
+import * as cacheUtils from '../src/internal/shared/cacheUtils'
 import * as cacheHttpClient from '../src/internal/cacheHttpClient'
 import {restoreCache} from '../src/cache'
-import {CacheFilename, CompressionMethod} from '../src/internal/constants'
+import {
+  CacheFilename,
+  CompressionMethod
+} from '../src/internal/shared/constants'
 import {CacheServiceClientJSON} from '../src/generated/results/api/v1/cache.twirp-client'
 import {DownloadOptions} from '../src/options'
 
 jest.mock('../src/internal/cacheHttpClient')
-jest.mock('../src/internal/cacheUtils')
-jest.mock('../src/internal/config')
+jest.mock('../src/internal/shared/cacheUtils')
+jest.mock('../src/internal/shared/config')
 jest.mock('../src/internal/tar')
 
 let logDebugMock: jest.SpyInstance
@@ -25,7 +28,7 @@ beforeAll(() => {
   jest.spyOn(core, 'error').mockImplementation(() => {})
 
   jest.spyOn(cacheUtils, 'getCacheFileName').mockImplementation(cm => {
-    const actualUtils = jest.requireActual('../src/internal/cacheUtils')
+    const actualUtils = jest.requireActual('../src/internal/shared/cacheUtils')
     return actualUtils.getCacheFileName(cm)
   })
 

packages/cache/__tests__/saveCache.test.ts

@@ -2,9 +2,12 @@ import * as core from '@actions/core'
 import * as path from 'path'
 import {saveCache} from '../src/cache'
 import * as cacheHttpClient from '../src/internal/cacheHttpClient'
-import * as cacheUtils from '../src/internal/cacheUtils'
-import * as config from '../src/internal/config'
-import {CacheFilename, CompressionMethod} from '../src/internal/constants'
+import * as cacheUtils from '../src/internal/shared/cacheUtils'
+import * as config from '../src/internal/shared/config'
+import {
+  CacheFilename,
+  CompressionMethod
+} from '../src/internal/shared/constants'
 import * as tar from '../src/internal/tar'
 import {TypedResponse} from '@actions/http-client/lib/interfaces'
 import {
@@ -14,8 +17,8 @@ import {
 import {HttpClientError} from '@actions/http-client'
 
 jest.mock('../src/internal/cacheHttpClient')
-jest.mock('../src/internal/cacheUtils')
-jest.mock('../src/internal/config')
+jest.mock('../src/internal/shared/cacheUtils')
+jest.mock('../src/internal/shared/config')
 jest.mock('../src/internal/tar')
 
 beforeAll(() => {
@@ -25,7 +28,7 @@ beforeAll(() => {
   jest.spyOn(core, 'warning').mockImplementation(() => {})
   jest.spyOn(core, 'error').mockImplementation(() => {})
   jest.spyOn(cacheUtils, 'getCacheFileName').mockImplementation(cm => {
-    const actualUtils = jest.requireActual('../src/internal/cacheUtils')
+    const actualUtils = jest.requireActual('../src/internal/shared/cacheUtils')
     return actualUtils.getCacheFileName(cm)
   })
   jest.spyOn(cacheUtils, 'resolvePaths').mockImplementation(async filePaths => {

packages/cache/__tests__/saveCacheV2.test.ts

@@ -1,9 +1,12 @@
 import * as core from '@actions/core'
 import * as path from 'path'
 import {saveCache} from '../src/cache'
-import * as cacheUtils from '../src/internal/cacheUtils'
-import {CacheFilename, CompressionMethod} from '../src/internal/constants'
-import * as config from '../src/internal/config'
+import * as cacheUtils from '../src/internal/shared/cacheUtils'
+import {
+  CacheFilename,
+  CompressionMethod
+} from '../src/internal/shared/constants'
+import * as config from '../src/internal/shared/config'
 import * as tar from '../src/internal/tar'
 import {CacheServiceClientJSON} from '../src/generated/results/api/v1/cache.twirp-client'
 import * as cacheHttpClient from '../src/internal/cacheHttpClient'

packages/cache/__tests__/tar.test.ts

@@ -8,9 +8,9 @@ import {
   ManifestFilename,
   SystemTarPathOnWindows,
   TarFilename
-} from '../src/internal/constants'
+} from '../src/internal/shared/constants'
 import * as tar from '../src/internal/tar'
-import * as utils from '../src/internal/cacheUtils'
+import * as utils from '../src/internal/shared/cacheUtils'
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 import fs = require('fs')
 

packages/cache/__tests__/uploadUtils.test.ts

@@ -1,4 +1,4 @@
-import * as uploadUtils from '../src/internal/uploadUtils'
+import * as uploadUtils from '../src/internal/shared/uploadUtils'
 import {TransferProgressEvent} from '@azure/ms-rest-js'
 
 test('upload progress tracked correctly', () => {

packages/cache/__tests__/util.test.ts

@@ -1,4 +1,4 @@
-import {maskSigUrl, maskSecretUrls} from '../src/internal/shared/util'
+import {maskSigUrl, maskSecretUrls} from '../src/internal/shared/requestUtils'
 import {setSecret, debug} from '@actions/core'
 
 jest.mock('@actions/core')

packages/cache/src/cache.ts

@@ -1,9 +1,9 @@
 import * as core from '@actions/core'
 import * as path from 'path'
-import * as utils from './internal/cacheUtils'
+import * as utils from './internal/shared/cacheUtils'
 import * as cacheHttpClient from './internal/cacheHttpClient'
-import * as cacheTwirpClient from './internal/shared/cacheTwirpClient'
-import {getCacheServiceVersion, isGhes} from './internal/config'
+import * as cacheTwirpClient from './internal/cacheTwirpClient'
+import {getCacheServiceVersion, isGhes} from './internal/shared/config'
 import {DownloadOptions, UploadOptions} from './options'
 import {createTar, extractTar, listTar} from './internal/tar'
 import {
@@ -12,7 +12,7 @@ import {
   FinalizeCacheEntryUploadResponse,
   GetCacheEntryDownloadURLRequest
 } from './generated/results/api/v1/cache'
-import {CacheFileSizeLimit} from './internal/constants'
+import {CacheFileSizeLimit} from './internal/shared/constants'
 export class ValidationError extends Error {
   constructor(message: string) {
     super(message)

packages/cache/src/internal/cacheHttpClient.ts

@@ -7,8 +7,8 @@ import {
 } from '@actions/http-client/lib/interfaces'
 import * as fs from 'fs'
 import {URL} from 'url'
-import * as utils from './cacheUtils'
-import {uploadCacheArchiveSDK} from './uploadUtils'
+import * as utils from './shared/cacheUtils'
+import {uploadCacheArchiveSDK} from './shared/uploadUtils'
 import {
   ArtifactCacheEntry,
   InternalCacheOptions,
@@ -22,7 +22,7 @@ import {
   downloadCacheHttpClient,
   downloadCacheHttpClientConcurrent,
   downloadCacheStorageSDK
-} from './downloadUtils'
+} from './shared/downloadUtils'
 import {
   DownloadOptions,
   UploadOptions,
@@ -33,8 +33,8 @@ import {
   isSuccessStatusCode,
   retryHttpClientResponse,
   retryTypedResponse
-} from './requestUtils'
-import {getCacheServiceURL} from './config'
+} from './shared/requestUtils'
+import {getCacheServiceURL} from './shared/config'
 import {getUserAgentString} from './shared/user-agent'
 
 function getCacheApiUrl(resource: string): string {