Use ActionState for getRemoteConfig

Author: mbg

lib/entry-points.js

@@ -5,6 +5,7 @@ import { performance } from "perf_hooks";
 import * as core from "@actions/core";
 import * as yaml from "js-yaml";
 
+import { ActionState } from "./action-common";
 import {
   getActionVersion,
   getOptionalInput,
@@ -78,6 +79,7 @@ import {
   Success,
   Failure,
   isHostedRunner,
+  getEnv,
 } from "./util";
 
 /**
@@ -600,12 +602,11 @@ async function downloadCacheWithTime(
 }
 
 async function loadUserConfig(
-  logger: Logger,
+  actionState: ActionState,
   configFile: string,
   workspacePath: string,
   apiDetails: api.GitHubApiCombinedDetails,
   tempDir: string,
-  validateConfig: boolean,
 ): Promise<UserConfig> {
   if (isLocal(configFile)) {
     if (configFile !== userConfigFromActionPath(tempDir)) {
@@ -618,14 +619,12 @@ async function loadUserConfig(
         );
       }
     }
-    return getLocalConfig(logger, configFile, validateConfig);
-  } else {
-    return await getRemoteConfig(
-      logger,
-      configFile,
-      apiDetails,
-      validateConfig,
+    const validateConfig = await actionState.features.getValue(
+      Feature.ValidateDbConfig,
     );
+    return getLocalConfig(actionState.logger, configFile, validateConfig);
+  } else {
+    return await getRemoteConfig(actionState, configFile, apiDetails);
   }
 }
 
@@ -1161,14 +1160,13 @@ export async function initConfig(
     logger.debug("No configuration file was provided");
   } else {
     logger.debug(`Using configuration file: ${inputs.configFile}`);
-    const validateConfig = await features.getValue(Feature.ValidateDbConfig);
+    const actionState: ActionState = { logger, features, env: getEnv() };
     userConfig = await loadUserConfig(
-      logger,
+      actionState,
       inputs.configFile,
       inputs.workspacePath,
       inputs.apiDetails,
       tempDir,
-      validateConfig,
     );
   }
 

src/config-utils.ts

@@ -1,6 +1,8 @@
+import { ActionState } from "../action-common";
 import { ActionsEnv } from "../actions-util";
 import * as api from "../api-client";
 import * as errorMessages from "../error-messages";
+import { Feature } from "../feature-flags";
 import {
   RepositoryProperties,
   RepositoryPropertyName,
@@ -42,18 +44,16 @@ export function getConfigFileInput(
 /**
  * Attempts to fetch a `UserConfig` from a remote `address`.
  *
- * @param logger The logger to use.
+ * @param actionState The current Action state.
  * @param configFile The remote address of the configuration file.
  * @param apiDetails Information about how to connect to the API.
- * @param validateConfig Whether to validate the configuration.
  *
  * @returns The `UserConfig`, if it could be fetched and parsed successfully.
  */
 export async function getRemoteConfig(
-  logger: Logger,
+  actionState: ActionState,
   configFile: string,
   apiDetails: api.GitHubApiCombinedDetails,
-  validateConfig: boolean,
 ): Promise<UserConfig> {
   const address = parseRemoteFileAddress(getEnv(), configFile);
 
@@ -79,8 +79,11 @@ export async function getRemoteConfig(
     );
   }
 
+  const validateConfig = await actionState.features.getValue(
+    Feature.ValidateDbConfig,
+  );
   return parseUserConfig(
-    logger,
+    actionState.logger,
     configFile,
     Buffer.from(fileContents, "base64").toString("binary"),
     validateConfig,