From 7e9e469530018c36397f413699461479a7986312 Mon Sep 17 00:00:00 2001 From: daz Date: Tue, 9 Apr 2024 13:47:18 -0600 Subject: [PATCH] Rename 'input-params' to 'configuration' --- sources/src/build-scan.ts | 2 +- sources/src/caching/cache-key.ts | 2 +- sources/src/caching/caches.ts | 2 +- sources/src/caching/gradle-home-extry-extractor.ts | 2 +- sources/src/caching/gradle-user-home-cache.ts | 2 +- sources/src/{input-params.ts => configuration.ts} | 0 sources/src/dependency-graph.ts | 2 +- sources/src/dependency-submission/main.ts | 2 +- sources/src/dependency-submission/post.ts | 2 +- sources/src/execution/provision.ts | 2 +- sources/src/job-summary.ts | 2 +- sources/src/setup-gradle.ts | 2 +- sources/src/setup-gradle/main.ts | 2 +- sources/src/setup-gradle/post.ts | 2 +- sources/test/jest/cache-debug.test.ts | 2 +- .../test/jest/{input-params.test.ts => configuration.test.ts} | 2 +- sources/test/jest/dependency-graph.test.ts | 2 +- 17 files changed, 16 insertions(+), 16 deletions(-) rename sources/src/{input-params.ts => configuration.ts} (100%) rename sources/test/jest/{input-params.test.ts => configuration.test.ts} (92%) diff --git a/sources/src/build-scan.ts b/sources/src/build-scan.ts index 014a8dd..69bc02b 100644 --- a/sources/src/build-scan.ts +++ b/sources/src/build-scan.ts @@ -1,5 +1,5 @@ import * as core from '@actions/core' -import {BuildScanConfig} from './input-params' +import {BuildScanConfig} from './configuration' export function setup(config: BuildScanConfig): void { maybeExportVariable('DEVELOCITY_INJECTION_INIT_SCRIPT_NAME', 'gradle-actions.inject-develocity.init.gradle') diff --git a/sources/src/caching/cache-key.ts b/sources/src/caching/cache-key.ts index b9402b1..48501d7 100644 --- a/sources/src/caching/cache-key.ts +++ b/sources/src/caching/cache-key.ts @@ -1,6 +1,6 @@ import * as github from '@actions/github' -import {CacheConfig, getJobMatrix} from '../input-params' +import {CacheConfig, getJobMatrix} from '../configuration' import {hashStrings} from './cache-utils' const CACHE_PROTOCOL_VERSION = 'v1' diff --git a/sources/src/caching/caches.ts b/sources/src/caching/caches.ts index 5b7858d..22c9b87 100644 --- a/sources/src/caching/caches.ts +++ b/sources/src/caching/caches.ts @@ -3,7 +3,7 @@ import {CacheListener} from './cache-reporting' import {GradleUserHomeCache} from './gradle-user-home-cache' import {CacheCleaner} from './cache-cleaner' import {DaemonController} from '../daemon-controller' -import {CacheConfig} from '../input-params' +import {CacheConfig} from '../configuration' const CACHE_RESTORED_VAR = 'GRADLE_BUILD_ACTION_CACHE_RESTORED' diff --git a/sources/src/caching/gradle-home-extry-extractor.ts b/sources/src/caching/gradle-home-extry-extractor.ts index e71cc32..f502555 100644 --- a/sources/src/caching/gradle-home-extry-extractor.ts +++ b/sources/src/caching/gradle-home-extry-extractor.ts @@ -9,7 +9,7 @@ import {CacheEntryListener, CacheListener} from './cache-reporting' import {cacheDebug, hashFileNames, isCacheDebuggingEnabled, restoreCache, saveCache, tryDelete} from './cache-utils' import {BuildResult, loadBuildResults} from '../build-results' -import {CacheConfig} from '../input-params' +import {CacheConfig} from '../configuration' import {getCacheKeyBase} from './cache-key' const SKIP_RESTORE_VAR = 'GRADLE_BUILD_ACTION_SKIP_RESTORE' diff --git a/sources/src/caching/gradle-user-home-cache.ts b/sources/src/caching/gradle-user-home-cache.ts index 180e19b..9adb677 100644 --- a/sources/src/caching/gradle-user-home-cache.ts +++ b/sources/src/caching/gradle-user-home-cache.ts @@ -8,7 +8,7 @@ import {generateCacheKey} from './cache-key' import {CacheListener} from './cache-reporting' import {saveCache, restoreCache, cacheDebug, isCacheDebuggingEnabled, tryDelete} from './cache-utils' import {GradleHomeEntryExtractor, ConfigurationCacheEntryExtractor} from './gradle-home-extry-extractor' -import {CacheConfig} from '../input-params' +import {CacheConfig} from '../configuration' const RESTORED_CACHE_KEY_KEY = 'restored-cache-key' diff --git a/sources/src/input-params.ts b/sources/src/configuration.ts similarity index 100% rename from sources/src/input-params.ts rename to sources/src/configuration.ts diff --git a/sources/src/dependency-graph.ts b/sources/src/dependency-graph.ts index c7bc4e6..4116191 100644 --- a/sources/src/dependency-graph.ts +++ b/sources/src/dependency-graph.ts @@ -10,7 +10,7 @@ import * as path from 'path' import fs from 'fs' import {PostActionJobFailure} from './errors' -import {DependencyGraphConfig, DependencyGraphOption, getGithubToken, getWorkspaceDirectory} from './input-params' +import {DependencyGraphConfig, DependencyGraphOption, getGithubToken, getWorkspaceDirectory} from './configuration' const DEPENDENCY_GRAPH_PREFIX = 'dependency-graph_' diff --git a/sources/src/dependency-submission/main.ts b/sources/src/dependency-submission/main.ts index 4d0d3c7..fad29e3 100644 --- a/sources/src/dependency-submission/main.ts +++ b/sources/src/dependency-submission/main.ts @@ -11,7 +11,7 @@ import { DependencyGraphConfig, DependencyGraphOption, GradleExecutionConfig -} from '../input-params' +} from '../configuration' import {saveDeprecationState} from '../deprecation-collector' /** diff --git a/sources/src/dependency-submission/post.ts b/sources/src/dependency-submission/post.ts index 91fe87f..50ab70e 100644 --- a/sources/src/dependency-submission/post.ts +++ b/sources/src/dependency-submission/post.ts @@ -1,7 +1,7 @@ import * as core from '@actions/core' import * as setupGradle from '../setup-gradle' -import {CacheConfig, SummaryConfig} from '../input-params' +import {CacheConfig, SummaryConfig} from '../configuration' import {PostActionJobFailure} from '../errors' // Catch and log any unhandled exceptions. These exceptions can leak out of the uploadChunk method in diff --git a/sources/src/execution/provision.ts b/sources/src/execution/provision.ts index b7c3eb4..ae02b90 100644 --- a/sources/src/execution/provision.ts +++ b/sources/src/execution/provision.ts @@ -8,7 +8,7 @@ import * as toolCache from '@actions/tool-cache' import * as gradlew from './gradlew' import {handleCacheFailure} from '../caching/cache-utils' -import {CacheConfig} from '../input-params' +import {CacheConfig} from '../configuration' const gradleVersionsBaseUrl = 'https://services.gradle.org/versions' diff --git a/sources/src/job-summary.ts b/sources/src/job-summary.ts index 7e728a9..8d711d4 100644 --- a/sources/src/job-summary.ts +++ b/sources/src/job-summary.ts @@ -3,7 +3,7 @@ import * as github from '@actions/github' import {RequestError} from '@octokit/request-error' import {BuildResult} from './build-results' -import {SummaryConfig, getGithubToken} from './input-params' +import {SummaryConfig, getGithubToken} from './configuration' import {Deprecation, getDeprecations} from './deprecation-collector' export async function generateJobSummary( diff --git a/sources/src/setup-gradle.ts b/sources/src/setup-gradle.ts index af418ae..d4d3a33 100644 --- a/sources/src/setup-gradle.ts +++ b/sources/src/setup-gradle.ts @@ -9,7 +9,7 @@ import * as buildScan from './build-scan' import {loadBuildResults, markBuildResultsProcessed} from './build-results' import {CacheListener, generateCachingReport} from './caching/cache-reporting' import {DaemonController} from './daemon-controller' -import {BuildScanConfig, CacheConfig, SummaryConfig, getWorkspaceDirectory} from './input-params' +import {BuildScanConfig, CacheConfig, SummaryConfig, getWorkspaceDirectory} from './configuration' const GRADLE_SETUP_VAR = 'GRADLE_BUILD_ACTION_SETUP_COMPLETED' const USER_HOME = 'USER_HOME' diff --git a/sources/src/setup-gradle/main.ts b/sources/src/setup-gradle/main.ts index 21442c8..665a9e1 100644 --- a/sources/src/setup-gradle/main.ts +++ b/sources/src/setup-gradle/main.ts @@ -3,7 +3,7 @@ import * as core from '@actions/core' import * as setupGradle from '../setup-gradle' import * as gradle from '../execution/gradle' import * as dependencyGraph from '../dependency-graph' -import {BuildScanConfig, CacheConfig, DependencyGraphConfig, GradleExecutionConfig} from '../input-params' +import {BuildScanConfig, CacheConfig, DependencyGraphConfig, GradleExecutionConfig} from '../configuration' import {saveDeprecationState} from '../deprecation-collector' /** diff --git a/sources/src/setup-gradle/post.ts b/sources/src/setup-gradle/post.ts index 375219a..4f7b9d4 100644 --- a/sources/src/setup-gradle/post.ts +++ b/sources/src/setup-gradle/post.ts @@ -2,7 +2,7 @@ import * as core from '@actions/core' import * as setupGradle from '../setup-gradle' import * as dependencyGraph from '../dependency-graph' -import {CacheConfig, DependencyGraphConfig, SummaryConfig} from '../input-params' +import {CacheConfig, DependencyGraphConfig, SummaryConfig} from '../configuration' import {PostActionJobFailure} from '../errors' import {emitDeprecationWarnings, restoreDeprecationState} from '../deprecation-collector' diff --git a/sources/test/jest/cache-debug.test.ts b/sources/test/jest/cache-debug.test.ts index d0c989d..141d51b 100644 --- a/sources/test/jest/cache-debug.test.ts +++ b/sources/test/jest/cache-debug.test.ts @@ -1,7 +1,7 @@ import * as path from 'path' import * as fs from 'fs' import {GradleUserHomeCache} from "../../src/caching/gradle-user-home-cache" -import {CacheConfig} from "../../src/input-params" +import {CacheConfig} from "../../src/configuration" const testTmp = 'test/jest/tmp' fs.rmSync(testTmp, {recursive: true, force: true}) diff --git a/sources/test/jest/input-params.test.ts b/sources/test/jest/configuration.test.ts similarity index 92% rename from sources/test/jest/input-params.test.ts rename to sources/test/jest/configuration.test.ts index 8db626f..d1dfa47 100644 --- a/sources/test/jest/input-params.test.ts +++ b/sources/test/jest/configuration.test.ts @@ -1,4 +1,4 @@ -import * as inputParams from '../../src/input-params' +import * as inputParams from '../../src/configuration' describe('input params', () => { describe('parses numeric input', () => { diff --git a/sources/test/jest/dependency-graph.test.ts b/sources/test/jest/dependency-graph.test.ts index 5904731..e97ed45 100644 --- a/sources/test/jest/dependency-graph.test.ts +++ b/sources/test/jest/dependency-graph.test.ts @@ -1,4 +1,4 @@ -import { DependencyGraphConfig } from "../../src/input-params" +import { DependencyGraphConfig } from "../../src/configuration" describe('dependency-graph', () => { describe('constructs job correlator', () => {